[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab/shared
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-06-18 11:53:03
Message-ID: 20040618115303.81C299910 () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

Change reading and writing of dates and color to the new (and standard) formats


  M +7 -15     kolabbase.cpp   1.1.2.4


--- kdepim/kresources/kolab/shared/kolabbase.cpp  #1.1.2.3:1.1.2.4
@@ -206,28 +206,20 @@ QDomDocument KolabBase::domTree()
 QString KolabBase::dateTimeToString( const QDateTime& time )
 {
-  return time.toString( "yyyyMMddhhmmss" );
+  return time.toString( Qt::ISODate );
 }
 
 QString KolabBase::dateToString( const QDate& date )
 {
-  return date.toString( "yyyyMMdd" );
+  return date.toString( Qt::ISODate );
 }
 
 QDateTime KolabBase::stringToDateTime( const QString& date )
 {
-  int h = date.mid( 8, 2 ).toInt();
-  int m = date.mid( 10, 2 ).toInt();
-  int s = date.mid( 12, 2 ).toInt();
-
-  return QDateTime( stringToDate( date ), QTime( h, m, s ) );
+  return QDateTime::fromString( date, Qt::ISODate );
 }
 
 QDate KolabBase::stringToDate( const QString& date )
 {
-  int y = date.left( 4 ).toInt();
-  int m = date.mid( 4, 2 ).toInt();
-  int d = date.mid( 6, 2 ).toInt();
-
-  return QDate( y, m, d );
+  return QDate::fromString( date, Qt::ISODate );
 }
 
@@ -254,11 +246,11 @@ KolabBase::Sensitivity KolabBase::string
 QString KolabBase::colorToString( const QColor& color )
 {
-  // Color is in the format "0xRRGGBB"
-  return "0x" + color.name().mid( 1 );
+  // Color is in the format "#RRGGBB"
+  return color.name();
 }
 
 QColor KolabBase::stringToColor( const QString& s )
 {
-  return QColor( "#" + s.mid( 2 ) );
+  return QColor( s );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]