cosmetics

15 files changed, 1349 insertions, 506 deletions

diff --git a/libopie2/opiepim/core/opimnotify.cpp b/libopie2/opiepim/core/opimnotify.cpp
index c61f9da..43858f0 100644
--- a/libopie2/opiepim/core/opimnotify.cpp
+++ b/libopie2/opiepim/core/opimnotify.cpp
@@ -5,254 +5,375 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#include <qshared.h>
 
-#include <opie2/opimnotify.h>
+#include "opimnotify.h"
 
-namespace Opie {
+/* QT */
+#include <qshared.h>
 
-struct OPimNotify::Data : public QShared {
-    Data() : QShared(),dur(-1),parent(0) {
+namespace Opie
+{
 
+struct OPimNotify::Data : public QShared
+{
+    Data() : QShared(), dur( -1 ), parent( 0 )
+    {
     }
     QDateTime start;
     int dur;
     QString application;
     int parent;
 };
 
-OPimNotify::OPimNotify( const QDateTime& start, int duration, int parent ) {
+OPimNotify::OPimNotify( const QDateTime& start, int duration, int parent )
+{
     data = new Data;
     data->start = start;
     data->dur = duration;
     data->parent = parent;
 }
+
+
 OPimNotify::OPimNotify( const OPimNotify& noti)
     : data( noti.data )
 {
     data->ref();
 }
-OPimNotify::~OPimNotify() {
-    if ( data->deref() ) {
+
+
+OPimNotify::~OPimNotify()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0l;
     }
 }
 
-OPimNotify &OPimNotify::operator=( const OPimNotify& noti) {
+
+OPimNotify &OPimNotify::operator=( const OPimNotify& noti )
+{
     noti.data->ref();
     deref();
     data = noti.data;
 
     return *this;
 }
-bool OPimNotify::operator==( const OPimNotify& noti ) {
+
+
+bool OPimNotify::operator==( const OPimNotify& noti )
+{
     if ( data == noti.data ) return true;
     if ( data->dur != noti.data->dur ) return false;
     if ( data->parent != noti.data->parent ) return false;
     if ( data->application != noti.data->application ) return false;
     if ( data->start != noti.data->start ) return false;
 
     return true;
 }
-QDateTime OPimNotify::dateTime()const {
+
+
+QDateTime OPimNotify::dateTime() const
+{
     return data->start;
 }
-QString OPimNotify::service()const {
+
+
+QString OPimNotify::service() const
+{
     return data->application;
 }
-int OPimNotify::parent()const {
+
+
+int OPimNotify::parent() const
+{
     return data->parent;
 }
-int OPimNotify::duration()const {
+
+
+int OPimNotify::duration() const
+{
     return data->dur;
 }
-QDateTime OPimNotify::endTime()const {
+
+
+QDateTime OPimNotify::endTime() const
+{
     return QDateTime( data->start.date(), data->start.time().addSecs( data->dur) );
 }
-void OPimNotify::setDateTime( const QDateTime& time ) {
+
+
+void OPimNotify::setDateTime( const QDateTime& time )
+{
     copyIntern();
     data->start = time;
 }
-void OPimNotify::setDuration( int dur ) {
+
+
+void OPimNotify::setDuration( int dur )
+{
     copyIntern();
     data->dur = dur;
 }
-void OPimNotify::setParent( int uid ) {
+
+
+void OPimNotify::setParent( int uid )
+{
     copyIntern();
     data->parent = uid;
 }
-void OPimNotify::setService( const QString& str ) {
+
+
+void OPimNotify::setService( const QString& str )
+{
     copyIntern();
     data->application = str;
 }
-void OPimNotify::copyIntern() {
-    if ( data->count != 1 ) {
+
+
+void OPimNotify::copyIntern()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
         Data* dat = new Data;
         dat->start = data->start;
         dat->dur   = data->dur;
         dat->application = data->application;
         dat->parent = data->parent;
         data = dat;
     }
 }
-void OPimNotify::deref() {
-    if ( data->deref() ) {
+
+
+void OPimNotify::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
 
+
 /***********************************************************/
-struct OPimAlarm::Data : public QShared {
-    Data() : QShared() {
+struct OPimAlarm::Data : public QShared
+{
+    Data() : QShared()
+    {
         sound = 1;
     }
     int sound;
     QString file;
 };
+
+
 OPimAlarm::OPimAlarm( int sound, const QDateTime& start, int duration, int parent )
     : OPimNotify( start, duration, parent )
 {
     data = new Data;
     data->sound = sound;
 }
+
+
 OPimAlarm::OPimAlarm( const OPimAlarm& al)
     : OPimNotify(al), data( al.data )
 {
     data->ref();
 }
-OPimAlarm::~OPimAlarm() {
-    if ( data->deref() ) {
+
+
+OPimAlarm::~OPimAlarm()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0l;
     }
 }
+
+
 OPimAlarm &OPimAlarm::operator=( const OPimAlarm& al)
 {
     OPimNotify::operator=( al );
     deref();
     al.data->ref();
 
     data = al.data;
 
 
     return *this;
 }
-bool OPimAlarm::operator==( const OPimAlarm& al) {
+
+
+bool OPimAlarm::operator==( const OPimAlarm& al )
+{
     if ( data->sound != al.data->sound ) return false;
     else if ( data->sound == Custom && data->file != al.data->file )
         return false;
 
     return OPimNotify::operator==( al );
 }
-QString OPimAlarm::type()const {
+
+
+QString OPimAlarm::type() const
+{
     return QString::fromLatin1("OPimAlarm");
 }
-int OPimAlarm::sound()const {
+
+
+int OPimAlarm::sound() const
+{
     return data->sound;
 }
-QString OPimAlarm::file()const {
+
+
+QString OPimAlarm::file() const
+{
     return data->file;
 }
-void OPimAlarm::setSound( int snd) {
+
+
+void OPimAlarm::setSound( int snd )
+{
     copyIntern();
     data->sound = snd;
 }
-void OPimAlarm::setFile( const QString& sound ) {
+
+
+void OPimAlarm::setFile( const QString& sound )
+{
     copyIntern();
     data->file = sound;
 }
-void OPimAlarm::deref() {
-    if ( data->deref() ) {
+
+
+void OPimAlarm::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0l;
     }
 }
-void OPimAlarm::copyIntern() {
-    if ( data->count != 1 ) {
+
+
+void OPimAlarm::copyIntern()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
         Data *newDat = new Data;
         newDat->sound = data->sound;
         newDat->file  = data->file;
         data = newDat;
     }
 }
+
+
 /************************/
-struct OPimReminder::Data : public QShared {
-    Data() : QShared(), record( 0) {
-    }
+struct OPimReminder::Data : public QShared
+{
+    Data() : QShared(), record( 0 )
+    {}
     int record;
 
 };
+
+
 OPimReminder::OPimReminder( int uid, const QDateTime& start,  int dur, int parent )
     : OPimNotify( start, dur, parent )
 {
     data = new Data;
     data->record = uid;
 }
+
+
 OPimReminder::OPimReminder( const OPimReminder& rem )
     :  OPimNotify( rem ), data( rem.data )
 {
     data->ref();
 }
-OPimReminder& OPimReminder::operator=( const OPimReminder& rem) {
+
+
+OPimReminder& OPimReminder::operator=( const OPimReminder& rem )
+{
     OPimNotify::operator=(rem );
 
     deref();
     rem.data->ref();
     data = rem.data;
 
     return *this;
 }
-bool OPimReminder::operator==( const OPimReminder& rem) {
+
+
+bool OPimReminder::operator==( const OPimReminder& rem )
+{
     if ( data->record != rem.data->record ) return false;
 
     return OPimNotify::operator==( rem );
 }
-QString OPimReminder::type()const {
+
+
+QString OPimReminder::type() const
+{
     return QString::fromLatin1("OPimReminder");
 }
-int OPimReminder::recordUid()const {
+
+
+int OPimReminder::recordUid() const
+{
     return data->record;
 }
-void OPimReminder::setRecordUid( int uid ) {
+
+
+void OPimReminder::setRecordUid( int uid )
+{
     copyIntern();
     data->record = uid;
 }
-void OPimReminder::deref() {
-    if ( data->deref() ) {
+
+
+void OPimReminder::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0l;
     }
 }
-void OPimReminder::copyIntern() {
-    if ( data->count != 1 ) {
+
+
+void OPimReminder::copyIntern()
+{
+    if ( data->count != 1 )
+    {
         Data* da = new Data;
         da->record = data->record;
         data = da;
     }
 }
+
 }
diff --git a/libopie2/opiepim/core/opimnotify.h b/libopie2/opiepim/core/opimnotify.h
index fed3970..d0e40ca 100644
--- a/libopie2/opiepim/core/opimnotify.h
+++ b/libopie2/opiepim/core/opimnotify.h
@@ -5,70 +5,74 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_PIM_NOTIFY_H
-#define OPIE_PIM_NOTIFY_H
 
+#ifndef OPIMNOTIFY_H
+#define OPIMNOTIFY_H
+
+/* QT */
 #include <qdatetime.h>
 #include <qvaluelist.h>
 
-
-namespace Opie {
+namespace Opie
+{
 /**
  * This is the base class of Notifiers. Possible
  * notifiers would be Alarms, Reminders
  * What they share is that they have
  * A DateTime, Type, Duration
  * This is what this base class takes care of
  * on top of that it's shared
  */
 /*
  * TALK to eilers: have a class OPimDuration which sets the Duration
  *                 given on the Due/Start Date? -zecke
  * discuss: do we need a uid for the notify? -zecke
  */
-class OPimNotify {
+class OPimNotify
+{
+
 public:
     typedef QValueList<OPimNotify> ValueList;
     OPimNotify( const QDateTime& start = QDateTime(), int duration = 0, int parent = 0 );
     OPimNotify( const OPimNotify& );
     virtual ~OPimNotify();
 
     OPimNotify &operator=(const OPimNotify& );
     bool operator==( const OPimNotify& );
 
     virtual QString type()const = 0;
 
     /** start date */
     QDateTime dateTime()const;
     QString service()const;
 
     /**
      * RETURN the parent uid
      */
     int parent()const;
 
     /**
      * in Seconds
      */
     int duration()const;
@@ -79,86 +83,87 @@ public:
     QDateTime endTime()const;
 
     void setDateTime( const QDateTime& );
     void setDuration( int dur );
     void setParent(int uid );
     void setService( const QString& );
 
 
 private:
     inline void copyIntern();
     void deref();
     struct Data;
     Data* data;
 
     /* d-pointer */
     class NotifyPrivate;
     NotifyPrivate* d;
 
 };
 /**
  * An alarm is a sound/mail/buzzer played/send
  * at a given time to inform about
  * an Event
  */
-class OPimAlarm : public OPimNotify {
+class OPimAlarm : public OPimNotify
+{
 public:
     enum Sound{Loud=1, Silent=0, Custom=2 };
     OPimAlarm( int sound = Silent, const QDateTime& start = QDateTime(), int duration = 0, int parent = 0 );
     OPimAlarm( const OPimAlarm& );
     ~OPimAlarm();
 
     OPimAlarm &operator=( const OPimAlarm& );
     bool operator==( const OPimAlarm& );
     QString type()const;
 
     int sound()const;
     QString file()const;
 
     void setSound( int );
     /* only when sound is custom... */
     void setFile( const QString& sound );
 
 private:
     void deref();
     void copyIntern();
     struct Data;
     Data * data;
 
     class Private;
     Private* d;
 
 };
 
 /**
  * A Reminder will be put into the
  * datebook
  * Note that the returned dateTime() may be not valid.
  * In these cases one must resolve the uid and get the OEvent
  */
-class OPimReminder : public OPimNotify {
+class OPimReminder : public OPimNotify
+{
 public:
-
     /**
      * c'tor of a reminder
      * @param uid The uid of the Record inside the Datebook
      * @param start the StartDate invalid for all day...
      * @param duration The duration of the event ( -1 for all day )
      * @param parent The 'parent' record of this reminder
      */
     OPimReminder( int uid = 0,  const QDateTime& start = QDateTime(),
                   int duration = 0, int parent = 0  );
     OPimReminder( const OPimReminder& );
     OPimReminder &operator=(const OPimReminder& );
 
     QString type()const;
 
     bool operator==( const OPimReminder& );
 
     /**
      * the uid of the alarm
      * inside the 'datebook' application
      */
     int recordUid()const;
     void setRecordUid( int uid );
 
 private:
diff --git a/libopie2/opiepim/core/opimnotifymanager.cpp b/libopie2/opiepim/core/opimnotifymanager.cpp
index 1771fad..a54d597 100644
--- a/libopie2/opiepim/core/opimnotifymanager.cpp
+++ b/libopie2/opiepim/core/opimnotifymanager.cpp
@@ -5,189 +5,245 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#include <opie2/opimnotifymanager.h>
 
+#include "opimnotifymanager.h"
+
+/* OPIE */
 #include <opie2/oconversion.h>
 
+/* QT */
 #include <qstringlist.h>
 
-namespace Opie {
+namespace Opie
+{
 
 OPimNotifyManager::OPimNotifyManager( const Reminders& rem,  const Alarms& al)
     : m_rem( rem ), m_al( al )
 {}
-OPimNotifyManager::~OPimNotifyManager() {
-}
+
+
+OPimNotifyManager::~OPimNotifyManager()
+{}
+
+
 /* use static_cast and type instead of dynamic... */
-void OPimNotifyManager::add( const OPimNotify& noti) {
-    if ( noti.type() == QString::fromLatin1("OPimReminder") ) {
+void OPimNotifyManager::add( const OPimNotify& noti )
+{
+    if ( noti.type() == QString::fromLatin1( "OPimReminder" ) )
+    {
         const OPimReminder& rem = static_cast<const OPimReminder&>(noti);
         m_rem.append( rem );
-    }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) {
+    }
+    else if ( noti.type() == QString::fromLatin1( "OPimAlarm" ) )
+    {
         const OPimAlarm& al = static_cast<const OPimAlarm&>(noti);
         m_al.append( al );
     }
 }
-void OPimNotifyManager::remove( const OPimNotify& noti) {
-    if ( noti.type() == QString::fromLatin1("OPimReminder") ) {
+
+
+void OPimNotifyManager::remove( const OPimNotify& noti )
+{
+    if ( noti.type() == QString::fromLatin1( "OPimReminder" ) )
+    {
         const OPimReminder& rem = static_cast<const OPimReminder&>(noti);
         m_rem.remove( rem );
-    }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) {
+    }
+    else if ( noti.type() == QString::fromLatin1( "OPimAlarm" ) )
+    {
         const OPimAlarm& al = static_cast<const OPimAlarm&>(noti);
         m_al.remove( al );
     }
 }
-void OPimNotifyManager::replace( const OPimNotify& noti) {
-    if ( noti.type() == QString::fromLatin1("OPimReminder") ) {
+
+
+void OPimNotifyManager::replace( const OPimNotify& noti )
+{
+    if ( noti.type() == QString::fromLatin1( "OPimReminder" ) )
+    {
         const OPimReminder& rem = static_cast<const OPimReminder&>(noti);
         m_rem.remove( rem );
         m_rem.append( rem );
-    }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) {
+    }
+    else if ( noti.type() == QString::fromLatin1( "OPimAlarm" ) )
+    {
         const OPimAlarm& al = static_cast<const OPimAlarm&>(noti);
         m_al.remove( al );
         m_al.append( al );
     }
 }
-OPimNotifyManager::Reminders OPimNotifyManager::reminders()const {
+
+
+OPimNotifyManager::Reminders OPimNotifyManager::reminders() const
+{
     return m_rem;
 }
-OPimNotifyManager::Alarms    OPimNotifyManager::alarms()const {
+
+
+OPimNotifyManager::Alarms OPimNotifyManager::alarms() const
+{
     return m_al;
 }
-OPimAlarm OPimNotifyManager::alarmAtDateTime( const QDateTime& when, bool& found ) const {
+
+
+OPimAlarm OPimNotifyManager::alarmAtDateTime( const QDateTime& when, bool& found ) const
+{
 	Alarms::ConstIterator it;
 	found = true;
 
-	for ( it = m_al.begin(); it != m_al.end(); ++it ){
+    for ( it = m_al.begin(); it != m_al.end(); ++it )
+    {
 		if ( (*it).dateTime() == when )
 			return (*it);
 	}
 
 	// Fall through if nothing could be found
 	found = false;
 	OPimAlarm empty;
 	return empty;
 }
 
 
-void OPimNotifyManager::setAlarms( const Alarms& al) {
+void OPimNotifyManager::setAlarms( const Alarms& al )
+{
     m_al = al;
 }
-void OPimNotifyManager::setReminders( const Reminders& rem) {
+
+
+void OPimNotifyManager::setReminders( const Reminders& rem )
+{
     m_rem = rem;
 }
+
+
 /* FIXME!!! */
 /**
  * The idea is to check if the provider for our service
  * is online
  * if it is we will use QCOP
  * if not the Factory to get the backend...
  * Qtopia1.6 services would be kewl to have here....
  */
-void OPimNotifyManager::registerNotify( const OPimNotify& ) {
-
+void OPimNotifyManager::registerNotify( const OPimNotify& )
+{
 }
+
+
 /* FIXME!!! */
 /**
  * same as above...
  * Also implement Url model
  * have a MainWindow....
  */
-void OPimNotifyManager::deregister( const OPimNotify& ) {
-
+void OPimNotifyManager::deregister( const OPimNotify& )
+{
 }
 
-bool OPimNotifyManager::isEmpty()const {
+
+bool OPimNotifyManager::isEmpty() const
+{
     qWarning("is Empty called on OPimNotifyManager %d %d", m_rem.count(), m_al.count() );
     if ( m_rem.isEmpty() && m_al.isEmpty() ) return true;
     else return false;
 }
 
-// Taken from otodoaccessxml..
+
+// Taken from otodoaccessxml.. code duplication bad. any alternative?
 QString OPimNotifyManager::alarmsToString() const
 {
 	QString str;
 
 	OPimNotifyManager::Alarms alarms = m_al;
-	if ( !alarms.isEmpty() ) {
+    if ( !alarms.isEmpty() )
+    {
 		QStringList als;
 		OPimNotifyManager::Alarms::Iterator it = alarms.begin();
-		for ( ; it != alarms.end(); ++it ) {
+        for ( ; it != alarms.end(); ++it )
+        {
 			/* only if time is valid */
-			if ( (*it).dateTime().isValid() ) {
+            if ( ( *it ).dateTime().isValid() )
+            {
 				als << OConversion::dateTimeToString( (*it).dateTime() )
 					+ ":" + QString::number( (*it).duration() )
 					+ ":" + QString::number( (*it).sound() )
 					+ ":";
 			}
 		}
 		// now write the list
 		qWarning("als: %s", als.join("____________").latin1() );
 		str = als.join(";");
 	}
 
 	return str;
 }
+
+
 QString OPimNotifyManager::remindersToString() const
 {
 	QString str;
 
 	OPimNotifyManager::Reminders reminders = m_rem;
-	if (!reminders.isEmpty() ) {
+    if ( !reminders.isEmpty() )
+    {
 		OPimNotifyManager::Reminders::Iterator it = reminders.begin();
 		QStringList records;
-		for ( ; it != reminders.end(); ++it ) {
+        for ( ; it != reminders.end(); ++it )
+        {
 			records << QString::number( (*it).recordUid() );
 		}
 		str = records.join(";");
 	}
 
 	return str;
 }
 
+
 void OPimNotifyManager::alarmsFromString( const QString& str )
 {
         QStringList als = QStringList::split(";", str );
-        for (QStringList::Iterator it = als.begin(); it != als.end(); ++it ) {
+    for ( QStringList::Iterator it = als.begin(); it != als.end(); ++it )
+    {
 		QStringList alarm = QStringList::split(":", (*it), TRUE ); // allow empty
 		qWarning("alarm: %s", alarm.join("___").latin1() );
 		qWarning("alarm[0]: %s %s", alarm[0].latin1(), 
 			 OConversion::dateTimeFromString( alarm[0] ).toString().latin1() );
 		OPimAlarm al( alarm[2].toInt(), OConversion::dateTimeFromString( alarm[0] ), 
 			      alarm[1].toInt() );
 		add( al );
         }
 }
 
+
 void OPimNotifyManager::remindersFromString( const QString& str )
 {
 
         QStringList rems = QStringList::split(";", str );
-        for (QStringList::Iterator it = rems.begin(); it != rems.end(); ++it ) {
+    for ( QStringList::Iterator it = rems.begin(); it != rems.end(); ++it )
+    {
 		OPimReminder rem( (*it).toInt() );
 		add( rem );
         }
 	
 }
 }
diff --git a/libopie2/opiepim/core/opimnotifymanager.h b/libopie2/opiepim/core/opimnotifymanager.h
index 0272e5d..9241ea2 100644
--- a/libopie2/opiepim/core/opimnotifymanager.h
+++ b/libopie2/opiepim/core/opimnotifymanager.h
@@ -5,60 +5,64 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_PIM_NOTIFY_MANAGER_H
-#define OPIE_PIM_NOTIFY_MANAGER_H
-
-#include <qvaluelist.h>
+#ifndef OPIMNOTIFYMANAGER_H
+#define OPIMNOTIFYMANAGER_H
 
+/* OPIE */
 #include <opie2/opimnotify.h>
 
-namespace Opie {
+/* QT */
+#include <qvaluelist.h>
+
+namespace Opie
+{
 /**
  * The notify manager keeps track of the Notifiers....
  */
-class OPimNotifyManager {
+class OPimNotifyManager
+{
 public:
     typedef QValueList<OPimReminder> Reminders;
     typedef QValueList<OPimAlarm>    Alarms;
     OPimNotifyManager( const Reminders& rems = Reminders(), const Alarms& alarms = Alarms() );
     ~OPimNotifyManager();
 
     /* we will cast it for you ;) */
     void add( const OPimNotify& );
     void remove( const OPimNotify& );
     /* replaces all with this one! */
     void replace( const OPimNotify& );
 
     Reminders reminders()const;
 
     /**
      * Return 
      */
     Alarms    alarms()const;
 
     /**
      * Return alarm at DateTime "when". If more than one is registered at this
      * DateTime, the first one is returned.
      * If none was found, an empty Alarm is returned.
      * @param when The date and time of the returned alarm
@@ -85,38 +89,36 @@ public:
 
     bool isEmpty()const;
 
     /** 
      * Return all alarms as string
      */
     QString alarmsToString() const;
     /** 
      * Return all notifiers as string
      */
     QString remindersToString() const;
 
     /**
      * Convert string to alarms 
      * @param str String created by alarmsToString()
      */
     void alarmsFromString( const QString& str );
 
     /**
      * Convert string to reminders
      * @param str String created by remindersToString()
      */
     void remindersFromString( const QString& str );
 
-
-
 private:
     Reminders m_rem;
     Alarms m_al;
 
     class Private;
     Private *d;
 
 };
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 72bb372..c603f44 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -5,209 +5,270 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#include <qarray.h>
 
+#include "opimrecord.h"
+
+/* OPIE */
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
-#include <opie2/opimrecord.h>
+/* QT */
+#include <qarray.h>
 
-namespace Opie {
+namespace Opie
+{
 Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia );
 
 
 OPimRecord::OPimRecord( int uid )
-    : Qtopia::Record() {
+        : Qtopia::Record()
+{
 
     m_lastHit = -1;
     setUid( uid );
 }
-OPimRecord::~OPimRecord() {
-}
+
+
+OPimRecord::~OPimRecord()
+{}
+
+
 OPimRecord::OPimRecord( const OPimRecord& rec )
     : Qtopia::Record( rec )
 {
     (*this) = rec;
 }
 
-OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
+
+OPimRecord &OPimRecord::operator=( const OPimRecord& rec )
+{
     if ( this == &rec ) return *this;
 
     Qtopia::Record::operator=( rec );
     m_xrefman = rec.m_xrefman;
     m_lastHit = rec.m_lastHit;
 
     return  *this;
 }
+
+
 /*
  * category names
  */
-QStringList OPimRecord::categoryNames( const QString& appname ) const {
+QStringList OPimRecord::categoryNames( const QString& appname ) const
+{
     QStringList list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
-    for (uint i = 0; i < cats.count(); i++ ) {
+    for ( uint i = 0; i < cats.count(); i++ )
+    {
         list << catDB.label( appname, cats[i] );
     }
 
     return list;
 }
-void OPimRecord::setCategoryNames( const QStringList& ) {
 
+
+void OPimRecord::setCategoryNames( const QStringList& )
+{
 }
-void OPimRecord::addCategoryName( const QString& ) {
+
+
+void OPimRecord::addCategoryName( const QString& )
+{
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
-bool OPimRecord::isEmpty()const {
+
+
+bool OPimRecord::isEmpty() const
+{
     return ( uid() == 0 );
 }
+
+
 /*QString OPimRecord::crossToString()const {
     QString str;
     QMap<QString, QArray<int> >::ConstIterator it;
     for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
         QArray<int> id = it.data();
         for ( uint i = 0; i < id.size(); ++i ) {
             str += it.key() + "," + QString::number( i ) + ";";
         }
     }
     str = str.remove( str.length()-1, 1); // strip the ;
     //qWarning("IDS " + str );
 
     return str;
     }*/
 /* if uid = 1 assign a new one */
-void OPimRecord::setUid( int uid ) {
+void OPimRecord::setUid( int uid )
+{
     if ( uid == 1)
         uid = uidGen().generate();
 
     Qtopia::Record::setUid( uid );
 };
-Qtopia::UidGen &OPimRecord::uidGen() {
+
+
+Qtopia::UidGen &OPimRecord::uidGen()
+{
     return m_uidGen;
 }
-OPimXRefManager &OPimRecord::xrefmanager() {
+
+
+OPimXRefManager &OPimRecord::xrefmanager()
+{
     return m_xrefman;
 }
-int OPimRecord::rtti(){
+
+
+int OPimRecord::rtti()
+{
     return 0;
 }
 
 /**
  * now let's put our data into the stream
  */
 /*
  * First read UID
  *            Categories
  *            XRef
  */
-bool OPimRecord::loadFromStream( QDataStream& stream ) {
+bool OPimRecord::loadFromStream( QDataStream& stream )
+{
     int Int;
     uint UInt;
     stream >> Int;
     setUid(Int);
 
     /** Categories */
     stream >> UInt;
     QArray<int> array(UInt);
-    for (uint i = 0; i < UInt; i++ ) {
+    for ( uint i = 0; i < UInt; i++ )
+    {
         stream >> array[i];
     }
     setCategories( array );
 
     /*
      * now we do the X-Ref stuff
      */
     OPimXRef xref;
     stream >> UInt;
-    for ( uint i = 0; i < UInt; i++ ) {
+    for ( uint i = 0; i < UInt; i++ )
+    {
         xref.setPartner( OPimXRef::One, partner( stream ) );
         xref.setPartner( OPimXRef::Two, partner( stream ) );
         m_xrefman.add( xref );
     }
 
     return true;
 }
-bool OPimRecord::saveToStream( QDataStream& stream )const {
+
+
+bool OPimRecord::saveToStream( QDataStream& stream ) const
+{
     /** UIDs */
 
     stream << uid();
 
     /** Categories  */
     stream << categories().count();
-    for ( uint i = 0; i < categories().count(); i++ ) {
+    for ( uint i = 0; i < categories().count(); i++ )
+    {
         stream << categories()[i];
     }
 
     /*
      * first the XRef count
      * then the xrefs
      */
     stream << m_xrefman.list().count();
     for ( OPimXRef::ValueList::ConstIterator it = m_xrefman.list().begin();
-          it != m_xrefman.list().end(); ++it ) {
+            it != m_xrefman.list().end(); ++it )
+    {
         flush( (*it).partner( OPimXRef::One),  stream  );
         flush( (*it).partner( OPimXRef::Two),  stream  );
     }
     return true;
 }
-void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const{
+
+
+void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const
+{
     str << par.service();
     str << par.uid();
     str << par.field();
 }
-OPimXRefPartner OPimRecord::partner( QDataStream& stream ) {
+
+
+OPimXRefPartner OPimRecord::partner( QDataStream& stream )
+{
     OPimXRefPartner par;
     QString str;
     int i;
 
     stream >> str;
     par.setService( str );
 
     stream >> i;
     par.setUid( i );
 
     stream >> i ;
     par.setField( i );
 
     return par;
 }
-void OPimRecord::setLastHitField( int lastHit )const {
+
+
+void OPimRecord::setLastHitField( int lastHit ) const
+{
     m_lastHit = lastHit;
 }
-int OPimRecord::lastHitField()const{
+
+
+int OPimRecord::lastHitField() const
+{
     return m_lastHit;
 }
-QMap<QString, QString> OPimRecord::toExtraMap()const {
+
+
+QMap<QString, QString> OPimRecord::toExtraMap() const
+{
     return customMap;
 }
-void OPimRecord::setExtraMap( const QMap<QString, QString>& map) {
+
+
+void OPimRecord::setExtraMap( const QMap<QString, QString>& map )
+{
     customMap = map;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 63a3a98..4981a41 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -5,72 +5,76 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_PIM_RECORD_H
-#define OPIE_PIM_RECORD_H
 
-#include <qdatastream.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#ifndef OPIMRECORD_H
+#define OPIMRECORD_H
 
+/* OPIE */
+#include <opie2/opimxrefmanager.h>
 /*
  * we need to get customMap which is private...
  */
 #define private protected
 #include <qpe/palmtoprecord.h>
 #undef private
 
-#include <opie2/opimxrefmanager.h>
+/* QT */
+#include <qdatastream.h>
+#include <qmap.h>
+#include <qstring.h>
+#include <qstringlist.h>
 
-namespace Opie {
+namespace Opie
+{
 /**
  * This is the base class for
  * all PIM Records
  *
  */
-class OPimRecord : public Qtopia::Record {
+class OPimRecord : public Qtopia::Record
+{
 public:
     /**
      * c'tor
      * uid of 0 isEmpty
      * uid of 1 will be assigned a new one
      */
     OPimRecord(int uid = 0);
     ~OPimRecord();
 
     /**
      * copy c'tor
      */
     OPimRecord( const OPimRecord& rec );
 
     /**
      * copy operator
      */
     OPimRecord &operator=( const OPimRecord& );
 
     /**
      * category names resolved
      */
     QStringList categoryNames( const QString& appname )const;
 
@@ -89,50 +93,52 @@ public:
      * if a Record isEmpty
      * it's empty if it's 0
      */
     virtual bool isEmpty()const;
 
     /**
      * toRichText summary
      */
     virtual QString toRichText()const = 0;
 
     /**
      * a small one line summary
      */
     virtual QString toShortText()const = 0;
 
     /**
      * the name of the Record
      */
     virtual QString type()const = 0;
 
     /**
      * matches the Records the regular expression?
      */
     virtual bool match( const QString &regexp ) const
-	{setLastHitField( -1 );
-            return Qtopia::Record::match(QRegExp(regexp));};
+    {
+        setLastHitField( -1 );
+        return Qtopia::Record::match( QRegExp( regexp ) );
+    };
 
     /**
      * if implemented this function returns which item has been
      * last hit by the match() function.
      * or -1 if not implemented or no hit has occured
      */
     int lastHitField()const;
 
     /**
      * converts the internal structure to a map
      */
     virtual QMap<int, QString> toMap()const = 0;
     // virtual fromMap( const <int, QString>& map ) = 0; // Should be added in the future (eilers)
 
     /**
      * key value representation of extra items
      */
     QMap<QString, QString> toExtraMap()const;
     void setExtraMap( const QMap<QString, QString>& );
 
     /**
      * the name for a recordField
      */
     virtual QString recordField(int)const = 0;
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index f1a22a7..fa5313f 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1,141 +1,124 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
-#include <opie2/ocontact.h>
+#include "ocontact.h"
+
+/* OPIE */
 #include <opie2/opimresolver.h>
 #include <opie2/oconversion.h>
-
 #include <qpe/stringutil.h>
 #include <qpe/timestring.h>
 #include <qpe/config.h>
 
+/* QT */
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 
+/* STD */
 #include <stdio.h>
 
 /*!
   \class Contact contact.h
   \brief The Contact class holds the data of an address book entry.
 
   This data includes information the name of the person, contact
   information, and business information such as deparment and job title.
 
   \ingroup qtopiaemb
   \ingroup qtopiadesktop
 */
 
 
-namespace Opie {
+namespace Opie
+{
 /*!
   Creates a new, empty contact.
 */
-OContact::OContact()
-    : OPimRecord(), mMap(), d( 0 )
-{
-}
+OContact::OContact():OPimRecord(), mMap(), d( 0 )
+{}
 
 /*!
   \internal
   Creates a new contact.  The properties of the contact are
   set from \a fromMap.
 */
-OContact::OContact( const QMap<int, QString> &fromMap ) :
-    OPimRecord(), mMap( fromMap ), d( 0 )
+OContact::OContact( const QMap<int, QString> &fromMap ):OPimRecord(), mMap( fromMap ), d( 0 )
 {
     QString cats = mMap[ Qtopia::AddressCategory ];
     if ( !cats.isEmpty() )
 	setCategories( idsFromString( cats ) );
 
     QString uidStr = find( Qtopia::AddressUid );
 
-    if ( uidStr.isEmpty() || (uidStr.toInt() == 0) ){
+    if ( uidStr.isEmpty() || ( uidStr.toInt() == 0 ) )
+    {
 	    qWarning( "Invalid UID found. Generate new one.." );
 	setUid( uidGen().generate() );
-    }else
+    }
+    else
 	setUid( uidStr.toInt() );
 
 //     if ( !uidStr.isEmpty() )
 // 	setUid( uidStr.toInt() );
 }
 
 /*!
   Destroys a contact.
 */
 OContact::~OContact()
-{
-}
+{}
 
 /*! \fn void OContact::setTitle( const QString &str )
   Sets the title of the contact to \a str.
 */
 
 /*! \fn void OContact::setFirstName( const QString &str )
   Sets the first name of the contact to \a str.
 */
 
 /*! \fn void OContact::setMiddleName( const QString &str )
   Sets the middle name of the contact to \a str.
 */
 
 /*! \fn void OContact::setLastName( const QString &str )
   Sets the last name of the contact to \a str.
 */
 
 /*! \fn void OContact::setSuffix( const QString &str )
   Sets the suffix of the contact to \a str.
 */
 
 /*! \fn void OContact::setFileAs( const QString &str )
   Sets the contact to filed as \a str.
 */
@@ -460,304 +443,350 @@ QMap<int, QString> OContact::toMap() const
 }
 
 /*!
   Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
     QString text;
     QString value, comp, state;
     QString str;
     bool marker = false;
 
     Config cfg("qpe");
     cfg.setGroup("Appearance");
     int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
 
     // name, jobtitle and company
     if ( !(value = fullName()).isEmpty() )
 	text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
     
     if ( !(value = jobTitle()).isEmpty() )
 	text += Qtopia::escapeString(value) + " ";
 
     comp = company();
-    if ( !(value = department()).isEmpty() ) {
+    if ( !( value = department() ).isEmpty() )
+    {
 	text += Qtopia::escapeString(value);
 	if ( comp )
 		text += ", " + Qtopia::escapeString(comp);
-    }else if ( comp )
+    }
+    else if ( comp )
 	    text += "<br>" + Qtopia::escapeString(comp);
     text += "<br><hr>";
 
     // defailt email
     QString defEmail = defaultEmail();
-    if ( !defEmail.isEmpty() ){
+    if ( !defEmail.isEmpty() )
+    {
 	text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
 		+ Qtopia::escapeString(defEmail);
 	marker = true;
     }
 
     // business address
     if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
-	 !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
+            !businessZip().isEmpty() || !businessCountry().isEmpty() )
+    {
 	text += QObject::tr( "<br><b>Work Address:</b>" );
 	marker = true;
     }
 
-    if ( !(value = businessStreet()).isEmpty() ){
+    if ( !( value = businessStreet() ).isEmpty() )
+    {
 	    text += "<br>" + Qtopia::escapeString(value);
 	    marker = true;
     }
 
-    switch( addressformat ){
-    case Zip_City_State:{ //  Zip_Code City, State
+    switch ( addressformat )
+    {
+    case Zip_City_State:
+        { //  Zip_Code City, State
 	    state =  businessState();
-	    if ( !(value = businessZip()).isEmpty() ){
+            if ( !( value = businessZip() ).isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(value) + " ";
 		    marker = true;
 		    
 	    }
-	    if ( !(value = businessCity()).isEmpty() ) {
+            if ( !( value = businessCity() ).isEmpty() )
+            {
 		    marker = true;
 		    if ( businessZip().isEmpty() && !businessStreet().isEmpty() )
 			    text += "<br>";
 		    text += Qtopia::escapeString(value);
 		    if ( state )
 			    text += ", " + Qtopia::escapeString(state);
-	    } else if ( !state.isEmpty() ){
+            }
+            else if ( !state.isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(state);
 		    marker = true;
 	    }
 	    break;
     }
-    case City_State_Zip:{ // City, State Zip_Code 
+    case City_State_Zip:
+        { // City, State Zip_Code
 	    state =  businessState();
-	    if ( !(value = businessCity()).isEmpty() ) {
+            if ( !( value = businessCity() ).isEmpty() )
+            {
 		    marker = true;
 		    text += "<br>" + Qtopia::escapeString(value);
 		    if ( state )
 			    text += ", " + Qtopia::escapeString(state);
-	    } else if ( !state.isEmpty() ){
+            }
+            else if ( !state.isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(state);
 		    marker = true;
 	    }
-	    if ( !(value = businessZip()).isEmpty() ){
+            if ( !( value = businessZip() ).isEmpty() )
+            {
 		    text += " " + Qtopia::escapeString(value);
 		    marker = true;
 	    }
 	    break;
     }
     }
 
-    if ( !(value = businessCountry()).isEmpty() ){
+    if ( !( value = businessCountry() ).isEmpty() )
+    {
 	text += "<br>" + Qtopia::escapeString(value);
 	marker = true;
     }
 
     // rest of Business data
     str = office();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b>" + QObject::tr("Office: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = businessWebpage();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/webpagework\"> " + QObject::tr("Business Web Page: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = businessPhone();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/phonework\"> " + QObject::tr("Business Phone: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = businessFax();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/faxwork\"> " + QObject::tr("Business Fax: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = businessMobile();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/mobilework\"> " + QObject::tr("Business Mobile: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = businessPager();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b>" + QObject::tr("Business Pager: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
 
     // text += "<br>";
 
     // home address
     if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
-	 !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
+            !homeZip().isEmpty() || !homeCountry().isEmpty() )
+    {
 	text += QObject::tr( "<br><b>Home Address:</b>" );
 	marker = true;
     }
 
-    if ( !(value = homeStreet()).isEmpty() ){
+    if ( !( value = homeStreet() ).isEmpty() )
+    {
 	text += "<br>" + Qtopia::escapeString(value);
 	marker = true;
     }
 
-    switch( addressformat ){
-    case Zip_City_State:{ //  Zip_Code City, State
+    switch ( addressformat )
+    {
+    case Zip_City_State:
+        { //  Zip_Code City, State
 	    state =  homeState();
-	    if ( !(value = homeZip()).isEmpty() ){
+            if ( !( value = homeZip() ).isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(value) + " ";
 		    marker = true;
 	    }
-	    if ( !(value = homeCity()).isEmpty() ) {
+            if ( !( value = homeCity() ).isEmpty() )
+            {
 		    marker = true;
 		    if ( homeZip().isEmpty() && !homeStreet().isEmpty() )
 			    text += "<br>";
 		    text += Qtopia::escapeString(value);
 		    if ( !state.isEmpty() )
 			    text += ", " + Qtopia::escapeString(state);
-	    } else if (!state.isEmpty()) {
+            }
+            else if ( !state.isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(state);
 		    marker = true;
 	    }
 	    break;
     }
-    case City_State_Zip:{ // City, State Zip_Code 
+    case City_State_Zip:
+        { // City, State Zip_Code
 	    state =  homeState();
-	    if ( !(value = homeCity()).isEmpty() ) {
+            if ( !( value = homeCity() ).isEmpty() )
+            {
 		    marker = true;
 		    text += "<br>" + Qtopia::escapeString(value);
 		    if ( state )
 			    text += ", " + Qtopia::escapeString(state);
-	    } else if ( !state.isEmpty() ){
+            }
+            else if ( !state.isEmpty() )
+            {
 		    text += "<br>" + Qtopia::escapeString(state);
 		    marker = true;
 	    }
-	    if ( !(value = homeZip()).isEmpty() ){
+            if ( !( value = homeZip() ).isEmpty() )
+            {
 		    text += " " + Qtopia::escapeString(value);
 		    marker = true;
 	    }
 	    break;
     }
     }
 	    
-    if ( !(value = homeCountry()).isEmpty() ){
+    if ( !( value = homeCountry() ).isEmpty() )
+    {
 	text += "<br>" + Qtopia::escapeString(value);
 	marker = true;
     }
 
     // rest of Home data
     str = homeWebpage();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/webpagehome\"> " + QObject::tr("Home Web Page: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = homePhone();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/phonehome\"> " + QObject::tr("Home Phone: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = homeFax();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/faxhome\"> " + QObject::tr("Home Fax: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
     str = homeMobile();
-    if ( !str.isEmpty() ){
+    if ( !str.isEmpty() )
+    {
 	text += "<br><b><img src=\"addressbook/mobilehome\"> " + QObject::tr("Home Mobile: ") + "</b>"
 		+ Qtopia::escapeString(str);
 	marker = true;
     }
 
     if ( marker )
 	    text += "<br><hr>";
 
     // the rest...
     str = emails();
     if ( !str.isEmpty() && ( str != defEmail ) )
 	text += "<br><b>" + QObject::tr("All Emails: ") + "</b>"
 		+ Qtopia::escapeString(str);
     str = profession();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Profession: ") + "</b>"
 		+ Qtopia::escapeString(str);
     str = assistant();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Assistant: ") + "</b>"
 		+ Qtopia::escapeString(str);
     str = manager();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Manager: ") + "</b>"
 		+ Qtopia::escapeString(str);
     str = gender();
-    if ( !str.isEmpty() && str.toInt() != 0 ) {
+    if ( !str.isEmpty() && str.toInt() != 0 )
+    {
 	    text += "<br>";
 	    if ( str.toInt() == 1 )
 		    str = QObject::tr( "Male" );
 	    else if ( str.toInt() == 2 )
 		    str = QObject::tr( "Female" );
 	    text += "<b>" + QObject::tr("Gender: ") + "</b>" + str;
     }
     str = spouse();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Spouse: ") + "</b>"
 		+ Qtopia::escapeString(str);
-    if ( birthday().isValid() ){
+    if ( birthday().isValid() )
+    {
 	    str = TimeString::numberDateString( birthday() );
 	    text += "<br><b>" + QObject::tr("Birthday: ") + "</b>"
 		    + Qtopia::escapeString(str);
     }
-    if ( anniversary().isValid() ){
+    if ( anniversary().isValid() )
+    {
 	    str = TimeString::numberDateString( anniversary() );
 	    text += "<br><b>" + QObject::tr("Anniversary: ") + "</b>"
 		    + Qtopia::escapeString(str);
     }
     str = children();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Children: ") + "</b>"
 		+ Qtopia::escapeString(str);
 
     str = nickname();
     if ( !str.isEmpty() )
 	text += "<br><b>" + QObject::tr("Nickname: ") + "</b>"
 		+ Qtopia::escapeString(str);
 
     // categories
-    if ( categoryNames("Contacts").count() ){
+    if ( categoryNames( "Contacts" ).count() )
+    {
 	    text += "<br><b>" + QObject::tr( "Category:") + "</b> ";
 	    text += categoryNames("Contacts").join(", ");
     }
 
     // notes last
-    if ( !(value = notes()).isEmpty() ) {
+    if ( !( value = notes() ).isEmpty() )
+    {
 	    text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
 	    QRegExp reg("\n");
 
 	    //QString tmp = Qtopia::escapeString(value);
 	    QString tmp = QStyleSheet::convertFromPlainText(value);
 	    //tmp.replace( reg, "<br>" );
 	    text += "<br>" + tmp + "<br>";
     }
     return text;
 }
 
 /*!
   \internal
 */
 void OContact::insert( int key, const QString &v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
 	mMap.remove( key );
     else
 	mMap.insert( key, value );
 }
 
 /*!
@@ -816,161 +845,168 @@ QString OContact::displayBusinessAddress() const
 }
 
 /*!
   \internal
 */
 QString OContact::displayHomeAddress() const
 {
     return displayAddress( homeStreet(), homeCity(),
 			   homeState(), homeZip(),
 			   homeCountry() );
 }
 
 /*!
   Returns the full name of the contact
 */
 QString OContact::fullName() const
 {
     QString title = find( Qtopia::Title );
     QString firstName = find( Qtopia::FirstName );
     QString middleName = find( Qtopia::MiddleName );
     QString lastName = find( Qtopia::LastName );
     QString suffix = find( Qtopia::Suffix );
 
     QString name = title;
-    if ( !firstName.isEmpty() ) {
+    if ( !firstName.isEmpty() )
+    {
 	if ( !name.isEmpty() )
 	    name += " ";
 	name += firstName;
     }
-    if ( !middleName.isEmpty() ) {
+    if ( !middleName.isEmpty() )
+    {
 	if ( !name.isEmpty() )
 	    name += " ";
 	name += middleName;
     }
-    if ( !lastName.isEmpty() ) {
+    if ( !lastName.isEmpty() )
+    {
 	if ( !name.isEmpty() )
 	    name += " ";
 	name += lastName;
     }
-    if ( !suffix.isEmpty() ) {
+    if ( !suffix.isEmpty() )
+    {
 	if ( !name.isEmpty() )
 	    name += " ";
 	name += suffix;
     }
     return name.simplifyWhiteSpace();
 }
 
 /*!
   Returns a list of the names of the children of the contact.
 */
 QStringList OContact::childrenList() const
 {
     return QStringList::split( " ", find( Qtopia::Children ) );
 }
 
 /*! \fn void OContact::insertEmail( const QString &email )
 
   Insert \a email into the email list. Ensures \a email can only be added
   once. If there is no default email address set, it sets it to the \a email.
 */
 
 /*! \fn void OContact::removeEmail( const QString &email )
 
   Removes the \a email from the email list. If the default email was \a email,
   then the default email address is assigned to the first email in the
   email list
 */
 
 /*! \fn void OContact::clearEmails()
 
   Clears the email list.
  */
 
 /*! \fn void OContact::insertEmails( const QStringList &emailList )
 
   Appends the \a emailList to the exiting email list
  */
 
 /*!
   Returns a list of email addresses belonging to the contact, including
   the default email address.
 */
 QStringList OContact::emailList() const
 {
     QString emailStr = emails();
 
     QStringList r;
-    if ( !emailStr.isEmpty() ) {
+    if ( !emailStr.isEmpty() )
+    {
 	qDebug(" emailstr ");
 	QStringList l = QStringList::split( emailSeparator(), emailStr );
 	for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
 	    r += (*it).simplifyWhiteSpace();
     }
 
     return r;
 }
 
 /*!
   \overload
 
   Generates the string for the contact to be filed as from the first,
   middle and last name of the contact.
 */
 void OContact::setFileAs()
 {
     QString lastName, firstName, middleName, fileas;
 
     lastName = find( Qtopia::LastName );
     firstName = find( Qtopia::FirstName );
     middleName = find( Qtopia::MiddleName );
     if ( !lastName.isEmpty() && !firstName.isEmpty()
 	 && !middleName.isEmpty() )
 	fileas = lastName + ", " + firstName + " " + middleName;
     else if ( !lastName.isEmpty() && !firstName.isEmpty() )
 	fileas = lastName + ", " + firstName;
     else if ( !lastName.isEmpty() || !firstName.isEmpty() ||
 	      !middleName.isEmpty() )
 	fileas = firstName + ( firstName.isEmpty() ? "" : " " )
 		 + middleName + ( middleName.isEmpty() ? "" : " " )
 		 + lastName;
 
     replace( Qtopia::FileAs, fileas );
 }
 
 /*!
   \internal
   Appends the contact information to \a buf.
 */
 void OContact::save( QString &buf ) const
 {
     static const QStringList SLFIELDS = fields();
     // I'm expecting "<Contact " in front of this...
     for ( QMap<int, QString>::ConstIterator it = mMap.begin();
-	  it != mMap.end(); ++it ) {
+            it != mMap.end(); ++it )
+    {
 	const QString &value = it.data();
 	int key = it.key();
-	if ( !value.isEmpty() ) {
+        if ( !value.isEmpty() )
+        {
 	    if ( key == Qtopia::AddressCategory || key == Qtopia::AddressUid)
 		continue;
 
 	    key -= Qtopia::AddressCategory+1;
 	    buf += SLFIELDS[key];
 	    buf += "=\"" + Qtopia::escapeString(value) + "\" ";
 	}
     }
     buf += customToXml();
     if ( categories().count() > 0 )
 	buf += "Categories=\"" + idsToString( categories() ) + "\" ";
     buf += "Uid=\"" + QString::number( uid() ) + "\" ";
     // You need to close this yourself
 }
 
 
 /*!
   \internal
   Returns the list of fields belonging to a contact
   Never change order of this list ! It has to be regarding
   enum AddressBookFields !!
 */
 QStringList OContact::fields()
 {
@@ -1040,199 +1076,218 @@ void OContact::setEmails( const QString &str )
     replace( Qtopia::Emails, str );
     if ( str.isEmpty() )
         setDefaultEmail( QString::null );
 }
 
 /*!
   Sets the list of children for the contact to those contained in \a str.
 */
 void OContact::setChildren( const QString &str )
 {
     replace( Qtopia::Children, str );
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
     setLastHitField( -1 );
     bool match;
     match = false;
     QMap<int, QString>::ConstIterator it;
-    for ( it = mMap.begin(); it != mMap.end(); ++it ) {
-	if ( (*it).find( r ) > -1 ) {
+    for ( it = mMap.begin(); it != mMap.end(); ++it )
+    {
+        if ( ( *it ).find( r ) > -1 )
+        {
             setLastHitField( it.key() );
 	    match = true;
 	    break;
 	}
     }
     return match;
 }
 
 
 QString OContact::toShortText() const
 {
 	return ( fullName() );
 }
+
+
 QString OContact::type() const
 {
 	return QString::fromLatin1( "OContact" );
 }
 
 
-
 class QString OContact::recordField( int pos ) const
 {
 	QStringList SLFIELDS = fields(); // ?? why this ? (se)
 	return SLFIELDS[pos];
 }
 
 // In future releases, we should store birthday and anniversary
 // internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 
 /*! \fn void OContact::setBirthday( const QDate& date )
   Sets the birthday for the contact to \a date. If date is null
   the current stored date will be removed.
 */
 void OContact::setBirthday( const QDate &v )
 {
-	if ( v.isNull() ){
+    if ( v.isNull() )
+    {
 		qWarning( "Remove Birthday");
 		replace( Qtopia::Birthday, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
   null, the current stored date will be removed.
 */
 void OContact::setAnniversary( const QDate &v )
 {
-	if ( v.isNull() ){
+    if ( v.isNull() )
+    {
 		qWarning( "Remove Anniversary");
 		replace( Qtopia::Anniversary, QString::null );
 		return;
 	}
 
 	if ( v.isValid() )
 		replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
+
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
 	QString str = find( Qtopia::Birthday );
 	// qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  OConversion::dateFromString ( str );
 	else
 		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const
 {
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
 	// qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return OConversion::dateFromString ( str );
 	else
 		return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
-    if ( def.isEmpty() ) {
+    if ( def.isEmpty() )
+    {
 	setDefaultEmail( e ); // will insert into the list for us
 	return;
     }
 
     // otherwise, insert assuming doesn't already exist
     QString emailsStr = find( Qtopia::Emails );
     if ( emailsStr.contains( e ))
 	return;
     if ( !emailsStr.isEmpty() )
 	emailsStr += emailSeparator();
     emailsStr += e;
     replace( Qtopia::Emails, emailsStr );
 }
 
+
 void OContact::removeEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
     QString emailsStr = find( Qtopia::Emails );
     QStringList emails = emailList();
 
     // otherwise, must first contain it
     if ( !emailsStr.contains( e ) )
 	return;
 
     // remove it
     //qDebug(" removing email from list %s", e.latin1());
     emails.remove( e );
     // reset the string
     emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator
     replace( Qtopia::Emails, emailsStr );
 
     // if default, then replace the default email with the first one
-    if ( def == e ) {
+    if ( def == e )
+    {
 	//qDebug("removeEmail is default; setting new default");
 	if ( !emails.count() )
 	    clearEmails();
 	else // setDefaultEmail will remove e from the list
 	    setDefaultEmail( emails.first() );
     }
 }
+
+
 void OContact::clearEmails()
 {
     mMap.remove( Qtopia::DefaultEmail );
     mMap.remove( Qtopia::Emails );
 }
+
+
 void OContact::setDefaultEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
 
     //qDebug("OContact::setDefaultEmail %s", e.latin1());
     replace( Qtopia::DefaultEmail, e );
 
     if ( !e.isEmpty() )
 	insertEmail( e );
 
 }
 
+
 void OContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
 	insertEmail( *it );
 }
-int OContact::rtti() {
+
+
+int OContact::rtti()
+{
     return OPimResolver::AddressBook;
 }
+
+
 void OContact::setUid( int i )
 {
 	OPimRecord::setUid(i);
 	replace( Qtopia::AddressUid , QString::number(i));
 }
 }
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index 34888dc..445fd7d 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -5,76 +5,81 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef __OCONTACT_H__
-#define __OCONTACT_H__
 
+#ifndef OCONTACT_H
+#define OCONTACT_H
+
+/* OPIE */
 #include <opie2/opimrecord.h>
 #include <qpe/recordfields.h>
 
+/* QT */
 #include <qdatetime.h>
 #include <qstringlist.h>
 
 #if defined(QPC_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
 
-namespace Opie {
+namespace Opie
+{
 class OContactPrivate;
 
 /**
  * OContact class represents a specialised PIM Record for contacts.
  * It does store all kind of persopn related information.
  *
  * @short Contact Container
  * @author TT, Stefan Eiler, Holger Freyther
  */
 class QPC_EXPORT OContact : public OPimRecord
 {
     friend class DataSet;
+
 public:
     OContact();
     OContact( const QMap<int, QString> &fromMap );
     virtual ~OContact();
 
     enum DateFormat{
 	    Zip_City_State = 0,
 	    City_State_Zip
     };
 
     /*
      * do we need to inline them
      * if yes do we need to inline them this way?
      * -zecke
      */
     void setTitle( const QString &v ) { replace( Qtopia::Title, v ); }
     void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); }
     void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); }
     void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); }
     void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); }
     void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); }
     void setFileAs();
 
     // default email address
diff --git a/libopie2/opiepim/ocontactfields.cpp b/libopie2/opiepim/ocontactfields.cpp
index deaa1e5..bec00f7 100644
--- a/libopie2/opiepim/ocontactfields.cpp
+++ b/libopie2/opiepim/ocontactfields.cpp
@@ -1,64 +1,67 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#include <opie2/ocontactfields.h>
+#include "ocontactfields.h"
 
-#include <qstringlist.h>
+/* OPIE */
+#include <opie2/ocontact.h>
+#include <qpe/recordfields.h> // We should use our own enum in the future ..
+#include <qpe/config.h>
+
+/* QT */
 #include <qobject.h>
+#include <qstringlist.h>
 
-// We should use our own enum in the future ..
-#include <qpe/recordfields.h>
-#include <qpe/config.h>
-#include <opie2/ocontact.h>
 
-namespace Opie {
+namespace Opie
+{
 /*!
   \internal
   Returns a list of personal field names for a contact.
 */
 QStringList OContactFields::personalfields( bool sorted, bool translated )
 {
     QStringList list;
     QMap<int, QString> mapIdToStr;
     if ( translated )
 	    mapIdToStr = idToTrFields();
     else
 	    mapIdToStr = idToUntrFields();
 
     list.append( mapIdToStr[ Qtopia::AddressUid ] );
     list.append( mapIdToStr[ Qtopia::AddressCategory ] );
 
     list.append( mapIdToStr[ Qtopia::Title ] );
     list.append( mapIdToStr[ Qtopia::FirstName ] );
     list.append( mapIdToStr[ Qtopia::MiddleName ] );
     list.append( mapIdToStr[ Qtopia::LastName ] );
     list.append( mapIdToStr[ Qtopia::Suffix ] );
     list.append( mapIdToStr[ Qtopia::FileAs ] );
 
     list.append( mapIdToStr[ Qtopia::JobTitle ] );
@@ -402,106 +405,113 @@ QMap<QString, int> OContactFields::untrFieldsToId()
 	QMap<int, QString> idtostr = idToUntrFields();
 	QMap<QString, int> ret_map;
 
 
         QMap<int, QString>::Iterator it;
         for( it = idtostr.begin(); it != idtostr.end(); ++it )
 		ret_map.insert( *it, it.key() );
 
 
 	return ret_map;
 }
 
 
 OContactFields::OContactFields():
 	fieldOrder( DEFAULT_FIELD_ORDER ),
 	changedFieldOrder( false )
 {
 	// Get the global field order from the config file and
 	// use it as a start pattern
 	Config cfg ( "AddressBook" );
 	cfg.setGroup( "ContactFieldOrder" );
 	globalFieldOrder = cfg.readEntry( "General", DEFAULT_FIELD_ORDER );
 }
 
-OContactFields::~OContactFields(){
+OContactFields::~OContactFields()
+{
 
 	// We will store the fieldorder into the config file
 	// to reuse it for the future.. 
-	if ( changedFieldOrder ){
+    if ( changedFieldOrder )
+    {
 		Config cfg ( "AddressBook" );
 		cfg.setGroup( "ContactFieldOrder" );
 		cfg.writeEntry( "General", globalFieldOrder );
 	}
 }
 
 
 
-void OContactFields::saveToRecord( OContact &cnt ){
+void OContactFields::saveToRecord( OContact &cnt )
+{
 
 	qDebug("ocontactfields saveToRecord: >%s<",fieldOrder.latin1());
 
 	// Store fieldorder into this contact.
 	cnt.setCustomField( CONTACT_FIELD_ORDER_NAME, fieldOrder );
 
 	globalFieldOrder = fieldOrder;
 	changedFieldOrder = true;
 
 }
 
-void OContactFields::loadFromRecord( const OContact &cnt ){
+void OContactFields::loadFromRecord( const OContact &cnt )
+{
 	qDebug("ocontactfields loadFromRecord");
 	qDebug("loading >%s<",cnt.fullName().latin1());
 
 	// Get fieldorder for this contact. If none is defined,
 	// we will use the global one from the config file..
 
 	fieldOrder = cnt.customField( CONTACT_FIELD_ORDER_NAME );
 
 	qDebug("fieldOrder from contact>%s<",fieldOrder.latin1());
 
-	if (fieldOrder.isEmpty()){
+    if ( fieldOrder.isEmpty() )
+    {
 		fieldOrder = globalFieldOrder;
 	}
 
 
 	qDebug("effective fieldOrder in loadFromRecord >%s<",fieldOrder.latin1());
 }
 
-void OContactFields::setFieldOrder( int num, int index ){
+void OContactFields::setFieldOrder( int num, int index )
+{
 	qDebug("qcontactfields setfieldorder pos %i -> %i",num,index);
 
 	fieldOrder[num] = QString::number( index, 16 )[0];
 
 	// We will store this new fieldorder globally to 
 	// remember it for contacts which have none
 	globalFieldOrder = fieldOrder;
 	changedFieldOrder = true;
 
 	qDebug("fieldOrder >%s<",fieldOrder.latin1());
 }
 
-int OContactFields::getFieldOrder( int num, int defIndex ){
+int OContactFields::getFieldOrder( int num, int defIndex )
+{
 	qDebug("ocontactfields getFieldOrder");
 	qDebug("fieldOrder >%s<",fieldOrder.latin1());
 
 	// Get index of combo as char..
 	QChar poschar = fieldOrder[num];
 
 	bool ok;
 	int ret = 0;
 	// Convert char to number..
 	if ( !( poschar == QChar::null ) )
 		ret = QString( poschar ).toInt(&ok, 16);
 	else
 		ok = false;
 
 	// Return default value if index for
 	// num was not set or if anything else happened..
 	if ( !ok ) ret = defIndex;
 
 	qDebug("returning >%i<",ret);
 
 	return ret;
 
 }
 
diff --git a/libopie2/opiepim/ocontactfields.h b/libopie2/opiepim/ocontactfields.h
index 993ce3b..9e89532 100644
--- a/libopie2/opiepim/ocontactfields.h
+++ b/libopie2/opiepim/ocontactfields.h
@@ -5,62 +5,68 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_CONTACTS_FIELDS
-#define OPIE_CONTACTS_FIELDS
+
+#ifndef OCONTACTFIELDS_H
+#define OCONTACTFIELDS_H
 
 class QStringList;
 
+/* OPIE */
+#include <opie2/ocontact.h>
+
+/* QT */
 #include <qmap.h>
 #include <qstring.h>
-#include <opie2/ocontact.h>
 
 #define CONTACT_FIELD_ORDER_NAME "opie-contactfield-order"
 #define DEFAULT_FIELD_ORDER "__________"
  
-namespace Opie {
-class OContactFields{
+namespace Opie
+{
+class OContactFields
+{
 
  public:
     OContactFields();
     ~OContactFields();
     /** Set the index for combo boxes.
      *  Sets the <b>index</b> of combo <b>num</b>.
      *  @param num selects the number of the combo
      *  @param index sets the index in the combo
      */
     void setFieldOrder( int num, int index );
 
     /** Get the index for combo boxes.
      * Returns the index of combo <b>num</b> or defindex
      * if none was defined..
      * @param num Selects the number of the combo
      * @param defIndex will be returned if none was defined (either 
      * globally in the config file, nor by the contact which was used 
      * by loadFromRecord() )
      */
     int getFieldOrder( int num, int defIndex);
 
     /** Store fieldorder to contact. */
     void saveToRecord( OContact& );
     /** Get Fieldorder from contact. */
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index de5e30b..d9cee2b 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -1,749 +1,1025 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+                             Copyright (C) Stefan Eilers <Eilers.Stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#include <qshared.h>
-#include <qarray.h>
 
-#include <qpe/palmtopuidgen.h>
-#include <qpe/categories.h>
-#include <qpe/stringutil.h>
+#include "oevent.h"
 
+/* OPIE */
 #include <opie2/orecur.h>
 #include <opie2/opimresolver.h>
 #include <opie2/opimnotifymanager.h>
+#include <qpe/categories.h>
+#include <qpe/palmtopuidgen.h>
+#include <qpe/stringutil.h>
 
-#include <opie2/oevent.h>
+/* QT */
+#include <qshared.h>
+#include <qarray.h>
 
-namespace Opie {
+namespace Opie
+{
 
-int OCalendarHelper::week( const QDate& date) {
+int OCalendarHelper::week( const QDate& date )
+{
     // Calculates the week this date is in within that
     // month. Equals the "row" is is in in the month view
     int week = 1;
     QDate tmp( date.year(), date.month(), 1 );
     if ( date.dayOfWeek() < tmp.dayOfWeek() )
         ++week;
 
     week += ( date.day() - 1 ) / 7;
 
     return week;
 }
-int OCalendarHelper::ocurrence( const QDate& date) {
+
+
+int OCalendarHelper::ocurrence( const QDate& date )
+{
     // calculates the number of occurrances of this day of the
     // week till the given date (e.g 3rd Wednesday of the month)
     return ( date.day() - 1 ) / 7 + 1;
 }
-int OCalendarHelper::dayOfWeek( char day ) {
+
+
+int OCalendarHelper::dayOfWeek( char day )
+{
     int dayOfWeek = 1;
     char i = ORecur::MON;
-    while ( !( i & day ) && i <= ORecur::SUN ) {
+    while ( !( i & day ) && i <= ORecur::SUN )
+    {
         i <<= 1;
         ++dayOfWeek;
     }
     return dayOfWeek;
 }
-int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
+
+
+int OCalendarHelper::monthDiff( const QDate& first, const QDate& second )
+{
     return ( second.year() - first.year() ) * 12 +
         second.month() - first.month();
 }
 
-struct OEvent::Data : public QShared {
-    Data() : QShared() {
+
+struct OEvent::Data : public QShared
+{
+    Data() : QShared()
+    {
         child = 0;
         recur = 0;
         manager = 0;
         isAllDay = false;
         parent = 0;
     }
-    ~Data() {
+    ~Data()
+    {
         delete manager;
         delete recur;
     }
     QString description;
     QString location;
     OPimNotifyManager* manager;
     ORecur* recur;
     QString note;
     QDateTime created;
     QDateTime start;
     QDateTime end;
     bool isAllDay : 1;
     QString timezone;
     QArray<int>* child;
     int parent;
 };
 
+
 OEvent::OEvent( int uid )
-    : OPimRecord( uid ) {
+        : OPimRecord( uid )
+{
     data = new Data;
 }
+
+
 OEvent::OEvent( const OEvent& ev)
     : OPimRecord( ev ), data( ev.data )
 {
     data->ref();
 }
 
+
 OEvent::OEvent( const QMap<int, QString> map )
     : OPimRecord( 0 )
 {
 	data = new Data;
 
 	fromMap( map );
 }
 
-OEvent::~OEvent() {
-    if ( data->deref() ) {
+
+OEvent::~OEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-OEvent& OEvent::operator=( const OEvent& ev) {
+
+
+OEvent& OEvent::operator=( const OEvent& ev )
+{
     if ( this == &ev ) return  *this;
 
     OPimRecord::operator=( ev );
     ev.data->ref();
     deref();
     data = ev.data;
 
 
     return *this;
 }
-QString OEvent::description()const {
+
+
+QString OEvent::description() const
+{
     return data->description;
 }
-void OEvent::setDescription( const QString& description ) {
+
+
+void OEvent::setDescription( const QString& description )
+{
     changeOrModify();
     data->description = description;
 }
-void OEvent::setLocation( const QString& loc ) {
+
+
+void OEvent::setLocation( const QString& loc )
+{
     changeOrModify();
     data->location = loc;
 }
-QString OEvent::location()const {
+
+
+QString OEvent::location() const
+{
     return data->location;
 }
-OPimNotifyManager &OEvent::notifiers()const {
+
+
+OPimNotifyManager &OEvent::notifiers() const
+{
     // I hope we can skip the changeOrModify here
     // the notifier should take care of it
     // and OPimNotify is shared too
     if (!data->manager )
         data->manager = new OPimNotifyManager;
 
     return *data->manager;
 }
-bool OEvent::hasNotifiers()const {
+
+
+bool OEvent::hasNotifiers() const
+{
     if (!data->manager )
         return false;
     if (data->manager->reminders().isEmpty() &&
         data->manager->alarms().isEmpty() )
         return false;
 
     return true;
 }
-ORecur OEvent::recurrence()const {
+
+
+ORecur OEvent::recurrence() const
+{
     if (!data->recur)
         data->recur = new ORecur;
 
     return *data->recur;
 }
-void OEvent::setRecurrence( const ORecur& rec) {
+
+
+void OEvent::setRecurrence( const ORecur& rec )
+{
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
-bool OEvent::hasRecurrence()const {
+
+
+bool OEvent::hasRecurrence() const
+{
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
-QString OEvent::note()const {
+
+
+QString OEvent::note() const
+{
     return data->note;
 }
-void OEvent::setNote( const QString& note ) {
+
+
+void OEvent::setNote( const QString& note )
+{
     changeOrModify();
     data->note = note;
 }
-QDateTime OEvent::createdDateTime()const {
+
+
+QDateTime OEvent::createdDateTime() const
+{
     return data->created;
 }
-void OEvent::setCreatedDateTime( const QDateTime& time ) {
+
+
+void OEvent::setCreatedDateTime( const QDateTime& time )
+{
     changeOrModify();
     data->created = time;
 }
-QDateTime OEvent::startDateTime()const {
+
+
+QDateTime OEvent::startDateTime() const
+{
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
-QDateTime OEvent::startDateTimeInZone()const {
+
+
+QDateTime OEvent::startDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
-void OEvent::setStartDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setStartDateTime( const QDateTime& dt )
+{
     changeOrModify();
     data->start = dt;
 }
-QDateTime OEvent::endDateTime()const {
+
+
+QDateTime OEvent::endDateTime() const
+{
     /*
      * if all Day event the end time needs
      * to be on the same day as the start
      */
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(23, 59, 59 ) );
     return data->end;
 }
-QDateTime OEvent::endDateTimeInZone()const {
+
+
+QDateTime OEvent::endDateTimeInZone() const
+{
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
-void OEvent::setEndDateTime( const QDateTime& dt ) {
+
+
+void OEvent::setEndDateTime( const QDateTime& dt )
+{
     changeOrModify();
     data->end =    dt;
 }
-bool OEvent::isMultipleDay()const {
+
+
+bool OEvent::isMultipleDay() const
+{
     return data->end.date().day() - data->start.date().day();
 }
-bool OEvent::isAllDay()const {
+
+
+bool OEvent::isAllDay() const
+{
     return data->isAllDay;
 }
-void OEvent::setAllDay( bool allDay ) {
+
+
+void OEvent::setAllDay( bool allDay )
+{
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
-void OEvent::setTimeZone( const QString& tz ) {
+
+
+void OEvent::setTimeZone( const QString& tz )
+{
     changeOrModify();
     data->timezone = tz;
 }
-QString OEvent::timeZone()const {
+
+
+QString OEvent::timeZone() const
+{
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
-bool OEvent::match( const QRegExp& re )const {
-    if ( re.match( data->description ) != -1 ){
+
+
+bool OEvent::match( const QRegExp& re ) const
+{
+    if ( re.match( data->description ) != -1 )
+    {
         setLastHitField( Qtopia::DatebookDescription );
         return true;
     }
-    if ( re.match( data->note ) != -1 ){
+    if ( re.match( data->note ) != -1 )
+    {
         setLastHitField( Qtopia::Note );
         return true;
     }
-    if ( re.match( data->location ) != -1 ){
+    if ( re.match( data->location ) != -1 )
+    {
         setLastHitField( Qtopia::Location );
         return true;
     }
-    if ( re.match( data->start.toString() ) != -1 ){
+    if ( re.match( data->start.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::StartDateTime );
         return true;
     }
-    if ( re.match( data->end.toString() ) != -1 ){
+    if ( re.match( data->end.toString() ) != -1 )
+    {
         setLastHitField( Qtopia::EndDateTime );
         return true;
     }
     return false;
 }
-QString OEvent::toRichText()const {
+
+
+QString OEvent::toRichText() const
+{
     QString text, value;
 
     // description
     text += "<b><h3><img src=\"datebook/DateBook\">";
-    if ( !description().isEmpty() ) {
+    if ( !description().isEmpty() )
+    {
         text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
     }
     text += "</h3></b><br><hr><br>";
 
     // location
-    if ( !(value = location()).isEmpty() ) {
+    if ( !( value = location() ).isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
         text += Qtopia::escapeString(value) + "<br>";
     }
 
     // all day event
-    if ( isAllDay() ) {
+    if ( isAllDay() )
+    {
         text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
     }
     // multiple day event
-    else if ( isMultipleDay () ) {
+    else if ( isMultipleDay () )
+    {
         text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
     }
     // start & end times
-    else {
+    else
+    {
         // start time
-        if ( startDateTime().isValid() ) {
+        if ( startDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "Start:") + "</b> ";
             text += Qtopia::escapeString(startDateTime().toString() ).
                     replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
         }
 
         // end time
-        if ( endDateTime().isValid() ) {
+        if ( endDateTime().isValid() )
+        {
             text += "<b>" + QObject::tr( "End:") + "</b> ";
             text += Qtopia::escapeString(endDateTime().toString() ).
                     replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
         }
     }
 
     // categories
-    if ( categoryNames("Calendar").count() ){
+    if ( categoryNames( "Calendar" ).count() )
+    {
 	    text += "<b>" + QObject::tr( "Category:") + "</b> ";
 	    text += categoryNames("Calendar").join(", ");
 	    text += "<br>";
     }
 
     //notes
-    if ( !note().isEmpty() ) {
+    if ( !note().isEmpty() )
+    {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
-QString OEvent::toShortText()const {
+
+
+QString OEvent::toShortText() const
+{
     QString text;
     text += QString::number( startDateTime().date().day() );
     text += ".";
     text += QString::number( startDateTime().date().month() );
     text += ".";
     text += QString::number( startDateTime().date().year() );
     text += " ";
     text += QString::number( startDateTime().time().hour() );
     text += ":";
     text += QString::number( startDateTime().time().minute() );
     text += " - ";
     text += description();
     return text;
 }
-QString OEvent::type()const {
+
+
+QString OEvent::type() const
+{
     return QString::fromLatin1("OEvent");
 }
-QString OEvent::recordField( int /*id */ )const {
+
+
+QString OEvent::recordField( int /*id */ ) const
+{
     return QString::null;
 }
-int OEvent::rtti() {
+
+
+int OEvent::rtti()
+{
     return OPimResolver::DateBook;
 }
-bool OEvent::loadFromStream( QDataStream& ) {
+
+
+bool OEvent::loadFromStream( QDataStream& )
+{
     return true;
 }
-bool OEvent::saveToStream( QDataStream& )const {
+
+
+bool OEvent::saveToStream( QDataStream& ) const
+{
     return true;
 }
-void OEvent::changeOrModify() {
-    if ( data->count != 1 ) {
+
+
+void OEvent::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         if (data->manager )
             d2->manager = new OPimNotifyManager( *data->manager );
 
         if ( data->recur )
             d2->recur = new ORecur( *data->recur );
 
         d2->note = data->note;
         d2->created = data->created;
         d2->start = data->start;
         d2->end = data->end;
         d2->isAllDay = data->isAllDay;
         d2->timezone = data->timezone;
         d2->parent = data->parent;
 
-        if ( data->child ) {
+        if ( data->child )
+        {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
         }
 
         data = d2;
     }
 }
-void OEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
 // Exporting Event data to map. Using the same
 // encoding as ODateBookAccessBackend_xml does..
 // Thus, we could remove the stuff there and use this
 // for it and for all other places..
 // Encoding should happen at one place, only ! (eilers)
-QMap<int, QString> OEvent::toMap()const {
+QMap<int, QString> OEvent::toMap() const
+{
     QMap<int, QString> retMap;
 
     retMap.insert( OEvent::FUid, QString::number( uid() ) );
     retMap.insert( OEvent::FCategories, Qtopia::escapeString( Qtopia::Record::idsToString( categories() ) ));
     retMap.insert( OEvent::FDescription, Qtopia::escapeString( description() ) );
     retMap.insert( OEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OEvent::FType, isAllDay() ? "AllDay" : "" );
     OPimAlarm alarm = notifiers().alarms()[0];
     retMap.insert( OEvent::FAlarm, QString::number( alarm.dateTime().secsTo(  startDateTime() ) / 60 ) );
     retMap.insert( OEvent::FSound, (alarm.sound() == OPimAlarm::Loud) ? "loud" : "silent" );
 
     OTimeZone zone(  timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
     retMap.insert( OEvent::FStart, QString::number( zone.fromUTCDateTime( zone.toDateTime(  startDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FEnd, QString::number( zone.fromUTCDateTime( zone.toDateTime(  endDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FNote, Qtopia::escapeString( note() ) );
     retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? QString( "None" ) : timeZone() );
     if( parent() )
 	    retMap.insert( OEvent::FRecParent, QString::number( parent() ) );
-    if( children().count() ){
+    if ( children().count() )
+    {
             QArray<int> childr = children();
 	    QString buf;
-            for ( uint i = 0; i < childr.count(); i++ ) {
+        for ( uint i = 0; i < childr.count(); i++ )
+        {
 		    if ( i != 0 ) buf += " ";
 		    buf += QString::number( childr[i] );
             }	    
 	    retMap.insert( OEvent::FRecChildren, buf );
     }
     
     // Add recurrence stuff
-    if( hasRecurrence() ){
+    if ( hasRecurrence() )
+    {
 	    ORecur recur = recurrence();
 	    QMap<int, QString> recFields = recur.toMap();
 	    retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
 	    retMap.insert( OEvent::FRWeekdays, recFields[ORecur::RWeekdays] );
 	    retMap.insert( OEvent::FRPosition, recFields[ORecur::RPosition] );
 	    retMap.insert( OEvent::FRFreq, recFields[ORecur::RFreq] );
 	    retMap.insert( OEvent::FRHasEndDate, recFields[ORecur::RHasEndDate] );
 	    retMap.insert( OEvent::FREndDate, recFields[ORecur::EndDate] );
 	    retMap.insert( OEvent::FRCreated, recFields[ORecur::Created] );
 	    retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
-    } else {
+    }
+    else
+    {
 	    ORecur recur = recurrence();
 	    QMap<int, QString> recFields = recur.toMap();
 	    retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
     }
    
     return retMap;
 }
 
+
 void OEvent::fromMap( const QMap<int, QString>& map )
 {
 
 	// We just want to set the UID if it is really stored.
 	if ( !map[OEvent::FUid].isEmpty() )
 		setUid( map[OEvent::FUid].toInt() );
 
 	setCategories( idsFromString( map[OEvent::FCategories] ) );
 	setDescription( map[OEvent::FDescription] );
 	setLocation( map[OEvent::FLocation] );
 
 	if ( map[OEvent::FType] == "AllDay" )
 		setAllDay( true );
 	else
 		setAllDay( false );
 	
 	int alarmTime = -1;
 	if( !map[OEvent::FAlarm].isEmpty() )
 		alarmTime = map[OEvent::FAlarm].toInt();
 
 	int sound = ( ( map[OEvent::FSound] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
-	if ( ( alarmTime != -1 )  ){
+    if ( ( alarmTime != -1 ) )
+    {
 		QDateTime dt = startDateTime().addSecs( -1*alarmTime*60 );
 		OPimAlarm al( sound ,  dt  );
 		notifiers().add( al );
 	}
-	if ( !map[OEvent::FTimeZone].isEmpty() && ( map[OEvent::FTimeZone] != "None" ) ){
+    if ( !map[ OEvent::FTimeZone ].isEmpty() && ( map[ OEvent::FTimeZone ] != "None" ) )
+    {
 		setTimeZone( map[OEvent::FTimeZone] );
 	}
 	
 	time_t start = (time_t) map[OEvent::FStart].toLong();
 	time_t end   = (time_t) map[OEvent::FEnd].toLong();
 
 	/* AllDay is always in UTC */
-	if ( isAllDay() ) {
+    if ( isAllDay() )
+    {
 		OTimeZone utc = OTimeZone::utc();
 		setStartDateTime( utc.fromUTCDateTime( start ) );
 		setEndDateTime  ( utc.fromUTCDateTime( end   ) );
 		setTimeZone( "UTC"); // make sure it is really utc
-	}else {
+    }
+    else
+    {
 		/* to current date time */
 		// qWarning(" Start is %d", start );
 		OTimeZone zone( timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
 		QDateTime date = zone.toDateTime( start );
 		qWarning(" Start is %s", date.toString().latin1() );
 		setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
 
 		date = zone.toDateTime( end );
 		setEndDateTime  ( zone.toDateTime( date, OTimeZone::current() ) );
 	}
 	
 	if ( !map[OEvent::FRecParent].isEmpty() )
 		setParent( map[OEvent::FRecParent].toInt() );
 
-	if ( !map[OEvent::FRecChildren].isEmpty() ){
+    if ( !map[ OEvent::FRecChildren ].isEmpty() )
+    {
 		QStringList list = QStringList::split(' ', map[OEvent::FRecChildren] );
-		for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+        for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+        {
 			addChild( (*it).toInt() );
 		}
 	}
 	
 	// Fill recurrence stuff and put it directly into the ORecur-Object using fromMap..
-	if( !map[OEvent::FRType].isEmpty() ){
+    if ( !map[ OEvent::FRType ].isEmpty() )
+    {
 		QMap<int, QString> recFields;
 		recFields.insert( ORecur::RType, map[OEvent::FRType] );
 		recFields.insert( ORecur::RWeekdays, map[OEvent::FRWeekdays] );
 		recFields.insert( ORecur::RPosition, map[OEvent::FRPosition] );
 		recFields.insert( ORecur::RFreq, map[OEvent::FRFreq] );
 		recFields.insert( ORecur::RHasEndDate, map[OEvent::FRHasEndDate] );
 		recFields.insert( ORecur::EndDate, map[OEvent::FREndDate] );
 		recFields.insert( ORecur::Created, map[OEvent::FRCreated] );
 		recFields.insert( ORecur::Exceptions, map[OEvent::FRExceptions] );
 		ORecur recur( recFields );
 		setRecurrence( recur );
 	}
 	
 }
 
 
-int OEvent::parent()const {
+int OEvent::parent() const
+{
     return data->parent;
 }
-void OEvent::setParent( int uid ) {
+
+
+void OEvent::setParent( int uid )
+{
     changeOrModify();
     data->parent = uid;
 }
-QArray<int> OEvent::children() const{
+
+
+QArray<int> OEvent::children() const
+{
     if (!data->child) return QArray<int>();
     else
         return data->child->copy();
 }
-void OEvent::setChildren( const QArray<int>& arr ) {
+
+
+void OEvent::setChildren( const QArray<int>& arr )
+{
     changeOrModify();
     if (data->child) delete data->child;
 
     data->child = new QArray<int>( arr );
     data->child->detach();
 }
-void OEvent::addChild( int uid ) {
+
+
+void OEvent::addChild( int uid )
+{
     changeOrModify();
-    if (!data->child ) {
+    if ( !data->child )
+    {
         data->child = new QArray<int>(1);
         (*data->child)[0] = uid;
-    }else{
+    }
+    else
+    {
         int count = data->child->count();
         data->child->resize( count + 1 );
         (*data->child)[count] = uid;
     }
 }
-void OEvent::removeChild( int uid ) {
+
+
+void OEvent::removeChild( int uid )
+{
     if (!data->child || !data->child->contains( uid ) ) return;
     changeOrModify();
     QArray<int> newAr( data->child->count() - 1 );
     int j = 0;
     uint count = data->child->count();
-    for ( uint i = 0; i < count; i++ ) {
-        if ( (*data->child)[i] != uid ) {
+    for ( uint i = 0; i < count; i++ )
+    {
+        if ( ( *data->child ) [ i ] != uid )
+        {
             newAr[j] = (*data->child)[i];
             j++;
         }
     }
     (*data->child) = newAr;
 }
-struct OEffectiveEvent::Data : public QShared {
-    Data() : QShared() {
-    }
+
+
+struct OEffectiveEvent::Data : public QShared
+{
+    Data() : QShared()
+    {}
     OEvent event;
     QDate date;
     QTime start, end;
     QDate startDate, endDate;
     bool dates : 1;
 };
 
-OEffectiveEvent::OEffectiveEvent() {
+
+OEffectiveEvent::OEffectiveEvent()
+{
     data = new Data;
     data->date = QDate::currentDate();
     data->start = data->end = QTime::currentTime();
     data->dates = false;
 }
+
+
 OEffectiveEvent::OEffectiveEvent( const OEvent& ev, const QDate& startDate,
-                                  Position pos ) {
+                                  Position pos )
+{
     data = new Data;
     data->event = ev;
     data->date = startDate;
     if ( pos & Start )
         data->start = ev.startDateTime().time();
     else
         data->start = QTime( 0, 0, 0 );
 
     if ( pos & End )
         data->end = ev.endDateTime().time();
     else
         data->end = QTime( 23, 59, 59 );
 
     data->dates = false;
 }
-OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev) {
+
+
+OEffectiveEvent::OEffectiveEvent( const OEffectiveEvent& ev )
+{
     data = ev.data;
     data->ref();
 }
-OEffectiveEvent::~OEffectiveEvent() {
-    if ( data->deref() ) {
+
+
+OEffectiveEvent::~OEffectiveEvent()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev ) {
+
+
+OEffectiveEvent& OEffectiveEvent::operator=( const OEffectiveEvent& ev )
+{
     if ( *this == ev ) return  *this;
 
     ev.data->ref();
     deref();
     data = ev.data;
 
     return *this;
 }
 
-void OEffectiveEvent::setStartTime( const QTime& ti) {
+
+void OEffectiveEvent::setStartTime( const QTime& ti )
+{
     changeOrModify();
     data->start = ti;
 }
-void OEffectiveEvent::setEndTime( const QTime& en) {
+
+
+void OEffectiveEvent::setEndTime( const QTime& en )
+{
     changeOrModify();
     data->end = en;
 }
-void OEffectiveEvent::setEvent( const OEvent& ev) {
+
+
+void OEffectiveEvent::setEvent( const OEvent& ev )
+{
     changeOrModify();
     data->event = ev;
 }
-void OEffectiveEvent::setDate( const QDate& da) {
+
+
+void OEffectiveEvent::setDate( const QDate& da )
+{
     changeOrModify();
     data->date = da;
 }
+
+
 void OEffectiveEvent::setEffectiveDates( const QDate& from,
-                                         const QDate& to ) {
-    if (!from.isValid() ) {
+        const QDate& to )
+{
+    if ( !from.isValid() )
+    {
         data->dates = false;
         return;
     }
 
     data->startDate = from;
     data->endDate = to;
 }
-QString OEffectiveEvent::description()const {
+
+
+QString OEffectiveEvent::description() const
+{
     return data->event.description();
 }
-QString OEffectiveEvent::location()const {
+
+
+QString OEffectiveEvent::location() const
+{
     return data->event.location();
 }
-QString OEffectiveEvent::note()const {
+
+
+QString OEffectiveEvent::note() const
+{
     return data->event.note();
 }
-OEvent OEffectiveEvent::event()const {
+
+
+OEvent OEffectiveEvent::event() const
+{
     return data->event;
 }
-QTime OEffectiveEvent::startTime()const {
+
+
+QTime OEffectiveEvent::startTime() const
+{
     return data->start;
 }
-QTime OEffectiveEvent::endTime()const {
+
+
+QTime OEffectiveEvent::endTime() const
+{
     return data->end;
 }
-QDate OEffectiveEvent::date()const {
+
+
+QDate OEffectiveEvent::date() const
+{
     return data->date;
 }
-int OEffectiveEvent::length()const {
+
+
+int OEffectiveEvent::length() const
+{
     return (data->end.hour() * 60 - data->start.hour() * 60)
         + QABS(data->start.minute() - data->end.minute() );
 }
-int OEffectiveEvent::size()const {
+
+
+int OEffectiveEvent::size() const
+{
     return ( data->end.hour() - data->start.hour() ) * 3600
         + (data->end.minute() - data->start.minute() * 60
         + data->end.second() - data->start.second() );
 }
-QDate OEffectiveEvent::startDate()const {
+
+
+QDate OEffectiveEvent::startDate() const
+{
     if ( data->dates )
         return data->startDate;
     else if ( data->event.hasRecurrence() )  // single day, since multi-day should have a d pointer
         return data->date;
     else
         return data->event.startDateTime().date();
 }
-QDate OEffectiveEvent::endDate()const {
+
+
+QDate OEffectiveEvent::endDate() const
+{
     if ( data->dates )
         return data->endDate;
     else if ( data->event.hasRecurrence() )
         return data->date;
     else
         return data->event.endDateTime().date();
 }
-void OEffectiveEvent::deref() {
-    if ( data->deref() ) {
+
+
+void OEffectiveEvent::deref()
+{
+    if ( data->deref() )
+    {
         delete data;
         data = 0;
     }
 }
-void OEffectiveEvent::changeOrModify() {
-    if ( data->count != 1 ) {
+
+
+void OEffectiveEvent::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         data->deref();
         Data* d2 = new Data;
         d2->event = data->event;
         d2->date = data->date;
         d2->start = data->start;
         d2->end = data->end;
         d2->startDate = data->startDate;
         d2->endDate = data->endDate;
         d2->dates = data->dates;
         data = d2;
     }
 }
-bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const{
+
+
+bool OEffectiveEvent::operator<( const OEffectiveEvent &e ) const
+{
     if ( data->date < e.date() )
 	return TRUE;
     if ( data->date == e.date() )
 	return ( startTime() < e.startTime() );
     else
 	return FALSE;
 }
-bool OEffectiveEvent::operator<=( const OEffectiveEvent &e ) const{
+
+
+bool OEffectiveEvent::operator<=( const OEffectiveEvent &e ) const
+{
     return (data->date <= e.date() );
 }
-bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator==( const OEffectiveEvent &e ) const
+{
     return ( date() == e.date()
 	     && startTime() == e.startTime()
 	     && endTime()== e.endTime()
 	     && event() == e.event() );
 }
-bool OEffectiveEvent::operator!=( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator!=( const OEffectiveEvent &e ) const
+{
     return !(*this == e );
 }
-bool OEffectiveEvent::operator>( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator>( const OEffectiveEvent &e ) const
+{
     return !(*this <= e );
 }
-bool OEffectiveEvent::operator>= ( const OEffectiveEvent &e ) const {
+
+
+bool OEffectiveEvent::operator>= ( const OEffectiveEvent &e ) const
+{
     return !(*this < e);
 }
 
 }
diff --git a/libopie2/opiepim/oevent.h b/libopie2/opiepim/oevent.h
index 9502efa..dc5e4d6 100644
--- a/libopie2/opiepim/oevent.h
+++ b/libopie2/opiepim/oevent.h
@@ -1,92 +1,96 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+                             Copyright (C) Stefan Eilers <Eilers.Stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 // CONTAINS GPLed code of TT
 
-#ifndef OPIE_PIM_EVENT_H
-#define OPIE_PIM_EVENT_H
-
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qvaluelist.h>
+#ifndef OEVENT_H
+#define OEVENT_H
 
+/* OPIE */
+#include <opie2/otimezone.h>
+#include <opie2/opimrecord.h>
 #include <qpe/recordfields.h>
 #include <qpe/palmtopuidgen.h>
 
-#include <opie2/otimezone.h>
-#include <opie2/opimrecord.h>
+/* QT */
+#include <qstring.h>
+#include <qdatetime.h>
+#include <qvaluelist.h>
 
-namespace Opie {
-struct OCalendarHelper {
+namespace Opie
+{
+struct OCalendarHelper
+{
     /** calculate the week number of the date */
     static int week( const QDate& );
     /** calculate the occurence of week days since the start of the month */
     static int ocurrence( const QDate& );
 
     // returns the dayOfWeek for the *first* day it finds (ignores
     // any further days!). Returns 1 (Monday) if there isn't any day found
     static int dayOfWeek( char day );
 
     /** returns the diff of month */
     static int monthDiff( const QDate& first, const QDate& second );
 
 };
 
 class OPimNotifyManager;
 class ORecur;
 
 /**
  * This is the container for all Events. It encapsules all
  * available information for a single Event
  * @short container for events.
  */
-class OEvent : public OPimRecord {
+class OEvent : public OPimRecord
+{
 public:
     typedef QValueList<OEvent> ValueList;
     /**
      * RecordFields contain possible attributes
      * used in the Results of toMap()..
      */
     enum RecordFields {
         FUid = Qtopia::UID_ID,
         FCategories = Qtopia::CATEGORY_ID,
         FDescription = 0,
         FLocation,
 	FType,
 	FAlarm,
 	FSound,
 	FRType,
 	FRWeekdays,
 	FRPosition,
 	FRFreq,
 	FRHasEndDate,
 	FREndDate,
 	FRCreated,
 	FRExceptions,
 	FStart,
 	FEnd,
@@ -170,62 +174,65 @@ public:
     void setParent( int uid );
 
 
     /* needed reimp */
     QString toRichText()const;
     QString toShortText()const;
     QString type()const;
 
     QMap<int, QString> toMap()const;
     void fromMap( const QMap<int, QString>& map );
     QString recordField(int )const;
 
     static int rtti();
 
     bool loadFromStream( QDataStream& );
     bool saveToStream( QDataStream& )const;
 
 /*    bool operator==( const OEvent& );
     bool operator!=( const OEvent& );
     bool operator<( const OEvent& );
     bool operator<=( const OEvent& );
     bool operator>( const OEvent& );
     bool operator>=(const OEvent& );
 */
+
 private:
     inline void changeOrModify();
     void deref();
     struct Data;
     Data* data;
     class Private;
     Private* priv;
 
 };
 
 /**
  * AN Event can span through multiple days. We split up a multiday eve
  */
-class OEffectiveEvent {
+class OEffectiveEvent
+{
+
 public:
     typedef QValueList<OEffectiveEvent> ValueList;
     enum Position { MidWay, Start, End, StartEnd };
         // If we calculate the effective event of a multi-day event
     // we have to figure out whether we are at the first day,
     // at the end, or anywhere else ("middle"). This is important
     // for the start/end times (00:00/23:59)
     // MidWay: 00:00 -> 23:59, as we are "in the middle" of a multi-
     //         day event
     // Start: start time -> 23:59
     // End: 00:00 -> end time
     // Start | End == StartEnd: for single-day events (default)
     //                          here we draw start time -> end time
     OEffectiveEvent();
     OEffectiveEvent( const OEvent& event, const QDate& startDate, Position pos = StartEnd );
     OEffectiveEvent( const OEffectiveEvent& );
     OEffectiveEvent &operator=(const OEffectiveEvent& );
     ~OEffectiveEvent();
 
     void setStartTime( const QTime& );
     void setEndTime( const QTime& );
     void setEvent( const OEvent& );
     void setDate( const QDate& );
 
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 8f0011b..1742dcc 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -6,70 +6,75 @@
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#ifndef OPIE_RECORD_LIST_H
-#define OPIE_RECORD_LIST_H
-
-#include <qarray.h>
+#ifndef ORECORDLIST_H
+#define ORECORDLIST_H
 
+/* OPIE */
 #include <opie2/otemplatebase.h>
 #include <opie2/opimrecord.h>
 
-namespace Opie {
+/* QT */
+#include <qarray.h>
+
+namespace Opie
+{
 
 class ORecordListIteratorPrivate;
 /**
  * Our List Iterator
  * it behaves like STL or Qt
  *
  * for(it = list.begin(); it != list.end(); ++it )
  *   doSomeCoolStuff( (*it) );
  */
 template <class T> class ORecordList;
 template <class T = OPimRecord>
-class ORecordListIterator {
+class ORecordListIterator
+{
     friend class ORecordList<T>;
+
 public:
     typedef OTemplateBase<T> Base;
 
     /**
      * The c'tor used internally from
      * ORecordList
      */
     ORecordListIterator( const QArray<int>, const Base* );
 
     /**
      * The standard c'tor
      */
     ORecordListIterator();
     ~ORecordListIterator();
 
     ORecordListIterator( const ORecordListIterator& );
     ORecordListIterator &operator=(const ORecordListIterator& );
 
     /**
      * a * operator ;)
      * use it like this T = (*it);
      */
     T operator*();
     ORecordListIterator &operator++();
@@ -84,253 +89,314 @@ public:
     uint current()const;
 
     /**
      * the number of items
      */
     uint count()const;
 
     /**
      * sets the current item
      */
     void setCurrent( uint cur );
 
 private:
     QArray<int> m_uids;
     uint m_current;
     const Base* m_temp;
     bool m_end : 1;
     T m_record;
     bool m_direction :1;
 
     /* d pointer for future versions */
     ORecordListIteratorPrivate *d;
 };
 
+
 class ORecordListPrivate;
 /**
  * The recordlist used as a return type
  * from OPimAccessTemplate
  */
 template <class T = OPimRecord >
-class ORecordList {
+class ORecordList
+{
 public:
     typedef OTemplateBase<T> Base;
     typedef ORecordListIterator<T> Iterator;
 
     /**
      * c'tor
      */
-    ORecordList () {
-    }
+    ORecordList ()
+    {}
 ORecordList( const QArray<int>& ids,
                  const Base* );
     ~ORecordList();
 
     /**
      * the first iterator
      */
     Iterator begin();
 
     /**
      * the end
      */
     Iterator end();
 
     /**
      * the number of items in the list
      */
      uint count()const;
 
     T operator[]( uint i );
     int uidAt(uint i );
 
    /**
     * Remove the contact with given uid
     */
     bool remove( int uid );
 
     /*
       ConstIterator begin()const;
       ConstIterator end()const;
     */
 private:
     QArray<int> m_ids;
     const Base* m_acc;
     ORecordListPrivate *d;
 };
 
+
 /* ok now implement it  */
 template <class T>
-ORecordListIterator<T>::ORecordListIterator() {
+ORecordListIterator<T>::ORecordListIterator()
+{
     m_current = 0;
     m_temp = 0l;
     m_end = true;
     m_record = T();
     /* forward */
     m_direction = TRUE;
 }
+
+
 template <class T>
-ORecordListIterator<T>::~ORecordListIterator() {
+ORecordListIterator<T>::~ORecordListIterator()
+{
 /* nothing to delete */
 }
 
+
 template <class T>
-ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
+ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it )
+{
 //    qWarning("ORecordListIterator copy c'tor");
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
     m_direction = it.m_direction;
 }
 
+
 template <class T>
-ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
+ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it )
+{
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
 
     return *this;
 }
 
+
 template <class T>
-T ORecordListIterator<T>::operator*() {
+T ORecordListIterator<T>::operator*()
+{
 	//qWarning("operator* %d %d", m_current,  m_uids[m_current] );
     if (!m_end )
         m_record = m_temp->find( m_uids[m_current], m_uids, m_current,
                                  m_direction ? Base::Forward :
                                  Base::Reverse  );
     else
         m_record = T();
 
     return m_record;
 }
 
+
 template <class T>
-ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
+ORecordListIterator<T> &ORecordListIterator<T>::operator++()
+{
     m_direction = true;
-    if (m_current < m_uids.count() ) {
+    if ( m_current < m_uids.count() )
+    {
         m_end = false;
         ++m_current;
-    }else
+    }
+    else
         m_end = true;
 
     return *this;
 }
+
+
 template <class T>
-ORecordListIterator<T> &ORecordListIterator<T>::operator--() {
+ORecordListIterator<T> &ORecordListIterator<T>::operator--()
+{
     m_direction = false;
-    if ( m_current > 0 ) {
+    if ( m_current > 0 )
+    {
         --m_current;
         m_end = false;
-    }  else
+    }
+    else
         m_end = true;
 
     return *this;
 }
 
+
 template <class T>
-bool ORecordListIterator<T>::operator==( const ORecordListIterator<T>& it ) {
+bool ORecordListIterator<T>::operator==( const ORecordListIterator<T>& it )
+{
 
     /* if both are at we're the same.... */
     if ( m_end == it.m_end ) return true;
 
     if ( m_uids != it.m_uids ) return false;
     if ( m_current != it.m_current ) return false;
     if ( m_temp != it.m_temp ) return false;
 
     return true;
 }
+
+
 template <class T>
-bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) {
+bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it )
+{
     return !(*this == it );
 }
+
+
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
                                   const Base* t )
     : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false ),
       m_direction( false )
 {
     /* if the list is empty we're already at the end of the list */
     if (uids.count() == 0 )
         m_end = true;
 }
+
+
 template <class T>
-uint ORecordListIterator<T>::current()const {
+uint ORecordListIterator<T>::current() const
+{
     return m_current;
 }
+
+
 template <class T>
-void ORecordListIterator<T>::setCurrent( uint cur ) {
-    if( cur < m_uids.count() ) {
+void ORecordListIterator<T>::setCurrent( uint cur )
+{
+    if ( cur < m_uids.count() )
+    {
 	m_end = false;
 	m_current= cur;
     }
 }
 template <class T>
-uint ORecordListIterator<T>::count()const {
+uint ORecordListIterator<T>::count() const
+{
     return m_uids.count();
 }
+
+
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
-{
-}
+{}
+
+
 template <class T>
-ORecordList<T>::~ORecordList() {
+ORecordList<T>::~ORecordList()
+{
 /* nothing to do here */
 }
+
+
 template <class T>
-typename ORecordList<T>::Iterator ORecordList<T>::begin() {
+typename ORecordList<T>::Iterator ORecordList<T>::begin()
+{
     Iterator it( m_ids, m_acc );
     return it;
 }
+
+
 template <class T>
-typename ORecordList<T>::Iterator ORecordList<T>::end() {
+typename ORecordList<T>::Iterator ORecordList<T>::end()
+{
     Iterator it( m_ids, m_acc );
     it.m_end = true;
     it.m_current = m_ids.count();
 
     return it;
 }
+
+
 template <class T>
-uint ORecordList<T>::count()const {
+uint ORecordList<T>::count() const
+{
 return m_ids.count();
 }
+
+
 template <class T>
-T ORecordList<T>::operator[]( uint i ) {
+T ORecordList<T>::operator[] ( uint i )
+{
     if ( i >= m_ids.count() )
         return T();
     /* forward */
     return m_acc->find( m_ids[i], m_ids, i );
 }
+
+
 template <class T>
-int ORecordList<T>::uidAt( uint i ) {
+int ORecordList<T>::uidAt( uint i )
+{
     return m_ids[i];
 }
 
+
 template <class T>
-bool ORecordList<T>::remove( int uid ) {
+bool ORecordList<T>::remove( int uid )
+{
 	QArray<int> copy( m_ids.count() );
 	int counter = 0;
 	bool ret_val = false;
 
-	for (uint i = 0; i < m_ids.count(); i++){
-		if ( m_ids[i] != uid ){
+    for ( uint i = 0; i < m_ids.count(); i++ )
+    {
+        if ( m_ids[ i ] != uid )
+        {
 			copy[counter++] = m_ids[i];
 
-		}else
+        }
+        else
 			ret_val = true;
 	}
 
 	copy.resize( counter );
 	m_ids = copy;
 
 
 	return ret_val;
 }
 
 }
 #endif
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 3eb0026..f534067 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -5,546 +5,708 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#include <qobject.h>
-#include <qshared.h>
-
 
+#include "otodo.h"
 
+/* OPIE */
+#include <opie2/opimstate.h>
+#include <opie2/orecur.h>
+#include <opie2/opimmaintainer.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/opimresolver.h>
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
 #include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
+/* QT */
+#include <qobject.h>
+#include <qshared.h>
 
-#include <opie2/opimstate.h>
-#include <opie2/orecur.h>
-#include <opie2/opimmaintainer.h>
-#include <opie2/opimnotifymanager.h>
-#include <opie2/opimresolver.h>
-
-#include <opie2/otodo.h>
-
-namespace Opie {
+namespace Opie
+{
 
-struct OTodo::OTodoData : public QShared {
-    OTodoData() : QShared() {
+struct OTodo::OTodoData : public QShared
+{
+    OTodoData() : QShared()
+    {
         recur = 0;
         state = 0;
         maintainer = 0;
         notifiers = 0;
     };
-    ~OTodoData() {
+    ~OTodoData()
+    {
         delete recur;
         delete maintainer;
         delete notifiers;
     }
 
     QDate date;
     bool isCompleted:1;
     bool hasDate:1;
     int priority;
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     OPimState *state;
     ORecur *recur;
     OPimMaintainer *maintainer;
     QDate start;
     QDate completed;
     OPimNotifyManager *notifiers;
 };
 
+
 OTodo::OTodo(const OTodo &event )
     : OPimRecord( event ),  data( event.data )
 {
     data->ref();
 //    qWarning("ref up");
 }
-OTodo::~OTodo() {
+
+
+OTodo::~OTodo()
+{
 
 //    qWarning("~OTodo "  );
-    if ( data->deref() ) {
+    if ( data->deref() )
+    {
 //        qWarning("OTodo::dereffing");
         delete data;
         data = 0l;
     }
 }
+
+
 OTodo::OTodo(bool completed, int priority,
                      const QArray<int> &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData " + summary);
     setCategories( category );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
+
+
 OTodo::OTodo(bool completed, int priority,
                      const QStringList &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData" + summary);
     setCategories( idsFromString( category.join(";") ) );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
+
+
 bool OTodo::match( const QRegExp &regExp )const
 {
-  if( QString::number( data->priority ).find( regExp ) != -1 ){
+    if ( QString::number( data->priority ).find( regExp ) != -1 )
+    {
       setLastHitField( Priority );
       return true;
-  }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){
+    }
+    else if ( data->hasDate && data->date.toString().find( regExp ) != -1 )
+    {
       setLastHitField( HasDate );
       return true;
-  }else if(data->desc.find( regExp ) != -1 ){
+    }
+    else if ( data->desc.find( regExp ) != -1 )
+    {
         setLastHitField( Description );
         return true;
-  }else if(data->sum.find( regExp ) != -1 ) {
+    }
+    else if ( data->sum.find( regExp ) != -1 )
+    {
         setLastHitField( Summary );
         return true;
   }
   return false;
 }
+
+
 bool OTodo::isCompleted() const
 {
     return data->isCompleted;
 }
+
+
 bool OTodo::hasDueDate() const
 {
     return data->hasDate;
 }
-bool OTodo::hasStartDate()const {
+
+
+bool OTodo::hasStartDate() const
+{
     return data->start.isValid();
 }
-bool OTodo::hasCompletedDate()const {
+
+
+bool OTodo::hasCompletedDate() const
+{
     return data->completed.isValid();
 }
+
+
 int OTodo::priority()const
 {
     return data->priority;
 }
+
+
 QString OTodo::summary() const
 {
     return data->sum;
 }
+
+
 ushort OTodo::progress() const
 {
     return data->prog;
 }
+
+
 QDate OTodo::dueDate()const
 {
     return data->date;
 }
-QDate OTodo::startDate()const {
+
+
+QDate OTodo::startDate() const
+{
     return data->start;
 }
-QDate OTodo::completedDate()const {
+
+
+QDate OTodo::completedDate() const
+{
     return data->completed;
 }
+
+
 QString OTodo::description()const
 {
     return data->desc;
 }
-bool OTodo::hasState() const{
+
+
+bool OTodo::hasState() const
+{
     if (!data->state ) return false;
     return ( data->state->state() != OPimState::Undefined );
 }
-OPimState OTodo::state()const {
-    if (!data->state ) {
+
+
+OPimState OTodo::state() const
+{
+    if ( !data->state )
+    {
         OPimState state;
         return state;
     }
 
     return (*data->state);
 }
-bool OTodo::hasRecurrence()const {
+
+
+bool OTodo::hasRecurrence() const
+{
     if (!data->recur) return false;
     return data->recur->doesRecur();
 }
-ORecur OTodo::recurrence()const {
+
+
+ORecur OTodo::recurrence() const
+{
     if (!data->recur) return ORecur();
 
     return (*data->recur);
 }
-bool OTodo::hasMaintainer()const {
+
+
+bool OTodo::hasMaintainer() const
+{
     if (!data->maintainer) return false;
 
     return (data->maintainer->mode() != OPimMaintainer::Undefined );
 }
-OPimMaintainer OTodo::maintainer()const {
+
+
+OPimMaintainer OTodo::maintainer() const
+{
     if (!data->maintainer) return OPimMaintainer();
 
     return (*data->maintainer);
 }
+
+
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
+
+
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
+
+
 void OTodo::setDescription(const QString &desc )
 {
 //    qWarning( "desc " + desc );
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
+
+
 void OTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
+
+
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
+
+
 void OTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
-void OTodo::setStartDate( const QDate& date ) {
+
+
+void OTodo::setStartDate( const QDate& date )
+{
     changeOrModify();
     data->start = date;
 }
-void OTodo::setCompletedDate( const QDate& date ) {
+
+
+void OTodo::setCompletedDate( const QDate& date )
+{
     changeOrModify();
     data->completed = date;
 }
-void OTodo::setState( const OPimState& state ) {
+
+
+void OTodo::setState( const OPimState& state )
+{
     changeOrModify();
     if (data->state )
         (*data->state) = state;
     else
         data->state = new OPimState( state );
 }
-void OTodo::setRecurrence( const ORecur& rec) {
+
+
+void OTodo::setRecurrence( const ORecur& rec )
+{
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
-void OTodo::setMaintainer( const OPimMaintainer& pim ) {
+
+
+void OTodo::setMaintainer( const OPimMaintainer& pim )
+{
     changeOrModify();
 
     if (data->maintainer )
         (*data->maintainer) = pim;
     else
         data->maintainer = new OPimMaintainer( pim );
 }
+
+
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
 	return QDate::currentDate() > data->date;
     return false;
 }
+
+
 void OTodo::setProgress(ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
-QString OTodo::toShortText() const {
+
+
+QString OTodo::toShortText() const
+{
  return summary();
 }
+
+
 /*!
   Returns a richt text string
 */
 QString OTodo::toRichText() const
 {
   QString text;
   QStringList catlist;
 
   // summary
   text += "<b><h3><img src=\"todo/TodoList\"> ";
-  if ( !summary().isEmpty() ) {
+    if ( !summary().isEmpty() )
+    {
       text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
   }
   text += "</h3></b><br><hr><br>";
 
   // description
-  if( !description().isEmpty() ){
+    if ( !description().isEmpty() )
+    {
     text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
     text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
   }
 
   // priority
   int priorityval = priority();
   text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
           QString::number( priorityval ) + "\"> ";
 
   switch ( priorityval )
   {
     case 1 : text += QObject::tr( "Very high" );
         break;
     case 2 : text += QObject::tr( "High" );
         break;
     case 3 : text += QObject::tr( "Normal" );
         break;
     case 4 : text += QObject::tr( "Low" );
         break;
     case 5 : text += QObject::tr( "Very low" );
         break;
   };
   text += "<br>";
 
   // progress
   text += "<b>" + QObject::tr( "Progress:") + " </b>"
           + QString::number( progress() ) + " %<br>";
 
   // due date
-  if (hasDueDate() ){
+    if ( hasDueDate() )
+    {
     QDate dd = dueDate();
     int off = QDate::currentDate().daysTo( dd );
 
     text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\"";
     if ( off < 0 )
       text += "#FF0000";
     else if ( off == 0 )
       text += "#FFFF00";
     else if ( off > 0 )
       text += "#00FF00";
 
     text += "\">" + dd.toString() + "</font><br>";
   }
 
   // categories
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
   text += categoryNames( "Todo List" ).join(", ");
   text += "<br>";
 
   return text;
 }
-bool OTodo::hasNotifiers()const {
+
+
+bool OTodo::hasNotifiers() const
+{
     if (!data->notifiers) return false;
     return !data->notifiers->isEmpty();
 }
-OPimNotifyManager& OTodo::notifiers() {
+
+
+OPimNotifyManager& OTodo::notifiers()
+{
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
     return (*data->notifiers);
 }
-const OPimNotifyManager& OTodo::notifiers()const{
+
+
+const OPimNotifyManager& OTodo::notifiers() const
+{
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
 
     return (*data->notifiers);
 }
 
-bool OTodo::operator<( const OTodo &toDoEvent )const{
+
+bool OTodo::operator<( const OTodo &toDoEvent ) const
+{
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
-    if( hasDueDate() && toDoEvent.hasDueDate() ){
-	if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
+    if ( hasDueDate() && toDoEvent.hasDueDate() )
+    {
+        if ( dueDate() == toDoEvent.dueDate() )
+        { // let's the priority decide
 	    return priority() < toDoEvent.priority();
-	}else{
+        }
+        else
+        {
 	    return dueDate() < toDoEvent.dueDate();
 	}
     }
     return false;
 }
+
+
 bool OTodo::operator<=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return true;
-    if( hasDueDate() && toDoEvent.hasDueDate() ){
-	if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
+    if ( hasDueDate() && toDoEvent.hasDueDate() )
+    {
+        if ( dueDate() == toDoEvent.dueDate() )
+        { // let's the priority decide
 	    return priority() <= toDoEvent.priority();
-	}else{
+        }
+        else
+        {
 	    return dueDate() <= toDoEvent.dueDate();
 	}
     }
     return true;
 }
+
+
 bool OTodo::operator>(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
-    if( hasDueDate()  &&  toDoEvent.hasDueDate() ){
-	if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
+    if ( hasDueDate() && toDoEvent.hasDueDate() )
+    {
+        if ( dueDate() == toDoEvent.dueDate() )
+        { // let's the priority decide
 	    return priority() > toDoEvent.priority();
-	}else{
+        }
+        else
+        {
 	    return dueDate() > toDoEvent.dueDate();
 	}
     }
     return false;
 }
+
+
 bool OTodo::operator>=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
-    if( hasDueDate() && toDoEvent.hasDueDate() ){
-	if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
+    if ( hasDueDate() && toDoEvent.hasDueDate() )
+    {
+        if ( dueDate() == toDoEvent.dueDate() )
+        { // let's the priority decide
 	    return priority() > toDoEvent.priority();
-	}else{
+        }
+        else
+        {
 	    return dueDate() > toDoEvent.dueDate();
 	}
     }
     return true;
 }
+
+
 bool OTodo::operator==(const OTodo &toDoEvent )const
 {
     if ( data->priority != toDoEvent.data->priority ) return false;
     if ( data->priority != toDoEvent.data->prog ) return false;
     if ( data->isCompleted != toDoEvent.data->isCompleted ) return false;
     if ( data->hasDate != toDoEvent.data->hasDate ) return false;
     if ( data->date != toDoEvent.data->date ) return false;
     if ( data->sum != toDoEvent.data->sum ) return false;
     if ( data->desc != toDoEvent.data->desc ) return false;
     if ( data->maintainer    != toDoEvent.data->maintainer )
         return false;
 
     return OPimRecord::operator==( toDoEvent );
 }
-void OTodo::deref() {
+
+
+void OTodo::deref()
+{
 
 //    qWarning("deref in ToDoEvent");
-    if ( data->deref() ) {
+    if ( data->deref() )
+    {
 //        qWarning("deleting");
         delete data;
         data= 0;
     }
 }
+
+
 OTodo &OTodo::operator=(const OTodo &item )
 {
     if ( this == &item ) return *this;
 
     OPimRecord::operator=( item );
     //qWarning("operator= ref ");
     item.data->ref();
     deref();
     data = item.data;
 
     return *this;
 }
 
-QMap<int, QString> OTodo::toMap() const {
+
+QMap<int, QString> OTodo::toMap() const
+{
     QMap<int, QString> map;
 
     map.insert( Uid, QString::number( uid() ) );
     map.insert( Category,  idsToString( categories() ) );
     map.insert( HasDate, QString::number( data->hasDate ) );
     map.insert( Completed, QString::number( data->isCompleted ) );
     map.insert( Description, data->desc );
     map.insert( Summary, data->sum );
     map.insert( Priority, QString::number( data->priority ) );
     map.insert( DateDay,  QString::number( data->date.day() ) );
     map.insert( DateMonth, QString::number( data->date.month() ) );
     map.insert( DateYear, QString::number( data->date.year() ) );
     map.insert( Progress, QString::number( data->prog ) );
 //    map.insert( CrossReference, crossToString() );
     /* FIXME!!!   map.insert( State,  );
     map.insert( Recurrence, );
     map.insert( Reminders, );
     map.
     */
     return map;
 }
 
+
 /**
  *  change or modify looks at the ref count and either
  *  creates a new QShared Object or it can modify it
  * right in place
  */
-void OTodo::changeOrModify() {
-    if ( data->count != 1 ) {
+void OTodo::changeOrModify()
+{
+    if ( data->count != 1 )
+    {
         qWarning("changeOrModify");
         data->deref();
         OTodoData* d2 = new OTodoData();
         copy(data, d2 );
         data = d2;
     }
 }
+
+
 // WATCHOUT
 /*
  * if you add something to the Data struct
  * be sure to copy it here
  */
-void OTodo::copy( OTodoData* src, OTodoData* dest ) {
+void OTodo::copy( OTodoData* src, OTodoData* dest )
+{
     dest->date = src->date;
     dest->isCompleted = src->isCompleted;
     dest->hasDate = src->hasDate;
     dest->priority = src->priority;
     dest->desc = src->desc;
     dest->sum = src->sum;
     dest->extra = src->extra;
     dest->prog = src->prog;
 
     if (src->state )
         dest->state = new OPimState( *src->state );
 
     if (src->recur )
         dest->recur = new ORecur( *src->recur );
 
     if (src->maintainer )
         dest->maintainer = new OPimMaintainer( *src->maintainer )
                            ;
     dest->start = src->start;
     dest->completed = src->completed;
 
     if (src->notifiers )
         dest->notifiers = new OPimNotifyManager( *src->notifiers );
 }
-QString OTodo::type() const {
+
+
+QString OTodo::type() const
+{
     return QString::fromLatin1("OTodo");
 }
-QString OTodo::recordField(int /*id*/ )const {
+
+
+QString OTodo::recordField( int /*id*/ ) const
+{
     return QString::null;
 }
 
-int OTodo::rtti(){
+
+int OTodo::rtti()
+{
     return OPimResolver::TodoList;
 }
 
 }
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 61add04..04dd269 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -5,72 +5,74 @@
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
-#ifndef OPIE_TODO_EVENT_H
-#define OPIE_TODO_EVENT_H
 
+#ifndef OTODOEVENT_H
+#define OTODOEVENT_H
 
+/* OPIE */
+#include <opie2/opimrecord.h>
+#include <qpe/recordfields.h>
+#include <qpe/palmtopuidgen.h>
+
+/* QT */
 #include <qarray.h>
 #include <qmap.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qvaluelist.h>
 
-#include <qpe/recordfields.h>
-#include <qpe/palmtopuidgen.h>
-
-#include <opie2/opimrecord.h>
-
-
-namespace Opie {
+namespace Opie
+{
 
 class OPimState;
 class ORecur;
 class OPimMaintainer;
 class OPimNotifyManager;
-class OTodo : public  OPimRecord  {
+class OTodo : public OPimRecord
+{
 public:
     typedef QValueList<OTodo> ValueList;
     enum RecordFields {
         Uid = Qtopia::UID_ID,
         Category = Qtopia::CATEGORY_ID,
         HasDate,
         Completed,
         Description,
         Summary,
         Priority,
         DateDay,
         DateMonth,
         DateYear,
         Progress,
         CrossReference,
         State,
         Recurrence,
         Alarms,
         Reminders,
         Notifiers,
         Maintainer,
         StartDate,
         CompletedDate
     };
@@ -285,31 +287,34 @@ public:
 
     virtual bool match( const QRegExp &r )const;
 
     bool operator<(const OTodo &toDoEvent )const;
     bool operator<=(const OTodo &toDoEvent )const;
     bool operator!=(const OTodo &toDoEvent )const;
     bool operator>(const OTodo &toDoEvent )const;
     bool operator>=(const OTodo &toDoEvent)const;
     bool operator==(const OTodo &toDoEvent )const;
     OTodo &operator=(const OTodo &toDoEvent );
 
     static int rtti();
 
  private:
     class OTodoPrivate;
     struct OTodoData;
 
     void deref();
     inline void changeOrModify();
     void copy( OTodoData* src, OTodoData* dest );
     OTodoPrivate *d;
     OTodoData *data;
 
 };
-inline bool OTodo::operator!=(const OTodo &toDoEvent )const {
+
+
+inline bool OTodo::operator!=( const OTodo &toDoEvent ) const
+{
     return !(*this == toDoEvent);
 }
 
 }
 
 #endif