fix for #1188 (make the logviewer able to load different date types)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5927 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 29 insertions, 4 deletions

diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp
index f9c7d0cb3..098d82636 100644
--- a/src/modules/logview/LogFile.cpp
+++ b/src/modules/logview/LogFile.cpp
@@ -26,6 +26,7 @@
 
 #include "KviQString.h"
 #include "KviCString.h"
+#include "KviOptions.h"
 
 #include <QFileInfo>
 
@@ -77,10 +78,34 @@ LogFile::LogFile(const QString & szName)
 	m_szNetwork = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
 
 	QString szDate = szTmpName.section('_',-1).section('.',0,-2);
-	int iYear = szDate.section('.',0,0).toInt();
-	int iMonth = szDate.section('.',1,1).toInt();
-	int iDay = szDate.section('.',2,2).toInt();
-	m_date.setYMD(iYear,iMonth,iDay);
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) 
+	{
+		case 1:
+			m_date = QDate::fromString(szDate, Qt::ISODate);
+			break;
+		case 2:
+			m_date = QDate::fromString(szDate, Qt::SystemLocaleDate);
+			break;
+		case 0:
+		default:
+			m_date = QDate::fromString(szDate, "yyyy.MM.dd");
+			break;
+	}
+	if(!m_date.isValid())
+	{
+		// probably the log has been created when the OutputDatetimeFormat option
+		// was set to a different value. Try to guess its format
+		m_date = QDate::fromString(szDate, "yyyy.MM.dd");
+		if(!m_date.isValid())
+		{
+			m_date = QDate::fromString(szDate, Qt::ISODate);
+			if(!m_date.isValid())
+			{
+				m_date = QDate::fromString(szDate, Qt::SystemLocaleDate);
+				// if the date is still not valid, we give up
+			}
+		}
+	}
 }
 
 void LogFile::getText(QString & szText)