the usual cosmetics

24 files changed, 851 insertions, 650 deletions

diff --git a/Rules.make b/Rules.make
index 0360cc6..84b7dab 100644
--- a/Rules.make
+++ b/Rules.make
@@ -112,2 +112,4 @@ $(OPIEDIR)/stamp-headers :
 	( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
+	( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
+	( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; )
 	( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
diff --git a/libopie2/opiepim/core/oconversion.cpp b/libopie2/opiepim/core/oconversion.cpp
index b7eebef..160c2c6 100644
--- a/libopie2/opiepim/core/oconversion.cpp
+++ b/libopie2/opiepim/core/oconversion.cpp
@@ -1,30 +1,30 @@
 /*

-                             This file is part of the Opie Project

-                             Copyright (C) The Main Author <main-author@whereever.org>

-              =.             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.

+                            This file is part of the Opie Project

+             =.             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.

 */

 

+/* OPIE */

 #include <opie2/oconversion.h>

@@ -32,4 +32,4 @@
 

-

-namespace Opie {

+namespace Opie

+{

 

@@ -37,89 +37,100 @@ QString OConversion::dateToString( const QDate &d )
 {

-	if ( d.isNull() || !d.isValid() )

-		return QString::null;

+    if ( d.isNull() || !d.isValid() )

+        return QString::null;

 

-	// ISO format in year, month, day (YYYYMMDD); e.g. 20021231

-	QString year = QString::number( d.year() );

-	QString month = QString::number( d.month() );

-	month = month.rightJustify( 2, '0' );

-	QString day = QString::number( d.day() );

-	day = day.rightJustify( 2, '0' );

+    // ISO format in year, month, day (YYYYMMDD); e.g. 20021231

+    QString year = QString::number( d.year() );

+    QString month = QString::number( d.month() );

+    month = month.rightJustify( 2, '0' );

+    QString day = QString::number( d.day() );

+    day = day.rightJustify( 2, '0' );

 

-	QString str = year + month + day;

-	//qDebug( "\tPimContact dateToStr = %s", str.latin1() );

+    QString str = year + month + day;

+    //qDebug( "\tPimContact dateToStr = %s", str.latin1() );

 

-	return str;

+    return str;

 }

 

+

 QDate OConversion::dateFromString( const QString& s )

 {

-	QDate date;

-

-	if ( s.isEmpty() )

-		return date;

-

-	// Be backward compatible to old Opie format:

-	// Try to load old format. If it fails, try new ISO-Format!

-	date = TimeConversion::fromString ( s );

-	if ( date.isValid() )

-		return date;

-

-	// Read ISO-Format (YYYYMMDD)

-	int year = s.mid(0, 4).toInt();

-	int month = s.mid(4,2).toInt();

-	int day = s.mid(6,2).toInt();

-

-	// do some quick sanity checking -eilers

-        // but we isValid() again? -zecke

-	if ( year < 1900 || year > 3000 ) {

-		qWarning( "PimContact year is not in range");

-		return date;

-	}

-	if ( month < 0 || month > 12 ) {

-		qWarning( "PimContact month is not in range");

-		return date;

-	}

-	if ( day < 0 || day > 31 ) {

-		qWarning( "PimContact day is not in range");

-		return date;

-	}

-

-	date.setYMD( year, month, day );

-	if ( !date.isValid() ) {

-		qWarning( "PimContact date is not valid");

-		return date;

-	}

-

-	return date;

+    QDate date;

+

+    if ( s.isEmpty() )

+        return date;

+

+    // Be backward compatible to old Opie format:

+    // Try to load old format. If it fails, try new ISO-Format!

+    date = TimeConversion::fromString ( s );

+    if ( date.isValid() )

+        return date;

+

+    // Read ISO-Format (YYYYMMDD)

+    int year = s.mid( 0, 4 ).toInt();

+    int month = s.mid( 4, 2 ).toInt();

+    int day = s.mid( 6, 2 ).toInt();

+

+    // do some quick sanity checking -eilers

+    // but we isValid() again? -zecke

+    if ( year < 1900 || year > 3000 )

+    {

+        qWarning( "PimContact year is not in range" );

+        return date;

+    }

+    if ( month < 0 || month > 12 )

+    {

+        qWarning( "PimContact month is not in range" );

+        return date;

+    }

+    if ( day < 0 || day > 31 )

+    {

+        qWarning( "PimContact day is not in range" );

+        return date;

+    }

+

+    date.setYMD( year, month, day );

+    if ( !date.isValid() )

+    {

+        qWarning( "PimContact date is not valid" );

+        return date;

+    }

+

+    return date;

 }

-QString OConversion::dateTimeToString( const QDateTime& dt ) {

-    if (!dt.isValid() || dt.isNull() ) return QString::null;

 

-    QString year  = QString::number( dt.date().year()   );

-    QString month = QString::number( dt.date().month()  );

-    QString day   = QString::number( dt.date().day()    );

 

-    QString hour  = QString::number( dt.time().hour()   );

-    QString min   = QString::number( dt.time().minute() );

-    QString sec   = QString::number( dt.time().second() );

+QString OConversion::dateTimeToString( const QDateTime& dt )

+{

+    if ( !dt.isValid() || dt.isNull() )

+        return QString::null;

 

-    month = month.rightJustify( 2, '0' );

-    day   = day.  rightJustify( 2, '0' );

-    hour  = hour. rightJustify( 2, '0' );

-    min   = min.  rightJustify( 2, '0' );

-    sec   = sec.  rightJustify( 2, '0' );

+    QString year = QString::number( dt.date().year() );

+    QString month = QString::number( dt.date().month() );

+    QString day = QString::number( dt.date().day() );

 

-    QString str = day + month + year + hour + min + sec;

+    QString hour = QString::number( dt.time().hour() );

+    QString min = QString::number( dt.time().minute() );

+    QString sec = QString::number( dt.time().second() );

 

-    return str;

+    month = month.rightJustify( 2, '0' );

+    day = day. rightJustify( 2, '0' );

+    hour = hour. rightJustify( 2, '0' );

+    min = min. rightJustify( 2, '0' );

+    sec = sec. rightJustify( 2, '0' );

+

+    return day + month + year + hour + min + sec;

 }

-QDateTime OConversion::dateTimeFromString( const QString& str) {

 

-    if ( str.isEmpty() ) return QDateTime();

-    int day   = str.mid(0, 2).toInt();

-    int month = str.mid(2, 2).toInt();

-    int year  = str.mid(4, 4).toInt();

-    int hour  = str.mid(8, 2).toInt();

-    int min   = str.mid(10, 2).toInt();

-    int sec   = str.mid(12, 2).toInt();

+

+QDateTime OConversion::dateTimeFromString( const QString& str )

+{

+

+    if ( str.isEmpty() )

+        return QDateTime();

+    int day = str.mid( 0, 2 ).toInt();

+    int month = str.mid( 2, 2 ).toInt();

+    int year = str.mid( 4, 4 ).toInt();

+    int hour = str.mid( 8, 2 ).toInt();

+    int min = str.mid( 10, 2 ).toInt();

+    int sec = str.mid( 12, 2 ).toInt();

 

@@ -131,2 +142,2 @@ QDateTime OConversion::dateTimeFromString( const QString& str) {
 

-}
\ No newline at end of file
+}

diff --git a/libopie2/opiepim/core/oconversion.h b/libopie2/opiepim/core/oconversion.h
index 3c4fdf3..eeb97e5 100644
--- a/libopie2/opiepim/core/oconversion.h
+++ b/libopie2/opiepim/core/oconversion.h
@@ -29,7 +29,6 @@
 
-#ifndef __oconversion_h__
-#define __oconversion_h__
+#ifndef OCONVERSION_H
+#define OCONVERSION_H
 
-/* #include <time.h> */
-/* #include <sys/types.h> */
+/* QT */
 #include <qdatetime.h>
diff --git a/libopie2/opiepim/core/opimcache.h b/libopie2/opiepim/core/opimcache.h
index e70a910..a033574 100644
--- a/libopie2/opiepim/core/opimcache.h
+++ b/libopie2/opiepim/core/opimcache.h
@@ -28,9 +28,11 @@
 */
-#ifndef OPIE_PIM_CACHE_H
-#define OPIE_PIM_CACHE_H
-
-#include <qintcache.h>
+#ifndef OPIMCACHE_H
+#define OPIMCACHE_H
 
+/* OPIE */
 #include <opie2/opimrecord.h>
 
+/* QT */
+#include <qintcache.h>
+
 namespace Opie {
diff --git a/libopie2/opiepim/core/opimmaintainer.cpp b/libopie2/opiepim/core/opimmaintainer.cpp
index b2eff12..b8d829a 100644
--- a/libopie2/opiepim/core/opimmaintainer.cpp
+++ b/libopie2/opiepim/core/opimmaintainer.cpp
@@ -29,3 +29,3 @@
 
-#include <opie2/opimmaintainer.h>
+#include "opimmaintainer.h"
 
diff --git a/libopie2/opiepim/core/opimmaintainer.h b/libopie2/opiepim/core/opimmaintainer.h
index 46bc9d2..e7e7eeb 100644
--- a/libopie2/opiepim/core/opimmaintainer.h
+++ b/libopie2/opiepim/core/opimmaintainer.h
@@ -28,5 +28,6 @@
 */
-#ifndef OPIE_PIM_MAINTAINER_H
-#define OPIE_PIM_MAINTAINER_H
+#ifndef OPIMMAINTAINER_H
+#define OPIMMAINTAINER_H
 
+/* QT */
 #include <qstring.h>
diff --git a/libopie2/opiepim/core/opimresolver.cpp b/libopie2/opiepim/core/opimresolver.cpp
index eceabcb..73d7de1 100644
--- a/libopie2/opiepim/core/opimresolver.cpp
+++ b/libopie2/opiepim/core/opimresolver.cpp
@@ -28,11 +28,12 @@
 */
-#include <qcopchannel_qws.h>
 
-#include <qpe/qcopenvelope_qws.h>
+#include "opimresolver.h"
 
-#include <opie2/otodoaccess.h>
+/* OPIE */
 #include <opie2/ocontactaccess.h>
+#include <opie2/otodoaccess.h>
+#include <qpe/qcopenvelope_qws.h>
 
-//#include "opimfactory.h"
-#include <opie2/opimresolver.h>
+/* QT */
+#include <qcopchannel_qws.h>
 
diff --git a/libopie2/opiepim/core/opimresolver.h b/libopie2/opiepim/core/opimresolver.h
index adc7c16..dd6f07f 100644
--- a/libopie2/opiepim/core/opimresolver.h
+++ b/libopie2/opiepim/core/opimresolver.h
@@ -28,5 +28,9 @@
 */
-#ifndef OPIE_PIM_RESOLVER
-#define OPIE_PIM_RESOLVER
+#ifndef OPIMRESOLVER_H
+#define OPIMRESOLVER_H
 
+/* OPIE */
+#include <opie2/otemplatebase.h>
+
+/* QT */
 #include <qstring.h>
@@ -34,4 +38,2 @@
 
-#include <opie2/otemplatebase.h>
-
 namespace Opie {
@@ -49,3 +51,4 @@ namespace Opie {
 class OPimResolver {
-public:
+  
+  public:
     enum BuiltIn { TodoList = 0,
@@ -102,3 +105,4 @@ public:
     OPimBase* backend( int rtti );
-private:
+    
+  private:
     OPimResolver();
diff --git a/libopie2/opiepim/core/opimstate.cpp b/libopie2/opiepim/core/opimstate.cpp
index 1013a1c..8aff558 100644
--- a/libopie2/opiepim/core/opimstate.cpp
+++ b/libopie2/opiepim/core/opimstate.cpp
@@ -28,6 +28,7 @@
 */
-#include <qshared.h>
-
 #include "opimstate.h"
 
+/* QT */
+#include <qshared.h>
+
 namespace Opie {
diff --git a/libopie2/opiepim/core/opimstate.h b/libopie2/opiepim/core/opimstate.h
index 78e8cd0..8336b3e 100644
--- a/libopie2/opiepim/core/opimstate.h
+++ b/libopie2/opiepim/core/opimstate.h
@@ -28,5 +28,6 @@
 */
-#ifndef OPIE_PIM_STATE_H
-#define OPIE_PIM_STATE_H
+#ifndef OPIMSTATE_H
+#define OPIMSTATE_H
 
+/* QT */
 #include <qstring.h>
@@ -46,3 +47,4 @@ namespace Opie {
 class OPimState {
-public:
+
+  public:
     enum State {
@@ -62,3 +64,4 @@ public:
     int state()const;
-private:
+    
+  private:
     void deref();
diff --git a/libopie2/opiepim/core/opimxref.cpp b/libopie2/opiepim/core/opimxref.cpp
index 85d3345..f58ebb5 100644
--- a/libopie2/opiepim/core/opimxref.cpp
+++ b/libopie2/opiepim/core/opimxref.cpp
@@ -28,3 +28,3 @@
 */
-#include <opie2/opimxref.h>
+#include "opimxref.h"
 
@@ -38,4 +38,3 @@ OPimXRef::OPimXRef( const OPimXRefPartner& one, const OPimXRefPartner& two )
 }
-OPimXRef::OPimXRef()
-    : m_partners(2)
+OPimXRef::OPimXRef():m_partners(2)
 {
@@ -43,2 +42,3 @@ OPimXRef::OPimXRef()
 }
+
 OPimXRef::OPimXRef( const OPimXRef& ref) {
@@ -46,4 +46,6 @@ OPimXRef::OPimXRef( const OPimXRef& ref) {
 }
+
 OPimXRef::~OPimXRef() {
 }
+
 OPimXRef &OPimXRef::operator=( const OPimXRef& ref) {
@@ -52,4 +54,5 @@ OPimXRef &OPimXRef::operator=( const OPimXRef& ref) {
 
-    return* this;
+    return *this;
 }
+
 bool OPimXRef::operator==( const OPimXRef& oper ) {
@@ -62,2 +65,3 @@ OPimXRefPartner OPimXRef::partner( enum Partners par) const{
 }
+
 void OPimXRef::setPartner( enum Partners par,  const OPimXRefPartner& part) {
@@ -65,2 +69,3 @@ void OPimXRef::setPartner( enum Partners par,  const OPimXRefPartner& part) {
 }
+
 bool OPimXRef::containsString( const QString& string ) const{
@@ -71,2 +76,3 @@ bool OPimXRef::containsString( const QString& string ) const{
 }
+
 bool OPimXRef::containsUid( int uid ) const{
diff --git a/libopie2/opiepim/core/opimxref.h b/libopie2/opiepim/core/opimxref.h
index 820c9c4..f3e814e 100644
--- a/libopie2/opiepim/core/opimxref.h
+++ b/libopie2/opiepim/core/opimxref.h
@@ -29,5 +29,9 @@
 
-#ifndef OPIM_XREF_H
-#define OPIM_XREF_H
+#ifndef OPIMXREF_H
+#define OPIMXREF_H
 
+/* OPIE */
+#include <opie2/opimxrefpartner.h>
+
+/* QT */
 #include <qarray.h>
@@ -35,4 +39,2 @@
 
-#include <opie2/opimxrefpartner.h>
-
 namespace Opie {
@@ -43,3 +45,3 @@ namespace Opie {
 class OPimXRef {
-public:
+  public:
     typedef QValueList<OPimXRef> ValueList;
@@ -54,10 +56,10 @@ public:
 
-    OPimXRefPartner partner( enum Partners )const;
+    OPimXRefPartner partner( enum Partners ) const;
 
-    void setPartner( enum Partners,  const OPimXRefPartner& );
+    void setPartner( enum Partners, const OPimXRefPartner& );
 
-    bool containsString( const QString& service)const;
-    bool containsUid( int uid )const;
+    bool containsString( const QString& service) const;
+    bool containsUid( int uid ) const;
 
-private:
+  private:
     QArray<OPimXRefPartner> m_partners;
diff --git a/libopie2/opiepim/core/opimxrefmanager.cpp b/libopie2/opiepim/core/opimxrefmanager.cpp
index bf6fed6..e7c6c5a 100644
--- a/libopie2/opiepim/core/opimxrefmanager.cpp
+++ b/libopie2/opiepim/core/opimxrefmanager.cpp
@@ -28,3 +28,3 @@
 */
-#include <opie2/opimxrefmanager.h>
+#include "opimxrefmanager.h"
 
@@ -34,2 +34,3 @@ OPimXRefManager::OPimXRefManager() {
 }
+
 OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
@@ -37,4 +38,6 @@ OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
 }
+
 OPimXRefManager::~OPimXRefManager() {
 }
+
 OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
@@ -43,2 +46,3 @@ OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
 }
+
 bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
@@ -48,2 +52,3 @@ bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
 }
+
 void OPimXRefManager::add( const OPimXRef& ref) {
@@ -51,2 +56,3 @@ void OPimXRefManager::add( const OPimXRef& ref) {
 }
+
 void OPimXRefManager::remove( const OPimXRef& ref) {
@@ -54,2 +60,3 @@ void OPimXRefManager::remove( const OPimXRef& ref) {
 }
+
 void OPimXRefManager::replace( const OPimXRef& ref) {
@@ -58,2 +65,3 @@ void OPimXRefManager::replace( const OPimXRef& ref) {
 }
+
 void OPimXRefManager::clear() {
@@ -61,3 +69,4 @@ void OPimXRefManager::clear() {
 }
-QStringList OPimXRefManager::apps()const {
+
+QStringList OPimXRefManager::apps() const {
     OPimXRef::ValueList::ConstIterator it;
@@ -75,6 +84,8 @@ QStringList OPimXRefManager::apps()const {
 }
-OPimXRef::ValueList OPimXRefManager::list()const {
+
+OPimXRef::ValueList OPimXRefManager::list() const {
     return m_list;
 }
-OPimXRef::ValueList OPimXRefManager::list( const QString& appName )const{
+
+OPimXRef::ValueList OPimXRefManager::list( const QString& appName ) const{
     OPimXRef::ValueList list;
@@ -89,3 +100,4 @@ OPimXRef::ValueList OPimXRefManager::list( const QString& appName )const{
 }
-OPimXRef::ValueList OPimXRefManager::list( int uid )const {
+
+OPimXRef::ValueList OPimXRefManager::list( int uid ) const {
     OPimXRef::ValueList list;
diff --git a/libopie2/opiepim/core/opimxrefmanager.h b/libopie2/opiepim/core/opimxrefmanager.h
index fa2d7f4..b80a645 100644
--- a/libopie2/opiepim/core/opimxrefmanager.h
+++ b/libopie2/opiepim/core/opimxrefmanager.h
@@ -28,9 +28,12 @@
 */
-#ifndef OPIM_XREF_MANAGER_H
-#define OPIM_XREF_MANAGER_H
 
-#include <qstringlist.h>
+#ifndef OPIMXREFMANAGER_H
+#define OPIMXREFMANAGER_H
 
+/* OPIE */
 #include <opie2/opimxref.h>
 
+/* QT */
+#include <qstringlist.h>
+
 namespace Opie {
diff --git a/libopie2/opiepim/core/opimxrefpartner.cpp b/libopie2/opiepim/core/opimxrefpartner.cpp
index f6ccc7f..3741bc3 100644
--- a/libopie2/opiepim/core/opimxrefpartner.cpp
+++ b/libopie2/opiepim/core/opimxrefpartner.cpp
@@ -28,3 +28,3 @@
 */
-#include <opie2/opimxrefpartner.h>
+#include "opimxrefpartner.h"
 
@@ -36,2 +36,3 @@ OPimXRefPartner::OPimXRefPartner( const QString& appName,
 }
+
 OPimXRefPartner::OPimXRefPartner( const OPimXRefPartner& ref ) {
@@ -39,4 +40,6 @@ OPimXRefPartner::OPimXRefPartner( const OPimXRefPartner& ref ) {
 }
+
 OPimXRefPartner::~OPimXRefPartner() {
 }
+
 OPimXRefPartner &OPimXRefPartner::operator=( const OPimXRefPartner& par ) {
@@ -48,2 +51,3 @@ OPimXRefPartner &OPimXRefPartner::operator=( const OPimXRefPartner& par ) {
 }
+
 bool OPimXRefPartner::operator==( const OPimXRefPartner& par ) {
@@ -55,2 +59,3 @@ bool OPimXRefPartner::operator==( const OPimXRefPartner& par ) {
 }
+
 QString OPimXRefPartner::service()const {
@@ -58,2 +63,3 @@ QString OPimXRefPartner::service()const {
 }
+
 int OPimXRefPartner::uid()const {
@@ -61,2 +67,3 @@ int OPimXRefPartner::uid()const {
 }
+
 int OPimXRefPartner::field()const {
@@ -64,2 +71,3 @@ int OPimXRefPartner::field()const {
 }
+
 void OPimXRefPartner::setService( const QString& appName ) {
@@ -67,2 +75,3 @@ void OPimXRefPartner::setService( const QString& appName ) {
 }
+
 void OPimXRefPartner::setUid( int uid ) {
@@ -70,2 +79,3 @@ void OPimXRefPartner::setUid( int uid ) {
 }
+
 void OPimXRefPartner::setField( int field ) {
diff --git a/libopie2/opiepim/core/opimxrefpartner.h b/libopie2/opiepim/core/opimxrefpartner.h
index 6853d5b..005dbc0 100644
--- a/libopie2/opiepim/core/opimxrefpartner.h
+++ b/libopie2/opiepim/core/opimxrefpartner.h
@@ -31,2 +31,3 @@
 
+/* QT */
 #include <qstring.h>
@@ -42,3 +43,4 @@ namespace Opie {
 class OPimXRefPartner {
-public:
+
+  public:
     OPimXRefPartner( const QString& service = QString::null,
@@ -58,3 +60,4 @@ public:
     void setField( int field );
-private:
+    
+  private:
     QString m_app;
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
index 033f264..5e2da25 100644
--- a/libopie2/opiepim/core/orecur.cpp
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -29,12 +29,16 @@
 
-#include <time.h>
+#include "orecur.h"
 
-#include <qshared.h>
+/* OPIE */
+#include <opie2/otimezone.h>
+#include <qpe/timeconversion.h>
 
-#include <qtopia/timeconversion.h>
+/* QT */
+#include <qshared.h>
 
-#include <opie2/otimezone.h>
-#include <opie2/orecur.h>
+/* STD */
+#include <time.h>
 
 namespace Opie {
+
 struct ORecur::Data : public QShared {
@@ -69,4 +73,4 @@ ORecur::ORecur( const QMap<int, QString>& map )
 {
-	ORecur();
-	fromMap( map );
+    ORecur();
+    fromMap( map );
 }
@@ -79,2 +83,4 @@ ORecur::ORecur( const ORecur& rec)
 }
+
+
 ORecur::~ORecur() {
@@ -85,2 +91,4 @@ ORecur::~ORecur() {
 }
+
+
 void ORecur::deref() {
@@ -91,2 +99,4 @@ void ORecur::deref() {
 }
+
+
 bool ORecur::operator==( const ORecur& )const {
@@ -94,2 +104,4 @@ bool ORecur::operator==( const ORecur& )const {
 }
+
+
 ORecur &ORecur::operator=( const ORecur& re) {
@@ -103,2 +115,4 @@ ORecur &ORecur::operator=( const ORecur& re) {
 }
+
+
 bool ORecur::doesRecur()const {
@@ -106,2 +120,4 @@ bool ORecur::doesRecur()const {
 }
+
+
 /*
@@ -120,2 +136,4 @@ bool ORecur::doesRecur( const QDate& date ) {
 }
+
+
 // FIXME unuglify!
@@ -131,2 +149,4 @@ bool ORecur::nextOcurrence( const QDate& from, QDate& next ) {
 }
+
+
 bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
@@ -144,7 +164,7 @@ bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
     if (hasEndDate() && endDate() < from)
-	return FALSE;
+        return FALSE;
 
     if (start() >= from  ) {
-	next = start();
-	return TRUE;
+        next = start();
+        return TRUE;
     }
@@ -152,253 +172,255 @@ bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
     switch ( type() ) {
-	case Weekly:
-	    /* weekly is just daily by 7 */
-	    /* first convert the repeatPattern.Days() mask to the next
-	       day of week valid after from */
+        case Weekly:
+            /* weekly is just daily by 7 */
+            /* first convert the repeatPattern.Days() mask to the next
+            day of week valid after from */
             dayOfWeek = from.dayOfWeek();
-	    dayOfWeek--; /* we want 0-6, doco for above specs 1-7 */
-
-	    /* this is done in case freq > 1 and from in week not
-	       for this round */
-	    // firstOfWeek = 0; this is already done at decl.
-	    while(!((1 << firstOfWeek) & days() ))
-		firstOfWeek++;
-
-	    /* there is at least one 'day', or there would be no event */
-	    while(!((1 << (dayOfWeek % 7)) & days() ))
-		dayOfWeek++;
-
-	    dayOfWeek = dayOfWeek % 7; /* the actual day of week */
-	    dayOfWeek -= start().dayOfWeek() -1;
-
-	    firstOfWeek = firstOfWeek % 7; /* the actual first of week */
-	    firstOfWeek -= start().dayOfWeek() -1;
-
-	    // dayOfWeek may be negitive now
-	    // day of week is number of days to add to start day
-
-	    freq *= 7;
-	    // FALL-THROUGH !!!!!
-	case Daily:
-	    // the add is for the possible fall through from weekly */
-	    if(start().addDays(dayOfWeek) > from) {
-		/* first week exception */
-		next = QDate(start().addDays(dayOfWeek) );
-		if ((next > endDate())
-		    && hasEndDate() )
-		    return FALSE;
-		return TRUE;
-	    }
-	    /* if from is middle of a non-week */
-
-	    diff = start().addDays(dayOfWeek).daysTo(from) % freq;
-	    diff2 = start().addDays(firstOfWeek).daysTo(from) % freq;
-
-	    if(diff != 0)
-		diff = freq - diff;
-	    if(diff2 != 0)
-		diff2 = freq - diff2;
-	    diff = QMIN(diff, diff2);
-
-	    next = QDate(from.addDays(diff));
-	    if ( (next > endDate())
-		 && hasEndDate() )
-		return FALSE;
-	    return TRUE;
-	case MonthlyDay:
-	    iday = from.day();
-	    iyear = from.year();
-	    imonth = from.month();
-	    /* find equivelent day of month for this month */
-	    dayOfWeek = start().dayOfWeek();
-	    weekOfMonth = (start().day() - 1) / 7;
-
-	    /* work out when the next valid month is */
-	    a = from.year() - start().year();
-	    a *= 12;
-	    a = a + (imonth - start().month());
-	    /* a is e.start()monthsFrom(from); */
-	    if(a % freq) {
-		a = freq - (a % freq);
-		imonth = from.month() + a;
-		if (imonth > 12) {
-		    imonth--;
-		    iyear += imonth / 12;
-		    imonth = imonth % 12;
-		    imonth++;
-		}
-	    }
-	    /* imonth is now the first month after or on
-	       from that matches the frequency given */
-
-	    /* find for this month */
-	    tmpDate = QDate( iyear, imonth, 1 );
-
-	    iday = 1;
-	    iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
-	    iday += 7 * weekOfMonth;
-	    while (iday > tmpDate.daysInMonth()) {
-		imonth += freq;
-		if (imonth > 12) {
-		    imonth--;
-		    iyear += imonth / 12;
-		    imonth = imonth % 12;
-		    imonth++;
-		}
-		tmpDate = QDate( iyear, imonth, 1 );
-		/* these loops could go for a while, check end case now */
-		if ((tmpDate > endDate()) && hasEndDate() )
-		    return FALSE;
-		iday = 1;
-		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
-		iday += 7 * weekOfMonth;
-	    }
-	    tmpDate = QDate(iyear, imonth, iday);
-
-	    if (tmpDate >= from) {
-		next = tmpDate;
-		if ((next > endDate() ) && hasEndDate() )
-		    return FALSE;
-		return TRUE;
-	    }
-
-	    /* need to find the next iteration */
-	    do {
-		imonth += freq;
-		if (imonth > 12) {
-		    imonth--;
-		    iyear += imonth / 12;
-		    imonth = imonth % 12;
-		    imonth++;
-		}
-		tmpDate = QDate( iyear, imonth, 1 );
-		/* these loops could go for a while, check end case now */
-		if ((tmpDate > endDate()) && hasEndDate() )
-		    return FALSE;
-		iday = 1;
-		iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
-		iday += 7 * weekOfMonth;
-	    } while (iday > tmpDate.daysInMonth());
-	    tmpDate = QDate(iyear, imonth, iday);
-
-	    next = tmpDate;
-	    if ((next > endDate()) && hasEndDate() )
-		return FALSE;
-	    return TRUE;
-	case MonthlyDate:
-	    iday = start().day();
-	    iyear = from.year();
-	    imonth = from.month();
-
-	    a = from.year() - start().year();
-	    a *= 12;
-	    a = a + (imonth - start().month());
-	    /* a is e.start()monthsFrom(from); */
-	    if(a % freq) {
-		a = freq - (a % freq);
-		imonth = from.month() + a;
-		if (imonth > 12) {
-		    imonth--;
-		    iyear += imonth / 12;
-		    imonth = imonth % 12;
-		    imonth++;
-		}
-	    }
-	    /* imonth is now the first month after or on
-	       from that matches the frequencey given */
-
-	    /* this could go for a while, worse case, 4*12 iterations, probably */
-	    while(!QDate::isValid(iyear, imonth, iday) ) {
-		imonth += freq;
-		if (imonth > 12) {
-		    imonth--;
-		    iyear += imonth / 12;
-		    imonth = imonth % 12;
-		    imonth++;
-		}
-		/* these loops could go for a while, check end case now */
-		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
-		    return FALSE;
-	    }
-
-	    if(QDate(iyear, imonth, iday) >= from) {
-		/* done */
-		next = QDate(iyear, imonth, iday);
-		if ((next > endDate()) && hasEndDate() )
-		    return FALSE;
-		return TRUE;
-	    }
-
-	    /* ok, need to cycle */
-	    imonth += freq;
-	    imonth--;
-	    iyear += imonth / 12;
-	    imonth = imonth % 12;
-	    imonth++;
-
-	    while(!QDate::isValid(iyear, imonth, iday) ) {
-		imonth += freq;
-		imonth--;
-		iyear += imonth / 12;
-		imonth = imonth % 12;
-		imonth++;
-		if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
-		    return FALSE;
-	    }
-
-	    next = QDate(iyear, imonth, iday);
-	    if ((next > endDate()) && hasEndDate() )
-		return FALSE;
-	    return TRUE;
-	case Yearly:
-	    iday = start().day();
-	    imonth = start().month();
-	    iyear = from.year(); // after all, we want to start in this year
-
-	    diff = 1;
-	    if(imonth == 2 && iday > 28) {
-		/* leap year, and it counts, calculate actual frequency */
-		if(freq % 4)
-		    if (freq % 2)
-			freq = freq * 4;
-		    else
-			freq = freq * 2;
-		/* else divides by 4 already, leave freq alone */
-		diff = 4;
-	    }
-
-	    a = from.year() - start().year();
-	    if(a % freq) {
-		a = freq - (a % freq);
-		iyear = iyear + a;
-	    }
-
-	    /* under the assumption we won't hit one of the special not-leap years twice */
-	    if(!QDate::isValid(iyear, imonth, iday)) {
-		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
-		iyear += freq;
-	    }
-
-	    if(QDate(iyear, imonth, iday) >= from) {
-		next = QDate(iyear, imonth, iday);
-
-		if ((next > endDate()) && hasEndDate() )
-		    return FALSE;
-		return TRUE;
-	    }
-	    /* iyear == from.year(), need to advance again */
-	    iyear += freq;
-	    /* under the assumption we won't hit one of the special not-leap years twice */
-	    if(!QDate::isValid(iyear, imonth, iday)) {
-		/* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
-		iyear += freq;
-	    }
-
-	    next = QDate(iyear, imonth, iday);
-	    if ((next > endDate()) && hasEndDate() )
-		return FALSE;
-	    return TRUE;
-	default:
-	    return FALSE;
+            dayOfWeek--; /* we want 0-6, doco for above specs 1-7 */
+
+            /* this is done in case freq > 1 and from in week not
+            for this round */
+            // firstOfWeek = 0; this is already done at decl.
+            while(!((1 << firstOfWeek) & days() ))
+                firstOfWeek++;
+
+            /* there is at least one 'day', or there would be no event */
+            while(!((1 << (dayOfWeek % 7)) & days() ))
+                dayOfWeek++;
+
+            dayOfWeek = dayOfWeek % 7; /* the actual day of week */
+            dayOfWeek -= start().dayOfWeek() -1;
+
+            firstOfWeek = firstOfWeek % 7; /* the actual first of week */
+            firstOfWeek -= start().dayOfWeek() -1;
+
+            // dayOfWeek may be negitive now
+            // day of week is number of days to add to start day
+
+            freq *= 7;
+            // FALL-THROUGH !!!!!
+        case Daily:
+            // the add is for the possible fall through from weekly */
+            if(start().addDays(dayOfWeek) > from) {
+                /* first week exception */
+                next = QDate(start().addDays(dayOfWeek) );
+                if ((next > endDate())
+                    && hasEndDate() )
+                    return FALSE;
+                return TRUE;
+            }
+            /* if from is middle of a non-week */
+
+            diff = start().addDays(dayOfWeek).daysTo(from) % freq;
+            diff2 = start().addDays(firstOfWeek).daysTo(from) % freq;
+
+            if(diff != 0)
+                diff = freq - diff;
+            if(diff2 != 0)
+                diff2 = freq - diff2;
+            diff = QMIN(diff, diff2);
+
+            next = QDate(from.addDays(diff));
+            if ( (next > endDate())
+                && hasEndDate() )
+                return FALSE;
+            return TRUE;
+        case MonthlyDay:
+            iday = from.day();
+            iyear = from.year();
+            imonth = from.month();
+            /* find equivelent day of month for this month */
+            dayOfWeek = start().dayOfWeek();
+            weekOfMonth = (start().day() - 1) / 7;
+
+            /* work out when the next valid month is */
+            a = from.year() - start().year();
+            a *= 12;
+            a = a + (imonth - start().month());
+            /* a is e.start()monthsFrom(from); */
+            if(a % freq) {
+                a = freq - (a % freq);
+                imonth = from.month() + a;
+                if (imonth > 12) {
+                    imonth--;
+                    iyear += imonth / 12;
+                    imonth = imonth % 12;
+                    imonth++;
+                }
+            }
+            /* imonth is now the first month after or on
+            from that matches the frequency given */
+
+            /* find for this month */
+            tmpDate = QDate( iyear, imonth, 1 );
+
+            iday = 1;
+            iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
+            iday += 7 * weekOfMonth;
+            while (iday > tmpDate.daysInMonth()) {
+                imonth += freq;
+                if (imonth > 12) {
+                    imonth--;
+                    iyear += imonth / 12;
+                    imonth = imonth % 12;
+                    imonth++;
+                }
+                tmpDate = QDate( iyear, imonth, 1 );
+                /* these loops could go for a while, check end case now */
+                if ((tmpDate > endDate()) && hasEndDate() )
+                    return FALSE;
+                iday = 1;
+                iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
+                iday += 7 * weekOfMonth;
+            }
+            tmpDate = QDate(iyear, imonth, iday);
+
+            if (tmpDate >= from) {
+                next = tmpDate;
+                if ((next > endDate() ) && hasEndDate() )
+                    return FALSE;
+                return TRUE;
+            }
+
+            /* need to find the next iteration */
+            do {
+                imonth += freq;
+                if (imonth > 12) {
+                    imonth--;
+                    iyear += imonth / 12;
+                    imonth = imonth % 12;
+                    imonth++;
+                }
+                tmpDate = QDate( iyear, imonth, 1 );
+                /* these loops could go for a while, check end case now */
+                if ((tmpDate > endDate()) && hasEndDate() )
+                    return FALSE;
+                iday = 1;
+                iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7;
+                iday += 7 * weekOfMonth;
+            } while (iday > tmpDate.daysInMonth());
+            tmpDate = QDate(iyear, imonth, iday);
+
+            next = tmpDate;
+            if ((next > endDate()) && hasEndDate() )
+                return FALSE;
+            return TRUE;
+        case MonthlyDate:
+            iday = start().day();
+            iyear = from.year();
+            imonth = from.month();
+
+            a = from.year() - start().year();
+            a *= 12;
+            a = a + (imonth - start().month());
+            /* a is e.start()monthsFrom(from); */
+            if(a % freq) {
+                a = freq - (a % freq);
+                imonth = from.month() + a;
+                if (imonth > 12) {
+                    imonth--;
+                    iyear += imonth / 12;
+                    imonth = imonth % 12;
+                    imonth++;
+                }
+            }
+            /* imonth is now the first month after or on
+            from that matches the frequencey given */
+
+            /* this could go for a while, worse case, 4*12 iterations, probably */
+            while(!QDate::isValid(iyear, imonth, iday) ) {
+                imonth += freq;
+                if (imonth > 12) {
+                    imonth--;
+                    iyear += imonth / 12;
+                    imonth = imonth % 12;
+                    imonth++;
+                }
+                /* these loops could go for a while, check end case now */
+                if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
+                    return FALSE;
+            }
+
+            if(QDate(iyear, imonth, iday) >= from) {
+                /* done */
+                next = QDate(iyear, imonth, iday);
+                if ((next > endDate()) && hasEndDate() )
+                    return FALSE;
+                return TRUE;
+            }
+
+            /* ok, need to cycle */
+            imonth += freq;
+            imonth--;
+            iyear += imonth / 12;
+            imonth = imonth % 12;
+            imonth++;
+
+            while(!QDate::isValid(iyear, imonth, iday) ) {
+                imonth += freq;
+                imonth--;
+                iyear += imonth / 12;
+                imonth = imonth % 12;
+                imonth++;
+                if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() )
+                    return FALSE;
+            }
+
+            next = QDate(iyear, imonth, iday);
+            if ((next > endDate()) && hasEndDate() )
+                return FALSE;
+            return TRUE;
+        case Yearly:
+            iday = start().day();
+            imonth = start().month();
+            iyear = from.year(); // after all, we want to start in this year
+
+            diff = 1;
+            if(imonth == 2 && iday > 28) {
+                /* leap year, and it counts, calculate actual frequency */
+                if(freq % 4)
+                    if (freq % 2)
+                        freq = freq * 4;
+                    else
+                        freq = freq * 2;
+                /* else divides by 4 already, leave freq alone */
+                diff = 4;
+            }
+
+            a = from.year() - start().year();
+            if(a % freq) {
+                a = freq - (a % freq);
+                iyear = iyear + a;
+            }
+
+            /* under the assumption we won't hit one of the special not-leap years twice */
+            if(!QDate::isValid(iyear, imonth, iday)) {
+                /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
+                iyear += freq;
+            }
+
+            if(QDate(iyear, imonth, iday) >= from) {
+                next = QDate(iyear, imonth, iday);
+
+                if ((next > endDate()) && hasEndDate() )
+                    return FALSE;
+                return TRUE;
+            }
+            /* iyear == from.year(), need to advance again */
+            iyear += freq;
+            /* under the assumption we won't hit one of the special not-leap years twice */
+            if(!QDate::isValid(iyear, imonth, iday)) {
+                /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */
+                iyear += freq;
+            }
+
+            next = QDate(iyear, imonth, iday);
+            if ((next > endDate()) && hasEndDate() )
+                return FALSE;
+            return TRUE;
+        default:
+            return FALSE;
     }
 }
+
+
 ORecur::RepeatType ORecur::type()const{
@@ -406,2 +428,4 @@ ORecur::RepeatType ORecur::type()const{
 }
+
+
 int ORecur::frequency()const {
@@ -409,2 +433,4 @@ int ORecur::frequency()const {
 }
+
+
 int ORecur::position()const {
@@ -412,2 +438,4 @@ int ORecur::position()const {
 }
+
+
 char ORecur::days() const{
@@ -415,2 +443,4 @@ char ORecur::days() const{
 }
+
+
 bool ORecur::hasEndDate()const {
@@ -418,2 +448,4 @@ bool ORecur::hasEndDate()const {
 }
+
+
 QDate ORecur::endDate()const {
@@ -421,2 +453,4 @@ QDate ORecur::endDate()const {
 }
+
+
 QDate ORecur::start()const{
@@ -424,2 +458,4 @@ QDate ORecur::start()const{
 }
+
+
 QDateTime ORecur::createdDateTime()const {
@@ -427,2 +463,4 @@ QDateTime ORecur::createdDateTime()const {
 }
+
+
 int ORecur::repetition()const {
@@ -430,2 +468,4 @@ int ORecur::repetition()const {
 }
+
+
 QString ORecur::service()const {
@@ -433,2 +473,4 @@ QString ORecur::service()const {
 }
+
+
 ORecur::ExceptionList& ORecur::exceptions() {
@@ -436,2 +478,4 @@ ORecur::ExceptionList& ORecur::exceptions() {
 }
+
+
 void ORecur::setType( const RepeatType& z) {
@@ -440,2 +484,4 @@ void ORecur::setType( const RepeatType& z) {
 }
+
+
 void ORecur::setFrequency( int freq ) {
@@ -444,2 +490,4 @@ void ORecur::setFrequency( int freq ) {
 }
+
+
 void ORecur::setPosition( int pos ) {
@@ -448,2 +496,4 @@ void ORecur::setPosition( int pos ) {
 }
+
+
 void ORecur::setDays( char c ) {
@@ -452,2 +502,4 @@ void ORecur::setDays( char c ) {
 }
+
+
 void ORecur::setEndDate( const QDate& dt) {
@@ -456,2 +508,4 @@ void ORecur::setEndDate( const QDate& dt) {
 }
+
+
 void ORecur::setCreatedDateTime( const QDateTime& t) {
@@ -460,2 +514,4 @@ void ORecur::setCreatedDateTime( const QDateTime& t) {
 }
+
+
 void ORecur::setHasEndDate( bool b) {
@@ -464,2 +520,4 @@ void ORecur::setHasEndDate( bool b) {
 }
+
+
 void ORecur::setRepitition( int rep ) {
@@ -468,2 +526,4 @@ void ORecur::setRepitition( int rep ) {
 }
+
+
 void ORecur::setService( const QString& app ) {
@@ -472,2 +532,4 @@ void ORecur::setService( const QString& app ) {
 }
+
+
 void ORecur::setStart( const QDate& dt ) {
@@ -476,2 +538,4 @@ void ORecur::setStart( const QDate& dt ) {
 }
+
+
 void ORecur::checkOrModify() {
@@ -494,2 +558,4 @@ void ORecur::checkOrModify() {
 }
+
+
 QString ORecur::toString()const {
@@ -502,5 +568,5 @@ QString ORecur::toString()const {
     if (data->days > 0 )
-	buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\"";
+        buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\"";
     if ( data->pos != 0 )
-	buf += " rposition=\"" + recMap[ORecur::RPosition] + "\"";
+        buf += " rposition=\"" + recMap[ORecur::RPosition] + "\"";
 
@@ -509,5 +575,5 @@ QString ORecur::toString()const {
     if ( data->hasEnd )
-	buf += " enddt=\""
-	       + recMap[ORecur::EndDate]
-	       + "\"";
+        buf += " enddt=\""
+            + recMap[ORecur::EndDate]
+            + "\"";
     buf += " created=\"" + recMap[ORecur::Created] + "\"";
@@ -524,26 +590,26 @@ QString ORecur::rTypeString() const
 {
-	QString retString;
-	switch ( data->type ) {
-	case ORecur::Daily:
-		retString = "Daily";
-		break;
-	case ORecur::Weekly:
-		retString = "Weekly";
-		break;
-	case ORecur::MonthlyDay:
-		retString = "MonthlyDay";
-		break;
-	case ORecur::MonthlyDate:
-		retString = "MonthlyDate";
-		break;
-	case ORecur::Yearly:
-		retString = "Yearly";
-		break;
-	default:
-		retString = "NoRepeat";
-		break;
-
-	}
-
-	return retString;
+    QString retString;
+    switch ( data->type ) {
+    case ORecur::Daily:
+            retString = "Daily";
+            break;
+    case ORecur::Weekly:
+            retString = "Weekly";
+            break;
+    case ORecur::MonthlyDay:
+            retString = "MonthlyDay";
+            break;
+    case ORecur::MonthlyDate:
+            retString = "MonthlyDate";
+            break;
+    case ORecur::Yearly:
+            retString = "Yearly";
+            break;
+    default:
+            retString = "NoRepeat";
+            break;
+
+    }
+
+    return retString;
 }
@@ -552,12 +618,12 @@ QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const
 {
-	QMap<QString, RepeatType> convertMap;
+        QMap<QString, RepeatType> convertMap;
 
-	convertMap.insert( QString( "Daily" ), ORecur::Daily );
-	convertMap.insert( QString( "Weekly" ), ORecur::Weekly );
-	convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay );
-	convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate );
-	convertMap.insert( QString( "Yearly" ), ORecur::Yearly );
-	convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat );
+        convertMap.insert( QString( "Daily" ), ORecur::Daily );
+        convertMap.insert( QString( "Weekly" ), ORecur::Weekly );
+        convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay );
+        convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate );
+        convertMap.insert( QString( "Yearly" ), ORecur::Yearly );
+        convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat );
 
-	return convertMap;
+        return convertMap;
 }
@@ -567,30 +633,30 @@ QMap<int, QString> ORecur::toMap() const
 {
-	QMap<int, QString> retMap;
-	
-	retMap.insert( ORecur::RType, rTypeString() );
-	retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) );
-	retMap.insert( ORecur::RPosition, QString::number(data->pos ) );
-	retMap.insert( ORecur::RFreq, QString::number( data->freq ) );
-	retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
-	if( data -> hasEnd )
-		retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
-	retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) );
-	
-	if ( data->list.isEmpty() ) return retMap;
-
-	// save exceptions list here!!
-	ExceptionList::ConstIterator it;
-	ExceptionList list = data->list;
-	QString exceptBuf;
-	QDate date;
-	for ( it = list.begin(); it != list.end(); ++it ) {
-		date = (*it);
-		if ( it != list.begin() ) exceptBuf += " ";
-		
-		exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
-	}
-
-	retMap.insert( ORecur::Exceptions, exceptBuf );
-
-	return retMap;
+    QMap<int, QString> retMap;
+    
+    retMap.insert( ORecur::RType, rTypeString() );
+    retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) );
+    retMap.insert( ORecur::RPosition, QString::number(data->pos ) );
+    retMap.insert( ORecur::RFreq, QString::number( data->freq ) );
+    retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
+    if( data -> hasEnd )
+            retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
+    retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) );
+    
+    if ( data->list.isEmpty() ) return retMap;
+
+    // save exceptions list here!!
+    ExceptionList::ConstIterator it;
+    ExceptionList list = data->list;
+    QString exceptBuf;
+    QDate date;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+            date = (*it);
+            if ( it != list.begin() ) exceptBuf += " ";
+            
+            exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+    }
+
+    retMap.insert( ORecur::Exceptions, exceptBuf );
+
+    return retMap;
 }
@@ -599,27 +665,27 @@ void ORecur::fromMap( const QMap<int, QString>& map )
 {
-	QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); 
-
-	data -> type  = repTypeMap[ map [ORecur::RType] ];
-	data -> days  = (char) map[ ORecur::RWeekdays ].toInt();
-	data -> pos   = map[ ORecur::RPosition ].toInt();
-	data -> freq = map[ ORecur::RFreq ].toInt();
-	data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false;
-	OTimeZone utc = OTimeZone::utc();
-	if ( data -> hasEnd ){
-		data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date();
-	}
-	data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date();
+    QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); 
+
+    data -> type  = repTypeMap[ map [ORecur::RType] ];
+    data -> days  = (char) map[ ORecur::RWeekdays ].toInt();
+    data -> pos   = map[ ORecur::RPosition ].toInt();
+    data -> freq = map[ ORecur::RFreq ].toInt();
+    data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false;
+    OTimeZone utc = OTimeZone::utc();
+    if ( data -> hasEnd ){
+            data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date();
+    }
+    data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date();
 
 #if 0
-	// FIXME: Exceptions currently not supported...
-	// Convert the list of exceptions from QString into ExceptionList
-	data -> list.clear();
-	QString exceptStr = map[ ORecur::Exceptions ];
-	QStringList exceptList = QStringList::split( " ", exceptStr );
-	...
+    // FIXME: Exceptions currently not supported...
+    // Convert the list of exceptions from QString into ExceptionList
+    data -> list.clear();
+    QString exceptStr = map[ ORecur::Exceptions ];
+    QStringList exceptList = QStringList::split( " ", exceptStr );
+    ...
 #endif
-	
-	
+        
+        
 }
 
-}
\ No newline at end of file
+}
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
index 60508f5..7808897 100644
--- a/libopie2/opiepim/core/orecur.h
+++ b/libopie2/opiepim/core/orecur.h
@@ -29,7 +29,6 @@
 
-#ifndef OPIE_RECUR_H
-#define OPIE_RECUR_H
-
-#include <sys/types.h>
+#ifndef ORECUR_H
+#define ORECUR_H
 
+/* QT */
 #include <qdatetime.h>
@@ -38,2 +37,4 @@
 
+/* STD */
+#include <sys/types.h>
 
@@ -45,3 +46,4 @@ namespace Opie {
 class ORecur {
-public:
+
+  public:
     typedef QValueList<QDate> ExceptionList;
@@ -52,3 +54,3 @@ public:
     enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, 
-		 EndDate, Created, Exceptions };
+                EndDate, Created, Exceptions };
 
@@ -116,3 +118,4 @@ public:
     QString toString()const;
-private:
+    
+  private:
     bool p_nextOccurrence( const QDate& from, QDate& next );
diff --git a/libopie2/opiepim/core/otemplatebase.h b/libopie2/opiepim/core/otemplatebase.h
index 17d9961..58cbfeb 100644
--- a/libopie2/opiepim/core/otemplatebase.h
+++ b/libopie2/opiepim/core/otemplatebase.h
@@ -28,9 +28,10 @@
 */
-#ifndef OPIE_TEMPLATE_BASE_H
-#define OPIE_TEMPLATE_BASE_H
-
-#include <qarray.h>
+#ifndef OTEMPLATEBASE_H
+#define OTEMPLATEBASE_H
 
+/* OPIE */
 #include <opie2/opimrecord.h>
 
+/* QT */
+#include <qarray.h>
 
diff --git a/libopie2/opiepim/core/otimezone.cpp b/libopie2/opiepim/core/otimezone.cpp
index dab68af..e67715f 100644
--- a/libopie2/opiepim/core/otimezone.cpp
+++ b/libopie2/opiepim/core/otimezone.cpp
@@ -29,72 +29,86 @@
 
+#include "otimezone.h"
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <sys/types.h>
 
-#include <opie2/otimezone.h>
-
-namespace Opie {
+namespace Opie
+{
 
-    QDateTime utcTime( time_t t) {
-        tm* broken = ::gmtime( &t );
-        QDateTime ret;
-        ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon +1, broken->tm_mday ) );
-        ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
-        return ret;
-    }
-    QDateTime utcTime( time_t t, const QString&  zone) {
-        QCString org = ::getenv( "TZ" );
+QDateTime utcTime( time_t t )
+{
+    tm * broken = ::gmtime( &t );
+    QDateTime ret;
+    ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon + 1, broken->tm_mday ) );
+    ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
+    return ret;
+}
+QDateTime utcTime( time_t t, const QString& zone )
+{
+    QCString org = ::getenv( "TZ" );
 #ifndef Q_OS_MACX   // Following line causes bus errors on Mac
-        ::setenv( "TZ", zone.latin1(), true );
-        ::tzset();
 
-        tm* broken = ::localtime( &t );
-        ::setenv( "TZ", org, true );
+    ::setenv( "TZ", zone.latin1(), true );
+    ::tzset();
+
+    tm* broken = ::localtime( &t );
+    ::setenv( "TZ", org, true );
 #else
 #warning "Need a replacement for MacOSX!!"
-        tm* broken = ::localtime( &t );
+
+    tm* broken = ::localtime( &t );
 #endif
 
-        QDateTime ret;
-        ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon +1, broken->tm_mday ) );
-        ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
-
-        return ret;
-    }
-    time_t to_Time_t( const QDateTime& utc, const QString& str ) {
-        QDate d = utc.date();
-        QTime t = utc.time();
-
-        tm broken;
-        broken.tm_year = d.year()  - 1900;
-        broken.tm_mon  = d.month() - 1;
-        broken.tm_mday = d.day();
-        broken.tm_hour = t.hour();
-        broken.tm_min  = t.minute();
-        broken.tm_sec = t.second();
-
-        QCString org = ::getenv( "TZ" );
+    QDateTime ret;
+    ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon + 1, broken->tm_mday ) );
+    ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
+
+    return ret;
+}
+time_t to_Time_t( const QDateTime& utc, const QString& str )
+{
+    QDate d = utc.date();
+    QTime t = utc.time();
+
+    tm broken;
+    broken.tm_year = d.year() - 1900;
+    broken.tm_mon = d.month() - 1;
+    broken.tm_mday = d.day();
+    broken.tm_hour = t.hour();
+    broken.tm_min = t.minute();
+    broken.tm_sec = t.second();
+
+    QCString org = ::getenv( "TZ" );
 #ifndef Q_OS_MACX   // Following line causes bus errors on Mac
-        ::setenv( "TZ", str.latin1(), true );
-        ::tzset();
 
-        time_t ti = ::mktime( &broken );
-        ::setenv( "TZ", org, true );
+    ::setenv( "TZ", str.latin1(), true );
+    ::tzset();
+
+    time_t ti = ::mktime( &broken );
+    ::setenv( "TZ", org, true );
 #else
 #warning "Need a replacement for MacOSX!!"
-        time_t ti = ::mktime( &broken );
+
+    time_t ti = ::mktime( &broken );
 #endif
-        return ti;
-    }
-}
 
-namespace Opie {
-OTimeZone::OTimeZone( const ZoneName& zone )
-    : m_name(zone) {
+    return ti;
 }
-OTimeZone::~OTimeZone() {
 }
 
-bool OTimeZone::isValid()const {
+namespace Opie
+{
+OTimeZone::OTimeZone( const ZoneName& zone )
+        : m_name( zone )
+{}
+
+
+OTimeZone::~OTimeZone()
+{}
+
+
+bool OTimeZone::isValid() const
+{
     return !m_name.isEmpty();
@@ -106,14 +120,26 @@ bool OTimeZone::isValid()const {
  */
-QDateTime OTimeZone::toLocalDateTime( const QDateTime& dt) {
+QDateTime OTimeZone::toLocalDateTime( const QDateTime& dt )
+{
     return OTimeZone::current().toDateTime( dt, *this );
 }
-QDateTime OTimeZone::toUTCDateTime( const QDateTime& dt ) {
+
+
+QDateTime OTimeZone::toUTCDateTime( const QDateTime& dt )
+{
     return OTimeZone::utc().toDateTime( dt, *this );
 }
-QDateTime OTimeZone::fromUTCDateTime( time_t t) {
+
+
+QDateTime OTimeZone::fromUTCDateTime( time_t t )
+{
     return utcTime( t );
 }
-QDateTime OTimeZone::toDateTime( time_t t) {
+
+
+QDateTime OTimeZone::toDateTime( time_t t )
+{
     return utcTime( t, m_name );
 }
+
+
 /*
@@ -122,15 +148,25 @@ QDateTime OTimeZone::toDateTime( time_t t) {
  */
-QDateTime OTimeZone::toDateTime( const QDateTime& dt, const OTimeZone& zone ) {
+QDateTime OTimeZone::toDateTime( const QDateTime& dt, const OTimeZone& zone )
+{
     time_t utc = to_Time_t( dt, zone.m_name );
-    qWarning("%d %s", utc, zone.m_name.latin1() );
+    qWarning( "%d %s", utc, zone.m_name.latin1() );
     return utcTime( utc, m_name );
 }
-time_t OTimeZone::fromDateTime( const QDateTime& time ) {
+
+
+time_t OTimeZone::fromDateTime( const QDateTime& time )
+{
     return to_Time_t( time, m_name );
 }
-time_t OTimeZone::fromUTCDateTime( const QDateTime& time ) {
+
+
+time_t OTimeZone::fromUTCDateTime( const QDateTime& time )
+{
     return to_Time_t( time, "UTC" );
 }
-OTimeZone OTimeZone::current() {
-    QCString str = ::getenv("TZ");
+
+
+OTimeZone OTimeZone::current()
+{
+    QCString str = ::getenv( "TZ" );
     OTimeZone zone( str );
@@ -138,6 +174,12 @@ OTimeZone OTimeZone::current() {
 }
-OTimeZone OTimeZone::utc() {
-    return OTimeZone("UTC");
+
+
+OTimeZone OTimeZone::utc()
+{
+    return OTimeZone( "UTC" );
 }
-QString OTimeZone::timeZone()const {
+
+
+QString OTimeZone::timeZone() const
+{
     return m_name;
diff --git a/libopie2/opiepim/core/otimezone.h b/libopie2/opiepim/core/otimezone.h
index 28ae6cb..f0b4022 100644
--- a/libopie2/opiepim/core/otimezone.h
+++ b/libopie2/opiepim/core/otimezone.h
@@ -29,8 +29,11 @@
 
-#ifndef OPIE_TIME_ZONE_H
-#define OPIE_TIME_ZONE_H
+#ifndef OTIMEZONE_H
+#define OTIMEZONE_H
 
-#include <time.h>
+/* QT */
 #include <qdatetime.h>
 
+/* STD */
+#include <time.h>
+
 namespace Opie
@@ -44,2 +47,3 @@ namespace Opie
 class OTimeZone {
+
  public:
@@ -93,3 +97,4 @@ class OTimeZone {
 
-    QString timeZone()const;
+    QString timeZone() const;
+    
  private:
diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h
index 51d1c6d..c7d32c2 100644
--- a/libopie2/opieui/otabwidget.h
+++ b/libopie2/opieui/otabwidget.h
@@ -1,5 +1,4 @@
 /*
-                            This file is part of the Opie Project
-
-                             Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
+                             This file is part of the Opie Project
+                             Copyright (C) 2002 Dan Williams <williamsdr@acm.org>
               =.
@@ -71,4 +70,4 @@ class OTabWidget : public QWidget
     Q_OBJECT
-public:
-
+  
+  public:
 /**
@@ -109,3 +108,2 @@ public:
  */
- // FIXME WFlags? -zecke
     OTabWidget( QWidget * = 0, const char * = 0, TabStyle = Global, TabPosition = Top );
@@ -264,3 +262,3 @@ private:
 
-signals:
+  signals:
 /**
@@ -273,3 +271,3 @@ signals:
 
-private slots:
+  private slots:
 
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp
index 0fdf08d..8bb4ed6 100644
--- a/libopie2/opieui/owait.cpp
+++ b/libopie2/opieui/owait.cpp
@@ -1,25 +1,30 @@
-/*  This file is part of the OPIE libraries
-    Copyright (C) 2003 Maximilian Reiss  (harlekin@handhelds.org)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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.
-*/
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Maximilian Reiss <harlekin@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 <qlabel.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qpe/qpeapplication.h>
-#include <qpainter.h>
+*/
 
@@ -27,4 +32,10 @@
 
+/* OPIE */
+#include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
+/* QT */
+#include <qlayout.h>
+#include <qpainter.h>
+
 static int frame = 0;
@@ -40,7 +51,8 @@ static int frame = 0;
  */
-OWait::OWait(QWidget *parent, const char* msg, bool dispIcon )
-  :QDialog(parent, msg, TRUE,WStyle_Customize) {
+OWait::OWait( QWidget *parent, const char* msg, bool dispIcon )
+      :QDialog( parent, msg, TRUE, WStyle_Customize )
+{
 
 
-    QHBoxLayout *hbox  = new QHBoxLayout( this );
+    QHBoxLayout * hbox = new QHBoxLayout( this );
 
@@ -62,4 +74,5 @@ OWait::OWait(QWidget *parent, const char* msg, bool dispIcon )
 
-void OWait::timerEvent( QTimerEvent * )  {
-    frame = (++frame) % 4;
+void OWait::timerEvent( QTimerEvent * )
+{
+    frame = ( ++frame ) % 4;
     repaint();
@@ -67,10 +80,12 @@ void OWait::timerEvent( QTimerEvent * )  {
 
-void OWait::paintEvent( QPaintEvent * )  {
-      QPainter p( m_lb  );
-      p.drawPixmap( 0, 0, m_pix, m_aniSize * frame,  0, m_aniSize, m_aniSize );
+void OWait::paintEvent( QPaintEvent * )
+{
+    QPainter p( m_lb );
+    p.drawPixmap( 0, 0, m_pix, m_aniSize * frame, 0, m_aniSize, m_aniSize );
 }
 
-void OWait::show()  {
+void OWait::show()
+{
 
-    move( ( ( qApp->desktop()->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop()->height() ) / 2 ) - ( m_aniSize / 2 ) );
+    move( ( ( qApp->desktop() ->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop() ->height() ) / 2 ) - ( m_aniSize / 2 ) );
     startTimer( 300 );
@@ -80,3 +95,4 @@ void OWait::show()  {
 
-void OWait::hide()  {
+void OWait::hide()
+{
     killTimers();
@@ -87,3 +103,4 @@ void OWait::hide()  {
 
-void OWait::setTimerLength( int length )  {
+void OWait::setTimerLength( int length )
+{
     m_timerLength = length;
@@ -91,3 +108,3 @@ void OWait::setTimerLength( int length )  {
 
-OWait::~OWait() {
-}
+OWait::~OWait()
+{}
diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h
index cbfc8d6..3267064 100644
--- a/libopie2/opieui/owait.h
+++ b/libopie2/opieui/owait.h
@@ -1,28 +1,38 @@
-/*  This file is part of the OPIE libraries
-    Copyright (C) 2003 Maximilian Reiss  (harlekin@handhelds.org)
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Maximilian Reiss <harlekin@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.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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 OWAIT_H
+#define OWAIT_H
 
-
-#ifndef WAITPOPUP_H
-#define WAITPOPUP_H
-
+/* QT */
 #include <qdialog.h>
-#include <qpixmap.h>
 #include <qlabel.h>
+#include <qpixmap.h>
 #include <qtimer.h>
@@ -36,9 +46,8 @@
  */
-class OWait : public QDialog {
-
+class OWait : public QDialog
+{
     Q_OBJECT
 
-public:
-    // FIXME Wflags -zecke?
-    OWait(QWidget *parent=0,const char* name=0, bool dispIcon=TRUE);
+  public:
+    OWait( QWidget *parent = 0, const char* name = 0, bool dispIcon = TRUE );
     ~OWait();
@@ -57,3 +66,3 @@ public:
 
-    public slots:
+  public slots:
     /**
@@ -63,4 +72,4 @@ public:
 
- private:
-    void timerEvent( QTimerEvent * ) ;
+  private:
+    void timerEvent( QTimerEvent * );
     void paintEvent( QPaintEvent * );