1 files changed, 10 insertions, 24 deletions

diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 9377e3d..a54ba8a 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -391,70 +391,56 @@ bool Serializer::extractMeta(const QDomNode &n,
 		} else if (name == META_VALID_DATE) {
 			dta->valid = QDateTime::fromString(val, Qt::ISODate);
 		} else if (name == META_EXPIRE_DATE) {
 			dta->expire = QDateTime::fromString(val, Qt::ISODate);
 		} else if (name == META_UPDATE_DATE) {
 			dta->update = QDateTime::fromString(val, Qt::ISODate);
 		} else if (name == META_UPDATE_INT) {
 			dta->updateInt = strtoul(val.latin1(), 0, 10);
 		} else if (name == META_UNIQUEID) {
 			dta->uniqueid = unescapeEntryData(val).latin1();
 		} else {
 			printDebug(string("extractMeta(): invalid: ")
 				   + name.latin1());
 		}
 #else
 
-		QDateTime m_dt;
-
-		if ((name == META_CREATE_DATE) ||
-		    (name == META_VALID_DATE)  ||
-		    (name == META_EXPIRE_DATE) ||
-		    (name == META_UPDATE_DATE)) 
-		  {
-		    int pos = val.find("T");
-		    QString date = val.left(pos);
-		    QString time = val.mid(pos+1);
-		    qDebug("Serializer::extractMeta from %s to date=%s ,time=%s",val.latin1(), date.latin1(), time.latin1()  );
-		    bool ok1, ok2;
-
-		    QDate m_date = KGlobal::locale()->readDate(date, &ok1);
-		    QTime m_time = KGlobal::locale()->readTime(time, &ok2);
-		    if ((ok1 == false) || (ok2 == false))
-		      qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
-		    m_dt.setDate(m_date);
-		    m_dt.setTime(m_time);
-		  }
 
+		bool ok = true;
 
 		if (name == META_CREATE_DATE) {
-			dta->create = m_dt;
+			dta->create = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
 		} else if (name == META_VALID_DATE) {
-			dta->valid = m_dt;
+			dta->valid = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
 		} else if (name == META_EXPIRE_DATE) {
-		  dta->expire = m_dt;
+		  dta->expire = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
 		} else if (name == META_UPDATE_DATE) {
-		  dta->update = m_dt;
+		  dta->update = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
 		} else if (name == META_UPDATE_INT) {
 			dta->updateInt = strtoul(val.latin1(), 0, 10);
 		} else if (name == META_UNIQUEID) {
 			dta->uniqueid = unescapeEntryData(val).latin1();
 		} else {
 			printDebug(string("extractMeta(): invalid: ")
 				   + name.latin1());
 		}
+
+		if (ok == false)
+		  qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+
+
 #endif
 		cur = cur.nextSibling();
 	}
 	return true;
 }
 
 bool Serializer::checkValid()
 {
 	PWM_ASSERT(domDoc);
 	QDomElement root(domDoc->documentElement());
 	if (root.nodeName() != ROOT_MAGIC_NEW &&
 	    root.nodeName() != ROOT_MAGIC_OLD) {
 		printDebug("Serializer: wrong magic");
 		return false;
 	}
 	if (root.attribute(VER_STR_NEW) != COMPAT_VER_NEW &&