SVN commit 678795 by mlaurent:

Use kdatetime and port++


 M  +16 -19    kolabbase.cpp  
 M  +7 -8      kolabbase.h  


--- trunk/KDE/kdepim/kresources/kolab/shared/kolabbase.cpp #678794:678795
@@ -84,7 +84,7 @@
 void KolabBase::setFields( const KABC::Addressee* addressee )
 {
 //TODO port it
-#if 0
+#if 1
   // An addressee does not have a creation date, so somehow we should
   // make one, if this is a new entry
 
@@ -97,7 +97,7 @@
   kDebug(5006) << "Creation time string: " << creationString << endl;
   KDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = QDateTime::currentDateTime();
+    creationDate = KDateTime::currentDateTime(KDateTime::Spec( mTimeZone ) );
     kDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -139,12 +139,10 @@
 
 void KolabBase::saveTo( KABC::Addressee* addressee ) const
 {
-//TODO port it
-#if 0
   addressee->setUid( uid() );
   addressee->setNote( body() );
   addressee->setCategories( categories().split( ',', QString::SkipEmptyParts ) );
-  addressee->setRevision( lastModified().toTimeZone( mTimeZone ).dateTime() );
+  addressee->setRevision( lastModified().toZone( mTimeZone ).dateTime() );
   addressee->insertCustom( "KOLAB", "CreationDate",
                            dateTimeToString( creationDate() ) );
 
@@ -159,7 +157,6 @@
     addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Public ) );
     break;
   }
-#endif
   // TODO: Attachments
 }
 
@@ -193,12 +190,12 @@
   return mCategories;
 }
 
-void KolabBase::setCreationDate( const QDateTime& date )
+void KolabBase::setCreationDate( const KDateTime& date )
 {
   mCreationDate = date;
 }
 
-QDateTime KolabBase::creationDate() const
+KDateTime KolabBase::creationDate() const
 {
   return mCreationDate;
 }
@@ -300,7 +297,7 @@
   else if ( tagName == "creation-date" )
     setCreationDate( stringToDateTime( element.text() ) );
   else if ( tagName == "last-modification-date" )
-    setLastModified( KDateTime( stringToDateTime( element.text() ), mTimeZone ) );
+    setLastModified( KDateTime( stringToDateTime( element.text() )) );
   else if ( tagName == "sensitivity" )
     setSensitivity( stringToSensitivity( element.text() ) );
   else if ( tagName == "product-id" )
@@ -381,9 +378,9 @@
 }
 
 
-QString KolabBase::dateTimeToString( const QDateTime& time )
+QString KolabBase::dateTimeToString( const KDateTime& time )
 {
-  return time.toString( Qt::ISODate ) + 'Z';
+  return time.toString( KDateTime::ISODate ) + 'Z';
 }
 
 QString KolabBase::dateToString( const QDate& date )
@@ -391,12 +388,12 @@
   return date.toString( Qt::ISODate );
 }
 
-QDateTime KolabBase::stringToDateTime( const QString& _date )
+KDateTime KolabBase::stringToDateTime( const QString& _date )
 {
   QString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return QDateTime::fromString( date, Qt::ISODate );
+  return KDateTime::fromString( date, KDateTime::ISODate );
 }
 
 QDate KolabBase::stringToDate( const QString& date )
@@ -446,14 +443,14 @@
   }
 }
 
-QDateTime KolabBase::localToUTC( const KDateTime& time ) const
+KDateTime KolabBase::localToUTC( const KDateTime& time ) const
 {
-  return time.toUtc().dateTime();
+  return time.toUtc();
 }
 
-KDateTime KolabBase::utcToLocal( const QDateTime& time ) const
+KDateTime KolabBase::utcToLocal( const KDateTime& time ) const
 {
-  QDateTime dt = time;
-  dt.setTimeSpec( Qt::UTC );
-  return KDateTime( dt, mTimeZone );
+  KDateTime dt = time;
+  dt.setTimeSpec( KDateTime::UTC );
+  return dt;
 }
--- trunk/KDE/kdepim/kresources/kolab/shared/kolabbase.h #678794:678795
@@ -35,7 +35,6 @@
 #define KOLABBASE_H
 
 #include <qdom.h>
-#include <QDateTime>
 #include <KDateTime>
 #include <QColor>
 
@@ -83,8 +82,8 @@
   virtual void setCategories( const QString& categories );
   virtual QString categories() const;
 
-  virtual void setCreationDate( const QDateTime& date );
-  virtual QDateTime creationDate() const;
+  virtual void setCreationDate( const KDateTime& date );
+  virtual KDateTime creationDate() const;
 
   virtual void setLastModified( const KDateTime& date );
   virtual KDateTime lastModified() const;
@@ -101,9 +100,9 @@
   virtual int pilotSyncStatus() const;
 
   // String - Date conversion methods
-  static QString dateTimeToString( const QDateTime& time );
+  static QString dateTimeToString( const KDateTime& time );
   static QString dateToString( const QDate& date );
-  static QDateTime stringToDateTime( const QString& time );
+  static KDateTime stringToDateTime( const QString& time );
   static QDate stringToDate( const QString& date );
 
   // String - Sensitivity conversion methods
@@ -157,13 +156,13 @@
   // Write a string tag
   static void writeString( QDomElement&, const QString&, const QString& );
 
-  QDateTime localToUTC( const KDateTime& time ) const;
-  KDateTime utcToLocal( const QDateTime& time ) const;
+  KDateTime localToUTC( const KDateTime& time ) const;
+  KDateTime utcToLocal( const KDateTime& time ) const;
 
   QString mUid;
   QString mBody;
   QString mCategories;
-  QDateTime mCreationDate;
+  KDateTime mCreationDate;
   KDateTime mLastModified;
   Sensitivity mSensitivity;
   const KTimeZone *mTimeZone;