Summer time/winter time/Timezone changes done
authorSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 12:27:47 +0000 (15:27 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 12:27:47 +0000 (15:27 +0300)
QtMeetings.conf
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/DateTimeSettings.cpp
src/Domain/Configuration/DateTimeSettings.h
src/IO/Communication/MessagingUtils.cpp

index a7172e6..04cb472 100644 (file)
@@ -7,8 +7,8 @@
                <username>maemo</username>
                <password>P@ssw0rd</password>-->
                <serverurl>jklexch01.ixonos.com</serverurl>
-               <username>puontsi</username>
-               <password>Kirjaimia13On</password>
+               <username></username>
+               <password></password>
                <!-- interval is interpreted in seconds -->
                <refreshinterval>60</refreshinterval>
        </connection>
                </room>
     </rooms>
 
-    <datetime>
-               <dayofweek>sunday</dayofweek>
-               <StandardTimeChangeMoment>05102009040000</StandardTimeChangeMoment>
-               <DaylightSaveTimeChangeMoment>01042010030000</DaylightSaveTimeChangeMoment>
-    </datetime>
+    <daylight_saving_time>
+               <!-- Sunday = 0, Monday = 1, Tuesday = 2 etc.. -->
+               <DayOfWeek>0</DayOfWeek>
+               <!-- date/time format is dd.MM.yyyy hh:mm:ss  -->
+               <StandardTimeChangeMoment>05.10.2009 03:00:00</StandardTimeChangeMoment>
+               <DaylightSaveTimeChangeMoment>01.04.2010 03:00:00</DaylightSaveTimeChangeMoment>
+    </daylight_saving_time>
        
 
        <!-- language code must be in ISO 3166-1 alpha-2 standard -->
index f3c24d7..0076e23 100644 (file)
@@ -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");
                }
        }
        
index b885e6b..83c6767 100644 (file)
@@ -1,7 +1,18 @@
 #include "DateTimeSettings.h"
 #include <QtDebug>
 
-DateTimeSettings::DateTimeSettings(const QDateTime &aStandardTimeChange, const QDateTime &aDaylightTimeChange, const QString aDayOfWeek)
+const QString DateTimeSettings::weekDays[DAYS_IN_A_WEEK]=
+{ 
+       "Sunday", 
+       "Monday", 
+       "Tuesday", 
+       "Wednesday", 
+       "Thursday", 
+       "Friday",
+       "Saturday" 
+};
+
+DateTimeSettings::DateTimeSettings(const QDateTime &aStandardTimeChange, const QDateTime &aDaylightTimeChange, weekDay aDayOfWeek)
 {
        this->iDaylightSaveTimeChangeMoment = aDaylightTimeChange;
        this->iStandardTimeChangeMoment = aStandardTimeChange;
@@ -20,17 +31,17 @@ DateTimeSettings::~DateTimeSettings()
 
 }
 
-QDateTime DateTimeSettings::standardTimeChange()
+QDateTime DateTimeSettings::STDDateTime()
 {
        return (this->iStandardTimeChangeMoment);
 }
 
-QDateTime DateTimeSettings::daylightSaveTimeChange()
+QDateTime DateTimeSettings::DSTDateTime()
 {
        return (this->iDaylightSaveTimeChangeMoment);
 }
 
-QString DateTimeSettings::standardTimeChange_Time()
+QString DateTimeSettings::STDTime()
 {
        QTime time = this->iStandardTimeChangeMoment.time();
 
@@ -40,7 +51,7 @@ QString DateTimeSettings::standardTimeChange_Time()
        return (time.toString("hh:mm:ss"));
 }
 
-QString DateTimeSettings::standardTimeChange_Month()
+QString DateTimeSettings::STDMonth()
 {
        QDate date = this->iStandardTimeChangeMoment.date();
 
@@ -50,7 +61,7 @@ QString DateTimeSettings::standardTimeChange_Month()
        return (date.toString("M"));
 }
 
-QString DateTimeSettings::standardTimeChange_Day()
+QString DateTimeSettings::STDDay()
 {
        QDate date = this->iStandardTimeChangeMoment.date();
 
@@ -60,7 +71,7 @@ QString DateTimeSettings::standardTimeChange_Day()
        return (date.toString("d"));
 }
 
-QString DateTimeSettings::daylightSaveTimeChange_Time()
+QString DateTimeSettings::DSTTime()
 {
        QTime time = this->iDaylightSaveTimeChangeMoment.time();
 
@@ -70,7 +81,7 @@ QString DateTimeSettings::daylightSaveTimeChange_Time()
        return (time.toString("hh:mm:ss"));
 }
 
-QString DateTimeSettings::daylightSaveTimeChange_Month()
+QString DateTimeSettings::DSTMonth()
 {
        QDate date = this->iDaylightSaveTimeChangeMoment.date();
 
@@ -80,7 +91,7 @@ QString DateTimeSettings::daylightSaveTimeChange_Month()
        return (date.toString("M"));
 }
 
-QString DateTimeSettings::daylightSaveTimeChange_Day()
+QString DateTimeSettings::DSTDay()
 {
        QDate date = this->iDaylightSaveTimeChangeMoment.date();
 
@@ -90,31 +101,29 @@ QString DateTimeSettings::daylightSaveTimeChange_Day()
        return (date.toString("d"));
 }
 
-void DateTimeSettings::setDaylightSaveTimeChange(const QDateTime &aDaylightSaveTimeChange)
+void DateTimeSettings::setDSTDateTime(const QDateTime &aDaylightSaveTimeChange)
 {
        this->iDaylightSaveTimeChangeMoment = aDaylightSaveTimeChange;
        qDebug() << "DateTimeSettings::setDaylightSaveTimeChange: "
-                               +this->iDaylightSaveTimeChangeMoment.toString("ddMMyyyyhhmmss");
+                               +this->iDaylightSaveTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss");
 }
 
-void DateTimeSettings::setStandardTimeChange(const QDateTime &aStandardTimeChange)
+void DateTimeSettings::setSTDDateTime(const QDateTime &aStandardTimeChange)
 {
        this->iStandardTimeChangeMoment = aStandardTimeChange;
        qDebug() << "DateTimeSettings::setStandardTimeChange: "
-                                       +this->iStandardTimeChangeMoment.toString("ddMMyyyyhhmmss");
+                                       +this->iStandardTimeChangeMoment.toString("dd.MM.yyyy hh:mm:ss");
 }
 
-void DateTimeSettings::setDayOfWeek(const QString aDay)
+void DateTimeSettings::setSwitchDay(weekDay aDay)
 {
        this->iDayOfWeek = aDay;
        qDebug() << "DateTimeSettings::setDayOfWeek: "
-                                               +this->iDayOfWeek;
+                                               +DateTimeSettings::weekDays[this->iDayOfWeek];
 }
 
-QString DateTimeSettings::dayOfWeek()
+QString DateTimeSettings::switchDay()
 {
-
-       qDebug() << "DateTimeSettings::dayOfWeek: " +this->iDayOfWeek;
-
-       return(this->iDayOfWeek);
+       qDebug() << "DateTimeSettings::dayOfWeek: " +DateTimeSettings::weekDays[this->iDayOfWeek];
+       return(DateTimeSettings::weekDays[this->iDayOfWeek]);
 }
index 7de5bf6..6c79e7d 100644 (file)
@@ -4,17 +4,33 @@
 #include <QDateTime>
 #include <QString>
 
+#define DAYS_IN_A_WEEK 7
+
 class DateTimeSettings
 {
 public:
 
        /*!
+        * An enumeration for the weekdays to be used.
+        */
+       typedef enum 
+       {
+               Sunday = 0,
+               Monday,
+               Tuesday,
+               Wednesday,
+               Thursday,
+               Friday,
+               Saturday
+       } weekDay;
+
+       /*!
         * Overloaded.
         * \param aStandardTimeChange The date and time when the standard time is to be used. The year part and the milliseconds are omitted.
         * \param aDaylightTimeChange The date and time when the daylight time is to be used. The year part and the milliseconds are omitted.
         * \param aDayOfWeek The day of the week when the time is to be used.
         */
-       DateTimeSettings(const QDateTime &aStandardTimeChange, const QDateTime &aDaylightTimeChange, const QString aDayOfWeek);
+       DateTimeSettings(const QDateTime &aStandardTimeChange, const QDateTime &aDaylightTimeChange, weekDay aDayOfWeek);
 
        //! Copy constructor.
        /*!
@@ -26,69 +42,77 @@ public:
        virtual ~DateTimeSettings();
 
        /*!
-        * 
+        * \return The Date/time when the standard time is to be switched into use
         */
-       QDateTime standardTimeChange();
+       QDateTime STDDateTime();
 
        /*!
-        * 
+        * \return The Date/time when the daylight saving time is to be switched into use
         */
-       QDateTime daylightSaveTimeChange();
+       QDateTime DSTDateTime();
 
        /*!
-        * 
+        * \return The time as a string (hh:mm:ss) of the moment the standard time is to be switched into use
         */
-       QString standardTimeChange_Time();
+       QString STDTime();
 
        /*!
-        * 
+        * \return The month as a string (MM) of the moment the standard time is to be switched into use
         */
-       QString standardTimeChange_Month();
+       QString STDMonth();
 
        /*!
-        * 
+        * \return The day as a string (dd) of the moment the standard time is to be switched into use
         */
-       QString standardTimeChange_Day();
+       QString STDDay();
 
        /*!
-        * 
+        * \return The time as a string (hh:mm:ss) of the moment the daylight saving time is to be switched into use
         */
-       QString daylightSaveTimeChange_Time();
+       QString DSTTime();
 
        /*!
-        * 
+        * \return The month as a string (MM) of the moment the daylight saving time is to be switched into use
         */
-       QString daylightSaveTimeChange_Month();
+       QString DSTMonth();
 
        /*!
-        * 
+        * \return The day as a string (dd) of the moment the daylight saving time is to be switched into use
         */
-       QString daylightSaveTimeChange_Day();
+       QString DSTDay();
 
        /*!
-        * 
+        * Sets the time/date of the moment the daylight saving time is to be switched into use
         */
-       void setDaylightSaveTimeChange(const QDateTime &aDaylightSaveTimeChange);
+       void setDSTDateTime(const QDateTime &aDaylightSaveTimeChange);
 
        /*!
-        * 
+        * Sets the time/date of the moment the standard time is to be switched into use
         */
-       void setStandardTimeChange(const QDateTime &aStandardTimeChange);
+       void setSTDDateTime(const QDateTime &aStandardTimeChange);
 
        /*!
-        * 
+        * Sets the appropriate day of the week the time switch is carried out.
+        * \see DateTimeSettings::weekDay
         */
-       void setDayOfWeek(const QString aDay);
+       void setSwitchDay(DateTimeSettings::weekDay aDay);
 
        /*!
-        * 
+        * \return The appropriate day of the week the time switch is carried out.
         */
-       QString dayOfWeek();
-                       
+       QString switchDay();
+
 private:
        QDateTime iStandardTimeChangeMoment;
        QDateTime iDaylightSaveTimeChangeMoment;
-       QString iDayOfWeek;     
+       weekDay iDayOfWeek;
+
+       /*!
+        * Contains the weekday strings that are passed to the exchange server when
+        * defining the timezone variables
+        */
+       static const QString weekDays[DAYS_IN_A_WEEK];
 };
 
+
 #endif /*DATETIMESETTINGS_H_*/
index 4387685..dfa0ee7 100644 (file)
@@ -8,55 +8,56 @@
 
 /*
  * BaseMessage class functions
-*/
+ */
 BaseMessage::BaseMessage()
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::BaseMessage" );
+       qDebug("BaseMessage::BaseMessage");
 #endif
        iMessage = new QDomDocument();
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::BaseMessage end" );
+       qDebug("BaseMessage::BaseMessage end");
 #endif
 }
 
 BaseMessage::~BaseMessage()
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::~BaseMessage" );
+       qDebug("BaseMessage::~BaseMessage");
 #endif
-       if( iMessage )
-               {
+       if (iMessage)
+       {
                delete iMessage;
                iMessage = 0;
-               }
+       }
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::~BaseMessage end" );
+       qDebug("BaseMessage::~BaseMessage end");
 #endif
 }
 
-QList<QDomNode> BaseMessage::getNodesByName( const QString& aNodeName, const QString& aParentName, QDomNode* aRootNode )
+QList<QDomNode> BaseMessage::getNodesByName(const QString& aNodeName, const QString& aParentName, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getNodesByName" );
+       qDebug("BaseMessage::getNodesByName");
 #endif
-       
+
        //TODO: Add implementation for attribute search
-       
+
        QDomNodeList list;
        QList<QDomNode> specList;
-       
-       list = ( aRootNode ) ? aRootNode->toElement().elementsByTagName( aNodeName ) : iMessage->elementsByTagName( aNodeName );
 
-       for( int i=0; i<list.count(); i++ )
+       list
+                       = (aRootNode ) ? aRootNode->toElement().elementsByTagName(aNodeName) : iMessage->elementsByTagName(aNodeName);
+
+       for (int i=0; i<list.count(); i++)
        {
-               if( aParentName != QString::null )
+               if (aParentName != QString::null )
                {
-               if( !list.item( i ).parentNode().isNull() && list.item( i ).parentNode().isElement() && list.item( i ).parentNode().toElement().tagName().compare( aParentName ) == 0 )
+                       if( !list.item( i ).parentNode().isNull() && list.item( i ).parentNode().isElement() && list.item( i ).parentNode().toElement().tagName().compare( aParentName ) == 0 )
                        specList.append( list.item( i ) );
                }
                else
-                       specList.append( list.item( i ) );
+               specList.append( list.item( i ) );
        }
 #ifdef MU_DEBUG
        qDebug( "BaseMessage::getNodesByName end" );
@@ -64,59 +65,54 @@ QList<QDomNode> BaseMessage::getNodesByName( const QString& aNodeName, const QSt
        return specList;
 }
 
-QDomNode BaseMessage::getNodeFromDocument( const QString& aNodeName,
-                                                               QDomNode::NodeType aNodeType,
-                                                               const QString& aParentName,
-                                                               int aIndex,
-                                                               QDomNode* aRootNode )
+QDomNode BaseMessage::getNodeFromDocument(const QString& aNodeName, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getNodeFromDocument" );
+       qDebug("BaseMessage::getNodeFromDocument");
 #endif
        QDomNode node;
-       if( aNodeType == QDomNode::ElementNode )
-               node = getElementFromDocument( aNodeName, aParentName, aIndex, aRootNode );
-       else if( aNodeType == QDomNode::AttributeNode )
-               node = getAttributeFromDocument( aNodeName, aParentName, aIndex, aRootNode );
-#ifdef MU_DEBUG
-       qDebug( "BaseMessage::getNodeFromDocument end" );
+       if (aNodeType == QDomNode::ElementNode)
+               node
+                               = getElementFromDocument(aNodeName, aParentName, aIndex, aRootNode);
+       else if (aNodeType == QDomNode::AttributeNode)
+               node
+                               = getAttributeFromDocument(aNodeName, aParentName, aIndex, aRootNode);
+#ifdef MU_DEBUG
+       qDebug("BaseMessage::getNodeFromDocument end");
 #endif
        return node;
 }
 
-QDomNode BaseMessage::getAttributeFromDocument( const QString& aAttributeName,
-                                                               const QString& aParentName,
-                                                               int aIndex,
-                                                               QDomNode* aRootNode )
+QDomNode BaseMessage::getAttributeFromDocument(const QString& aAttributeName, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getAttributeFromDocument" );
+       qDebug("BaseMessage::getAttributeFromDocument");
 #endif
 
        QDomNode root;
        QDomNode node;
        QDomNode parent;
-       
+
        root = ( !aRootNode ) ? iMessage->documentElement() : *aRootNode;
-       if( root.isNull() )
-               {
+       if (root.isNull() )
+       {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getAttributeFromDocument : RootNode is NULL." );
+               qDebug("BaseMessage::getAttributeFromDocument : RootNode is NULL.");
 #endif         
                return node;
-               }
+       }
 
-       if( aParentName != QString::null )
+       if (aParentName != QString::null )
        {
                if( root.isElement() )
                {
                        QDomNodeList list = root.toElement().elementsByTagName( aParentName );
-                       if( list.count() > 0 ) parent = list.item( 0 );
+                       if( list.count()> 0 ) parent = list.item( 0 );
                }
        }
-       
+
        QDomNamedNodeMap attrs = parent.attributes();
-       
+
        int count = attrs.count();
        if( count==0 || aIndex >= count || !attrs.contains( aAttributeName ) ) return root;
 
@@ -133,109 +129,104 @@ QDomNode BaseMessage::getAttributeFromDocument( const QString& aAttributeName,
                                list.append( attr );
                        }
                        else
-                               list.append( attr );
+                       list.append( attr );
                }
 
        }
 
-       if( list.count() > 0 )
-               node = list.at( aIndex );
+       if( list.count()> 0 )
+       node = list.at( aIndex );
 
 #ifdef MU_DEBUG
        qDebug( "BaseMessage::getAttributeFromDocument end." );
 #endif 
-       
+
        return node;
 }
 
-QDomNode BaseMessage::getElementFromDocument( const QString& aElementName,
-                                                               const QString& aParentName,
-                                                               int aIndex,
-                                                               QDomNode* aRootNode )
+QDomNode BaseMessage::getElementFromDocument(const QString& aElementName, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getElementFromDocument" );
+       qDebug("BaseMessage::getElementFromDocument");
 #endif
-               QDomNode node;
-               QDomNodeList elems;
+       QDomNode node;
+       QDomNodeList elems;
 
-               if( !aRootNode )
-               {
-               elems = iMessage->elementsByTagName( aElementName );
-               }
-               else
-               {
-               elems = aRootNode->toElement().elementsByTagName( aElementName );
-               }
+       if ( !aRootNode)
+       {
+               elems = iMessage->elementsByTagName(aElementName);
+       }
+       else
+       {
+               elems = aRootNode->toElement().elementsByTagName(aElementName);
+       }
 
-               int count = elems.count();
-               if( count == 0 || aIndex >= count )
-               { 
+       int count = elems.count();
+       if (count == 0 || aIndex >= count)
+       {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getElementFromDocument : No Elements found." );
+               qDebug("BaseMessage::getElementFromDocument : No Elements found.");
 #endif                 
-                       return node; //no elements found
-               }
+               return node; //no elements found
+       }
 
-               QList<QDomElement> list;
+       QList<QDomElement> list;
 
-               for( int i=0; i<count; i++ )
+       for (int i=0; i<count; i++)
+       {
+               QDomElement elem = elems.item( i ).toElement();
+               if (elem.tagName().compare(aElementName) == 0 || elem.localName().compare(aElementName) == 0)
                {
-                       QDomElement elem = elems.item( i ).toElement();
-                       if( elem.tagName().compare( aElementName ) == 0 || elem.localName().compare( aElementName ) == 0 )
+                       if (aParentName != QString::null )
                        {
-                               if( aParentName != QString::null )
+                               if( !elem.parentNode().isNull() )
                                {
-                                       if( !elem.parentNode().isNull() )
-                                       {
-                                               if( elem.parentNode().toElement().tagName().compare( aParentName ) == 0 || elem.parentNode().toElement().tagName().compare( aParentName ) == 0 )
-                                                       list.append( elem );
-                                       }
-                               }
-                               else
+                                       if( elem.parentNode().toElement().tagName().compare( aParentName ) == 0 || elem.parentNode().toElement().tagName().compare( aParentName ) == 0 )
                                        list.append( elem );
+                               }
                        }
-
+                       else
+                       list.append( elem );
                }
 
-               if( list.count() > 0 )
-                       node = list.at( aIndex );
+       }
+
+       if( list.count()> 0 )
+       node = list.at( aIndex );
 
 #ifdef MU_DEBUG
        qDebug( "BaseMessage::getElementFromDocument end" );
 #endif         
-               return node;
+       return node;
 }
 
-bool BaseMessage::matchName( const QDomNode& aNode, const QString& aName )
+bool BaseMessage::matchName(const QDomNode& aNode, const QString& aName)
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::matchName" );
+       qDebug("BaseMessage::matchName");
 #endif
-       if( aNode.isElement() )
+       if (aNode.isElement() )
        {
-               if( aNode.toElement().tagName().toLower().compare( aName.toLower() ) == 0
-                               || aNode.localName().toLower().compare( aName.toLower() ) == 0 )
+               if (aNode.toElement().tagName().toLower().compare(aName.toLower() ) == 0 || aNode.localName().toLower().compare(aName.toLower() ) == 0)
                {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::matchName end" );
+                       qDebug("BaseMessage::matchName end");
 #endif                 
                        return true;
                }
        }
-       else if( aNode.isAttr() )
+       else if (aNode.isAttr() )
        {
-               if( aNode.toAttr().name().toLower().compare( aName.toLower() ) == 0
-                               || aNode.localName().toLower().compare( aName.toLower() ) == 0 )
+               if (aNode.toAttr().name().toLower().compare(aName.toLower() ) == 0 || aNode.localName().toLower().compare(aName.toLower() ) == 0)
                {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::matchName end" );
+                       qDebug("BaseMessage::matchName end");
 #endif                 
                        return true;
                }
        }
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::matchName : No match." );
+       qDebug("BaseMessage::matchName : No match.");
 #endif 
        return false;
 }
@@ -243,63 +234,64 @@ bool BaseMessage::matchName( const QDomNode& aNode, const QString& aName )
 QByteArray BaseMessage::getMessage()
 {
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getMessage" );
+       qDebug("BaseMessage::getMessage");
 #endif
        QByteArray msg;
-       if( iMessage )
+       if (iMessage)
        {
-               msg.append( iMessage->toByteArray() );
+               msg.append(iMessage->toByteArray() );
        }
 #ifdef MU_DEBUG
-       qDebug( "BaseMessage::getMessage end" );
+       qDebug("BaseMessage::getMessage end");
 #endif 
        return msg;
 }
 
 /*
  * RequestMessage class functions
-*/
-RequestMessage::RequestMessage( RequestCommandId aCommandId ) : iCurrCmd( aCommandId )
+ */
+RequestMessage::RequestMessage(RequestCommandId aCommandId) :
+       iCurrCmd(aCommandId)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::RequestMessage" );
+       qDebug("RequestMessage::RequestMessage");
 #endif
        createEnvelopeBase();
 
-       if( aCommandId != ReqCmdNoCommand )
+       if (aCommandId != ReqCmdNoCommand)
        {
-               createMessageStructure( aCommandId );
+               createMessageStructure(aCommandId);
        }
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::RequestMessage end" );
+       qDebug("RequestMessage::RequestMessage end");
 #endif
 }
 
-RequestMessage::RequestMessage( const QString& /*aFileName*/ )
+RequestMessage::RequestMessage(const QString& /*aFileName*/)
 {
        //createEnvelopeBase();
        //TODO: read operation structures from a file
 }
 
-int RequestMessage::addNode( const QDomNode& aNode, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode )
+int RequestMessage::addNode(const QDomNode& aNode, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::addNode" );
+       qDebug("RequestMessage::addNode");
 #endif
 
-       if( !iMessage )
+       if ( !iMessage)
        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::addNode : iMessage is NULL." );
+               qDebug("RequestMessage::addNode : iMessage is NULL.");
 #endif 
                return MsgErrSomeError;
        }
 
        int err = MsgErrNoError;
 
-       if( aNodeType == QDomNode::ElementNode && aNode.isElement() )
+       if (aNodeType == QDomNode::ElementNode && aNode.isElement() )
        {
-               if( aParentName == QString::null )
+               if (aParentName == QString::null )
                {
                        if( !aRootNode )
                        iMessage->appendChild( aNode );
@@ -309,7 +301,7 @@ int RequestMessage::addNode( const QDomNode& aNode, QDomNode::NodeType aNodeType
                else
                {
                        QDomNodeList list = ( aRootNode ) ? aRootNode->toElement().elementsByTagName( aParentName ) : iMessage->elementsByTagName( aParentName );
-                               
+
                        if( list.count() == 0 || aIndex >= list.count() ) err = MsgErrSomeError;
                        else
                        {
@@ -323,7 +315,7 @@ int RequestMessage::addNode( const QDomNode& aNode, QDomNode::NodeType aNodeType
                if( aParentName != QString::null )
                {
                        QDomNodeList list = ( aRootNode ) ? aRootNode->toElement().elementsByTagName( aParentName ) : iMessage->elementsByTagName( aParentName );
-                               
+
                        if( list.count() == 0 || aIndex >= list.count() ) err = MsgErrSomeError;
                        else
                        {
@@ -332,10 +324,10 @@ int RequestMessage::addNode( const QDomNode& aNode, QDomNode::NodeType aNodeType
                        }
                }
                else
-                       err = MsgErrSomeError; //Attribute must have a parent specified
+               err = MsgErrSomeError; //Attribute must have a parent specified
        }
        else
-               err = MsgErrSomeError;
+       err = MsgErrSomeError;
 
 #ifdef MU_DEBUG
        qDebug( "RequestMessage::addNode end : err=%d", err );
@@ -343,34 +335,36 @@ int RequestMessage::addNode( const QDomNode& aNode, QDomNode::NodeType aNodeType
        return err;
 }
 
-int RequestMessage::setNodeValue( const QString& aNodeName, const QString& aValue, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode )
+int RequestMessage::setNodeValue(const QString& aNodeName, const QString& aValue, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::setNodeValue" );
+       qDebug("RequestMessage::setNodeValue");
 #endif
 
-       QDomNode node = getNodeFromDocument( aNodeName, aNodeType, aParentName, aIndex, aRootNode );
-       if( node.isNull() || !iMessage )
-               {
+       QDomNode
+                       node =
+                                       getNodeFromDocument(aNodeName, aNodeType, aParentName, aIndex, aRootNode);
+       if (node.isNull() || !iMessage)
+       {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::setNodeValue : Node is NULL or iMessage is NULL." );
+               qDebug("RequestMessage::setNodeValue : Node is NULL or iMessage is NULL.");
 #endif         
                return MsgErrSomeError;
-               }
+       }
 
        int err = MsgErrNoError;
 
-       if( node.isElement() )
+       if (node.isElement() )
        {
-               node.appendChild( iMessage->createTextNode( aValue ) );
+               node.appendChild(iMessage->createTextNode(aValue) );
        }
-       else if( node.isAttr() )
-               node.toAttr().setValue( aValue );
+       else if (node.isAttr() )
+               node.toAttr().setValue(aValue);
        else
                err = MsgErrSomeError;
 
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::setNodeValue end : err=%d", err );
+       qDebug("RequestMessage::setNodeValue end : err=%d", err);
 #endif 
        return err;
 }
@@ -378,37 +372,38 @@ int RequestMessage::setNodeValue( const QString& aNodeName, const QString& aValu
 int RequestMessage::createEnvelopeBase()
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createEnvelopeBase" );
+       qDebug("RequestMessage::createEnvelopeBase");
 #endif
-       if( iMessage )
-               {
+       if (iMessage)
+       {
                delete iMessage;
                iMessage = 0;
-               }
+       }
 
        iMessage = new QDomDocument();
 
-       int size = sizeof( reqCmdArrayEnvelopeBase ) / sizeof( MessageBodyElement );
+       int size = sizeof(reqCmdArrayEnvelopeBase ) / sizeof(MessageBodyElement);
        int err = MsgErrNoError;
 
-       QDomNode base = constructArrayToNode( reqCmdArrayEnvelopeBase, size );
+       QDomNode base = constructArrayToNode(reqCmdArrayEnvelopeBase, size);
 
-       if( !base.isNull() )
-               err = addNode( base );
-       else err = MsgErrSomeError;
+       if ( !base.isNull() )
+               err = addNode(base);
+       else
+               err = MsgErrSomeError;
 
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createEnvelopeBase end : err=%d", err );
+       qDebug("RequestMessage::createEnvelopeBase end : err=%d", err);
 #endif         
        return err;
 }
 
-QString RequestMessage::getContentTypeForHeader( RequestCommandId aCommandId )
+QString RequestMessage::getContentTypeForHeader(RequestCommandId aCommandId)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::getContentTypeForHeader" );
+       qDebug("RequestMessage::getContentTypeForHeader");
 #endif
-       QString contentType( QString::null );
+       QString contentType(QString::null );
 
        RequestCommandId cmd = ( aCommandId == ReqCmdNoCommand ) ? iCurrCmd : aCommandId;
 
@@ -417,45 +412,48 @@ QString RequestMessage::getContentTypeForHeader( RequestCommandId aCommandId )
                QString operation( QString::null );
                switch( cmd )
                {
-               //Used commands
-               case ReqCmdGetUserAvailability : { operation = "GetUserAvailability"; } break;
-               case ReqCmdConvertId : { operation = "ConvertId"; } break;
-               case ReqCmdGetItem : { operation = "GetItem"; } break;
-
-               //Currently unused operations
-
-               /*case ReqCmdAddDelegate : { operation = "AddDelegate"; } break;
-               case ReqCmdCopyFolder : { operation = "CopyFolder"; } break;
-               case ReqCmdCopyItem : { operation = "CopyItem"; } break;
-               case ReqCmdCreateAttachment : { operation = "CreateAttachment"; } break;
-               case ReqCmdCreateFolder : { operation = "CreateFolder"; } break;
-               case ReqCmdCreateItem : { operation = "CreateItem"; } break;
-               case ReqCmdCreateManagedFolder : { operation = "CreateManagedFolder"; } break;
-               case ReqCmdDeleteAttachment : { operation = "DeleteAttachment"; } break;
-               case ReqCmdDeleteFolder : { operation = "DeleteFolder"; } break;
-               case ReqCmdDeleteItem : { operation = "DeleteItem"; } break;
-               case ReqCmdExpandDL : { operation = "ExpandDL"; } break;
-               case ReqCmdFindFolder : { operation = "FindFolder"; } break;
-               case ReqCmdFindItem : { operation = "FindItem"; } break;
-               case ReqCmdGetAttachment : { operation = "GetAttachment"; } break;
-               case ReqCmdGetDelegate : { operation = "GetDelegate"; } break;
-               case ReqCmdGetEvents : { operation = "GetEvents"; } break;
-               case ReqCmdGetFolder : { operation = "GetFolder"; } break;
-               case ReqCmdGetUserOofSettings : { operation = "GetUserOofSettings"; } break;
-               case ReqCmdMoveFolder : { operation = "MoveFolder"; } break;
-               case ReqCmdMoveItem : { operation = "MoveItem"; } break;
-               case ReqCmdRemoveDelegate : { operation = "RemoveDelegate"; } break;
-               case ReqCmdResolveNames : { operation = "ResolveNames"; } break;
-               case ReqCmdSendItem : { operation = "SendItem"; } break;
-               case ReqCmdSetUserOofSettings : { operation = "SetUserOofSettings"; } break;
-               case ReqCmdSubscribe : { operation = "Subscribe"; } break;
-               case ReqCmdSyncFolderHierarchy : { operation = "SyncFolderHierarchy"; } break;
-               case ReqCmdSyncFolderItems : { operation = "SyncFolderItems"; } break;
-               case ReqCmdUnsubscribe : { operation = "Unsubscribe"; } break;
-               case ReqCmdUpdateDelegate : { operation = "UpdateDelegate"; } break;
-               case ReqCmdUpdateFolder : { operation = "UpdateFolder"; } break;
-               case ReqCmdUpdateItem : { operation = "UpdateItem"; } break;*/
-               default: break;
+                       //Used commands
+                       case ReqCmdGetUserAvailability :
+                       {       operation = "GetUserAvailability";}break;
+                       case ReqCmdConvertId :
+                       {       operation = "ConvertId";}break;
+                       case ReqCmdGetItem :
+                       {       operation = "GetItem";}break;
+
+                       //Currently unused operations
+
+                       /*case ReqCmdAddDelegate : { operation = "AddDelegate"; } break;
+                        case ReqCmdCopyFolder : { operation = "CopyFolder"; } break;
+                        case ReqCmdCopyItem : { operation = "CopyItem"; } break;
+                        case ReqCmdCreateAttachment : { operation = "CreateAttachment"; } break;
+                        case ReqCmdCreateFolder : { operation = "CreateFolder"; } break;
+                        case ReqCmdCreateItem : { operation = "CreateItem"; } break;
+                        case ReqCmdCreateManagedFolder : { operation = "CreateManagedFolder"; } break;
+                        case ReqCmdDeleteAttachment : { operation = "DeleteAttachment"; } break;
+                        case ReqCmdDeleteFolder : { operation = "DeleteFolder"; } break;
+                        case ReqCmdDeleteItem : { operation = "DeleteItem"; } break;
+                        case ReqCmdExpandDL : { operation = "ExpandDL"; } break;
+                        case ReqCmdFindFolder : { operation = "FindFolder"; } break;
+                        case ReqCmdFindItem : { operation = "FindItem"; } break;
+                        case ReqCmdGetAttachment : { operation = "GetAttachment"; } break;
+                        case ReqCmdGetDelegate : { operation = "GetDelegate"; } break;
+                        case ReqCmdGetEvents : { operation = "GetEvents"; } break;
+                        case ReqCmdGetFolder : { operation = "GetFolder"; } break;
+                        case ReqCmdGetUserOofSettings : { operation = "GetUserOofSettings"; } break;
+                        case ReqCmdMoveFolder : { operation = "MoveFolder"; } break;
+                        case ReqCmdMoveItem : { operation = "MoveItem"; } break;
+                        case ReqCmdRemoveDelegate : { operation = "RemoveDelegate"; } break;
+                        case ReqCmdResolveNames : { operation = "ResolveNames"; } break;
+                        case ReqCmdSendItem : { operation = "SendItem"; } break;
+                        case ReqCmdSetUserOofSettings : { operation = "SetUserOofSettings"; } break;
+                        case ReqCmdSubscribe : { operation = "Subscribe"; } break;
+                        case ReqCmdSyncFolderHierarchy : { operation = "SyncFolderHierarchy"; } break;
+                        case ReqCmdSyncFolderItems : { operation = "SyncFolderItems"; } break;
+                        case ReqCmdUnsubscribe : { operation = "Unsubscribe"; } break;
+                        case ReqCmdUpdateDelegate : { operation = "UpdateDelegate"; } break;
+                        case ReqCmdUpdateFolder : { operation = "UpdateFolder"; } break;
+                        case ReqCmdUpdateItem : { operation = "UpdateItem"; } break;*/
+                       default: break;
                };
 
                if( operation != QString::null )
@@ -473,18 +471,18 @@ QString RequestMessage::getContentTypeForHeader( RequestCommandId aCommandId )
 
 int RequestMessage::createMessageStructure()
 {
-       return createMessageStructure( iCurrCmd );
+       return createMessageStructure(iCurrCmd);
 }
 
-int RequestMessage::createMessageStructure( RequestCommandId aCommandId )
+int RequestMessage::createMessageStructure(RequestCommandId aCommandId)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createMessageStructure" );
+       qDebug("RequestMessage::createMessageStructure");
 #endif
-       if( !iMessage )
+       if ( !iMessage)
        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createMessageStructure : iMessage is NULL" );
+               qDebug("RequestMessage::createMessageStructure : iMessage is NULL");
 #endif         
                return MsgErrSomeError;
        }
@@ -492,10 +490,10 @@ int RequestMessage::createMessageStructure( RequestCommandId aCommandId )
        //Should always be soap:Envelope or first element in envelopebase array
        QDomNode last = iMessage->documentElement();
 
-       if( !matchName( last, reqCmdArrayEnvelopeBase[0].iElementName ) )
+       if ( !matchName(last, reqCmdArrayEnvelopeBase[0].iElementName) )
        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createMessageStructure : Document element is not valid SOAP envelope" );
+               qDebug("RequestMessage::createMessageStructure : Document element is not valid SOAP envelope");
 #endif         
                return MsgErrSomeError;
        }
@@ -503,38 +501,60 @@ int RequestMessage::createMessageStructure( RequestCommandId aCommandId )
        QDomNode cmd;
        int err = MsgErrNoError;
 
-       switch( aCommandId )
+       switch (aCommandId)
        {
-       case ReqCmdGetUserAvailability : { cmd = constructArrayToNode( reqCmdArrayGetUserAvailability, sizeof( reqCmdArrayGetUserAvailability ) / sizeof( MessageBodyElement ) ); } break;
-       case ReqCmdConvertId : { cmd = constructArrayToNode( reqCmdArrayConvertId, sizeof( reqCmdArrayConvertId ) / sizeof( MessageBodyElement ) ); } break;
-       case ReqCmdGetItem : { cmd = constructArrayToNode( reqCmdArrayGetCalendarItem, sizeof( reqCmdArrayGetCalendarItem ) / sizeof( MessageBodyElement ) ); } break;
-       default: break;
+               case ReqCmdGetUserAvailability:
+               {
+                       cmd
+                                       = constructArrayToNode(reqCmdArrayGetUserAvailability, sizeof(reqCmdArrayGetUserAvailability )
+                                                       / sizeof(MessageBodyElement));
+               }
+                       break;
+               case ReqCmdConvertId:
+               {
+                       cmd
+                                       = constructArrayToNode(reqCmdArrayConvertId, sizeof(reqCmdArrayConvertId )
+                                                       / sizeof(MessageBodyElement));
+               }
+                       break;
+               case ReqCmdGetItem:
+               {
+                       cmd
+                                       = constructArrayToNode(reqCmdArrayGetCalendarItem, sizeof(reqCmdArrayGetCalendarItem )
+                                                       / sizeof(MessageBodyElement));
+               }
+                       break;
+               default:
+                       break;
        };
 
-       if( cmd.isNull() ) err = MsgErrSomeError;
-       else{
-               err = addNode( cmd, QDomNode::ElementNode, reqCmdArrayEnvelopeBase[0].iElementName );
+       if (cmd.isNull() )
+               err = MsgErrSomeError;
+       else
+       {
+               err
+                               = addNode(cmd, QDomNode::ElementNode, reqCmdArrayEnvelopeBase[0].iElementName);
        }
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::createMessageStructure end : err=%d", err );
+       qDebug("RequestMessage::createMessageStructure end : err=%d", err);
 #endif 
        return err;
 }
 
-QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray, int aSize )
+QDomNode RequestMessage::constructArrayToNode(const MessageBodyElement* aArray, int aSize)
 {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode" );
+       qDebug("RequestMessage::constructArrayToNode");
 #endif
        QDomElement target; //final node to be returned
 
-       if( !iMessage || aSize == 0 )
-               {
+       if ( !iMessage || aSize == 0)
+       {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : iMessage is NULL or aSize is 0." );
+               qDebug("RequestMessage::constructArrayToNode : iMessage is NULL or aSize is 0.");
 #endif
                return target;
-               }
+       }
 
        QDomElement last; // last appended node
 
@@ -543,16 +563,16 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
 
        //get the root
        MessageBodyElement root = aArray[idx];
-       if( root.iNodeType != QDomNode::ElementNode || root.iTraversalLevel > 0 )
+       if (root.iNodeType != QDomNode::ElementNode || root.iTraversalLevel > 0)
        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+               qDebug("RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults.");
 #endif         
                return target; //Root must be an element and on level 0
        }
        else
        {
-               if( root.iNamespace != QString::null )
+               if (root.iNamespace != QString::null )
                {
                        //QString prefix = root.iNamespace
                        target = iMessage->createElementNS( root.iNamespace, root.iElementName );
@@ -586,7 +606,7 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                                if( currentLvl == 0 )
                                {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+                                       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
 #endif                                                 
                                        return target; //Only root can be at traversal level 0
                                }
@@ -594,17 +614,17 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                                {
                                        //Sibling to previous
                                        if( !last.parentNode().isNull() )
-                                               last.parentNode().appendChild( elem );
+                                       last.parentNode().appendChild( elem );
                                        else
-                                               {
+                                       {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+                                               qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
 #endif 
                                                return target; //malformed. if last has no parent, it's a rootnode
-                                               }
+                                       }
                                }
                        }
-                       else if( element.iTraversalLevel > currentLvl )
+                       else if( element.iTraversalLevel> currentLvl )
                        {
                                //check if node is child to previous
                                //else there is something wrong in array representing the structure
@@ -615,7 +635,7 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                                else
                                {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+                                       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
 #endif 
                                        return target;
                                }
@@ -637,7 +657,7 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                        else
                        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+                               qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
 #endif                         
                                //some undefined error
                                return target;
@@ -651,9 +671,9 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
 
                        QDomAttr attr;
                        if( element.iNamespace != QString::null )
-                                attr = iMessage->createAttributeNS( element.iNamespace, element.iElementName );
+                       attr = iMessage->createAttributeNS( element.iNamespace, element.iElementName );
                        else
-                                attr = iMessage->createAttribute( element.iElementName );
+                       attr = iMessage->createAttribute( element.iElementName );
 
                        if( element.iTraversalLevel == currentLvl )
                        {
@@ -662,7 +682,7 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                        else
                        {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
+                               qDebug( "RequestMessage::constructArrayToNode : Malformed message definition. Check array for faults." );
 #endif                                 
                                //error in template array.
                                //attributes for element must be specified right after element
@@ -673,7 +693,7 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
                else
                {
 #ifdef MU_DEBUG
-       qDebug( "RequestMessage::constructArrayToNode : Node type not supported." );
+                       qDebug( "RequestMessage::constructArrayToNode : Node type not supported." );
 #endif 
                        //node type not supported
                        return target;
@@ -693,71 +713,71 @@ QDomNode RequestMessage::constructArrayToNode( const MessageBodyElement* aArray,
 ResponseMessage::ResponseMessage()
 {
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::ResponseMessage" );
+       qDebug("ResponseMessage::ResponseMessage");
 #endif
        iMessage = new QDomDocument();
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::ResponseMessage end" );
+       qDebug("ResponseMessage::ResponseMessage end");
 #endif
 }
 
-ResponseMessage::ResponseMessage( const QByteArray& aData )
+ResponseMessage::ResponseMessage(const QByteArray& aData)
 {
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::ResponseMessage" );
+       qDebug("ResponseMessage::ResponseMessage");
 #endif
-       iMessage->setContent( aData, true );
+       iMessage->setContent(aData, true);
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::ResponseMessage end" );
+       qDebug("ResponseMessage::ResponseMessage end");
 #endif
 }
 
-QString ResponseMessage::getNodeValue( const QString& aNodeName, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode )
+QString ResponseMessage::getNodeValue(const QString& aNodeName, QDomNode::NodeType aNodeType, const QString& aParentName, int aIndex, QDomNode* aRootNode)
 {
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::getNodeValue" );
+       qDebug("ResponseMessage::getNodeValue");
 #endif 
        QString value = QString::null;
        QDomNode node = getNodeFromDocument( aNodeName, aNodeType, aParentName, aIndex, aRootNode );
        if( !node.isNull() )
        {
                if( node.isElement() )
-                       value = node.toElement().text();
+               value = node.toElement().text();
                else if( node.isAttr() )
-                       value = node.toAttr().value();
+               value = node.toAttr().value();
        }
 #ifdef MU_DEBUG
        qDebug( "ResponseMessage::getNodeValue end" );
 #endif 
-       return value;   
+       return value;
 }
 
 bool ResponseMessage::hasErrors()
 {
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::hasErrors" );
+       qDebug("ResponseMessage::hasErrors");
 #endif
-       if( !iMessage )
-               {
+       if ( !iMessage)
+       {
 #ifdef MU_DEBUG
-       qDebug( "ResponseMessage::hasErrors : iMessage is NULL." );
+               qDebug("ResponseMessage::hasErrors : iMessage is NULL.");
 #endif
                return true;
-               }
+       }
 
        QDomElement root = iMessage->documentElement();
        bool err = false;
 
-       QString rootname = ( root.prefix() == QString::null ) ? root.tagName() : root.localName();
+       QString rootname = (root.prefix() == QString::null ) ? root.tagName() : root.localName();
        err = ( rootname.compare( QString( "Envelope" ) ) == 0 ) ? false : true;
 
        QDomNodeList list = iMessage->elementsByTagName( QString( "m:ResponseCode" ) );
        for( int i=0; i<list.count(); i++ )
        {
                if( list.item(i).nodeValue().compare( "NoError" ) != 0 )
-                       {
+               {
                        err = true;
-                       }
+               }
        }
 #ifdef MU_DEBUG
        qDebug( "ResponseMessage::hasErrors end : err=%d", err );
@@ -769,90 +789,93 @@ bool ResponseMessage::hasErrors()
  * ReqMsgGetUserAvailability class functions
  */
 
-ReqMsgGetUserAvailability::ReqMsgGetUserAvailability() : RequestMessage( ReqCmdGetUserAvailability )
+ReqMsgGetUserAvailability::ReqMsgGetUserAvailability() :
+       RequestMessage(ReqCmdGetUserAvailability)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::ReqMsgGetUserAvailability" );
+       qDebug("ReqMsgGetUserAvailability::ReqMsgGetUserAvailability");
 #endif
-       if( iMessage && iCurrCmd == ReqCmdGetUserAvailability )
+       if (iMessage && iCurrCmd == ReqCmdGetUserAvailability)
        {
-               setNodeValue( QString( "MergedFreeBusyIntervalInMinutes" ), QString::number( 60 ) );
-               setNodeValue( QString( "RequestedView" ), QString( "DetailedMerged" ) );
+               setNodeValue(QString("MergedFreeBusyIntervalInMinutes"), QString::number( 60) );
+               setNodeValue(QString("RequestedView"), QString("DetailedMerged") );
        }
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::ReqMsgGetUserAvailability end" );
+       qDebug("ReqMsgGetUserAvailability::ReqMsgGetUserAvailability end");
 #endif 
 }
 
-int ReqMsgGetUserAvailability::addUser( const QString& aAddress, const QString& /*aAttendeeType*/, const QString& aExcludeConflicts )
+int ReqMsgGetUserAvailability::addUser(const QString& aAddress, const QString& /*aAttendeeType*/, const QString& aExcludeConflicts)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::addUser" );
+       qDebug("ReqMsgGetUserAvailability::addUser");
 #endif
-       if( !iMessage || iCurrCmd != ReqCmdGetUserAvailability )
+       if ( !iMessage || iCurrCmd != ReqCmdGetUserAvailability)
        {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::addUser : iMessage is NULL or current command id is wrong" );
+               qDebug("ReqMsgGetUserAvailability::addUser : iMessage is NULL or current command id is wrong");
 #endif         
                return MsgErrSomeError;
        }
 
        int err = MsgErrNoError;
-       int size = sizeof( reqCmdMailboxElement ) / sizeof( MessageBodyElement );
+       int size = sizeof(reqCmdMailboxElement ) / sizeof(MessageBodyElement);
 
        //Create mailbox data element
-       QDomNode mailbox = constructArrayToNode( reqCmdMailboxElement, size );
-       if( !mailbox.isNull() )
+       QDomNode mailbox = constructArrayToNode(reqCmdMailboxElement, size);
+       if ( !mailbox.isNull() )
        {
                QDomNode email;
 
-               if( mailbox.hasChildNodes() )
+               if (mailbox.hasChildNodes() )
                {
-                       for ( QDomNode subnode = mailbox.firstChild(); !subnode.isNull(); subnode = subnode.nextSibling() )
+                       for (QDomNode subnode = mailbox.firstChild(); !subnode.isNull(); subnode
+                                       = subnode.nextSibling() )
                        {
-                               qDebug( "subnode: %s", subnode.toElement().tagName().toStdString().data() );
-                               if( matchName( subnode, QString( "Email" ) ) )
-                                       {
+                               qDebug("subnode: %s", subnode.toElement().tagName().toStdString().data() );
+                               if (matchName(subnode, QString("Email") ) )
+                               {
                                        email = subnode;
-                                       }
+                               }
                        }
                }
 
-               setNodeValue( QString( "Address" ), aAddress, QDomNode::ElementNode, QString( "Email" ), 0, &email );
-               setNodeValue( QString( "AttendeeType" ), QString( "Required" ), QDomNode::ElementNode, QString( "MailboxData" ), 0, &mailbox );
-               setNodeValue( QString( "ExcludeConflicts" ), aExcludeConflicts, QDomNode::ElementNode, QString( "MailboxData" ), 0, &mailbox );
+               setNodeValue(QString("Address"), aAddress, QDomNode::ElementNode, QString("Email"), 0, &email);
+               setNodeValue(QString("AttendeeType"), QString("Required"), QDomNode::ElementNode, QString("MailboxData"), 0, &mailbox);
+               setNodeValue(QString("ExcludeConflicts"), aExcludeConflicts, QDomNode::ElementNode, QString("MailboxData"), 0, &mailbox);
 
-               err = addNode( mailbox, QDomNode::ElementNode, QString( "MailboxDataArray" ) );
+               err
+                               = addNode(mailbox, QDomNode::ElementNode, QString("MailboxDataArray") );
        }
        else
                err = MsgErrSomeError;
 
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::addUser end : err=%d", err );
+       qDebug("ReqMsgGetUserAvailability::addUser end : err=%d", err);
 #endif 
        return err;
 }
 
-int ReqMsgGetUserAvailability::setTimeWindow( const QDateTime& aStart, const QDateTime& aEnd )
+int ReqMsgGetUserAvailability::setTimeWindow(const QDateTime& aStart, const QDateTime& aEnd)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeWindow" );
+       qDebug("ReqMsgGetUserAvailability::setTimeWindow");
 #endif
-       if( !iMessage || iCurrCmd != ReqCmdGetUserAvailability )
+       if ( !iMessage || iCurrCmd != ReqCmdGetUserAvailability)
        {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeWindow : iMessage is NULL or command id is wrong" );
+               qDebug("ReqMsgGetUserAvailability::setTimeWindow : iMessage is NULL or command id is wrong");
 #endif         
                return MsgErrSomeError;
        }
 
        int err = MsgErrNoError;
 
-       err = setNodeValue( QString( "StartTime" ), aStart.toString( Qt::ISODate ) );
-       err = setNodeValue( QString( "EndTime" ), aEnd.toString( Qt::ISODate ) );
+       err = setNodeValue(QString("StartTime"), aStart.toString(Qt::ISODate) );
+       err = setNodeValue(QString("EndTime"), aEnd.toString(Qt::ISODate) );
 
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeWindow end : err=%d", err );
+       qDebug("ReqMsgGetUserAvailability::setTimeWindow end : err=%d", err);
 #endif         
        return err;
 }
@@ -860,12 +883,12 @@ int ReqMsgGetUserAvailability::setTimeWindow( const QDateTime& aStart, const QDa
 int ReqMsgGetUserAvailability::setTimeZone()
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeZone" );
+       qDebug("ReqMsgGetUserAvailability::setTimeZone");
 #endif
-       if( !iMessage || iCurrCmd != ReqCmdGetUserAvailability )
+       if ( !iMessage || iCurrCmd != ReqCmdGetUserAvailability)
        {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeZone : iMessage is NULL or command id is wrong" );
+               qDebug("ReqMsgGetUserAvailability::setTimeZone : iMessage is NULL or command id is wrong");
 #endif         
                return MsgErrSomeError;
        }
@@ -876,34 +899,34 @@ int ReqMsgGetUserAvailability::setTimeZone()
 
        time(&rawtime);
        localTime = localtime(&rawtime);
-       
+
        int offsetMinutes = localTime->tm_gmtoff / 60;
        if (localTime->tm_isdst)
-               offsetMinutes -= 60;    // If DST is in use then reduce an hour from offset, because
-                                                               // DST will be added to the offset later and it already includes
-                                                               // DST. TODO: This is silly and must be changed if possible.
-                                                               // If you can get UTC offset without DST, use it here.
-       
+               offsetMinutes -= 60; // If DST is in use then reduce an hour from offset, because
+       // DST will be added to the offset later and it already includes
+       // DST. TODO: This is silly and must be changed if possible.
+       // If you can get UTC offset without DST, use it here.
+
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeZone - offset in minutes=%d", offsetMinutes );
+       qDebug("ReqMsgGetUserAvailability::setTimeZone - offset in minutes=%d", offsetMinutes);
 #endif
-       
-       DateTimeSettings *dateTimeSettings = Configuration::instance()->dateTimeSettings();
-               
-       setNodeValue( QString( "Bias" ), QString::number( -offsetMinutes ), QDomNode::ElementNode, QString( "TimeZone" ) );
-       setNodeValue( QString( "Bias" ), QString::number( 0 ), QDomNode::ElementNode, QString( "StandardTime" ) );
-       setNodeValue( QString( "Time" ), dateTimeSettings->standardTimeChange_Time(), QDomNode::ElementNode, QString( "StandardTime" ) );
-       setNodeValue( QString( "DayOrder" ), dateTimeSettings->standardTimeChange_Day(), QDomNode::ElementNode, QString( "StandardTime" ) );
-       setNodeValue( QString( "Month" ), dateTimeSettings->standardTimeChange_Month(), QDomNode::ElementNode, QString( "StandardTime" ) );
-       setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->dayOfWeek(), QDomNode::ElementNode, QString( "StandardTime" ) );
-       setNodeValue( QString( "Bias" ), QString::number( -60 ), QDomNode::ElementNode, QString( "DaylightTime" ) );
-       setNodeValue( QString( "Time" ), dateTimeSettings->daylightSaveTimeChange_Time(), QDomNode::ElementNode, QString( "DaylightTime" ) );
-       setNodeValue( QString( "DayOrder" ), dateTimeSettings->daylightSaveTimeChange_Day(), QDomNode::ElementNode, QString( "DaylightTime" ) );
-       setNodeValue( QString( "Month" ), dateTimeSettings->daylightSaveTimeChange_Month(), QDomNode::ElementNode, QString( "DaylightTime" ) );
-       setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->dayOfWeek(), QDomNode::ElementNode, QString( "DaylightTime" ) );
-
-#ifdef MU_DEBUG
-       qDebug( "ReqMsgGetUserAvailability::setTimeZone end : err=%d", err );
+
+        DateTimeSettings *dateTimeSettings = Configuration::instance()->dateTimeSettings();
+        
+        setNodeValue( QString( "Bias" ), QString::number( -offsetMinutes ), QDomNode::ElementNode, QString( "TimeZone" ) );
+        setNodeValue( QString( "Bias" ), QString::number( 0 ), QDomNode::ElementNode, QString( "StandardTime" ) );
+        setNodeValue( QString( "Time" ), dateTimeSettings->STDTime(), QDomNode::ElementNode, QString( "StandardTime" ) );
+        setNodeValue( QString( "DayOrder" ), dateTimeSettings->STDDay(), QDomNode::ElementNode, QString( "StandardTime" ) );
+        setNodeValue( QString( "Month" ), dateTimeSettings->STDMonth(), QDomNode::ElementNode, QString( "StandardTime" ) );
+        setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->switchDay(), QDomNode::ElementNode, QString( "StandardTime" ) );
+        setNodeValue( QString( "Bias" ), QString::number( -60 ), QDomNode::ElementNode, QString( "DaylightTime" ) );
+        setNodeValue( QString( "Time" ), dateTimeSettings->DSTTime(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+        setNodeValue( QString( "DayOrder" ), dateTimeSettings->DSTDay(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+        setNodeValue( QString( "Month" ), dateTimeSettings->DSTMonth(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+        setNodeValue( QString( "DayOfWeek" ), dateTimeSettings->switchDay(), QDomNode::ElementNode, QString( "DaylightTime" ) );
+
+#ifdef MU_DEBUG
+       qDebug("ReqMsgGetUserAvailability::setTimeZone end : err=%d", err);
 #endif         
        return err;
 }
@@ -911,65 +934,74 @@ int ReqMsgGetUserAvailability::setTimeZone()
 /*
  * ReqMsgConvertMeetingId class functions
  */
-ReqMsgConvertMeetingId::ReqMsgConvertMeetingId( const QString& aItemId, const QString& aMailbox )
+ReqMsgConvertMeetingId::ReqMsgConvertMeetingId(const QString& aItemId, const QString& aMailbox)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgConvertMeetingId::ReqMsgConvertMeetingId" );
+       qDebug("ReqMsgConvertMeetingId::ReqMsgConvertMeetingId");
 #endif 
        //For this class, we're not going to provide id for base class as parameter,
        //because before content structure initialization, we must add SOAP header to envelope
        iCurrCmd = ReqCmdConvertId;
-       
-       QDomNode header = constructArrayToNode( reqCmdArrayConvertIdHeader, sizeof( reqCmdArrayConvertIdHeader ) / sizeof( MessageBodyElement ) );
-       
-       if( !header.isNull() )
+
+       QDomNode
+                       header =
+                                       constructArrayToNode(reqCmdArrayConvertIdHeader, sizeof(reqCmdArrayConvertIdHeader )
+                                                       / sizeof(MessageBodyElement));
+
+       if ( !header.isNull() )
        {
-               int err = addNode( header, QDomNode::ElementNode, reqCmdArrayEnvelopeBase[0].iElementName );
+               int
+                               err =
+                                               addNode(header, QDomNode::ElementNode, reqCmdArrayEnvelopeBase[0].iElementName);
 
-               if( err == MsgErrNoError )
+               if (err == MsgErrNoError)
                {
-               createMessageStructure( ReqCmdConvertId );
-               
-               if( aItemId != QString::null ) setItemId( aItemId );
-               if( aMailbox != QString::null ) setMailbox( aMailbox );
-               
-               setNodeValue( QString( "Version" ), QString( "Exchange2007_SP1" ), QDomNode::AttributeNode, QString( "RequestServerVersion" ) );
-               setNodeValue( QString( "DestinationFormat" ), QString( "EwsLegacyId" ), QDomNode::AttributeNode, QString( "ConvertId" ) );
-               setNodeValue( QString( "Format" ), QString( "HexEntryId" ), QDomNode::AttributeNode, QString( "AlternateId" ) );
+                       createMessageStructure(ReqCmdConvertId);
+
+                       if (aItemId != QString::null ) setItemId( aItemId );
+                       if( aMailbox != QString::null ) setMailbox( aMailbox );
+
+                       setNodeValue( QString( "Version" ), QString( "Exchange2007_SP1" ), QDomNode::AttributeNode, QString( "RequestServerVersion" ) );
+                       setNodeValue( QString( "DestinationFormat" ), QString( "EwsLegacyId" ), QDomNode::AttributeNode, QString( "ConvertId" ) );
+                       setNodeValue( QString( "Format" ), QString( "HexEntryId" ), QDomNode::AttributeNode, QString( "AlternateId" ) );
                }
        }
        //setNodeValue( QString( "xmlns:t" ), NS_T, QDomNode::AttributeNode, QString( "ConvertId" ) );
-       
+
        //Must be added (for now at least) like this, because Envelope is initialized already, without attributes
        /*QDomAttr attr = iMessage->createAttribute( QString( "xmlns:t" ) );
-       attr.setValue( NS_T );
-       addNode( attr, QDomNode::AttributeNode, QString( "Envelope" ) );
-       */
+        attr.setValue( NS_T );
+        addNode( attr, QDomNode::AttributeNode, QString( "Envelope" ) );
+        */
 #ifdef MU_DEBUG
        qDebug( "ReqMsgConvertMeetingId::ReqMsgConvertMeetingId end" );
 #endif         
 }
 
-int ReqMsgConvertMeetingId::setItemId( const QString& aItemId )
+int ReqMsgConvertMeetingId::setItemId(const QString& aItemId)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgConvertMeetingId::setItemId" );
+       qDebug("ReqMsgConvertMeetingId::setItemId");
 #endif 
-       int err = setNodeValue( QString( "Id" ), aItemId, QDomNode::AttributeNode, QString( "AlternateId" ) );
+       int
+                       err =
+                                       setNodeValue(QString("Id"), aItemId, QDomNode::AttributeNode, QString("AlternateId") );
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgConvertMeetingId::setItemId end : err=%d", err );
+       qDebug("ReqMsgConvertMeetingId::setItemId end : err=%d", err);
 #endif 
        return err;
 }
 
-int ReqMsgConvertMeetingId::setMailbox( const QString& aMailbox )
+int ReqMsgConvertMeetingId::setMailbox(const QString& aMailbox)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgConvertMeetingId::setMailbox" );
+       qDebug("ReqMsgConvertMeetingId::setMailbox");
 #endif 
-       int err = setNodeValue( QString( "Mailbox" ), aMailbox, QDomNode::AttributeNode, QString( "AlternateId" ) );
+       int
+                       err =
+                                       setNodeValue(QString("Mailbox"), aMailbox, QDomNode::AttributeNode, QString("AlternateId") );
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgConvertMeetingId::setMailbox end : err=%d", err );
+       qDebug("ReqMsgConvertMeetingId::setMailbox end : err=%d", err);
 #endif
        return err;
 }
@@ -977,31 +1009,34 @@ int ReqMsgConvertMeetingId::setMailbox( const QString& aMailbox )
 /*
  * ReqMsgGetCalendarItem class functions
  */
-ReqMsgGetCalendarItem::ReqMsgGetCalendarItem( const QString& aItemId ) : RequestMessage( ReqCmdGetItem )
+ReqMsgGetCalendarItem::ReqMsgGetCalendarItem(const QString& aItemId) :
+       RequestMessage(ReqCmdGetItem)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetCalendarItem::ReqMsgGetCalendarItem" );
+       qDebug("ReqMsgGetCalendarItem::ReqMsgGetCalendarItem");
 #endif 
-       if( iMessage && iCurrCmd == ReqCmdGetItem )
+       if (iMessage && iCurrCmd == ReqCmdGetItem)
        {
-               setNodeValue( QString( "BaseShape" ), QString( "AllProperties" ) );
-               
-               if( aItemId != QString::null )
-                       setItemId( aItemId );
+               setNodeValue(QString("BaseShape"), QString("AllProperties") );
+
+               if (aItemId != QString::null )
+               setItemId( aItemId );
        }
 #ifdef MU_DEBUG
        qDebug( "ReqMsgGetCalendarItem::ReqMsgGetCalendarItem end" );
 #endif
 }
 
-int ReqMsgGetCalendarItem::setItemId( const QString& aItemId )
+int ReqMsgGetCalendarItem::setItemId(const QString& aItemId)
 {
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetCalendarItem::setItemId" );
+       qDebug("ReqMsgGetCalendarItem::setItemId");
 #endif 
-       int err = setNodeValue( QString( "Id" ), aItemId, QDomNode::AttributeNode, QString( "ItemId" ), 0 );
+       int
+                       err =
+                                       setNodeValue(QString("Id"), aItemId, QDomNode::AttributeNode, QString("ItemId"), 0);
 #ifdef MU_DEBUG
-       qDebug( "ReqMsgGetCalendarItem::setItemId end : err=%d", err );
+       qDebug("ReqMsgGetCalendarItem::setItemId end : err=%d", err);
 #endif 
        return err;
 }
@@ -1009,137 +1044,141 @@ int ReqMsgGetCalendarItem::setItemId( const QString& aItemId )
 /*
  * ResMsgGetUserAvailability class functions
  */
-ResMsgGetUserAvailability::ResMsgGetUserAvailability( const QByteArray& aData ) : ResponseMessage( aData )
+ResMsgGetUserAvailability::ResMsgGetUserAvailability(const QByteArray& aData) :
+       ResponseMessage(aData)
 {
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetUserAvailability::ResMsgGetUserAvailability" );
-       qDebug( "ResMsgGetUserAvailability::ResMsgGetUserAvailability end" );
+       qDebug("ResMsgGetUserAvailability::ResMsgGetUserAvailability");
+       qDebug("ResMsgGetUserAvailability::ResMsgGetUserAvailability end");
 #endif
 }
 
-int ResMsgGetUserAvailability::getMeetingsFromResponse( QList<Meeting*>& aMeetings, const Room &aRoom )
+int ResMsgGetUserAvailability::getMeetingsFromResponse(QList<Meeting*>& aMeetings, const Room &aRoom)
 {
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetUserAvailability::getMeetingsFromResponse" );
+       qDebug("ResMsgGetUserAvailability::getMeetingsFromResponse");
 #endif
-               if( !iMessage )
-                       {
+       if ( !iMessage)
+       {
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetUserAvailability::getMeetingsFromResponse : iMessage is NULL" );
+               qDebug("ResMsgGetUserAvailability::getMeetingsFromResponse : iMessage is NULL");
 #endif 
-                       return MsgErrSomeError;
-                       }
+               return MsgErrSomeError;
+       }
 
-               //TODO: Clean this function a bit (see getMeetingDetailsFromResponse)
-               
-               int err = MsgErrNoError;
+       //TODO: Clean this function a bit (see getMeetingDetailsFromResponse)
 
-               QDomNodeList list = iMessage->elementsByTagName( QString( "CalendarEvent" ) );
+       int err = MsgErrNoError;
 
-               for( int i=0; i<list.count(); i++ )
+       QDomNodeList list = iMessage->elementsByTagName(QString("CalendarEvent") );
+
+       for (int i=0; i<list.count(); i++)
+       {
+               QDomElement e = list.item( i ).toElement();
+               QString tagName = (e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
+
+               if( !e.isNull() && tagName == "calendarevent" )
                {
-                       QDomElement e = list.item( i ).toElement();
-                       QString tagName = ( e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
 
-                       if( !e.isNull() && tagName == "calendarevent" )
-                       {
+                       QString id, startsAt, endsAt, organizer, subject;
 
-                               QString id, startsAt, endsAt, organizer, subject;
+                       for ( QDomNode subnode = e.firstChild(); !subnode.isNull(); subnode = subnode.nextSibling() )
+                       {
+                               QDomElement e = subnode.toElement();
+                               QString tagName = ( e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
 
-                               for ( QDomNode subnode = e.firstChild(); !subnode.isNull(); subnode = subnode.nextSibling() )
+                               if( tagName == QString( "starttime" ) )
+                               {
+                                       startsAt = e.text();
+                               }
+                               else if( tagName == QString( "endtime" ) )
+                               {
+                                       endsAt = e.text();
+                               }
+                               else if( tagName == QString( "calendareventdetails" ) )
                                {
-                                       QDomElement e = subnode.toElement();
-                                       QString tagName = ( e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
 
-                                       if( tagName == QString( "starttime" ) )
-                                       {
-                                               startsAt = e.text();
-                                       }
-                                       else if( tagName == QString( "endtime" ) )
+                                       for ( QDomNode detailnode = subnode.firstChild(); !detailnode.isNull(); detailnode = detailnode.nextSibling() )
                                        {
-                                               endsAt = e.text();
-                                       }
-                                       else if( tagName == QString( "calendareventdetails" ) )
-                                       {
-
-                                               for ( QDomNode detailnode = subnode.firstChild(); !detailnode.isNull(); detailnode = detailnode.nextSibling() )
-                                               {
 
-                                                       QDomElement e = detailnode.toElement();
-                                                       QString tagName = ( e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
+                                               QDomElement e = detailnode.toElement();
+                                               QString tagName = ( e.prefix() == QString::null ) ? e.tagName().toLower() : e.localName().toLower();
 
-                                                       if( tagName == QString( "id" ) )
-                                                       {                                                       
-                                                               id = e.text();
-                                                       }
+                                               if( tagName == QString( "id" ) )
+                                               {
+                                                       id = e.text();
+                                               }
 
-                                                       if( tagName == QString( "subject" ) )
-                                                       {
-                                                               subject = e.text();
-                                                       }
+                                               if( tagName == QString( "subject" ) )
+                                               {
+                                                       subject = e.text();
                                                }
                                        }
                                }
+                       }
 
-                               QDateTime start = QDateTime::fromString( startsAt, Qt::ISODate );
-                               QDateTime end = QDateTime::fromString( endsAt, Qt::ISODate );
+                       QDateTime start = QDateTime::fromString( startsAt, Qt::ISODate );
+                       QDateTime end = QDateTime::fromString( endsAt, Qt::ISODate );
 
-                               aMeetings.append( new Meeting(
-                                               id,
-                                               aRoom,
-                                               start,
-                                               end,
-                                               subject ) );
+                       aMeetings.append( new Meeting(
+                                       id,
+                                       aRoom,
+                                       start,
+                                       end,
+                                       subject ) );
 
-                       }
                }
+       }
 #ifdef MU_DEBUG
        qDebug( "ResMsgGetUserAvailability::getMeetingsFromResponse end : err=%d", err );
 #endif         
-               return err;
+       return err;
 }
 
 /*
  * ResMsgGetCalendarItem class functions
  */
-int ResMsgGetCalendarItem::getMeetingDetailsFromResponse( Meeting& aMeeting )
+int ResMsgGetCalendarItem::getMeetingDetailsFromResponse(Meeting& aMeeting)
 {
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetCalendarItem::getMeetingDetailsFromResponse" );
+       qDebug("ResMsgGetCalendarItem::getMeetingDetailsFromResponse");
 #endif
-       if( !iMessage || hasErrors() )
-               {
+       if ( !iMessage || hasErrors() )
+       {
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetCalendarItem::getMeetingDetailsFromResponse : iMessage is NULL or response has errors." );
+               qDebug("ResMsgGetCalendarItem::getMeetingDetailsFromResponse : iMessage is NULL or response has errors.");
 #endif         
                return MsgErrSomeError;
-               }
+       }
 
        QString name, address, description; //Organizer
 
-       QDomNode box = getElementFromDocument( QString( "Mailbox" ), QString( "Organizer" ), 0 );
+       QDomNode box =
+                       getElementFromDocument(QString("Mailbox"), QString("Organizer"), 0);
 
-       if( !box.isNull() && box.hasChildNodes() )
+       if ( !box.isNull() && box.hasChildNodes() )
        {
-               for ( QDomNode subnode = box.firstChild(); !subnode.isNull(); subnode = subnode.nextSibling() )
+               for (QDomNode subnode = box.firstChild(); !subnode.isNull(); subnode
+                               = subnode.nextSibling() )
                {
-                       if( matchName( subnode, QString( "Name" ) ) )
+                       if (matchName(subnode, QString("Name") ) )
                                name = subnode.toElement().text();
-                       else if( matchName( subnode, QString( "EmailAddress" ) ) )
+                       else if (matchName(subnode, QString("EmailAddress") ) )
                                address = subnode.toElement().text();
                }
        }
-       
-       QDomNode body = getElementFromDocument( QString( "Body" ), QString( "CalendarItem" ), 0 );
 
-       if( body.isElement() )
+       QDomNode body =
+                       getElementFromDocument(QString("Body"), QString("CalendarItem"), 0);
+
+       if (body.isElement() )
                description = body.toElement().text();
-       
-       aMeeting.setOrganizer( name, address );
-       aMeeting.setDescription( description );
+
+       aMeeting.setOrganizer(name, address);
+       aMeeting.setDescription(description);
 
 #ifdef MU_DEBUG
-       qDebug( "ResMsgGetCalendarItem::getMeetingDetailsFromResponse end" );
+       qDebug("ResMsgGetCalendarItem::getMeetingDetailsFromResponse end");
 #endif         
        return MsgErrNoError;
 }