projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work done for the date/time..
[qtmeetings]
/
src
/
Domain
/
Configuration
/
Configuration.cpp
diff --git
a/src/Domain/Configuration/Configuration.cpp
b/src/Domain/Configuration/Configuration.cpp
index
40184fb
..
f3c24d7
100644
(file)
--- a/
src/Domain/Configuration/Configuration.cpp
+++ b/
src/Domain/Configuration/Configuration.cpp
@@
-2,6
+2,7
@@
#include "ConnectionSettings.h"
#include "StartupSettings.h"
#include "DisplaySettings.h"
#include "ConnectionSettings.h"
#include "StartupSettings.h"
#include "DisplaySettings.h"
+#include "DateTimeSettings.h"
#include "Room.h"
#include <QDomDocument>
#include <QDomElement>
#include "Room.h"
#include <QDomDocument>
#include <QDomElement>
@@
-301,17
+302,17
@@
void Configuration::saveDateTimeSettings( const QDomNode &aXML )
if ( tagName == QString( "dayofweek" ) )
{
if ( tagName == QString( "dayofweek" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iDayOfWeek);
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->dayOfWeek());
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "StandardTimeChangeMoment" ) )
{
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "StandardTimeChangeMoment" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iStandardTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss"));
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->standardTimeChange().toString("ddMMyyyyhhmmss"));
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
{
e.replaceChild( t, e.firstChild() );
}
else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
{
- QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->iDaylightSaveTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss"));
+ QDomText t = node.ownerDocument().createTextNode( iDateTimeSettings->daylightSaveTimeChange().toString("ddMMyyyyhhmmss"));
e.replaceChild( t, e.firstChild() );
}
}
e.replaceChild( t, e.firstChild() );
}
}
@@
-606,6
+607,11
@@
DateTimeSettings * Configuration::readDateTimeSettings( const QDomNode &aXML )
QDateTime daylightSaveTimeChangeMoment;
QString dayOfWeek;
QDateTime daylightSaveTimeChangeMoment;
QString dayOfWeek;
+ // Defaults
+ //standardTimeChangeMoment.fromString("05102009040000", "ddMMyyyyhhmmss");
+ //daylightSaveTimeChangeMoment.fromString("01042010030000", "ddMMyyyyhhmmss");
+ //dayOfWeek.append("sunday");
+
for ( QDomNode node = aXML.firstChild(); !node.isNull(); node = node.nextSibling() )
{
QDomElement e = node.toElement();
for ( QDomNode node = aXML.firstChild(); !node.isNull(); node = node.nextSibling() )
{
QDomElement e = node.toElement();
@@
-614,14
+620,17
@@
DateTimeSettings * Configuration::readDateTimeSettings( const QDomNode &aXML )
if ( tagName == QString( "dayofweek" ) )
{
dayOfWeek = e.text();
if ( tagName == QString( "dayofweek" ) )
{
dayOfWeek = e.text();
+ qDebug() << "Configuration::readDateTimeSettings: " +e.text();
}
}
- else if( tagName == QString( "StandardTimeChangeMoment" ) )
+ else if( tagName == QString( "standardtimechangemoment" ) )
{
{
- standardTimeChangeMoment.fromString(e.text(), "dd.MM.yyyy hh:mm:ss");
+ standardTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
+ qDebug() << "Configuration::readDateTimeSettings: " +standardTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
}
- else if( tagName == QString( "DaylightSaveTimeChangeMoment" ) )
+ else if( tagName == QString( "daylightsavetimechangemoment" ) )
{
{
- daylightSaveTimeChangeMoment.fromString(e.text(), "dd.MM.yyyy hh:mm:ss");
+ daylightSaveTimeChangeMoment = QDateTime::fromString(e.text(), "ddMMyyyyhhmmss");
+ qDebug() << "Configuration::readDateTimeSettings: " +daylightSaveTimeChangeMoment.toString("ddMMyyyyhhmmss");
}
}
}
}