Summer time/winter time/Timezone changes done

[qtmeetings] / src / Domain / Configuration / Configuration.cpp

diff --git a/src/Domain/Configuration/Configuration.cpp b/src/Domain/Configuration/Configuration.cpp
index f3c24d7..0076e23 100644 (file)
--- a/src/Domain/Configuration/Configuration.cpp
+++ b/src/Domain/Configuration/Configuration.cpp
@@ -135,7 +135,7 @@ void Configuration::save()
                {
                        saveDisplaySettings( node );
                }
-               else if (tagName == QString( "datetime" ) )
+               else if (tagName == QString( "daylight_saving_time" ) )
                {
                        saveDateTimeSettings( node );
                }
@@ -302,17 +302,17 @@ void Configuration::saveDateTimeSettings( const QDomNode &aXML )
 
                if ( tagName == QString( "dayofweek" ) )
                {
-                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->dayOfWeek());
+                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->switchDay() );
                        e.replaceChild( t, e.firstChild() );
                }
                else if( tagName == QString( "StandardTimeChangeMoment" ) )
                {
-                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->standardTimeChange().toString("ddMMyyyyhhmmss"));
+                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->STDDateTime().toString("ddMMyyyyhhmmss"));
                        e.replaceChild( t, e.firstChild() );
                }
                else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
                {
-                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->daylightSaveTimeChange().toString("ddMMyyyyhhmmss"));
+                       QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->DSTDateTime().toString("ddMMyyyyhhmmss"));
                        e.replaceChild( t, e.firstChild() );
                }
        }
@@ -377,7 +377,7 @@ Configuration* Configuration::readFromXML( const QString &aPath )
                {
                        conf->iDisplaySettings = Configuration::readDisplaySettings( node );
                }
-               else if ( tagName == QString( "datetime" ) )
+               else if ( tagName == QString( "daylight_saving_time" ) )
                {
                        conf->iDateTimeSettings = Configuration::readDateTimeSettings(node);
                }
@@ -603,14 +603,10 @@ DisplaySettings * Configuration::readDisplaySettings( const QDomNode &aXML )
 
 DateTimeSettings * Configuration::readDateTimeSettings( const QDomNode &aXML )
 {
-       QDateTime standardTimeChangeMoment;
-       QDateTime daylightSaveTimeChangeMoment;
-       QString dayOfWeek;
-       
-       // Defaults
-       //standardTimeChangeMoment.fromString("05102009040000", "ddMMyyyyhhmmss");
-       //daylightSaveTimeChangeMoment.fromString("01042010030000", "ddMMyyyyhhmmss");
-       //dayOfWeek.append("sunday");
+       // Set defaults..
+       QDateTime standardTimeChangeMoment = QDateTime::fromString("05.10.2009 04:00:00", "dd'.'MM'.'yyyy' 'hh:mm:ss");
+       QDateTime daylightSaveTimeChangeMoment = QDateTime::fromString("01.04.2010 03:00:00", "dd'.'MM'.'yyyy' 'hh:mm:ss");
+       DateTimeSettings::weekDay dayOfWeek = DateTimeSettings::Sunday;
        
        for ( QDomNode node = aXML.firstChild(); !node.isNull(); node = node.nextSibling() )
        {
@@ -619,18 +615,24 @@ DateTimeSettings * Configuration::readDateTimeSettings( const QDomNode &aXML )
 
                if ( tagName == QString( "dayofweek" ) )
                {
-                       dayOfWeek = e.text();
                        qDebug() << "Configuration::readDateTimeSettings: " +e.text();
+                       
+                       bool success = false;
+                       unsigned int weekDayTmp = e.text().toUInt( &success );
+                       if( success && weekDayTmp >= 0 && weekDayTmp < 7)
+                       {
+                               dayOfWeek = (DateTimeSettings::weekDay)weekDayTmp;
+                       }
                }
                else if( tagName == QString( "standardtimechangemoment" ) )
                {
-                       standardTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
-                       qDebug() << "Configuration::readDateTimeSettings: " +standardTimeChangeMoment.toString("ddMMyyyyhhmmss");
+                       standardTimeChangeMoment = QDateTime::fromString(e.text(), "dd'.'MM'.'yyyy' 'hh:mm:ss");
+                       qDebug() << "Configuration::readDateTimeSettings: " +standardTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss");
                }
                else if( tagName == QString( "daylightsavetimechangemoment" ) )
                {
-                       daylightSaveTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
-                       qDebug() << "Configuration::readDateTimeSettings: " +daylightSaveTimeChangeMoment.toString("ddMMyyyyhhmmss");
+                       daylightSaveTimeChangeMoment = QDateTime::fromString(e.text(), "dd'.'MM'.'yyyy' 'hh:mm:ss");
+                       qDebug() << "Configuration::readDateTimeSettings: " +daylightSaveTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss");
                }
        }