- convert to odebug framework

23 files changed, 2560 insertions, 2496 deletions

diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp
index fc18e07..bbfbf3d 100644
--- a/libopie2/opiedb/osqlbackendmanager.cpp
+++ b/libopie2/opiedb/osqlbackendmanager.cpp
@@ -1,106 +1,112 @@
+
+#include "osqlbackendmanager.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qdir.h>
 #include <qmap.h>
 
-#include "osqlbackendmanager.h"
 
 /**
  * \todo FIXME CONFIG!!!
  */
 
 namespace {
     class Config {
         typedef QMap<QString, QString> List;
     public:
         Config( const QString& fileName );
         /**
          * Quite simple layout in nature
          * BeginFile
          * Key = Value
          */
         bool load();
         QString value( const QString& key );
     private:
         List m_list;
         QString m_fileName;
     };
     Config::Config( const QString& fileName )
         : m_fileName( fileName ) {
     }
 
     bool Config::load() {
         if (!QFile::exists( m_fileName ) )
             return false;
         QFile file( m_fileName );
         if (!file.open(IO_ReadOnly ) )
             return false;
         QStringList list = QStringList::split( '\n', file.readAll() );
         QStringList::Iterator it;
         QString line;
         for (it =  list.begin(); it != list.end(); ++it ) {
             line = (*it).stripWhiteSpace();
-            qWarning("Anonymous::Config:" + line );
+            owarn << "Anonymous::Config:" + line << oendl;
             QStringList test = QStringList::split(' ', line );
             m_list.insert( test[0], test[2] );
         }
         return true;
     }
     QString Config::value( const QString& key ) {
         return m_list[key];
     }
 };
 
 
 using namespace Opie::DB;
 
 OSQLBackEndManager::OSQLBackEndManager( const QStringList& path )
     :m_path( path )
 {
 }
 OSQLBackEndManager::~OSQLBackEndManager() {
 }
 /**
  * scan dirs
  */
 OSQLBackEnd::ValueList OSQLBackEndManager::scan() {
     OSQLBackEnd::ValueList list;
     if (!m_path.isEmpty() ) {
         QStringList::Iterator it;
         for ( it = m_path.begin(); it != m_path.end(); ++it ) {
             list += scanDir( (*it) );
         }
     }
     return list;
 }
 /**
  * scan a specified dir for *.osql
  */
 OSQLBackEnd::ValueList OSQLBackEndManager::scanDir( const QString& dirName ) {
     OSQLBackEnd::ValueList list;
     QDir dir( dirName );
     if (dir.exists() ) {
         QStringList files = dir.entryList( "*.osql" );
         QStringList::Iterator it;
         for ( it = files.begin(); it != files.end(); ++it ) {
             list.append( file2backend( (*it) ) );
         }
     }
     return list;
 }
 
 /**
  * read a config file and convert it to a OSQLBackEnd
  */
 OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) {
     OSQLBackEnd end;
-    qWarning("fileName: " + file  );
+    owarn << "fileName: " + file << oendl;
     Config cfg( file );
     if (cfg.load() ) {
         end.setName( cfg.value( "Name") );
         end.setVendor( cfg.value("Vendor") );
         end.setLicense( cfg.value("License") );
         end.setLibrary( cfg.value("Library").local8Bit() );
         end.setDefault( cfg.value("Default").toInt() );
         end.setPreference( cfg.value("Preference").toInt() );
     }
     return end;
 }
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 588fc8f..69eddfe 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -1,238 +1,238 @@
 /*
                              This file is part of the Opie Project
 
               =.
             .=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 "osqlquery.h"
 #include "osqlitedriver.h"
 
 #include <opie2/odebug.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 
 // fromLocal8Bit() does not work as expected. Thus it
 // is replaced by fromLatin1() (eilers)
 #define __BUGGY_LOCAL8BIT_
 
-namespace Opie { 
-namespace DB { 
+namespace Opie {
+namespace DB {
 namespace Internal {
 
 namespace {
     struct Query {
         OSQLError::ValueList errors;
         OSQLResultItem::ValueList items;
         OSQLiteDriver *driver;
     };
 }
 
 
 OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
     : OSQLDriver( lib )
 {
     m_sqlite = 0l;
 }
 
 
 OSQLiteDriver::~OSQLiteDriver() {
     close();
 }
 
 
 QString OSQLiteDriver::id()const {
     return QString::fromLatin1("SQLite");
 }
 
 void OSQLiteDriver::setUserName( const QString& ) {}
 
 
 void OSQLiteDriver::setPassword( const QString& ) {}
 
 
 void OSQLiteDriver::setUrl( const QString& url ) {
     m_url = url;
 }
 
 
 void OSQLiteDriver::setOptions( const QStringList& ) {
 }
 
 /*
  * Functions to patch a regex search into sqlite
  */
 int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
-        int res;
-        if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
-                if (reg->regex_raw != NULL) {
-                    free(reg->regex_raw);
-                    regfree(&reg->regex_c);
-                }
-                reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
-                strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1);
-                res = regcomp(&reg->regex_c, zPattern, REG_EXTENDED);
-                if ( res != 0 ) {
-                    printf("Regcomp failed with code %u on string %s\n",res,zPattern);
-                    free(reg->regex_raw);
-                    reg->regex_raw=NULL;
-                return 0;
-                }
-        }
-        res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0);
-        return res;
+    int res;
+    if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
+        if (reg->regex_raw != NULL) {
+            free(reg->regex_raw);
+            regfree(&reg->regex_c);
+        }
+        reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
+        strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1);
+        res = regcomp(&reg->regex_c, zPattern, REG_EXTENDED);
+        if ( res != 0 ) {
+            printf("Regcomp failed with code %u on string %s\n",res,zPattern);
+            free(reg->regex_raw);
+            reg->regex_raw=NULL;
+        return 0;
+        }
+    }
+    res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0);
+    return res;
 }
 
 void rlikeFunc(sqlite_func *context, int arg, const char **argv){
-        if( argv[0]==0 || argv[1]==0 ){
-                printf("One of arguments Null!!\n");
-                return;
-        }
-                sqlite_set_result_int(context,
-                sqliteRlikeCompare((const char*)argv[0],
-        (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
+    if( argv[0]==0 || argv[1]==0 ){
+        printf("One of arguments Null!!\n");
+        return;
+    }
+        sqlite_set_result_int(context,
+        sqliteRlikeCompare((const char*)argv[0],
+    (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
 }
 
 /*
  * try to open a db specified via setUrl
  * and options
  */
 bool OSQLiteDriver::open() {
     char *error;
-        
- qDebug("OSQLiteDriver::open: about to open");
+
+    odebug << "OSQLiteDriver::open: about to open" << oendl; 
     m_sqlite = sqlite_open(m_url.local8Bit(),
                            0,
                            &error );
 
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
-        qWarning("OSQLiteDriver::open: %s", error );
+        owarn << "OSQLiteDriver::open: " << error << "" << oendl; 
         free( error );
         return false;
     }
     if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
-            odebug << "Unable to create user defined function!" << oendl;
+        odebug << "Unable to create user defined function!" << oendl;
     if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0)
-            odebug << "Unable to set rlike function result type!" << oendl;
+        odebug << "Unable to set rlike function result type!" << oendl;
     sqreg.regex_raw = NULL;
     return true;
 }
 
 
 /* close the db
  * sqlite closes them without
  * telling failure or success
  */
 bool OSQLiteDriver::close() {
     if (m_sqlite )
         sqlite_close( m_sqlite ), m_sqlite=0l;
-        if (sqreg.regex_raw != NULL){
-            odebug << "Freeing regex on close" << oendl;
-            free(sqreg.regex_raw);
-            sqreg.regex_raw=NULL;
-            regfree(&sqreg.regex_c);
-        }
+    if (sqreg.regex_raw != NULL){
+        odebug << "Freeing regex on close" << oendl;
+        free(sqreg.regex_raw);
+        sqreg.regex_raw=NULL;
+        regfree(&sqreg.regex_c);
+    }
     return true;
 }
 
 
 /* Query */
 OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     if ( !m_sqlite ) {
         // FIXME set error code
         OSQLResult result( OSQLResult::Failure );
         return result;
     }
     Query query;
     query.driver = this;
     char *err;
     /* SQLITE_OK 0 if return code > 0 == failure */
     if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err)  > 0 ) {
-        qWarning("OSQLiteDriver::query: Error while executing %s",err);
+        owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; 
         free(err );
         // FixMe Errors
     }
 
     OSQLResult result(OSQLResult::Success,
                       query.items,
                       query.errors );
     return result;
 }
 
 
 OSQLTable::ValueList OSQLiteDriver::tables() const {
 
 }
 
 
 OSQLError OSQLiteDriver::lastError() {
     OSQLError error;
     return error;
 };
 
 
 /* handle a callback add the row to the global
  * OSQLResultItem
  */
 int OSQLiteDriver::handleCallBack( int, char**, char** ) {
     return 0;
 }
 
 
 /* callback_handler add the values to the list*/
 int OSQLiteDriver::call_back( void* voi, int argc,
                               char** argv, char** columns) {
     Query* qu = (Query*)voi;
 
     //copy them over to a OSQLResultItem
     QMap<QString, QString> tableString;
     QMap<int, QString> tableInt;
     for (int i = 0; i < argc; i++ ) {
 
 #ifdef __BUGGY_LOCAL8BIT_
         tableInt.insert( i, QString::fromLatin1( argv[i] ) );
         tableString.insert( QString::fromLatin1( columns[i] ),
                             QString::fromLatin1( argv[i] ) );
 #else
         tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) );
         tableString.insert( QString::fromLocal8Bit( columns[i] ),
                             QString::fromLocal8Bit( argv[i] ) );
 #endif
     }
     OSQLResultItem item( tableString, tableInt );
     qu->items.append( item );
 
     return ((Query*)voi)->driver->handleCallBack( argc,
                                                   argv,
                                                   columns );
 
 
 }
 
 }}} // namespace OPIE::DB::Internal
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index c00585d..2b17230 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -1,315 +1,315 @@
 /*
                              This file is part of the Opie Project
 
                              (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=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/osoundsystem.h>
 #include <opie2/odebug.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/soundcard.h>
 #include <sys/stat.h>
 
 
 using namespace Opie::Core;
 using namespace Opie::MM;
 /*======================================================================================
  * OSoundSystem
  *======================================================================================*/
 
 OSoundSystem* OSoundSystem::_instance = 0;
 
 OSoundSystem::OSoundSystem()
 {
     odebug << "OSoundSystem::OSoundSystem()" << oendl;
     synchronize();
 }
 
 void OSoundSystem::synchronize()
 {
     // gather available interfaces by inspecting /dev
     //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
     //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
 
     _interfaces.clear();
     _interfaces.insert( "soundcard", new OSoundCard( this, "soundcard" ) );
 
 
     /*
 
     QString str;
     QFile f( "/dev/sound" );
     bool hasFile = f.open( IO_ReadOnly );
     if ( !hasFile )
     {
         odebug << "OSoundSystem: /dev/sound not existing. No sound devices available" << oendl;
         return;
     }
     QTextStream s( &f );
     s.readLine();
     s.readLine();
     while ( !s.atEnd() )
     {
         s >> str;
         str.truncate( str.find( ':' ) );
-        qDebug( "OSoundSystem: found interface '%s'", (const char*) str );
+        odebug << "OSoundSystem: found interface '" <<  str << "'" << oendl; 
         OAudioInterface* iface;
         iface = new OAudioInterface( this, (const char*) str );
 
         _interfaces.insert( str, iface );
         s.readLine();
     }
 */
 }
 
 
 int OSoundSystem::count() const
 {
     return _interfaces.count();
 }
 
 
 OSoundCard* OSoundSystem::card( const QString& iface ) const
 {
     return _interfaces[iface];
 }
 
 
 OSoundSystem* OSoundSystem::instance()
 {
     if ( !_instance ) _instance = new OSoundSystem();
     return _instance;
 }
 
 
 OSoundSystem::CardIterator OSoundSystem::iterator() const
 {
     return OSoundSystem::CardIterator( _interfaces );
 }
 
 
 /*======================================================================================
  * OSoundCard
  *======================================================================================*/
 
 OSoundCard::OSoundCard( QObject* parent, const char* name )
                  :QObject( parent, name ), _audio( 0 ), _mixer( 0 )
 {
     odebug << "OSoundCard::OSoundCard()" << oendl;
     init();
 }
 
 
 OSoundCard::~OSoundCard()
 {
 }
 
 
 void OSoundCard::init()
 {
     _audio = new OAudioInterface( this, "/dev/dsp" );
     _mixer = new OMixerInterface( this, "/dev/mixer" );
 }
 
 
 /*======================================================================================
  * OAudioInterface
  *======================================================================================*/
 
 OAudioInterface::OAudioInterface( QObject* parent, const char* name )
                  :QObject( parent, name ), _sfd(0)
 {
     odebug << "OAudioInterface::OAudioInterface()" << oendl;
     init();
 }
 
 
 OAudioInterface::~OAudioInterface()
 {
 }
 
 
 void OAudioInterface::init()
 {
 
 
 }
 
 
 /*======================================================================================
  * OMixerInterface
  *======================================================================================*/
 
 OMixerInterface::OMixerInterface( QObject* parent, const char* name )
                  :QObject( parent, name )
 {
     odebug << "OMixerInterface::OMixerInterface()" << oendl;
     init();
 }
 
 
 OMixerInterface::~OMixerInterface()
 {
 }
 
 
 void OMixerInterface::init()
 {
     // open the device
     _fd = ::open( name(), O_RDWR );
     if ( _fd == -1 )
     {
         owarn << "OMixerInterface::init(): Can't open mixer." << oendl;
         return;
     }
 
     // construct the device capabilities
     int devmask = 0;
     if ( ioctl( _fd, SOUND_MIXER_READ_DEVMASK, &devmask ) != -1 )
     {
         if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) )    _channels.insert( "PlayVolume", SOUND_MIXER_VOLUME );
         if ( devmask & ( 1 << SOUND_MIXER_BASS ) )      _channels.insert( "PlayBass", SOUND_MIXER_BASS );
         if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) )    _channels.insert( "PlayTreble", SOUND_MIXER_TREBLE );
         if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) )     _channels.insert( "PlaySynth", SOUND_MIXER_SYNTH );
         if ( devmask & ( 1 << SOUND_MIXER_PCM ) )       _channels.insert( "PlayPCM", SOUND_MIXER_PCM );
         if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) )   _channels.insert( "PlaySpeaker", SOUND_MIXER_SPEAKER );
         if ( devmask & ( 1 << SOUND_MIXER_LINE ) )      _channels.insert( "PlayLine", SOUND_MIXER_LINE );
         if ( devmask & ( 1 << SOUND_MIXER_MIC ) )       _channels.insert( "PlayMic", SOUND_MIXER_MIC );
         if ( devmask & ( 1 << SOUND_MIXER_CD ) )        _channels.insert( "PlayCD", SOUND_MIXER_CD );
         if ( devmask & ( 1 << SOUND_MIXER_IMIX ) )      _channels.insert( "PlayInputMix", SOUND_MIXER_IMIX );
         if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) )    _channels.insert( "PlayAltPCM", SOUND_MIXER_ALTPCM );
         if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) )    _channels.insert( "PlayRecord", SOUND_MIXER_RECLEV );
         if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) )     _channels.insert( "PlayInputGain", SOUND_MIXER_IGAIN );
         if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) )     _channels.insert( "PlayOutputGain", SOUND_MIXER_OGAIN );
         //odebug << "devmask available and constructed." << oendl;
     }
 
     devmask = 0;
     if ( ioctl( _fd, SOUND_MIXER_READ_RECMASK, &devmask ) != -1 )
     {
         if ( devmask & ( 1 << SOUND_MIXER_VOLUME ) )    _channels.insert( "RecVolume", SOUND_MIXER_VOLUME );
         if ( devmask & ( 1 << SOUND_MIXER_BASS ) )      _channels.insert( "RecBass", SOUND_MIXER_BASS );
         if ( devmask & ( 1 << SOUND_MIXER_TREBLE ) )    _channels.insert( "RecTreble", SOUND_MIXER_TREBLE );
         if ( devmask & ( 1 << SOUND_MIXER_SYNTH ) )     _channels.insert( "RecSynth", SOUND_MIXER_SYNTH );
         if ( devmask & ( 1 << SOUND_MIXER_PCM ) )       _channels.insert( "RecPCM", SOUND_MIXER_PCM );
         if ( devmask & ( 1 << SOUND_MIXER_SPEAKER ) )   _channels.insert( "RecSpeaker", SOUND_MIXER_SPEAKER );
         if ( devmask & ( 1 << SOUND_MIXER_LINE ) )      _channels.insert( "RecLine", SOUND_MIXER_LINE );
         if ( devmask & ( 1 << SOUND_MIXER_MIC ) )       _channels.insert( "RecMic", SOUND_MIXER_MIC );
         if ( devmask & ( 1 << SOUND_MIXER_CD ) )        _channels.insert( "RecCD", SOUND_MIXER_CD );
         if ( devmask & ( 1 << SOUND_MIXER_IMIX ) )      _channels.insert( "RecInputMix", SOUND_MIXER_IMIX );
         if ( devmask & ( 1 << SOUND_MIXER_ALTPCM ) )    _channels.insert( "RecAltPCM", SOUND_MIXER_ALTPCM );
         if ( devmask & ( 1 << SOUND_MIXER_RECLEV ) )    _channels.insert( "RecRecord", SOUND_MIXER_RECLEV );
         if ( devmask & ( 1 << SOUND_MIXER_IGAIN ) )     _channels.insert( "RecInputGain", SOUND_MIXER_IGAIN );
         if ( devmask & ( 1 << SOUND_MIXER_OGAIN ) )     _channels.insert( "RecOutputGain", SOUND_MIXER_OGAIN );
         //odebug << "recmask available and constructed." << oendl;
     }
 
 /*    ChannelIterator it;
     for ( it = _channels.begin(); it != _channels.end(); ++it )
     {
-        qDebug( "Channel %s available (bit %d)", (const char*) it.key(), it.data() );
-        qDebug( " +--- Volume: %02d | %02d", volume( it.key() ) & 0xff, volume( it.key() ) >> 8 );
+        odebug << "Channel " <<  it.key() << " available (bit " << it.data() << ")" << oendl; 
+        odebug << " +--- Volume: " << volume( it.key() ) & 0xff << " | " << volume( it.key() ) >> 8 << "" << oendl; 
     }
 */
 }
 
 QStringList OMixerInterface::allChannels() const
 {
     ChannelIterator it = _channels.begin();
     QStringList channels;
     while ( it != _channels.end() )
     {
         channels += it.key();
         it++;
     }
     return channels;
 }
 
 
 QStringList OMixerInterface::recChannels() const
 {
     owarn << "NYI" << oendl;
 }
 
 
 QStringList OMixerInterface::playChannels() const
 {
     owarn << "NYI" << oendl;
 }
 
 
 bool OMixerInterface::hasChannel( const QString& channel )
 {
     return _channels.contains( channel );
 }
 
 
 void OMixerInterface::setVolume( const QString& channel, int left, int right )
 {
     int volume = left;
     volume |= ( right == -1 ) ? left << 8 : right << 8;
 
     if ( _channels.contains( channel ) )
     {
         int result = ioctl( _fd, MIXER_WRITE( _channels[channel] ), &volume );
         if ( result == -1 )
         {
             owarn << "Can't set volume: " << strerror( errno ) << oendl;
         }
         else
         {
             if ( result & 0xff != left )
             {
                 owarn << "Device adjusted volume from " << left << " to " << (result & 0xff) << oendl;
             }
         }
     }
 }
 
 
 int OMixerInterface::volume( const QString& channel ) const
 {
     int volume;
 
     if ( _channels.contains( channel ) )
     {
         if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 )
         {
             owarn << "Can't get volume: " << strerror( errno ) << oendl;
         }
         else return volume;
     }
     return -1;
 }
 
 
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index e141097..67718ba 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -352,516 +352,519 @@ ONetworkInterface::~ONetworkInterface()
 }

 

 

 bool ONetworkInterface::setPromiscuousMode( bool b )

 {

     ioctl( SIOCGIFFLAGS );

     if ( b ) _ifr.ifr_flags |= IFF_PROMISC;

     else   _ifr.ifr_flags &= (~IFF_PROMISC);

     return ioctl( SIOCSIFFLAGS );

 }

 

 

 bool ONetworkInterface::promiscuousMode() const

 {

     ioctl( SIOCGIFFLAGS );

     return _ifr.ifr_flags & IFF_PROMISC;

 }

 

 

 bool ONetworkInterface::isWireless() const

 {

     return ioctl( SIOCGIWNAME );

 }

 

 

 /*======================================================================================

  * OChannelHopper

  *======================================================================================*/

 

 OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )

                :QObject( 0, "Mickey's funky hopper" ),

                _iface( iface ), _interval( 0 ), _tid( 0 )

 {

     int _maxChannel = iface->channels();

     // generate fancy hopping sequence honoring the device capabilities

     if ( _maxChannel >=  1 ) _channels.append(  1 );

     if ( _maxChannel >=  7 ) _channels.append(  7 );

     if ( _maxChannel >= 13 ) _channels.append( 13 );

     if ( _maxChannel >=  2 ) _channels.append(  2 );

     if ( _maxChannel >=  8 ) _channels.append(  8 );

     if ( _maxChannel >=  3 ) _channels.append(  3 );

     if ( _maxChannel >= 14 ) _channels.append( 14 );

     if ( _maxChannel >=  9 ) _channels.append(  9 );

     if ( _maxChannel >=  4 ) _channels.append(  4 );

     if ( _maxChannel >= 10 ) _channels.append( 10 );

     if ( _maxChannel >=  5 ) _channels.append(  5 );

     if ( _maxChannel >= 11 ) _channels.append( 11 );

     if ( _maxChannel >=  6 ) _channels.append(  6 );

     if ( _maxChannel >= 12 ) _channels.append( 12 );

     _channel = _channels.begin();

 }

 

 

 OChannelHopper::~OChannelHopper()

 {

 }

 

 

 bool OChannelHopper::isActive() const

 {

     return _tid;

 }

 

 

 int OChannelHopper::channel() const

 {

     return *_channel;

 }

 

 

 void OChannelHopper::timerEvent( QTimerEvent* )

 {

     _iface->setChannel( *_channel );

     emit( hopped( *_channel ) );

     odebug << "OChannelHopper::timerEvent(): set channel " << *_channel << " on interface '" << _iface->name() << "'" << oendl;

     if ( ++_channel == _channels.end() ) _channel = _channels.begin();

 }

 

 

 void OChannelHopper::setInterval( int interval )

 {

     if ( interval == _interval )

         return;

 

     if ( _interval )

         killTimer( _tid );

 

     _tid = 0;

     _interval = interval;

 

     if ( _interval )

     {

         _tid = startTimer( interval );

     }

 }

 

 

 int OChannelHopper::interval() const

 {

     return _interval;

 }

 

 

 /*======================================================================================

  * OWirelessNetworkInterface

  *======================================================================================*/

 

 OWirelessNetworkInterface::OWirelessNetworkInterface( QObject* parent, const char* name )

                          :ONetworkInterface( parent, name ), _hopper( 0 )

 {

     odebug << "OWirelessNetworkInterface::OWirelessNetworkInterface()" << oendl;

     init();

 }

 

 

 OWirelessNetworkInterface::~OWirelessNetworkInterface()

 {

 }

 

 

 struct iwreq& OWirelessNetworkInterface::iwr() const

 {

     return _iwr;

 }

 

 

 void OWirelessNetworkInterface::init()

 {

     odebug << "OWirelessNetworkInterface::init()" << oendl;

     memset( &_iwr, 0, sizeof( struct iwreq ) );

     buildInformation();

     buildPrivateList();

     dumpInformation();

 }

 

 

 bool OWirelessNetworkInterface::isAssociated() const

 {

     //FIXME: handle different modes

     return !(associatedAP() == OMacAddress::unknown);

 }

 

 

 OMacAddress OWirelessNetworkInterface::associatedAP() const

 {

     if ( ioctl( SIOCGIWAP ) )

         return (const unsigned char*) &_ifr.ifr_hwaddr.sa_data[0];

     else

         return OMacAddress::unknown;

 }

 

 

 void OWirelessNetworkInterface::buildInformation()

 {

     //ML: If you listen carefully enough, you can hear lots of WLAN drivers suck

     //ML: The HostAP drivers need more than sizeof struct_iw range to complete

     //ML: SIOCGIWRANGE otherwise they fail with "Invalid Argument Length".

     //ML: The Wlan-NG drivers on the otherside fail (segfault!) if you allocate

     //ML: _too much_ space. This is damn shitty crap *sigh*

     //ML: We allocate a large memory region in RAM and check whether the

     //ML: driver pollutes this extra space. The complaint will be made on stdout,

     //ML: so please forward this...

 

     struct iwreq wrq;

     int len = sizeof( struct iw_range )*2;

     char *buffer = (char*) malloc( len );

     //FIXME: Validate if we actually got the memory block

     memset( buffer, 0, len );

     memcpy( wrq.ifr_name, name(), IFNAMSIZ);

     wrq.u.data.pointer = (caddr_t) buffer;

     wrq.u.data.length = sizeof( struct iw_range );

     wrq.u.data.flags = 0;

 

     if ( ::ioctl( _sfd, SIOCGIWRANGE, &wrq ) == -1 )

     {

         owarn << "OWirelessNetworkInterface::buildInformation(): Can't get channel information - using default values." << oendl;

         _channels.insert( 2412,  1 ); // 2.412 GHz

         _channels.insert( 2417,  2 ); // 2.417 GHz

         _channels.insert( 2422,  3 ); // 2.422 GHz

         _channels.insert( 2427,  4 ); // 2.427 GHz

         _channels.insert( 2432,  5 ); // 2.432 GHz

         _channels.insert( 2437,  6 ); // 2.437 GHz

         _channels.insert( 2442,  7 ); // 2.442 GHz

         _channels.insert( 2447,  8 ); // 2.447 GHz

         _channels.insert( 2452,  9 ); // 2.452 GHz

         _channels.insert( 2457, 10 ); // 2.457 GHz

         _channels.insert( 2462, 11 ); // 2.462 GHz

 

         memset( &_range, 0, sizeof( struct iw_range ) );

     }

     else

     {

         // <check if the driver overwrites stuff>

         int max = 0;

         for ( int r = sizeof( struct iw_range ); r < len; r++ )

             if (buffer[r] != 0)

                 max = r;

         if (max > 0)

         {

             owarn << "OWirelessNetworkInterface::buildInformation(): Driver for wireless interface '" << name()

                   << "' sucks! It overwrote the buffer end with at least " << max - sizeof( struct iw_range ) << " bytes!" << oendl;

         }

         // </check if the driver overwrites stuff>

 

         struct iw_range range;

         memcpy( &range, buffer, sizeof range );

 

         odebug << "OWirelessNetworkInterface::buildInformation(): Interface reported to have " << (int) range.num_frequency << " channels." << oendl;

         for ( int i = 0; i < range.num_frequency; ++i )

         {

             int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 );

             odebug << "OWirelessNetworkInterface::buildInformation: Adding frequency " << freq << " as channel " << i+1 << oendl;

             _channels.insert( freq, i+1 );

         }

     }

 

     memcpy( &_range, buffer, sizeof( struct iw_range ) );

     odebug << "OWirelessNetworkInterface::buildInformation(): Information block constructed." << oendl;

     free(buffer);

 }

 

 

 short OWirelessNetworkInterface::wirelessExtensionDriverVersion() const

 {

     return _range.we_version_compiled;

 }

 

 

 void OWirelessNetworkInterface::buildPrivateList()

 {

     odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl;

 

     struct iw_priv_args priv[IW_MAX_PRIV_DEF];

 

     _iwr.u.data.pointer = (char*) &priv;

     _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself

     _iwr.u.data.flags = 0;

 

     if ( !wioctl( SIOCGIWPRIV ) )

     {

         owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl;

         return;

     }

 

     for ( int i = 0; i < _iwr.u.data.length; ++i )

     {

         new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args );

     }

     odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl;

 }

 

 

 void OWirelessNetworkInterface::dumpInformation() const

 {

     odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;

 

-    qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s",

-            _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );

-    qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d",

-             name(), _range.we_version_source, _range.we_version_compiled );

+    odebug << " - driver's idea of maximum throughput is " << _range.throughput

+           << " bps = " << ( _range.throughput / 8 ) << " byte/s = " << ( _range.throughput / 8 / 1024 )

+           << " Kb/s = " << QString().sprintf("%f.2", float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 )

+           << " Mb/s" << oendl;

+

+    odebug << " - driver for '" << name() << "' (V" << _range.we_version_source

+           << ") has been compiled against WE V" << _range.we_version_compiled << oendl;

 

     if ( _range.we_version_compiled != WIRELESS_EXT )

     {

         owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl;

     }

 

     odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;

 }

 

 

 int OWirelessNetworkInterface::channel() const

 {

     //FIXME: When monitoring enabled, then use it

     //FIXME: to gather the current RF channel

     //FIXME: Until then, get active channel from hopper.

     if ( _hopper && _hopper->isActive() )

         return _hopper->channel();

 

     if ( !wioctl( SIOCGIWFREQ ) )

     {

         return -1;

     }

     else

     {

         return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ];

     }

 }

 

 

 void OWirelessNetworkInterface::setChannel( int c ) const

 {

     if ( !c )

     {

         oerr << "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" << oendl;

         return;

     }

 

     if ( !_mon )

     {

         memset( &_iwr, 0, sizeof( struct iwreq ) );

         _iwr.u.freq.m = c;

         _iwr.u.freq.e = 0;

         wioctl( SIOCSIWFREQ );

     }

     else

     {

         _mon->setChannel( c );

     }

 }

 

 

 double OWirelessNetworkInterface::frequency() const

 {

     if ( !wioctl( SIOCGIWFREQ ) )

     {

         return -1.0;

     }

     else

     {

         return double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000000.0;

     }

 }

 

 

 int OWirelessNetworkInterface::channels() const

 {

     return _channels.count();

 }

 

 

 void OWirelessNetworkInterface::setChannelHopping( int interval )

 {

     if ( !_hopper ) _hopper = new OChannelHopper( this );

     _hopper->setInterval( interval );

     //FIXME: When and by whom will the channel hopper be deleted?

     //TODO: rely on QObject hierarchy

 }

 

 

 int OWirelessNetworkInterface::channelHopping() const

 {

     return _hopper->interval();

 }

 

 

 OChannelHopper* OWirelessNetworkInterface::channelHopper() const

 {

     return _hopper;

 }

 

 

 void OWirelessNetworkInterface::commit() const

 {

     wioctl( SIOCSIWCOMMIT );

 }

 

 

 void OWirelessNetworkInterface::setMode( const QString& newMode )

 {

     #ifdef FINALIZE

     QString currentMode = mode();

     if ( currentMode == newMode ) return;

     #endif

 

     odebug << "OWirelessNetworkInterface::setMode(): trying to set mode " << newMode << oendl;

 

     _iwr.u.mode = stringToMode( newMode );

 

     if ( _iwr.u.mode != IW_MODE_MONITOR )

     {

         // IWR.U.MODE WIRD DURCH ABFRAGE DES MODE HIER PLATTGEMACHT!!!!!!!!!!!!!!!!!!!!! DEPP!

         _iwr.u.mode = stringToMode( newMode );

         wioctl( SIOCSIWMODE );

 

         // special iwpriv fallback for monitor mode (check if we're really out of monitor mode now)

 

         if ( mode() == "monitor" )

         {

             odebug << "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not sufficient - trying fallback to iwpriv..." << oendl;

             if ( _mon )

                 _mon->setEnabled( false );

             else

                 odebug << "ONetwork(): can't switch monitor mode without installed monitoring interface" << oendl;

         }

 

     }

     else    // special iwpriv fallback for monitor mode

     {

         if ( wioctl( SIOCSIWMODE ) )

         {

             odebug << "OWirelessNetworkInterface::setMode(): IW_MODE_MONITOR ok" << oendl;

         }

         else

         {

             odebug << "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not working - trying fallback to iwpriv..." << oendl;

 

             if ( _mon )

                 _mon->setEnabled( true );

             else

                 odebug << "ONetwork(): can't switch monitor mode without installed monitoring interface" << oendl;

         }

     }

 }

 

 

 QString OWirelessNetworkInterface::mode() const

 {

     memset( &_iwr, 0, sizeof( struct iwreq ) );

 

     if ( !wioctl( SIOCGIWMODE ) )

     {

         return "<unknown>";

     }

 

     odebug << "OWirelessNetworkInterface::setMode(): WE's idea of current mode seems to be " << modeToString( _iwr.u.mode ) << oendl;

 

     // legacy compatible monitor mode check

 

     if ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 )

     {

         return "monitor";

     }

     else

     {

         return modeToString( _iwr.u.mode );

     }

 }

 

 void OWirelessNetworkInterface::setNickName( const QString& nickname )

 {

     _iwr.u.essid.pointer = const_cast<char*>( (const char*) nickname );

     _iwr.u.essid.length = nickname.length();

     wioctl( SIOCSIWNICKN );

 }

 

 

 QString OWirelessNetworkInterface::nickName() const

 {

     char str[IW_ESSID_MAX_SIZE];

     _iwr.u.data.pointer = &str[0];

     _iwr.u.data.length = IW_ESSID_MAX_SIZE;

     if ( !wioctl( SIOCGIWNICKN ) )

     {

         return "<unknown>";

     }

     else

     {

         str[_iwr.u.data.length] = 0x0; // some drivers (e.g. wlan-ng) don't zero-terminate the string

         return str;

     }

 }

 

 

 void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ... )

 {

     OPrivateIOCTL* priv = static_cast<OPrivateIOCTL*>( child( (const char*) call ) );

     if ( !priv )

     {

         owarn << "OWirelessNetworkInterface::setPrivate(): interface '" << name()

               << "' does not support private ioctl '" << call << "'" << oendl;

         return;

     }

     if ( priv->numberSetArgs() != numargs )

     {

         owarn << "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '"

               << call << "' expects " << priv->numberSetArgs() << ", but got " << numargs << oendl;

         return;

     }

 

     odebug << "OWirelessNetworkInterface::setPrivate(): about to call '" << call << "' on interface '" << name() << "'" << oendl;

     memset( &_iwr, 0, sizeof _iwr );

     va_list argp;

     va_start( argp, numargs );

     for ( int i = 0; i < numargs; ++i )

     {

         priv->setParameter( i, va_arg( argp, int ) );

     }

     va_end( argp );

     priv->invoke();

 }

 

 

 void OWirelessNetworkInterface::getPrivate( const QString& call )

 {

     oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl;

 }

 

 

 bool OWirelessNetworkInterface::hasPrivate( const QString& call )

 {

     return child( (const char*) call );

 }

 

 

 QString OWirelessNetworkInterface::SSID() const

 {

     char str[IW_ESSID_MAX_SIZE];

     _iwr.u.essid.pointer = &str[0];

     _iwr.u.essid.length = IW_ESSID_MAX_SIZE;

     if ( !wioctl( SIOCGIWESSID ) )

     {

         return "<unknown>";

     }

     else

     {

         return str;

     }

 }

 

 

 void OWirelessNetworkInterface::setSSID( const QString& ssid )

 {

     _iwr.u.essid.pointer = const_cast<char*>( (const char*) ssid );

     _iwr.u.essid.length = ssid.length();

     wioctl( SIOCSIWESSID );

 }

diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index ce0995b..b5ac325 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -1,72 +1,72 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=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/ostation.h>
 #include <opie2/odebug.h>
 
 
 using namespace Opie::Core;
 
 namespace Opie {
 namespace Net {
 /*======================================================================================
  * OStation
  *======================================================================================*/
 
 OStation::OStation()
 {
     odebug << "OStation::OStation()" << oendl;
 
     type = "<unknown>";
     macAddress = OMacAddress::unknown;
     ssid = "<unknown>";
     channel = 0;
     apAddress = OMacAddress::unknown;
 
 }
 
 
 OStation::~OStation()
 {
     odebug << "OStation::~OStation()" << oendl;
 }
 
 
 void OStation::dump()
 {
     odebug << "------- OStation::dump() ------------" << oendl;
-    qDebug( "type: %s", (const char*) type );
-    qDebug( "mac:  %s", (const char*) macAddress.toString() );
-    qDebug( "ap:   %s", (const char*) apAddress.toString() );
-    qDebug( "ip:   %s", (const char*) ipAddress.toString() );
+    odebug << "type: " <<  type << "" << oendl; 
+    odebug << "mac:  " <<  macAddress.toString() << "" << oendl; 
+    odebug << "ap:   " <<  apAddress.toString() << "" << oendl; 
+    odebug << "ip:   " <<  ipAddress.toString() << "" << oendl; 
 }
 
 }
 }
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 14207be..dda23cc 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -1,852 +1,856 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
 /*
  * SQL Backend for the OPIE-Contact Database.
  */
 
 #include "ocontactaccessbackend_sql.h"
 
-#include <qarray.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
-
-#include <qpe/global.h>
-#include <qpe/recordfields.h>
-
+/* OPIE */
 #include <opie2/opimcontact.h>
 #include <opie2/opimcontactfields.h>
 #include <opie2/opimdateconversion.h>
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
+#include <qpe/recordfields.h>
+
+/* QT */
+#include <qarray.h>
+#include <qdatetime.h>
+#include <qstringlist.h>
+
 
 using namespace Opie;
 using namespace Opie::DB;
 
 
 /*
  * Implementation of used query types * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
-        /**
-         * CreateQuery for the Todolist Table
-         */
-        class CreateQuery : public OSQLQuery {
-        public:
-                CreateQuery();
-                ~CreateQuery();
-                QString query()const;
-        };
-        
-        /**
-         * Clears (delete) a Table
-         */
-        class ClearQuery : public OSQLQuery {
-        public:
-                ClearQuery();
-                ~ClearQuery();
-                QString query()const;
-                
-        };
-        
-
-        /**
-         * LoadQuery
-         * this one queries for all uids
-         */
-        class LoadQuery : public OSQLQuery {
-        public:
-                LoadQuery();
-                ~LoadQuery();
-                QString query()const;
-        };
-        
-        /**
-         * inserts/adds a OPimContact to the table
-         */
-        class InsertQuery : public OSQLQuery {
-        public:
-                InsertQuery(const OPimContact& );
-                ~InsertQuery();
-                QString query()const;
-        private:
-                OPimContact m_contact;
-        };
-        
-
-        /**
-         * removes one from the table
-         */
-        class RemoveQuery : public OSQLQuery {
-        public:
-                RemoveQuery(int uid );
-                ~RemoveQuery();
-                QString query()const;
-        private:
-                int m_uid;
-        };
-        
-        /**
-         * a find query for noncustom elements
-         */
-        class FindQuery : public OSQLQuery {
-        public:
-                FindQuery(int uid);
-                FindQuery(const QArray<int>& );
-                ~FindQuery();
-                QString query()const;
-        private:
-                QString single()const;
-                QString multi()const;
-                QArray<int> m_uids;
-                int m_uid;
-        };
-
-        /**
-         * a find query for custom elements
-         */
-        class FindCustomQuery : public OSQLQuery {
-        public:
-                FindCustomQuery(int uid);
-                FindCustomQuery(const QArray<int>& );
-                ~FindCustomQuery();
-                QString query()const;
-        private:
-                QString single()const;
-                QString multi()const;
-                QArray<int> m_uids;
-                int m_uid;
-        };
-        
-
-
-        // We using two tables to store the information:
-        // 1. addressbook  : It contains General information about the contact (non custom)
-        // 2. custom_data  : Not official supported entries
-        // All tables are connected by the uid of the contact.
-        // Maybe I should add a table for meta-information ? 
-        CreateQuery::CreateQuery() : OSQLQuery() {}
-        CreateQuery::~CreateQuery() {}
-        QString CreateQuery::query()const {
-                QString qu;
-
-                qu += "create table addressbook( uid PRIMARY KEY ";
-
-                QStringList fieldList = OPimContactFields::untrfields( false );
-                for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
-                        qu += QString( ",\"%1\" VARCHAR(10)" ).arg( *it );
-                }
-                qu += " );";
-                
-                qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
-
-                return qu;
-        }
-        
-        ClearQuery::ClearQuery()
-                : OSQLQuery() {}
-        ClearQuery::~ClearQuery() {}
-        QString ClearQuery::query()const {
-                QString qu = "drop table addressbook;";
-                qu += "drop table custom_data;";
-        //      qu += "drop table dates;";
-                return qu;
-        }
-
-
-        LoadQuery::LoadQuery() : OSQLQuery() {}
-        LoadQuery::~LoadQuery() {}
-        QString LoadQuery::query()const {
-                QString qu;
-                qu += "select uid from addressbook";
-                
-                return qu;
-        }
-        
-
-        InsertQuery::InsertQuery( const OPimContact& contact )
-                : OSQLQuery(), m_contact( contact ) {
-        }
-
-        InsertQuery::~InsertQuery() {
-        }
-
-        /*
-         * converts from a OPimContact to a query
-         */
-        QString InsertQuery::query()const{
-
-                QString qu;
-                qu  += "insert into addressbook VALUES( " + 
-                        QString::number( m_contact.uid() );
-
-                // Get all information out of the contact-class
-                // Remember: The category is stored in contactMap, too ! 
-                QMap<int, QString> contactMap = m_contact.toMap();
-                
-                QStringList fieldList = OPimContactFields::untrfields( false );
-                QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
-                for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
-                        // Convert Column-String to Id and get value for this id..
-                        // Hmmm.. Maybe not very cute solution..
-                        int id = translate[*it];
-                        switch ( id ){
-                        case Qtopia::Birthday:
-                        case Qtopia::Anniversary:{
-                                QDate day;
-                                if ( id == Qtopia::Birthday ){
-                                        day = m_contact.birthday();
-                                } else {
-                                        day = m_contact.anniversary();
-                                }
-                                // These entries should stored in a special format
-                                // year-month-day
-                                if ( day.isValid() ){
-                                        qu += QString(",\"%1-%2-%3\"")
-                                                .arg( QString::number( day.year() ).rightJustify( 4, '0' ) )
-                                                .arg( QString::number( day.month() ).rightJustify( 2, '0' ) )
-                                                .arg( QString::number( day.day() ).rightJustify( 2, '0' ) );
-                                } else {
-                                        qu += ",\"\"";
-                                }
-                        }
-                                break;
-                        default:
-                                qu += QString( ",\"%1\"" ).arg( contactMap[id] );
-                        }
-                }
-                qu += " );";
-
-                        
-                // Now add custom data..
-                int id = 0;
-                id = 0;
-                QMap<QString, QString> customMap = m_contact.toExtraMap();
-                for( QMap<QString, QString>::Iterator it = customMap.begin(); 
-                     it != customMap.end(); ++it ){
-                        qu  += "insert into custom_data VALUES(" 
-                                +  QString::number( m_contact.uid() )
-                                + ","
-                                +  QString::number( id++ ) 
-                                + ",'" 
-                                + it.key()
-                                + "',"
-                                + "0" // Priority for future enhancements
-                                + ",'" 
-                                + it.data()
-                                + "');";
-                        }       
-                // qu  += "commit;";
-                qDebug("add %s", qu.latin1() );
-                return qu;
-        }
-        
-
-        RemoveQuery::RemoveQuery(int uid )
-                : OSQLQuery(), m_uid( uid ) {}
-        RemoveQuery::~RemoveQuery() {}
-        QString RemoveQuery::query()const {
-                QString qu = "DELETE from addressbook where uid = " 
-                        + QString::number(m_uid) + ";";
-                qu += "DELETE from custom_data where uid = " 
-                        + QString::number(m_uid) + ";";
-                return qu;
-        }
-        
-
-        
-
-        FindQuery::FindQuery(int uid)
-                : OSQLQuery(), m_uid( uid ) {
-        }
-        FindQuery::FindQuery(const QArray<int>& ints)
-                : OSQLQuery(), m_uids( ints ){
-        }
-        FindQuery::~FindQuery() {
-        }
-        QString FindQuery::query()const{
-        //      if ( m_uids.count() == 0 )
-                return single();
-        }
-        /*
-          else
-                        return multi();
-                        }
+    /**
+     * CreateQuery for the Todolist Table
+     */
+    class CreateQuery : public OSQLQuery {
+    public:
+        CreateQuery();
+        ~CreateQuery();
+        QString query()const;
+    };
+
+    /**
+     * Clears (delete) a Table
+     */
+    class ClearQuery : public OSQLQuery {
+    public:
+        ClearQuery();
+        ~ClearQuery();
+        QString query()const;
+
+    };
+
+
+    /**
+     * LoadQuery
+     * this one queries for all uids
+     */
+    class LoadQuery : public OSQLQuery {
+    public:
+        LoadQuery();
+        ~LoadQuery();
+        QString query()const;
+    };
+
+    /**
+     * inserts/adds a OPimContact to the table
+     */
+    class InsertQuery : public OSQLQuery {
+    public:
+        InsertQuery(const OPimContact& );
+        ~InsertQuery();
+        QString query()const;
+    private:
+        OPimContact m_contact;
+    };
+
+
+    /**
+     * removes one from the table
+     */
+    class RemoveQuery : public OSQLQuery {
+    public:
+        RemoveQuery(int uid );
+        ~RemoveQuery();
+        QString query()const;
+    private:
+        int m_uid;
+    };
+
+    /**
+     * a find query for noncustom elements
+     */
+    class FindQuery : public OSQLQuery {
+    public:
+        FindQuery(int uid);
+        FindQuery(const QArray<int>& );
+        ~FindQuery();
+        QString query()const;
+    private:
+        QString single()const;
+        QString multi()const;
+        QArray<int> m_uids;
+        int m_uid;
+    };
+
+    /**
+     * a find query for custom elements
+     */
+    class FindCustomQuery : public OSQLQuery {
+    public:
+        FindCustomQuery(int uid);
+        FindCustomQuery(const QArray<int>& );
+        ~FindCustomQuery();
+        QString query()const;
+    private:
+        QString single()const;
+        QString multi()const;
+        QArray<int> m_uids;
+        int m_uid;
+    };
+
+
+
+    // We using two tables to store the information:
+    // 1. addressbook  : It contains General information about the contact (non custom)
+    // 2. custom_data  : Not official supported entries
+    // All tables are connected by the uid of the contact.
+    // Maybe I should add a table for meta-information ?
+    CreateQuery::CreateQuery() : OSQLQuery() {}
+    CreateQuery::~CreateQuery() {}
+    QString CreateQuery::query()const {
+        QString qu;
+
+        qu += "create table addressbook( uid PRIMARY KEY ";
+
+        QStringList fieldList = OPimContactFields::untrfields( false );
+        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+            qu += QString( ",\"%1\" VARCHAR(10)" ).arg( *it );
+        }
+        qu += " );";
+
+        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
+
+        return qu;
+    }
+
+    ClearQuery::ClearQuery()
+        : OSQLQuery() {}
+    ClearQuery::~ClearQuery() {}
+    QString ClearQuery::query()const {
+        QString qu = "drop table addressbook;";
+        qu += "drop table custom_data;";
+//      qu += "drop table dates;";
+        return qu;
+    }
+
+
+    LoadQuery::LoadQuery() : OSQLQuery() {}
+    LoadQuery::~LoadQuery() {}
+    QString LoadQuery::query()const {
+        QString qu;
+        qu += "select uid from addressbook";
+
+        return qu;
+    }
+
+
+    InsertQuery::InsertQuery( const OPimContact& contact )
+        : OSQLQuery(), m_contact( contact ) {
+    }
+
+    InsertQuery::~InsertQuery() {
+    }
+
+    /*
+     * converts from a OPimContact to a query
+     */
+    QString InsertQuery::query()const{
+
+        QString qu;
+        qu  += "insert into addressbook VALUES( " +
+            QString::number( m_contact.uid() );
+
+        // Get all information out of the contact-class
+        // Remember: The category is stored in contactMap, too !
+        QMap<int, QString> contactMap = m_contact.toMap();
+
+        QStringList fieldList = OPimContactFields::untrfields( false );
+        QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+            // Convert Column-String to Id and get value for this id..
+            // Hmmm.. Maybe not very cute solution..
+            int id = translate[*it];
+            switch ( id ){
+            case Qtopia::Birthday:
+            case Qtopia::Anniversary:{
+                QDate day;
+                if ( id == Qtopia::Birthday ){
+                    day = m_contact.birthday();
+                } else {
+                    day = m_contact.anniversary();
+                }
+                // These entries should stored in a special format
+                // year-month-day
+                if ( day.isValid() ){
+                    qu += QString(",\"%1-%2-%3\"")
+                        .arg( QString::number( day.year() ).rightJustify( 4, '0' ) )
+                        .arg( QString::number( day.month() ).rightJustify( 2, '0' ) )
+                        .arg( QString::number( day.day() ).rightJustify( 2, '0' ) );
+                } else {
+                    qu += ",\"\"";
+                }
+            }
+                break;
+            default:
+                qu += QString( ",\"%1\"" ).arg( contactMap[id] );
+            }
+        }
+        qu += " );";
+
+
+        // Now add custom data..
+        int id = 0;
+        id = 0;
+        QMap<QString, QString> customMap = m_contact.toExtraMap();
+        for( QMap<QString, QString>::Iterator it = customMap.begin();
+             it != customMap.end(); ++it ){
+            qu  += "insert into custom_data VALUES("
+                +  QString::number( m_contact.uid() )
+                + ","
+                +  QString::number( id++ )
+                + ",'"
+                + it.key()
+                + "',"
+                + "0" // Priority for future enhancements
+                + ",'"
+                + it.data()
+                + "');";
+        }
+        // qu  += "commit;";
+        odebug << "add " << qu << "" << oendl;
+        return qu;
+    }
+
+
+    RemoveQuery::RemoveQuery(int uid )
+        : OSQLQuery(), m_uid( uid ) {}
+    RemoveQuery::~RemoveQuery() {}
+    QString RemoveQuery::query()const {
+        QString qu = "DELETE from addressbook where uid = "
+            + QString::number(m_uid) + ";";
+        qu += "DELETE from custom_data where uid = "
+            + QString::number(m_uid) + ";";
+        return qu;
+    }
+
+
+
+
+    FindQuery::FindQuery(int uid)
+        : OSQLQuery(), m_uid( uid ) {
+    }
+    FindQuery::FindQuery(const QArray<int>& ints)
+        : OSQLQuery(), m_uids( ints ){
+    }
+    FindQuery::~FindQuery() {
+    }
+    QString FindQuery::query()const{
+//      if ( m_uids.count() == 0 )
+        return single();
+    }
+    /*
+      else
+            return multi();
+            }
         QString FindQuery::multi()const {
-                QString qu = "select uid, type, value from addressbook where";
-                for (uint i = 0; i < m_uids.count(); i++ ) {
-                        qu += " UID = " + QString::number( m_uids[i] ) + " OR";
-                }
-                qu.remove( qu.length()-2, 2 ); // Hmmmm.. 
-                return qu;
-        }
-        */
-        QString FindQuery::single()const{
-                QString qu = "select *";
-                qu += " from addressbook where uid = " + QString::number(m_uid);
-
-                // qWarning("find query: %s", qu.latin1() );
-                return qu;
-        }
-
-
-        FindCustomQuery::FindCustomQuery(int uid)
-                : OSQLQuery(), m_uid( uid ) {
-        }
-        FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
-                : OSQLQuery(), m_uids( ints ){
-        }
-        FindCustomQuery::~FindCustomQuery() {
-        }
-        QString FindCustomQuery::query()const{
-        //      if ( m_uids.count() == 0 )
-                        return single();
-        }
-        QString FindCustomQuery::single()const{
-                QString qu = "select uid, type, value from custom_data where uid = ";
-                qu += QString::number(m_uid);
-                return qu;
-        }
+        QString qu = "select uid, type, value from addressbook where";
+        for (uint i = 0; i < m_uids.count(); i++ ) {
+            qu += " UID = " + QString::number( m_uids[i] ) + " OR";
+        }
+        qu.remove( qu.length()-2, 2 ); // Hmmmm..
+        return qu;
+    }
+    */
+    QString FindQuery::single()const{
+        QString qu = "select *";
+        qu += " from addressbook where uid = " + QString::number(m_uid);
+
+        // owarn << "find query: " << qu << "" << oendl;
+        return qu;
+    }
+
+
+    FindCustomQuery::FindCustomQuery(int uid)
+        : OSQLQuery(), m_uid( uid ) {
+    }
+    FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
+        : OSQLQuery(), m_uids( ints ){
+    }
+    FindCustomQuery::~FindCustomQuery() {
+    }
+    QString FindCustomQuery::query()const{
+//      if ( m_uids.count() == 0 )
+            return single();
+    }
+    QString FindCustomQuery::single()const{
+        QString qu = "select uid, type, value from custom_data where uid = ";
+        qu += QString::number(m_uid);
+        return qu;
+    }
 
 };
 
 
 /* --------------------------------------------------------------------------- */
 
 namespace Opie {
 
-OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* appname */, 
-                                                       const QString& filename ): 
-        OPimContactAccessBackend(), m_changed(false), m_driver( NULL )
+OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* appname */,
+                               const QString& filename ):
+    OPimContactAccessBackend(), m_changed(false), m_driver( NULL )
 {
-        qDebug("C'tor OPimContactAccessBackend_SQL starts");
-        QTime t;
-        t.start();
+    odebug << "C'tor OPimContactAccessBackend_SQL starts" << oendl;
+    QTime t;
+    t.start();
 
-        /* Expecting to access the default filename if nothing else is set */
-        if ( filename.isEmpty() ){
-                m_fileName = Global::applicationFileName( "addressbook","addressbook.db" );
-        } else
-                m_fileName = filename;
+    /* Expecting to access the default filename if nothing else is set */
+    if ( filename.isEmpty() ){
+        m_fileName = Global::applicationFileName( "addressbook","addressbook.db" );
+    } else
+        m_fileName = filename;
 
-        // Get the standart sql-driver from the OSQLManager..
-        OSQLManager man;
-        m_driver = man.standard();
-                m_driver->setUrl( m_fileName );
+    // Get the standart sql-driver from the OSQLManager..
+    OSQLManager man;
+    m_driver = man.standard();
+    m_driver->setUrl( m_fileName );
 
-        load();
+    load();
 
-        qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
+    odebug << "C'tor OPimContactAccessBackend_SQL ends: " << t.elapsed() << " ms" << oendl;
 }
 
 OPimContactAccessBackend_SQL::~OPimContactAccessBackend_SQL ()
 {
-        if( m_driver )
-                delete m_driver;
+    if( m_driver )
+        delete m_driver;
 }
 
 bool OPimContactAccessBackend_SQL::load ()
 {
-        if (!m_driver->open() )
-                return false;
+    if (!m_driver->open() )
+        return false;
 
-        // Don't expect that the database exists.
-        // It is save here to create the table, even if it
-        // do exist. ( Is that correct for all databases ?? )
-        CreateQuery creat;
-        OSQLResult res = m_driver->query( &creat );
+    // Don't expect that the database exists.
+    // It is save here to create the table, even if it
+    // do exist. ( Is that correct for all databases ?? )
+    CreateQuery creat;
+    OSQLResult res = m_driver->query( &creat );
 
-        update();
+    update();
 
-        return true;
+    return true;
 
 }
 
 bool OPimContactAccessBackend_SQL::reload()
 {
-        return load();
+    return load();
 }
 
 bool OPimContactAccessBackend_SQL::save()
 {
-        return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
+    return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 
 
 void OPimContactAccessBackend_SQL::clear ()
 {
-        ClearQuery cle;
-        OSQLResult res = m_driver->query( &cle );
+    ClearQuery cle;
+    OSQLResult res = m_driver->query( &cle );
 
-        reload();
+    reload();
 }
 
 bool OPimContactAccessBackend_SQL::wasChangedExternally()
 {
-        return false;
+    return false;
 }
 
 QArray<int> OPimContactAccessBackend_SQL::allRecords() const
 {
 
-        // FIXME: Think about cute handling of changed tables..
-        // Thus, we don't have to call update here...
-         if ( m_changed )  
-                ((OPimContactAccessBackend_SQL*)this)->update();
-        
-        return m_uids;
+    // FIXME: Think about cute handling of changed tables..
+    // Thus, we don't have to call update here...
+    if ( m_changed )
+        ((OPimContactAccessBackend_SQL*)this)->update();
+
+    return m_uids;
 }
 
 bool OPimContactAccessBackend_SQL::add ( const OPimContact &newcontact )
 {
-        qDebug("add in contact SQL-Backend");
-        InsertQuery ins( newcontact );
-        OSQLResult res = m_driver->query( &ins );
-
-        if ( res.state() == OSQLResult::Failure )
-                return false;
-
-        int c = m_uids.count();
-        m_uids.resize( c+1 );
-        m_uids[c] = newcontact.uid();
-        
-        return true;
+    odebug << "add in contact SQL-Backend" << oendl;
+    InsertQuery ins( newcontact );
+    OSQLResult res = m_driver->query( &ins );
+
+    if ( res.state() == OSQLResult::Failure )
+        return false;
+
+    int c = m_uids.count();
+    m_uids.resize( c+1 );
+    m_uids[c] = newcontact.uid();
+
+    return true;
 }
 
 
 bool OPimContactAccessBackend_SQL::remove ( int uid )
 {
-        RemoveQuery rem( uid );
-        OSQLResult res = m_driver->query(&rem );
+    RemoveQuery rem( uid );
+    OSQLResult res = m_driver->query(&rem );
 
-        if ( res.state() == OSQLResult::Failure )
-                return false;
+    if ( res.state() == OSQLResult::Failure )
+        return false;
 
-        m_changed = true;
+    m_changed = true;
 
-        return true;
+    return true;
 }
 
 bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact )
 {
-        if ( !remove( contact.uid() ) )
-                return false;
-        
-        return add( contact );
+    if ( !remove( contact.uid() ) )
+        return false;
+
+    return add( contact );
 }
 
 
 OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
-        qDebug("OPimContactAccessBackend_SQL::find()");
-        QTime t;
-        t.start();
+    odebug << "OPimContactAccessBackend_SQL::find()" << oendl;
+    QTime t;
+    t.start();
 
-        OPimContact retContact( requestNonCustom( uid ) );
-        retContact.setExtraMap( requestCustom( uid ) );
+    OPimContact retContact( requestNonCustom( uid ) );
+    retContact.setExtraMap( requestCustom( uid ) );
 
-        qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
-        return retContact;
+    odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl;
+    return retContact;
 }
 
 
 
 QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd )
 {
-        QString qu = "SELECT uid FROM addressbook WHERE";
-        QString searchQuery ="";
-
-        QDate startDate;
-        
-        if ( qd.isValid() )
-                startDate = qd.date();
-        else
-                startDate = QDate::currentDate();
-        
-
-        QMap<int, QString> queryFields = query.toMap();
-        QStringList fieldList = OPimContactFields::untrfields( false );
-        QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
-
-        // Convert every filled field to a SQL-Query
-        // bool isAnyFieldSelected = false;
-        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
-
-                int id = translate[*it];
-                QString queryStr = queryFields[id];
-                QDate* endDate = 0l;
-
-                if ( !queryStr.isEmpty() ){
-                        // If something is alredy stored in the query, add an "AND"
-                        // to the end of the string to prepare for the next ..
-                        if ( !searchQuery.isEmpty() )
-                                searchQuery += " AND";
-
-        //              isAnyFieldSelected = true;
-                        switch( id ){
-                        case Qtopia::Birthday:
-                                endDate = new QDate( query.birthday() ); 
-                                // Fall through !
-                        case Qtopia::Anniversary:
-                                if ( endDate == 0l )
-                                        endDate = new QDate( query.anniversary() );
-
-                                if ( settings & OPimContactAccess::DateDiff ) {
-                                        searchQuery += QString( " (\"%1\" <= '%2-%3-%4\' AND \"%5\" >= '%6-%7-%8')" )
-                                                .arg( *it )
-                                                .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) )
-                                                .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) )
-                                                .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) )
-                                                .arg( *it )
-                                                .arg( QString::number( startDate.year() ).rightJustify( 4, '0' ) )
-                                                .arg( QString::number( startDate.month() ).rightJustify( 2, '0' ) ) 
-                                                .arg( QString::number( startDate.day() ).rightJustify( 2, '0' ) ) ;
-                                }
-
-                                if ( settings & OPimContactAccess::DateYear ){
-                                        if ( settings & OPimContactAccess::DateDiff )
-                                                searchQuery += " AND";
-
-                                        searchQuery += QString( " (\"%1\" LIKE '%2-%')" )
-                                                .arg( *it )
-                                                .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) );
-                                }
-
-                                if ( settings & OPimContactAccess::DateMonth ){
-                                        if ( ( settings & OPimContactAccess::DateDiff ) 
-                                             || ( settings & OPimContactAccess::DateYear ) )
-                                                searchQuery += " AND";
-
-                                        searchQuery += QString( " (\"%1\" LIKE '%-%2-%')" )
-                                                .arg( *it )
-                                                .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) );
-                                }
-
-                                if ( settings & OPimContactAccess::DateDay ){
-                                        if ( ( settings & OPimContactAccess::DateDiff ) 
-                                             || ( settings & OPimContactAccess::DateYear ) 
-                                             || ( settings & OPimContactAccess::DateMonth ) )
-                                                searchQuery += " AND";
-
-                                        searchQuery += QString( " (\"%1\" LIKE '%-%-%2')" )
-                                                .arg( *it )
-                                                .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) );
-                                }
-
-                                break;
-                        default:
-                                // Switching between case sensitive and insensitive...
-                                // LIKE is not case sensitive, GLOB is case sensitive
-                                // Do exist a better solution to switch this ?
-                                if ( settings & OPimContactAccess::IgnoreCase )
-                                        searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 
-                                                + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 
-                                else
-                                        searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 
-                                                + queryStr + "'" + ")"; 
-                                        
-                        }
-                }
-        }
-        // Skip trailing "AND"
-        // if ( isAnyFieldSelected )
-        //      qu = qu.left( qu.length() - 4 );
-
-        qu += searchQuery;
-
-        qDebug( "queryByExample query: %s", qu.latin1() );
-
-        // Execute query and return the received uid's
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                QArray<int> empty;
-                return empty;
-        }
-
-        QArray<int> list = extractUids( res );
-
-                return list;    
+    QString qu = "SELECT uid FROM addressbook WHERE";
+    QString searchQuery ="";
+
+    QDate startDate;
+
+    if ( qd.isValid() )
+        startDate = qd.date();
+    else
+        startDate = QDate::currentDate();
+
+
+    QMap<int, QString> queryFields = query.toMap();
+    QStringList fieldList = OPimContactFields::untrfields( false );
+    QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+
+    // Convert every filled field to a SQL-Query
+//  bool isAnyFieldSelected = false;
+    for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+
+        int id = translate[*it];
+        QString queryStr = queryFields[id];
+        QDate* endDate = 0l;
+
+        if ( !queryStr.isEmpty() ){
+            // If something is alredy stored in the query, add an "AND"
+            // to the end of the string to prepare for the next ..
+            if ( !searchQuery.isEmpty() )
+                searchQuery += " AND";
+
+//          isAnyFieldSelected = true;
+            switch( id ){
+            case Qtopia::Birthday:
+                endDate = new QDate( query.birthday() );
+                // Fall through !
+            case Qtopia::Anniversary:
+                if ( endDate == 0l )
+                    endDate = new QDate( query.anniversary() );
+
+                if ( settings & OPimContactAccess::DateDiff ) {
+                    searchQuery += QString( " (\"%1\" <= '%2-%3-%4\' AND \"%5\" >= '%6-%7-%8')" )
+                        .arg( *it )
+                        .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) )
+                        .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) )
+                        .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) )
+                        .arg( *it )
+                        .arg( QString::number( startDate.year() ).rightJustify( 4, '0' ) )
+                        .arg( QString::number( startDate.month() ).rightJustify( 2, '0' ) )
+                        .arg( QString::number( startDate.day() ).rightJustify( 2, '0' ) ) ;
+                }
+
+                if ( settings & OPimContactAccess::DateYear ){
+                    if ( settings & OPimContactAccess::DateDiff )
+                        searchQuery += " AND";
+
+                    searchQuery += QString( " (\"%1\" LIKE '%2-%')" )
+                        .arg( *it )
+                        .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) );
+                }
+
+                if ( settings & OPimContactAccess::DateMonth ){
+                    if ( ( settings & OPimContactAccess::DateDiff )
+                         || ( settings & OPimContactAccess::DateYear ) )
+                        searchQuery += " AND";
+
+                    searchQuery += QString( " (\"%1\" LIKE '%-%2-%')" )
+                        .arg( *it )
+                        .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) );
+                }
+
+                if ( settings & OPimContactAccess::DateDay ){
+                    if ( ( settings & OPimContactAccess::DateDiff )
+                         || ( settings & OPimContactAccess::DateYear )
+                         || ( settings & OPimContactAccess::DateMonth ) )
+                        searchQuery += " AND";
+
+                    searchQuery += QString( " (\"%1\" LIKE '%-%-%2')" )
+                        .arg( *it )
+                        .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) );
+                }
+
+                break;
+            default:
+                // Switching between case sensitive and insensitive...
+                // LIKE is not case sensitive, GLOB is case sensitive
+                // Do exist a better solution to switch this ?
+                if ( settings & OPimContactAccess::IgnoreCase )
+                    searchQuery += "(\"" + *it + "\"" + " LIKE " + "'"
+                        + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")";
+                else
+                    searchQuery += "(\"" + *it + "\"" + " GLOB " + "'"
+                        + queryStr + "'" + ")";
+
+            }
+        }
+    }
+    // Skip trailing "AND"
+//  if ( isAnyFieldSelected )
+//      qu = qu.left( qu.length() - 4 );
+
+    qu += searchQuery;
+
+    odebug << "queryByExample query: " << qu << "" << oendl;
+
+    // Execute query and return the received uid's
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        QArray<int> empty;
+        return empty;
+    }
+
+    QArray<int> list = extractUids( res );
+
+    return list;
 }
 
 QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
 {
 #if 0
-        QArray<int> nix(0);
-        return nix;
+    QArray<int> nix(0);
+    return nix;
 
 #else
-        QString qu = "SELECT uid FROM addressbook WHERE (";
-        QString searchlist;
+    QString qu = "SELECT uid FROM addressbook WHERE (";
+    QString searchlist;
 
-        QStringList fieldList = OPimContactFields::untrfields( false );
-        // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
-        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
-                if ( !searchlist.isEmpty() )
-                        searchlist += " OR ";
-                searchlist += " rlike(\""+ r.pattern() + "\",\"" + *it + "\") ";
-        }
-                
-        qu = qu + searchlist + ")";
+    QStringList fieldList = OPimContactFields::untrfields( false );
+    // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+    for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+        if ( !searchlist.isEmpty() )
+            searchlist += " OR ";
+        searchlist += " rlike(\""+ r.pattern() + "\",\"" + *it + "\") ";
+    }
 
-        qDebug( "query: %s", qu.latin1() );
+    qu = qu + searchlist + ")";
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    odebug << "query: " << qu << "" << oendl;
 
-        return extractUids( res );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+
+    return extractUids( res );
 
 
 #endif
 }
 
 const uint OPimContactAccessBackend_SQL::querySettings()
 {
-        return OPimContactAccess::IgnoreCase 
-                | OPimContactAccess::WildCards
-                | OPimContactAccess::DateDiff
-                | OPimContactAccess::DateYear
-                | OPimContactAccess::DateMonth
-                | OPimContactAccess::DateDay
-                ;
+    return OPimContactAccess::IgnoreCase
+        | OPimContactAccess::WildCards
+        | OPimContactAccess::DateDiff
+        | OPimContactAccess::DateYear
+        | OPimContactAccess::DateMonth
+        | OPimContactAccess::DateDay
+        ;
 }
 
 bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
 {
-        /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
-         * may be added with any of the other settings. IgnoreCase should never used alone.
-         * Wildcards, RegExp, ExactMatch should never used at the same time...
-         */
-
-        // Step 1: Check whether the given settings are supported by this backend
-        if ( ( querySettings & ( 
-                                OPimContactAccess::IgnoreCase
-                                | OPimContactAccess::WildCards
-                                | OPimContactAccess::DateDiff
-                                | OPimContactAccess::DateYear
-                                | OPimContactAccess::DateMonth
-                                | OPimContactAccess::DateDay
-        //                      | OPimContactAccess::RegExp
-        //                      | OPimContactAccess::ExactMatch
-                               ) ) != querySettings )
-                return false;
-
-        // Step 2: Check whether the given combinations are ok..
-
-        // IngoreCase alone is invalid
-        if ( querySettings == OPimContactAccess::IgnoreCase )
-                return false;
-
-        // WildCards, RegExp and ExactMatch should never used at the same time 
-        switch ( querySettings & ~( OPimContactAccess::IgnoreCase
-                                    | OPimContactAccess::DateDiff
-                                    | OPimContactAccess::DateYear
-                                    | OPimContactAccess::DateMonth
-                                    | OPimContactAccess::DateDay
-                                    )
-                 ){
-        case OPimContactAccess::RegExp:
-                return ( true );
-        case OPimContactAccess::WildCards:
-                return ( true );
-        case OPimContactAccess::ExactMatch:
-                return ( true );
-        case 0: // one of the upper removed bits were set..
-                return ( true );
-        default:
-                return ( false );
-        }
+    /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
+     * may be added with any of the other settings. IgnoreCase should never used alone.
+     * Wildcards, RegExp, ExactMatch should never used at the same time...
+     */
+
+    // Step 1: Check whether the given settings are supported by this backend
+    if ( ( querySettings & (
+                OPimContactAccess::IgnoreCase
+                | OPimContactAccess::WildCards
+                | OPimContactAccess::DateDiff
+                | OPimContactAccess::DateYear
+                | OPimContactAccess::DateMonth
+                | OPimContactAccess::DateDay
+//              | OPimContactAccess::RegExp
+//              | OPimContactAccess::ExactMatch
+                   ) ) != querySettings )
+        return false;
+
+    // Step 2: Check whether the given combinations are ok..
+
+    // IngoreCase alone is invalid
+    if ( querySettings == OPimContactAccess::IgnoreCase )
+        return false;
+
+    // WildCards, RegExp and ExactMatch should never used at the same time
+    switch ( querySettings & ~( OPimContactAccess::IgnoreCase
+                    | OPimContactAccess::DateDiff
+                    | OPimContactAccess::DateYear
+                    | OPimContactAccess::DateMonth
+                    | OPimContactAccess::DateDay
+                    )
+         ){
+    case OPimContactAccess::RegExp:
+        return ( true );
+    case OPimContactAccess::WildCards:
+        return ( true );
+    case OPimContactAccess::ExactMatch:
+        return ( true );
+    case 0: // one of the upper removed bits were set..
+        return ( true );
+    default:
+        return ( false );
+    }
 
 }
 
 QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
 {
-        QTime t;
-        t.start();
+    QTime t;
+    t.start();
 
-        QString query = "SELECT uid FROM addressbook ";
-        query += "ORDER BY \"Last Name\" ";
+    QString query = "SELECT uid FROM addressbook ";
+    query += "ORDER BY \"Last Name\" ";
 
-        if ( !asc )
-                query += "DESC";
+    if ( !asc )
+        query += "DESC";
 
-        // qDebug("sorted query is: %s", query.latin1() ); 
+    // odebug << "sorted query is: " << query << "" << oendl;
 
-        OSQLRawQuery raw( query );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                QArray<int> empty;
-                return empty;
-        }
+    OSQLRawQuery raw( query );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        QArray<int> empty;
+        return empty;
+    }
 
-        QArray<int> list = extractUids( res );
+    QArray<int> list = extractUids( res );
 
-        qDebug("sorted needed %d ms!", t.elapsed() );
-        return list;
+    odebug << "sorted needed " << t.elapsed() << " ms!" << oendl;
+    return list;
 }
 
 
 void OPimContactAccessBackend_SQL::update()
 {
-        qDebug("Update starts");
-        QTime t;
-        t.start();
+    odebug << "Update starts" << oendl;
+    QTime t;
+    t.start();
 
-        // Now load the database set and extract the uid's
-        // which will be held locally
+    // Now load the database set and extract the uid's
+    // which will be held locally
 
-        LoadQuery lo;
-        OSQLResult res = m_driver->query(&lo);
-        if ( res.state() != OSQLResult::Success )
-                return;
+    LoadQuery lo;
+    OSQLResult res = m_driver->query(&lo);
+    if ( res.state() != OSQLResult::Success )
+        return;
 
-        m_uids = extractUids( res );
+    m_uids = extractUids( res );
 
-        m_changed = false;
+    m_changed = false;
 
-        qDebug("Update ends %d ms", t.elapsed() );
+    odebug << "Update ends " << t.elapsed() << " ms" << oendl;
 }
 
 QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-        qDebug("extractUids");
-        QTime t;
-        t.start();
-        OSQLResultItem::ValueList list = res.results();
-        OSQLResultItem::ValueList::Iterator it;
-        QArray<int> ints(list.count() );
-        qDebug(" count = %d", list.count() );
-
-        int i = 0;
-        for (it = list.begin(); it != list.end(); ++it ) {
-                ints[i] =  (*it).data("uid").toInt();
-                i++;
-        }
-        qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
-
-        return ints;
+    odebug << "extractUids" << oendl;
+    QTime t;
+    t.start();
+    OSQLResultItem::ValueList list = res.results();
+    OSQLResultItem::ValueList::Iterator it;
+    QArray<int> ints(list.count() );
+    odebug << " count = " << list.count() << "" << oendl;
+
+    int i = 0;
+    for (it = list.begin(); it != list.end(); ++it ) {
+        ints[i] =  (*it).data("uid").toInt();
+        i++;
+    }
+    odebug << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl;
+
+    return ints;
 
 }
 
 QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
 {
-        QTime t;
-        t.start();
-
-        QMap<int, QString> nonCustomMap;
-        
-        int t2needed = 0;
-        int t3needed = 0;
-        QTime t2;
-        t2.start();
-        FindQuery query( uid );
-        OSQLResult res_noncustom = m_driver->query( &query );
-        t2needed = t2.elapsed();
-
-        OSQLResultItem resItem = res_noncustom.first();
-
-        QTime t3;
-        t3.start();
-        // Now loop through all columns
-        QStringList fieldList = OPimContactFields::untrfields( false );
-        QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
-        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
-                // Get data for the selected column and store it with the
-                // corresponding id into the map..
-
-                int id =  translate[*it];
-                QString value = resItem.data( (*it) );
-                
-                // qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() );
-
-                switch( id ){
-                case Qtopia::Birthday:
-                case Qtopia::Anniversary:{
-                        // Birthday and Anniversary are encoded special ( yyyy-mm-dd )
-                        QStringList list = QStringList::split( '-', value );
-                        QStringList::Iterator lit = list.begin();
-                        int year  = (*lit).toInt();
-                        int month = (*(++lit)).toInt();
-                        int day   = (*(++lit)).toInt();
-                        if ( ( day != 0 ) && ( month != 0 ) && ( year != 0 ) ){
-                             QDate date( year, month, day );
-                             nonCustomMap.insert( id, OPimDateConversion::dateToString( date ) );
-                        }
-                }
-                        break;
-                case Qtopia::AddressCategory:
-                        qDebug("Category is: %s", value.latin1() );
-                default:
-                        nonCustomMap.insert( id, value );
-                }
-        }
-
-        // First insert uid
-        nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) ); 
-        t3needed = t3.elapsed();
-
-        // qDebug("Adding UID: %s", resItem.data( "uid" ).latin1() );
-        qDebug("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
-                 t.elapsed(), t2needed, t3needed  );
-
-        return nonCustomMap;
+    QTime t;
+    t.start();
+
+    QMap<int, QString> nonCustomMap;
+
+    int t2needed = 0;
+    int t3needed = 0;
+    QTime t2;
+    t2.start();
+    FindQuery query( uid );
+    OSQLResult res_noncustom = m_driver->query( &query );
+    t2needed = t2.elapsed();
+
+    OSQLResultItem resItem = res_noncustom.first();
+
+    QTime t3;
+    t3.start();
+    // Now loop through all columns
+    QStringList fieldList = OPimContactFields::untrfields( false );
+    QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+    for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+        // Get data for the selected column and store it with the
+        // corresponding id into the map..
+
+        int id =  translate[*it];
+        QString value = resItem.data( (*it) );
+
+        // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl;
+
+        switch( id ){
+        case Qtopia::Birthday:
+        case Qtopia::Anniversary:{
+            // Birthday and Anniversary are encoded special ( yyyy-mm-dd )
+            QStringList list = QStringList::split( '-', value );
+            QStringList::Iterator lit = list.begin();
+            int year  = (*lit).toInt();
+            int month = (*(++lit)).toInt();
+            int day   = (*(++lit)).toInt();
+            if ( ( day != 0 ) && ( month != 0 ) && ( year != 0 ) ){
+                 QDate date( year, month, day );
+                 nonCustomMap.insert( id, OPimDateConversion::dateToString( date ) );
+            }
+        }
+            break;
+        case Qtopia::AddressCategory:
+            odebug << "Category is: " << value << "" << oendl;
+        default:
+            nonCustomMap.insert( id, value );
+        }
+    }
+
+    // First insert uid
+    nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) );
+    t3needed = t3.elapsed();
+
+    // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl;
+    odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed
+           << " ms, mapping: " << t3needed << " ms" << oendl;
+
+    return nonCustomMap;
 }
 
 QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) const
 {
-        QTime t;
-        t.start();
-
-        QMap<QString, QString> customMap;
-        
-        FindCustomQuery query( uid );
-        OSQLResult res_custom = m_driver->query( &query );
-
-        if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
-                QMap<QString, QString> empty;
-                return empty;
-        }
-
-        OSQLResultItem::ValueList list = res_custom.results();
-        OSQLResultItem::ValueList::Iterator it = list.begin();
-        for ( ; it != list.end(); ++it ) {
-                customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
-        }
-
-        qDebug("RequestCustom needed: %d ms", t.elapsed() );
-        return customMap;
+    QTime t;
+    t.start();
+
+    QMap<QString, QString> customMap;
+
+    FindCustomQuery query( uid );
+    OSQLResult res_custom = m_driver->query( &query );
+
+    if ( res_custom.state() == OSQLResult::Failure ) {
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
+        QMap<QString, QString> empty;
+        return empty;
+    }
+
+    OSQLResultItem::ValueList list = res_custom.results();
+    OSQLResultItem::ValueList::Iterator it = list.begin();
+    for ( ; it != list.end(); ++it ) {
+        customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
+    }
+
+    odebug << "RequestCustom needed: " << t.elapsed() << " ms" << oendl;
+    return customMap;
 }
 
 }
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index ffa6a7d..b6ea461 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -1,596 +1,598 @@
 /*
                              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.
 */
 /*
  * VCard Backend for the OPIE-Contact Database.
  */
 
 
 #include "vobject_p.h"
 
 /* OPIE */
 #include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/odebug.h>
+
 #include <qpe/timeconversion.h>
 
 //FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
 #define protected public
 #include <qfile.h>
 #undef protected
 
 namespace Opie {
 
 OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ):
-        m_dirty( false ),
-        m_file( filename )
+    m_dirty( false ),
+    m_file( filename )
 {
-        load();
+    load();
 }
 
 
 bool OPimContactAccessBackend_VCard::load ()
 {
-        m_map.clear();
-        m_dirty = false;
-
-        VObject* obj = 0l;
-
-        if ( QFile::exists(m_file) ){
-                obj = Parse_MIME_FromFileName( QFile::encodeName(m_file).data() );
-                if ( !obj )
-                        return false;
-        }else{
-                qWarning("File \"%s\" not found !", m_file.latin1() );
-                return false;
-        }
-
-        while ( obj ) {
-                OPimContact con = parseVObject( obj );
-                /*
-                 * if uid is 0 assign a new one
-                 * this at least happens on
-                 * Nokia6210
-                 */
-                if ( con.uid() == 0 ){
-                        con.setUid( 1 );
-                        qWarning("assigned new uid %d",con.uid() );
-                }
-
-                m_map.insert( con.uid(), con );
-
-                VObject *t = obj;
-                obj = nextVObjectInList(obj);
-                cleanVObject( t );
-        }
-
-        return true;
+    m_map.clear();
+    m_dirty = false;
+
+    VObject* obj = 0l;
+
+    if ( QFile::exists(m_file) ){
+        obj = Parse_MIME_FromFileName( QFile::encodeName(m_file).data() );
+        if ( !obj )
+            return false;
+    }else{
+        owarn << "File \"" << m_file << "\" not found !" << oendl;
+        return false;
+    }
+
+    while ( obj ) {
+        OPimContact con = parseVObject( obj );
+        /*
+         * if uid is 0 assign a new one
+         * this at least happens on
+         * Nokia6210
+         */
+        if ( con.uid() == 0 ){
+            con.setUid( 1 );
+            owarn << "assigned new uid " << con.uid() << "" << oendl;
+        }
+
+        m_map.insert( con.uid(), con );
+
+        VObject *t = obj;
+        obj = nextVObjectInList(obj);
+        cleanVObject( t );
+    }
+
+    return true;
 
 }
 bool OPimContactAccessBackend_VCard::reload()
 {
-        return load();
+    return load();
 }
 bool OPimContactAccessBackend_VCard::save()
 {
-        if (!m_dirty )
-                return true;
+    if (!m_dirty )
+        return true;
 
-        QFile file( m_file );
-        if (!file.open(IO_WriteOnly ) )
-                return false;
+    QFile file( m_file );
+    if (!file.open(IO_WriteOnly ) )
+        return false;
 
-        VObject *obj;
-        obj = newVObject( VCCalProp );
-        addPropValue( obj, VCVersionProp, "1.0" );
+    VObject *obj;
+    obj = newVObject( VCCalProp );
+    addPropValue( obj, VCVersionProp, "1.0" );
 
-        VObject *vo;
-        for(QMap<int, OPimContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
-                vo = createVObject( *it );
-                writeVObject( file.fh, vo ); //FIXME: HACK!!!
-                cleanVObject( vo );
-        }
-        cleanStrTbl();
-        deleteVObject( obj );
+    VObject *vo;
+    for(QMap<int, OPimContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
+        vo = createVObject( *it );
+        writeVObject( file.fh, vo ); //FIXME: HACK!!!
+        cleanVObject( vo );
+    }
+    cleanStrTbl();
+    deleteVObject( obj );
 
-        m_dirty = false;
-        return true;
+    m_dirty = false;
+    return true;
 
 
 }
 void OPimContactAccessBackend_VCard::clear ()
 {
-        m_map.clear();
-        m_dirty = true; // ??? sure ? (se)
+    m_map.clear();
+    m_dirty = true; // ??? sure ? (se)
 }
 
 bool OPimContactAccessBackend_VCard::add ( const OPimContact& newcontact )
 {
-        m_map.insert( newcontact.uid(), newcontact );
-        m_dirty = true;
-        return true;
+    m_map.insert( newcontact.uid(), newcontact );
+    m_dirty = true;
+    return true;
 }
 
 bool OPimContactAccessBackend_VCard::remove ( int uid )
 {
-        m_map.remove( uid );
-        m_dirty = true;
-        return true;
+    m_map.remove( uid );
+    m_dirty = true;
+    return true;
 }
 
 bool OPimContactAccessBackend_VCard::replace ( const OPimContact &contact )
 {
-        m_map.replace( contact.uid(), contact );
-        m_dirty = true;
-        return true;
+    m_map.replace( contact.uid(), contact );
+    m_dirty = true;
+    return true;
 }
 
 OPimContact OPimContactAccessBackend_VCard::find ( int uid ) const
 {
     return m_map[uid];
 }
 
 QArray<int> OPimContactAccessBackend_VCard::allRecords() const
 {
-        QArray<int> ar( m_map.count() );
-        QMap<int, OPimContact>::ConstIterator it;
-        int i = 0;
-        for ( it = m_map.begin(); it != m_map.end(); ++it ) {
-                ar[i] = it.key();
-                i++;
-        }
-        return ar;
+    QArray<int> ar( m_map.count() );
+    QMap<int, OPimContact>::ConstIterator it;
+    int i = 0;
+    for ( it = m_map.begin(); it != m_map.end(); ++it ) {
+        ar[i] = it.key();
+        i++;
+    }
+    return ar;
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::queryByExample ( const OPimContact&, int, const QDateTime& )
 {
-        QArray<int> ar(0);
-        return ar;
+    QArray<int> ar(0);
+    return ar;
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
 {
-        QArray<int> ar(0);
-        return ar;
+    QArray<int> ar(0);
+    return ar;
 }
 
 const uint OPimContactAccessBackend_VCard::querySettings()
 {
-        return 0; // No search possible
+    return 0; // No search possible
 }
 
 bool OPimContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
-        return false; // No search possible, therefore all settings invalid ;)
+    return false; // No search possible, therefore all settings invalid ;)
 }
 
 bool OPimContactAccessBackend_VCard::wasChangedExternally()
 {
-        return false; // Don't expect concurrent access
+    return false; // Don't expect concurrent access
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::sorted( bool , int, int, int )
 {
-        QArray<int> ar(0);
-        return ar;
+    QArray<int> ar(0);
+    return ar;
 }
 
 // *** Private stuff ***
 
 
 OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
-        OPimContact c;
-
-        VObjectIterator it;
-        initPropIterator( &it, obj );
-        while( moreIteration( &it ) ) {
-                VObject *o = nextVObject( &it );
-                QCString name = vObjectName( o );
-                QCString value = vObjectStringZValue( o );
-                if ( name == VCNameProp ) {
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectTypeInfo( o );
-                                QString value = vObjectStringZValue( o );
-                                if ( name == VCNamePrefixesProp )
-                                        c.setTitle( value );
-                                else if ( name == VCNameSuffixesProp )
-                                        c.setSuffix( value );
-                                else if ( name == VCFamilyNameProp )
-                                        c.setLastName( value );
-                                else if ( name == VCGivenNameProp )
-                                        c.setFirstName( value );
-                                else if ( name == VCAdditionalNamesProp )
-                                        c.setMiddleName( value );
-                        }
-                }
-                else if ( name == VCAdrProp ) {
-                        bool work = TRUE; // default address is work address
-                        QString street;
-                        QString city;
-                        QString region;
-                        QString postal;
-                        QString country;
-
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectName( o );
-                                QString value = vObjectStringZValue( o );
-                                if ( name == VCHomeProp )
-                                        work = FALSE;
-                                else if ( name == VCWorkProp )
-                                        work = TRUE;
-                                else if ( name == VCStreetAddressProp )
-                                        street = value;
-                                else if ( name == VCCityProp )
-                                        city = value;
-                                else if ( name == VCRegionProp )
-                                        region = value;
-                                else if ( name == VCPostalCodeProp )
-                                        postal = value;
-                                else if ( name == VCCountryNameProp )
-                                        country = value;
-                        }
-                        if ( work ) {
-                                c.setBusinessStreet( street );
-                                c.setBusinessCity( city );
-                                c.setBusinessCountry( country );
-                                c.setBusinessZip( postal );
-                                c.setBusinessState( region );
-                        } else {
-                                c.setHomeStreet( street );
-                                c.setHomeCity( city );
-                                c.setHomeCountry( country );
-                                c.setHomeZip( postal );
-                                c.setHomeState( region );
-                        }
-                }
-                else if ( name == VCTelephoneProp ) {
-                        enum {
-                                HOME = 0x01,
-                                WORK = 0x02,
-                                VOICE = 0x04,
-                                CELL = 0x08,
-                                FAX = 0x10,
-                                PAGER = 0x20,
-                                UNKNOWN = 0x80
-                        };
-                        int type = 0;
-
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectTypeInfo( o );
-                                if ( name == VCHomeProp )
-                                        type |= HOME;
-                                else if ( name == VCWorkProp )
-                                        type |= WORK;
-                                else if ( name == VCVoiceProp )
-                                        type |= VOICE;
-                                else if ( name == VCCellularProp )
-                                        type |= CELL;
-                                else if ( name == VCFaxProp )
-                                        type |= FAX;
-                                else if ( name == VCPagerProp )
-                                        type |= PAGER;
-                                else  if ( name == VCPreferredProp )
-                                        ;
-                                else
-                                        type |= UNKNOWN;
-                        }
-                        if ( (type & UNKNOWN) != UNKNOWN ) {
-                                if ( ( type & (HOME|WORK) ) == 0 ) // default
-                                        type |= HOME;
-                                if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
-                                        type |= VOICE;
-
-                                qWarning("value %s %d", value.data(), type );
-                                if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) )
-                                        c.setHomePhone( value );
-                                if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
-                                        c.setHomeFax( value );
-                                if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
-                                        c.setHomeMobile( value );
-                                if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) && (type & (CELL|WORK) ) != (CELL|WORK) )
-                                        c.setBusinessPhone( value );
-                                if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
-                                        c.setBusinessFax( value );
-                                if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
-                                        c.setBusinessMobile( value );
-                                if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
-                                        c.setBusinessPager( value );
-                        }
-                }
-                else if ( name == VCEmailAddressProp ) {
-                        QString email = vObjectStringZValue( o );
-                        bool valid = TRUE;
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectTypeInfo( o );
-                                if ( name != VCInternetProp && name != VCHomeProp &&
-                                     name != VCWorkProp &&
-                                     name != VCPreferredProp )
-                                        // ### preffered should map to default email
-                                        valid = FALSE;
-                        }
-                        if ( valid ) {
-                                c.insertEmail( email );
-                        }
-                }
-                else if ( name == VCURLProp ) {
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectTypeInfo( o );
-                                if ( name == VCHomeProp )
-                                        c.setHomeWebpage( value );
-                                else if ( name == VCWorkProp )
-                                        c.setBusinessWebpage( value );
-                        }
-                }
-                else if ( name == VCOrgProp ) {
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectName( o );
-                                QString value = vObjectStringZValue( o );
-                                if ( name == VCOrgNameProp )
-                                        c.setCompany( value );
-                                else if ( name == VCOrgUnitProp )
-                                        c.setDepartment( value );
-                                else if ( name == VCOrgUnit2Prop )
-                                        c.setOffice( value );
-                        }
-                }
-                else if ( name == VCTitleProp ) {
-                        c.setJobTitle( value );
-                }
-                else if ( name == "X-Qtopia-Profession" ) {
-                        c.setProfession( value );
-                }
-                else if ( name == "X-Qtopia-Manager" ) {
-                        c.setManager( value );
-                }
-                else if ( name == "X-Qtopia-Assistant" ) {
-                        c.setAssistant( value );
-                }
-                else if ( name == "X-Qtopia-Spouse" ) {
-                        c.setSpouse( value );
-                }
-                else if ( name == "X-Qtopia-Gender" ) {
-                        c.setGender( value );
-                }
-                else if ( name == "X-Qtopia-Anniversary" ) {
-                        c.setAnniversary( convVCardDateToDate( value ) );
-                }
-                else if ( name == "X-Qtopia-Nickname" ) {
-                        c.setNickname( value );
-                }
-                else if ( name == "X-Qtopia-Children" ) {
-                        c.setChildren( value );
-                }
-                else if ( name == VCBirthDateProp ) {
-                        // Reading Birthdate regarding RFC 2425 (5.8.4)
-                        c.setBirthday( convVCardDateToDate( value ) );
-
-                }
-                else if ( name == VCCommentProp ) {
-                        c.setNotes( value );
-                }
+    OPimContact c;
+
+    VObjectIterator it;
+    initPropIterator( &it, obj );
+    while( moreIteration( &it ) ) {
+        VObject *o = nextVObject( &it );
+        QCString name = vObjectName( o );
+        QCString value = vObjectStringZValue( o );
+        if ( name == VCNameProp ) {
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectTypeInfo( o );
+                QString value = vObjectStringZValue( o );
+                if ( name == VCNamePrefixesProp )
+                    c.setTitle( value );
+                else if ( name == VCNameSuffixesProp )
+                    c.setSuffix( value );
+                else if ( name == VCFamilyNameProp )
+                    c.setLastName( value );
+                else if ( name == VCGivenNameProp )
+                    c.setFirstName( value );
+                else if ( name == VCAdditionalNamesProp )
+                    c.setMiddleName( value );
+            }
+        }
+        else if ( name == VCAdrProp ) {
+            bool work = TRUE; // default address is work address
+            QString street;
+            QString city;
+            QString region;
+            QString postal;
+            QString country;
+
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectName( o );
+                QString value = vObjectStringZValue( o );
+                if ( name == VCHomeProp )
+                    work = FALSE;
+                else if ( name == VCWorkProp )
+                    work = TRUE;
+                else if ( name == VCStreetAddressProp )
+                    street = value;
+                else if ( name == VCCityProp )
+                    city = value;
+                else if ( name == VCRegionProp )
+                    region = value;
+                else if ( name == VCPostalCodeProp )
+                    postal = value;
+                else if ( name == VCCountryNameProp )
+                    country = value;
+            }
+            if ( work ) {
+                c.setBusinessStreet( street );
+                c.setBusinessCity( city );
+                c.setBusinessCountry( country );
+                c.setBusinessZip( postal );
+                c.setBusinessState( region );
+            } else {
+                c.setHomeStreet( street );
+                c.setHomeCity( city );
+                c.setHomeCountry( country );
+                c.setHomeZip( postal );
+                c.setHomeState( region );
+            }
+        }
+        else if ( name == VCTelephoneProp ) {
+            enum {
+                HOME = 0x01,
+                WORK = 0x02,
+                VOICE = 0x04,
+                CELL = 0x08,
+                FAX = 0x10,
+                PAGER = 0x20,
+                UNKNOWN = 0x80
+            };
+            int type = 0;
+
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectTypeInfo( o );
+                if ( name == VCHomeProp )
+                    type |= HOME;
+                else if ( name == VCWorkProp )
+                    type |= WORK;
+                else if ( name == VCVoiceProp )
+                    type |= VOICE;
+                else if ( name == VCCellularProp )
+                    type |= CELL;
+                else if ( name == VCFaxProp )
+                    type |= FAX;
+                else if ( name == VCPagerProp )
+                    type |= PAGER;
+                else  if ( name == VCPreferredProp )
+                    ;
+                else
+                    type |= UNKNOWN;
+            }
+            if ( (type & UNKNOWN) != UNKNOWN ) {
+                if ( ( type & (HOME|WORK) ) == 0 ) // default
+                    type |= HOME;
+                if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
+                    type |= VOICE;
+
+                                owarn << "value " << value.data() << " " << type << "" << oendl;
+                if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) )
+                    c.setHomePhone( value );
+                if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
+                    c.setHomeFax( value );
+                if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
+                    c.setHomeMobile( value );
+                if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) && (type & (CELL|WORK) ) != (CELL|WORK) )
+                    c.setBusinessPhone( value );
+                if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
+                    c.setBusinessFax( value );
+                if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
+                    c.setBusinessMobile( value );
+                if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
+                    c.setBusinessPager( value );
+            }
+        }
+        else if ( name == VCEmailAddressProp ) {
+            QString email = vObjectStringZValue( o );
+            bool valid = TRUE;
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectTypeInfo( o );
+                if ( name != VCInternetProp && name != VCHomeProp &&
+                     name != VCWorkProp &&
+                     name != VCPreferredProp )
+                    // ### preffered should map to default email
+                    valid = FALSE;
+            }
+            if ( valid ) {
+                c.insertEmail( email );
+            }
+        }
+        else if ( name == VCURLProp ) {
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectTypeInfo( o );
+                if ( name == VCHomeProp )
+                    c.setHomeWebpage( value );
+                else if ( name == VCWorkProp )
+                    c.setBusinessWebpage( value );
+            }
+        }
+        else if ( name == VCOrgProp ) {
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectName( o );
+                QString value = vObjectStringZValue( o );
+                if ( name == VCOrgNameProp )
+                    c.setCompany( value );
+                else if ( name == VCOrgUnitProp )
+                    c.setDepartment( value );
+                else if ( name == VCOrgUnit2Prop )
+                    c.setOffice( value );
+            }
+        }
+        else if ( name == VCTitleProp ) {
+            c.setJobTitle( value );
+        }
+        else if ( name == "X-Qtopia-Profession" ) {
+            c.setProfession( value );
+        }
+        else if ( name == "X-Qtopia-Manager" ) {
+            c.setManager( value );
+        }
+        else if ( name == "X-Qtopia-Assistant" ) {
+            c.setAssistant( value );
+        }
+        else if ( name == "X-Qtopia-Spouse" ) {
+            c.setSpouse( value );
+        }
+        else if ( name == "X-Qtopia-Gender" ) {
+            c.setGender( value );
+        }
+        else if ( name == "X-Qtopia-Anniversary" ) {
+            c.setAnniversary( convVCardDateToDate( value ) );
+        }
+        else if ( name == "X-Qtopia-Nickname" ) {
+            c.setNickname( value );
+        }
+        else if ( name == "X-Qtopia-Children" ) {
+            c.setChildren( value );
+        }
+        else if ( name == VCBirthDateProp ) {
+            // Reading Birthdate regarding RFC 2425 (5.8.4)
+            c.setBirthday( convVCardDateToDate( value ) );
+
+        }
+        else if ( name == VCCommentProp ) {
+            c.setNotes( value );
+        }
 #if 0
-                else {
-                        printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
-                        VObjectIterator nit;
-                        initPropIterator( &nit, o );
-                        while( moreIteration( &nit ) ) {
-                                VObject *o = nextVObject( &nit );
-                                QCString name = vObjectName( o );
-                                QString value = vObjectStringZValue( o );
-                                printf(" subprop: %s = %s\n", name.data(), value.latin1() );
-                        }
-                }
+        else {
+            printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
+            VObjectIterator nit;
+            initPropIterator( &nit, o );
+            while( moreIteration( &nit ) ) {
+                VObject *o = nextVObject( &nit );
+                QCString name = vObjectName( o );
+                QString value = vObjectStringZValue( o );
+                printf(" subprop: %s = %s\n", name.data(), value.latin1() );
+            }
+        }
 #endif
-        }
-        c.setFileAs();
-        return c;
+    }
+    c.setFileAs();
+    return c;
 }
 
 
 VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
 {
-        VObject *vcard = newVObject( VCCardProp );
-        safeAddPropValue( vcard, VCVersionProp, "2.1" );
-        safeAddPropValue( vcard, VCLastRevisedProp, TimeConversion::toISO8601( QDateTime::currentDateTime() ) );
-        safeAddPropValue( vcard, VCUniqueStringProp, QString::number(c.uid()) );
-
-        // full name
-        safeAddPropValue( vcard, VCFullNameProp, c.fullName() );
-
-        // name properties
-        VObject *name = safeAddProp( vcard, VCNameProp );
-        safeAddPropValue( name, VCFamilyNameProp, c.lastName() );
-        safeAddPropValue( name, VCGivenNameProp, c.firstName() );
-        safeAddPropValue( name, VCAdditionalNamesProp, c.middleName() );
-        safeAddPropValue( name, VCNamePrefixesProp, c.title() );
-        safeAddPropValue( name, VCNameSuffixesProp, c.suffix() );
-
-        // home properties
-        VObject *home_adr= safeAddProp( vcard, VCAdrProp );
-        safeAddProp( home_adr, VCHomeProp );
-        safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
-        safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
-        safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
-        safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
-        safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
-
-        VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
-        safeAddProp( home_phone, VCHomeProp );
-        home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
-        safeAddProp( home_phone, VCHomeProp );
-        safeAddProp( home_phone, VCCellularProp );
-        home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
-        safeAddProp( home_phone, VCHomeProp );
-        safeAddProp( home_phone, VCFaxProp );
-
-        VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
-        safeAddProp( url, VCHomeProp );
-
-        // work properties
-        VObject *work_adr= safeAddProp( vcard, VCAdrProp );
-        safeAddProp( work_adr, VCWorkProp );
-        safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
-        safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
-        safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
-        safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
-        safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
-
-        VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
-        safeAddProp( work_phone, VCWorkProp );
-        work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
-        safeAddProp( work_phone, VCWorkProp );
-        safeAddProp( work_phone, VCCellularProp );
-        work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
-        safeAddProp( work_phone, VCWorkProp );
-        safeAddProp( work_phone, VCFaxProp );
-        work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
-        safeAddProp( work_phone, VCWorkProp );
-        safeAddProp( work_phone, VCPagerProp );
-
-        url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
-        safeAddProp( url, VCWorkProp );
-
-        VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
-        safeAddProp( title, VCWorkProp );
-
-
-        QStringList emails = c.emailList();
-        // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
-        for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
-                VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
-                safeAddProp( email, VCInternetProp );
-        }
-
-        safeAddPropValue( vcard, VCNoteProp, c.notes() );
-
-        // Exporting Birthday regarding RFC 2425 (5.8.4)
-        if ( c.birthday().isValid() ){
-                qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() );
-                safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
-        }
-
-        if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
-                VObject *org = safeAddProp( vcard, VCOrgProp );
-                safeAddPropValue( org, VCOrgNameProp, c.company() );
-                safeAddPropValue( org, VCOrgUnitProp, c.department() );
-                safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
-        }
-
-        // some values we have to export as custom fields
-        safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
-        safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
-        safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
-
-        safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
-        safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
-        if ( c.anniversary().isValid() ){
-                qWarning("Exporting anniversary as: %s", convDateToVCardDate( c.anniversary() ).latin1() );
-                safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
-        }
-        safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
-        safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
-
-        return vcard;
+    VObject *vcard = newVObject( VCCardProp );
+    safeAddPropValue( vcard, VCVersionProp, "2.1" );
+    safeAddPropValue( vcard, VCLastRevisedProp, TimeConversion::toISO8601( QDateTime::currentDateTime() ) );
+    safeAddPropValue( vcard, VCUniqueStringProp, QString::number(c.uid()) );
+
+    // full name
+    safeAddPropValue( vcard, VCFullNameProp, c.fullName() );
+
+    // name properties
+    VObject *name = safeAddProp( vcard, VCNameProp );
+    safeAddPropValue( name, VCFamilyNameProp, c.lastName() );
+    safeAddPropValue( name, VCGivenNameProp, c.firstName() );
+    safeAddPropValue( name, VCAdditionalNamesProp, c.middleName() );
+    safeAddPropValue( name, VCNamePrefixesProp, c.title() );
+    safeAddPropValue( name, VCNameSuffixesProp, c.suffix() );
+
+    // home properties
+    VObject *home_adr= safeAddProp( vcard, VCAdrProp );
+    safeAddProp( home_adr, VCHomeProp );
+    safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
+    safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
+    safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
+    safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
+    safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
+
+    VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
+    safeAddProp( home_phone, VCHomeProp );
+    home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
+    safeAddProp( home_phone, VCHomeProp );
+    safeAddProp( home_phone, VCCellularProp );
+    home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
+    safeAddProp( home_phone, VCHomeProp );
+    safeAddProp( home_phone, VCFaxProp );
+
+    VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
+    safeAddProp( url, VCHomeProp );
+
+    // work properties
+    VObject *work_adr= safeAddProp( vcard, VCAdrProp );
+    safeAddProp( work_adr, VCWorkProp );
+    safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
+    safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
+    safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
+    safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
+    safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
+
+    VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
+    safeAddProp( work_phone, VCWorkProp );
+    work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
+    safeAddProp( work_phone, VCWorkProp );
+    safeAddProp( work_phone, VCCellularProp );
+    work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
+    safeAddProp( work_phone, VCWorkProp );
+    safeAddProp( work_phone, VCFaxProp );
+    work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
+    safeAddProp( work_phone, VCWorkProp );
+    safeAddProp( work_phone, VCPagerProp );
+
+    url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
+    safeAddProp( url, VCWorkProp );
+
+    VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
+    safeAddProp( title, VCWorkProp );
+
+
+    QStringList emails = c.emailList();
+    // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
+    for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
+        VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
+        safeAddProp( email, VCInternetProp );
+    }
+
+    safeAddPropValue( vcard, VCNoteProp, c.notes() );
+
+    // Exporting Birthday regarding RFC 2425 (5.8.4)
+    if ( c.birthday().isValid() ){
+        owarn << "Exporting birthday as: " << convDateToVCardDate( c.birthday() ) << "" << oendl;
+        safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
+    }
+
+    if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
+        VObject *org = safeAddProp( vcard, VCOrgProp );
+        safeAddPropValue( org, VCOrgNameProp, c.company() );
+        safeAddPropValue( org, VCOrgUnitProp, c.department() );
+        safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
+    }
+
+    // some values we have to export as custom fields
+    safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
+    safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
+    safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
+
+    safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
+    safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
+    if ( c.anniversary().isValid() ){
+        owarn << "Exporting anniversary as: " << convDateToVCardDate( c.anniversary() ) << "" << oendl;
+        safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
+    }
+    safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
+    safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
+
+    return vcard;
 }
 
 QString OPimContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
 {
-                QString str_rfc2425 = QString("%1-%2-%3")
-                        .arg( d.year() )
-                        .arg( d.month(), 2 )
-                        .arg( d.day(), 2 );
-                // Now replace spaces with "0"...
-                int pos = 0;
-                while ( ( pos = str_rfc2425.find (' ')  ) > 0 )
-                        str_rfc2425.replace( pos, 1, "0" );
-
-                return str_rfc2425;
+        QString str_rfc2425 = QString("%1-%2-%3")
+            .arg( d.year() )
+            .arg( d.month(), 2 )
+            .arg( d.day(), 2 );
+        // Now replace spaces with "0"...
+        int pos = 0;
+        while ( ( pos = str_rfc2425.find (' ')  ) > 0 )
+            str_rfc2425.replace( pos, 1, "0" );
+
+        return str_rfc2425;
 }
 
 QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 {
-        int monthPos = datestr.find('-');
-        int dayPos = datestr.find('-', monthPos+1 );
-        int sep_ignore = 1;
-        if ( monthPos == -1 || dayPos == -1 ) {
-                qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
-                // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
-                if ( datestr.length() == 8 ){
-                        monthPos   = 4;
-                        dayPos     = 6;
-                        sep_ignore = 0;
-                        qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
-                } else {
-                        return QDate();
-                }
-        }
-        int y = datestr.left( monthPos ).toInt();
-        int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
-        int d = datestr.mid( dayPos + sep_ignore ).toInt();
-        qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
-        QDate date ( y,m,d );
-        return date;
+    int monthPos = datestr.find('-');
+    int dayPos = datestr.find('-', monthPos+1 );
+    int sep_ignore = 1;
+    if ( monthPos == -1 || dayPos == -1 ) {
+        odebug << "fromString didn't find - in str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
+        // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
+        if ( datestr.length() == 8 ){
+            monthPos   = 4;
+            dayPos     = 6;
+            sep_ignore = 0;
+            odebug << "Try with follwing positions str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
+        } else {
+            return QDate();
+        }
+    }
+    int y = datestr.left( monthPos ).toInt();
+    int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
+    int d = datestr.mid( dayPos + sep_ignore ).toInt();
+    odebug << "TimeConversion::fromString ymd = " << datestr << " => " << y << " " << m << " " << d << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
+    QDate date ( y,m,d );
+    return date;
 }
 
 VObject* OPimContactAccessBackend_VCard::safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
-        VObject *ret = 0;
-        if ( o && !value.isEmpty() )
-                ret = addPropValue( o, prop, value.latin1() );
-        return ret;
+    VObject *ret = 0;
+    if ( o && !value.isEmpty() )
+        ret = addPropValue( o, prop, value.latin1() );
+    return ret;
 }
 
 VObject* OPimContactAccessBackend_VCard::safeAddProp( VObject *o, const char *prop)
 {
-        VObject *ret = 0;
-        if ( o )
-                ret = addProp( o, prop );
-        return ret;
+    VObject *ret = 0;
+    if ( o )
+        ret = addProp( o, prop );
+    return ret;
 }
 
 }
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 7b4d81f..5ffcb11 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -1,750 +1,754 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
 /*
  * XML Backend for the OPIE-Contact Database.
  */
 
+
+/* OPIE */
 #include <opie2/ocontactaccessbackend_xml.h>
+#include <opie2/xmltree.h>
+#include <opie2/ocontactaccessbackend.h>
+#include <opie2/ocontactaccess.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
 
+/* QT */
 #include <qasciidict.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
 
-#include <qpe/global.h>
-
-#include <opie2/xmltree.h>
-#include <opie2/ocontactaccessbackend.h>
-#include <opie2/ocontactaccess.h>
-
+/* STD */
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie::Core;
 
 
 namespace Opie {
 OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ):
-        m_changed( false )
+    m_changed( false )
 {
-        // Just m_contactlist should call delete if an entry
-        // is removed.
-        m_contactList.setAutoDelete( true );
-        m_uidToContact.setAutoDelete( false );
+    // Just m_contactlist should call delete if an entry
+    // is removed.
+    m_contactList.setAutoDelete( true );
+    m_uidToContact.setAutoDelete( false );
 
-        m_appName = appname;
+    m_appName = appname;
 
-        /* Set journalfile name ... */
-        m_journalName = getenv("HOME");
-        m_journalName +="/.abjournal" + appname;
+    /* Set journalfile name ... */
+    m_journalName = getenv("HOME");
+    m_journalName +="/.abjournal" + appname;
 
-        /* Expecting to access the default filename if nothing else is set */
-        if ( filename.isEmpty() ){
-                m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
-        } else
-                m_fileName = filename;
+    /* Expecting to access the default filename if nothing else is set */
+    if ( filename.isEmpty() ){
+        m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
+    } else
+        m_fileName = filename;
 
-        /* Load Database now */
-        load ();
+    /* Load Database now */
+    load ();
 }
 
 bool OPimContactAccessBackend_XML::save()
 {
 
-        if ( !m_changed )
-                return true;
-
-        QString strNewFile = m_fileName + ".new";
-        QFile f( strNewFile );
-        if ( !f.open( IO_WriteOnly|IO_Raw ) )
-                return false;
-
-        int total_written;
-        int idx_offset = 0;
-        QString out;
-
-        // Write Header
-        out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
-                " <Groups>\n"
-                " </Groups>\n"
-                " <Contacts>\n";
-        QCString cstr = out.utf8();
-        f.writeBlock( cstr.data(), cstr.length() );
-        idx_offset += cstr.length();
-        out = "";
-
-        // Write all contacts
-        QListIterator<OPimContact> it( m_contactList );
-        for ( ; it.current(); ++it ) {
-                // qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
-                out += "<Contact ";
-                (*it)->save( out );
-                out += "/>\n";
-                cstr = out.utf8();
-                total_written = f.writeBlock( cstr.data(), cstr.length() );
-                idx_offset += cstr.length();
-                if ( total_written != int(cstr.length()) ) {
-                        f.close();
-                        QFile::remove( strNewFile );
-                        return false;
-                }
-                out = "";
-        }
-        out += " </Contacts>\n</AddressBook>\n";
-
-        // Write Footer
-        cstr = out.utf8();
-        total_written = f.writeBlock( cstr.data(), cstr.length() );
-        if ( total_written != int( cstr.length() ) ) {
-                f.close();
-                QFile::remove( strNewFile );
-                return false;
-        }
-        f.close();
-
-        // move the file over, I'm just going to use the system call
-        // because, I don't feel like using QDir.
-        if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
-                qWarning( "problem renaming file %s to %s, errno: %d",
-                          strNewFile.latin1(), m_journalName.latin1(), errno );
-                // remove the tmp file...
-                QFile::remove( strNewFile );
-        }
-
-        /* The journalfile should be removed now... */
-        removeJournal();
-
-        m_changed = false;
-        return true;
+    if ( !m_changed )
+        return true;
+
+    QString strNewFile = m_fileName + ".new";
+    QFile f( strNewFile );
+    if ( !f.open( IO_WriteOnly|IO_Raw ) )
+        return false;
+
+    int total_written;
+    int idx_offset = 0;
+    QString out;
+
+    // Write Header
+    out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
+        " <Groups>\n"
+        " </Groups>\n"
+        " <Contacts>\n";
+    QCString cstr = out.utf8();
+    f.writeBlock( cstr.data(), cstr.length() );
+    idx_offset += cstr.length();
+    out = "";
+
+    // Write all contacts
+    QListIterator<OPimContact> it( m_contactList );
+    for ( ; it.current(); ++it ) {
+        // owarn << " Uid " << (*it)->uid() << " at Offset: " << idx_offset << "" << oendl;
+        out += "<Contact ";
+        (*it)->save( out );
+        out += "/>\n";
+        cstr = out.utf8();
+        total_written = f.writeBlock( cstr.data(), cstr.length() );
+        idx_offset += cstr.length();
+        if ( total_written != int(cstr.length()) ) {
+            f.close();
+            QFile::remove( strNewFile );
+            return false;
+        }
+        out = "";
+    }
+    out += " </Contacts>\n</AddressBook>\n";
+
+    // Write Footer
+    cstr = out.utf8();
+    total_written = f.writeBlock( cstr.data(), cstr.length() );
+    if ( total_written != int( cstr.length() ) ) {
+        f.close();
+        QFile::remove( strNewFile );
+        return false;
+    }
+    f.close();
+
+    // move the file over, I'm just going to use the system call
+    // because, I don't feel like using QDir.
+    if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
+        qWarning( "problem renaming file %s to %s, errno: %d",
+              strNewFile.latin1(), m_journalName.latin1(), errno );
+        // remove the tmp file...
+        QFile::remove( strNewFile );
+    }
+
+    /* The journalfile should be removed now... */
+    removeJournal();
+
+    m_changed = false;
+    return true;
 }
 
 bool OPimContactAccessBackend_XML::load ()
 {
-        m_contactList.clear();
-        m_uidToContact.clear();
-
-        /* Load XML-File and journal if it exists */
-        if ( !load ( m_fileName, false ) )
-                return false;
-        /* The returncode of the journalfile is ignored due to the
-         * fact that it does not exist when this class is instantiated !
-         * But there may such a file exist, if the application crashed.
-         * Therefore we try to load it to get the changes before the #
-         * crash happened...
-         */
-        load (m_journalName, true);
-
-        return true;
+    m_contactList.clear();
+    m_uidToContact.clear();
+
+    /* Load XML-File and journal if it exists */
+    if ( !load ( m_fileName, false ) )
+        return false;
+    /* The returncode of the journalfile is ignored due to the
+     * fact that it does not exist when this class is instantiated !
+     * But there may such a file exist, if the application crashed.
+     * Therefore we try to load it to get the changes before the #
+     * crash happened...
+     */
+    load (m_journalName, true);
+
+    return true;
 }
 
 void OPimContactAccessBackend_XML::clear ()
 {
-        m_contactList.clear();
-        m_uidToContact.clear();
+    m_contactList.clear();
+    m_uidToContact.clear();
 
-        m_changed = false;
+    m_changed = false;
 }
 
 bool OPimContactAccessBackend_XML::wasChangedExternally()
 {
-        QFileInfo fi( m_fileName );
+    QFileInfo fi( m_fileName );
 
-        QDateTime lastmod = fi.lastModified ();
+    QDateTime lastmod = fi.lastModified ();
 
-        return (lastmod != m_readtime);
+    return (lastmod != m_readtime);
 }
 
 QArray<int> OPimContactAccessBackend_XML::allRecords() const
 {
-        QArray<int> uid_list( m_contactList.count() );
+    QArray<int> uid_list( m_contactList.count() );
 
-        uint counter = 0;
-        QListIterator<OPimContact> it( m_contactList );
-        for( ; it.current(); ++it ){
-                uid_list[counter++] = (*it)->uid();
-        }
+    uint counter = 0;
+    QListIterator<OPimContact> it( m_contactList );
+    for( ; it.current(); ++it ){
+        uid_list[counter++] = (*it)->uid();
+    }
 
-        return ( uid_list );
+    return ( uid_list );
 }
 
 OPimContact OPimContactAccessBackend_XML::find ( int uid ) const
 {
-        OPimContact foundContact; //Create empty contact
+    OPimContact foundContact; //Create empty contact
 
-        OPimContact* found = m_uidToContact.find( QString().setNum( uid ) );
+    OPimContact* found = m_uidToContact.find( QString().setNum( uid ) );
 
-        if ( found ){
-                foundContact = *found;
-        }
+    if ( found ){
+        foundContact = *found;
+    }
 
-        return ( foundContact );
+    return ( foundContact );
 }
 
 QArray<int> OPimContactAccessBackend_XML::queryByExample ( const OPimContact &query, int settings,
-                                                        const QDateTime& d )
+                            const QDateTime& d )
 {
 
-        QArray<int> m_currentQuery( m_contactList.count() );
-        QListIterator<OPimContact> it( m_contactList );
-        uint arraycounter = 0;
-
-        for( ; it.current(); ++it ){
-                /* Search all fields and compare them with query object. Store them into list
-                 * if all fields matches.
-                 */
-                QDate* queryDate = 0l;
-                QDate* checkDate = 0l;
-                bool allcorrect = true;
-                for ( int i = 0; i < Qtopia::Groups; i++ ) {
-                        // Birthday and anniversary are special nonstring fields and should
-                        // be handled specially
-                        switch ( i ){
-                        case Qtopia::Birthday:
-                                queryDate = new QDate( query.birthday() );
-                                checkDate = new QDate( (*it)->birthday() );
-                                // fall through
-                        case Qtopia::Anniversary:
-                                if ( queryDate == 0l ){
-                                        queryDate = new QDate( query.anniversary() );
-                                        checkDate = new QDate( (*it)->anniversary() );
-                                }
-
-                                if ( queryDate->isValid() ){
-                                        if(  checkDate->isValid() ){
-                                                if ( settings & OPimContactAccess::DateYear ){
-                                                        if ( queryDate->year() != checkDate->year() )
-                                                                allcorrect = false;
-                                                }
-                                                if ( settings & OPimContactAccess::DateMonth ){
-                                                        if ( queryDate->month() != checkDate->month() )
-                                                                allcorrect = false;
-                                                }
-                                                if ( settings & OPimContactAccess::DateDay ){
-                                                        if ( queryDate->day() != checkDate->day() )
-                                                                allcorrect = false;
-                                                }
-                                                if ( settings & OPimContactAccess::DateDiff ) {
-                                                        QDate current;
-                                                        // If we get an additional date, we
-                                                        // will take this date instead of
-                                                        // the current one..
-                                                        if ( !d.date().isValid() )
-                                                                current = QDate::currentDate();
-                                                        else
-                                                                current = d.date();
-
-                                                        // We have to equalize the year, otherwise
-                                                        // the search will fail..
-                                                        checkDate->setYMD( current.year(),
-                                                                           checkDate->month(),
-                                                                           checkDate->day() );
-                                                        if ( *checkDate < current )
-                                                                checkDate->setYMD( current.year()+1,
-                                                                                   checkDate->month(),
-                                                                                   checkDate->day() );
-
-                                                        // Check whether the birthday/anniversary date is between
-                                                        // the current/given date and the maximum date
-                                                        // ( maximum time range ) !
-                                                        qWarning("Checking if %s is between %s and %s ! ",
-                                                                 checkDate->toString().latin1(),
-                                                                 current.toString().latin1(),
-                                                                 queryDate->toString().latin1() );
-                                                        if ( current.daysTo( *queryDate ) >= 0 ){
-                                                                if ( !( ( *checkDate >= current ) &&
-                                                                        ( *checkDate <= *queryDate ) ) ){
-                                                                        allcorrect = false;
-                                                                        qWarning (" Nope!..");
-                                                                }
-                                                        }
-                                                }
-                                        } else{
-                                                // checkDate is invalid. Therefore this entry is always rejected
-                                                allcorrect = false;
-                                        }
-                                }
-
-                                delete queryDate;
-                                queryDate = 0l;
-                                delete checkDate;
-                                checkDate = 0l;
-                                break;
-                        default:
-                                /* Just compare fields which are not empty in the query object */
-                                if ( !query.field(i).isEmpty() ){
-                                        switch ( settings & ~( OPimContactAccess::IgnoreCase
-                                                               | OPimContactAccess::DateDiff
-                                                               | OPimContactAccess::DateYear
-                                                               | OPimContactAccess::DateMonth
-                                                               | OPimContactAccess::DateDay
-                                                               | OPimContactAccess::MatchOne
-                                                               ) ){
-
-                                        case OPimContactAccess::RegExp:{
-                                                QRegExp expr ( query.field(i),
-                                                               !(settings & OPimContactAccess::IgnoreCase),
-                                                               false );
-                                                if ( expr.find ( (*it)->field(i), 0 ) == -1 )
-                                                        allcorrect = false;
-                                        }
-                                                break;
-                                        case OPimContactAccess::WildCards:{
-                                                QRegExp expr ( query.field(i),
-                                                               !(settings & OPimContactAccess::IgnoreCase),
-                                                               true );
-                                                if ( expr.find ( (*it)->field(i), 0 ) == -1 )
-                                                        allcorrect = false;
-                                        }
-                                                break;
-                                        case OPimContactAccess::ExactMatch:{
-                                                if (settings & OPimContactAccess::IgnoreCase){
-                                                        if ( query.field(i).upper() !=
-                                                             (*it)->field(i).upper() )
-                                                                allcorrect = false;
-                                                }else{
-                                                        if ( query.field(i) != (*it)->field(i) )
-                                                                allcorrect = false;
-                                                }
-                                        }
-                                                break;
-                                        }
-                                }
-                        }
-                }
-                if ( allcorrect ){
-                        m_currentQuery[arraycounter++] = (*it)->uid();
-                }
-        }
-
-        // Shrink to fit..
-        m_currentQuery.resize(arraycounter);
-
-        return m_currentQuery;
+    QArray<int> m_currentQuery( m_contactList.count() );
+    QListIterator<OPimContact> it( m_contactList );
+    uint arraycounter = 0;
+
+    for( ; it.current(); ++it ){
+        /* Search all fields and compare them with query object. Store them into list
+         * if all fields matches.
+         */
+        QDate* queryDate = 0l;
+        QDate* checkDate = 0l;
+        bool allcorrect = true;
+        for ( int i = 0; i < Qtopia::Groups; i++ ) {
+            // Birthday and anniversary are special nonstring fields and should
+            // be handled specially
+            switch ( i ){
+            case Qtopia::Birthday:
+                queryDate = new QDate( query.birthday() );
+                checkDate = new QDate( (*it)->birthday() );
+                // fall through
+            case Qtopia::Anniversary:
+                if ( queryDate == 0l ){
+                    queryDate = new QDate( query.anniversary() );
+                    checkDate = new QDate( (*it)->anniversary() );
+                }
+
+                if ( queryDate->isValid() ){
+                    if(  checkDate->isValid() ){
+                        if ( settings & OPimContactAccess::DateYear ){
+                            if ( queryDate->year() != checkDate->year() )
+                                allcorrect = false;
+                        }
+                        if ( settings & OPimContactAccess::DateMonth ){
+                            if ( queryDate->month() != checkDate->month() )
+                                allcorrect = false;
+                        }
+                        if ( settings & OPimContactAccess::DateDay ){
+                            if ( queryDate->day() != checkDate->day() )
+                                allcorrect = false;
+                        }
+                        if ( settings & OPimContactAccess::DateDiff ) {
+                            QDate current;
+                            // If we get an additional date, we
+                            // will take this date instead of
+                            // the current one..
+                            if ( !d.date().isValid() )
+                                current = QDate::currentDate();
+                            else
+                                current = d.date();
+
+                            // We have to equalize the year, otherwise
+                            // the search will fail..
+                            checkDate->setYMD( current.year(),
+                                       checkDate->month(),
+                                       checkDate->day() );
+                            if ( *checkDate < current )
+                                checkDate->setYMD( current.year()+1,
+                                           checkDate->month(),
+                                           checkDate->day() );
+
+                            // Check whether the birthday/anniversary date is between
+                            // the current/given date and the maximum date
+                            // ( maximum time range ) !
+                            qWarning("Checking if %s is between %s and %s ! ",
+                                 checkDate->toString().latin1(),
+                                 current.toString().latin1(),
+                                 queryDate->toString().latin1() );
+                            if ( current.daysTo( *queryDate ) >= 0 ){
+                                if ( !( ( *checkDate >= current ) &&
+                                    ( *checkDate <= *queryDate ) ) ){
+                                    allcorrect = false;
+                                    qWarning (" Nope!..");
+                                }
+                            }
+                        }
+                    } else{
+                        // checkDate is invalid. Therefore this entry is always rejected
+                        allcorrect = false;
+                    }
+                }
+
+                delete queryDate;
+                queryDate = 0l;
+                delete checkDate;
+                checkDate = 0l;
+                break;
+            default:
+                /* Just compare fields which are not empty in the query object */
+                if ( !query.field(i).isEmpty() ){
+                    switch ( settings & ~( OPimContactAccess::IgnoreCase
+                                   | OPimContactAccess::DateDiff
+                                   | OPimContactAccess::DateYear
+                                   | OPimContactAccess::DateMonth
+                                   | OPimContactAccess::DateDay
+                                   | OPimContactAccess::MatchOne
+                                   ) ){
+
+                    case OPimContactAccess::RegExp:{
+                        QRegExp expr ( query.field(i),
+                                   !(settings & OPimContactAccess::IgnoreCase),
+                                   false );
+                        if ( expr.find ( (*it)->field(i), 0 ) == -1 )
+                            allcorrect = false;
+                    }
+                        break;
+                    case OPimContactAccess::WildCards:{
+                        QRegExp expr ( query.field(i),
+                                   !(settings & OPimContactAccess::IgnoreCase),
+                                   true );
+                        if ( expr.find ( (*it)->field(i), 0 ) == -1 )
+                            allcorrect = false;
+                    }
+                        break;
+                    case OPimContactAccess::ExactMatch:{
+                        if (settings & OPimContactAccess::IgnoreCase){
+                            if ( query.field(i).upper() !=
+                                 (*it)->field(i).upper() )
+                                allcorrect = false;
+                        }else{
+                            if ( query.field(i) != (*it)->field(i) )
+                                allcorrect = false;
+                        }
+                    }
+                        break;
+                    }
+                }
+            }
+        }
+        if ( allcorrect ){
+            m_currentQuery[arraycounter++] = (*it)->uid();
+        }
+    }
+
+    // Shrink to fit..
+    m_currentQuery.resize(arraycounter);
+
+    return m_currentQuery;
 }
 
 QArray<int> OPimContactAccessBackend_XML::matchRegexp(  const QRegExp &r ) const
 {
-        QArray<int> m_currentQuery( m_contactList.count() );
-        QListIterator<OPimContact> it( m_contactList );
-        uint arraycounter = 0;
+    QArray<int> m_currentQuery( m_contactList.count() );
+    QListIterator<OPimContact> it( m_contactList );
+    uint arraycounter = 0;
 
-        for( ; it.current(); ++it ){
-                if ( (*it)->match( r ) ){
-                        m_currentQuery[arraycounter++] = (*it)->uid();
-                }
+    for( ; it.current(); ++it ){
+        if ( (*it)->match( r ) ){
+            m_currentQuery[arraycounter++] = (*it)->uid();
+        }
 
-        }
-        // Shrink to fit..
-        m_currentQuery.resize(arraycounter);
+    }
+    // Shrink to fit..
+    m_currentQuery.resize(arraycounter);
 
-        return m_currentQuery;
+    return m_currentQuery;
 }
 
 const uint OPimContactAccessBackend_XML::querySettings()
 {
-        return ( OPimContactAccess::WildCards
-                 | OPimContactAccess::IgnoreCase
-                 | OPimContactAccess::RegExp
-                 | OPimContactAccess::ExactMatch
-                 | OPimContactAccess::DateDiff
-                 | OPimContactAccess::DateYear
-                 | OPimContactAccess::DateMonth
-                 | OPimContactAccess::DateDay
-                 );
+    return ( OPimContactAccess::WildCards
+         | OPimContactAccess::IgnoreCase
+         | OPimContactAccess::RegExp
+         | OPimContactAccess::ExactMatch
+         | OPimContactAccess::DateDiff
+         | OPimContactAccess::DateYear
+         | OPimContactAccess::DateMonth
+         | OPimContactAccess::DateDay
+         );
 }
 
 bool OPimContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 {
-        /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
-         * may be added with any of the other settings. IgnoreCase should never used alone.
-         * Wildcards, RegExp, ExactMatch should never used at the same time...
-         */
-
-        // Step 1: Check whether the given settings are supported by this backend
-        if ( ( querySettings & ( 
-                                OPimContactAccess::IgnoreCase
-                                | OPimContactAccess::WildCards
-                                | OPimContactAccess::DateDiff
-                                | OPimContactAccess::DateYear
-                                | OPimContactAccess::DateMonth
-                                | OPimContactAccess::DateDay
-                                | OPimContactAccess::RegExp
-                                | OPimContactAccess::ExactMatch
-                               ) ) != querySettings )
-                return false;
-
-        // Step 2: Check whether the given combinations are ok..
-
-        // IngoreCase alone is invalid
-        if ( querySettings == OPimContactAccess::IgnoreCase )
-                return false;
-
-        // WildCards, RegExp and ExactMatch should never used at the same time 
-        switch ( querySettings & ~( OPimContactAccess::IgnoreCase
-                                    | OPimContactAccess::DateDiff
-                                    | OPimContactAccess::DateYear
-                                    | OPimContactAccess::DateMonth
-                                    | OPimContactAccess::DateDay
-                                    )
-                 ){
-        case OPimContactAccess::RegExp:
-                return ( true );
-        case OPimContactAccess::WildCards:
-                return ( true );
-        case OPimContactAccess::ExactMatch:
-                return ( true );
-        case 0: // one of the upper removed bits were set..
-                return ( true );
-        default:
-                return ( false );
-        }
+    /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
+     * may be added with any of the other settings. IgnoreCase should never used alone.
+     * Wildcards, RegExp, ExactMatch should never used at the same time...
+     */
+
+    // Step 1: Check whether the given settings are supported by this backend
+    if ( ( querySettings & (
+                OPimContactAccess::IgnoreCase
+                | OPimContactAccess::WildCards
+                | OPimContactAccess::DateDiff
+                | OPimContactAccess::DateYear
+                | OPimContactAccess::DateMonth
+                | OPimContactAccess::DateDay
+                | OPimContactAccess::RegExp
+                | OPimContactAccess::ExactMatch
+                   ) ) != querySettings )
+        return false;
+
+    // Step 2: Check whether the given combinations are ok..
+
+    // IngoreCase alone is invalid
+    if ( querySettings == OPimContactAccess::IgnoreCase )
+        return false;
+
+    // WildCards, RegExp and ExactMatch should never used at the same time
+    switch ( querySettings & ~( OPimContactAccess::IgnoreCase
+                    | OPimContactAccess::DateDiff
+                    | OPimContactAccess::DateYear
+                    | OPimContactAccess::DateMonth
+                    | OPimContactAccess::DateDay
+                    )
+         ){
+    case OPimContactAccess::RegExp:
+        return ( true );
+    case OPimContactAccess::WildCards:
+        return ( true );
+    case OPimContactAccess::ExactMatch:
+        return ( true );
+    case 0: // one of the upper removed bits were set..
+        return ( true );
+    default:
+        return ( false );
+    }
 }
 
 // Currently only asc implemented..
 QArray<int> OPimContactAccessBackend_XML::sorted( bool asc,  int , int ,  int )
 {
-        QMap<QString, int> nameToUid;
-        QStringList names;
-        QArray<int> m_currentQuery( m_contactList.count() );
-
-        // First fill map and StringList with all Names
-        // Afterwards sort namelist and use map to fill array to return..
-        QListIterator<OPimContact> it( m_contactList );
-        for( ; it.current(); ++it ){
-                names.append( (*it)->fileAs() + QString::number( (*it)->uid() ) );
-                nameToUid.insert( (*it)->fileAs() + QString::number( (*it)->uid() ), (*it)->uid() );
-        }
-        names.sort();
-
-        int i = 0;
-        if ( asc ){
-                for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
-                        m_currentQuery[i++] = nameToUid[ (*it) ];
-        }else{
-                for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
-                        m_currentQuery[i++] = nameToUid[ (*it) ];
-        }
-
-        return m_currentQuery;
+    QMap<QString, int> nameToUid;
+    QStringList names;
+    QArray<int> m_currentQuery( m_contactList.count() );
+
+    // First fill map and StringList with all Names
+    // Afterwards sort namelist and use map to fill array to return..
+    QListIterator<OPimContact> it( m_contactList );
+    for( ; it.current(); ++it ){
+        names.append( (*it)->fileAs() + QString::number( (*it)->uid() ) );
+        nameToUid.insert( (*it)->fileAs() + QString::number( (*it)->uid() ), (*it)->uid() );
+    }
+    names.sort();
+
+    int i = 0;
+    if ( asc ){
+        for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
+            m_currentQuery[i++] = nameToUid[ (*it) ];
+    }else{
+        for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
+            m_currentQuery[i++] = nameToUid[ (*it) ];
+    }
+
+    return m_currentQuery;
 
 }
 
 bool OPimContactAccessBackend_XML::add ( const OPimContact &newcontact )
 {
-        //qWarning("odefaultbackend: ACTION::ADD");
-        updateJournal (newcontact, ACTION_ADD);
-        addContact_p( newcontact );
+    //owarn << "odefaultbackend: ACTION::ADD" << oendl;
+    updateJournal (newcontact, ACTION_ADD);
+    addContact_p( newcontact );
 
-        m_changed = true;
+    m_changed = true;
 
-        return true;
+    return true;
 }
 
 bool OPimContactAccessBackend_XML::replace ( const OPimContact &contact )
 {
-        m_changed = true;
+    m_changed = true;
 
-        OPimContact* found = m_uidToContact.find ( QString().setNum( contact.uid() ) );
+    OPimContact* found = m_uidToContact.find ( QString().setNum( contact.uid() ) );
 
-        if ( found ) {
-                OPimContact* newCont = new OPimContact( contact );
+    if ( found ) {
+        OPimContact* newCont = new OPimContact( contact );
 
-                updateJournal ( *newCont, ACTION_REPLACE);
-                m_contactList.removeRef ( found );
-                m_contactList.append ( newCont );
-                m_uidToContact.remove( QString().setNum( contact.uid() ) );
-                m_uidToContact.insert( QString().setNum( newCont->uid() ), newCont );
+        updateJournal ( *newCont, ACTION_REPLACE);
+        m_contactList.removeRef ( found );
+        m_contactList.append ( newCont );
+        m_uidToContact.remove( QString().setNum( contact.uid() ) );
+        m_uidToContact.insert( QString().setNum( newCont->uid() ), newCont );
 
-                qWarning("Nur zur Sicherheit: %d == %d ?",contact.uid(), newCont->uid());
+        owarn << "Nur zur Sicherheit: " << contact.uid() << " == " << newCont->uid() << " ?" << oendl;
 
-                return true;
-        } else
-                return false;
+        return true;
+    } else
+        return false;
 }
 
 bool OPimContactAccessBackend_XML::remove ( int uid )
 {
-        m_changed = true;
+    m_changed = true;
 
-        OPimContact* found = m_uidToContact.find ( QString().setNum( uid ) );
+    OPimContact* found = m_uidToContact.find ( QString().setNum( uid ) );
 
-        if ( found ) {
-                updateJournal ( *found, ACTION_REMOVE);
-                m_contactList.removeRef ( found );
-                m_uidToContact.remove( QString().setNum( uid ) );
+    if ( found ) {
+        updateJournal ( *found, ACTION_REMOVE);
+        m_contactList.removeRef ( found );
+        m_uidToContact.remove( QString().setNum( uid ) );
 
-                return true;
-        } else
-                return false;
+        return true;
+    } else
+        return false;
 }
 
 bool OPimContactAccessBackend_XML::reload(){
-        /* Reload is the same as load in this implementation */
-        return ( load() );
+    /* Reload is the same as load in this implementation */
+    return ( load() );
 }
 
 void OPimContactAccessBackend_XML::addContact_p( const OPimContact &newcontact )
 {
-        OPimContact* contRef = new OPimContact( newcontact );
+    OPimContact* contRef = new OPimContact( newcontact );
 
-        m_contactList.append ( contRef );
-        m_uidToContact.insert( QString().setNum( newcontact.uid() ), contRef );
+    m_contactList.append ( contRef );
+    m_uidToContact.insert( QString().setNum( newcontact.uid() ), contRef );
 }
 
 /* This function loads the xml-database and the journalfile */
 bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal )
 {
 
-        /* We use the time of the last read to check if the file was
-         * changed externally.
-         */
-        if ( !isJournal ){
-                QFileInfo fi( filename );
-                m_readtime = fi.lastModified ();
-        }
-
-        const int JOURNALACTION = Qtopia::Notes + 1;
-        const int JOURNALROW = JOURNALACTION + 1;
-
-        bool foundAction = false;
-        journal_action action = ACTION_ADD;
-        int journalKey = 0;
-        QMap<int, QString> contactMap;
-        QMap<QString, QString> customMap;
-        QMap<QString, QString>::Iterator customIt;
-        QAsciiDict<int> dict( 47 );
-
-        dict.setAutoDelete( TRUE );
-        dict.insert( "Uid", new int(Qtopia::AddressUid) );
-        dict.insert( "Title", new int(Qtopia::Title) );
-        dict.insert( "FirstName", new int(Qtopia::FirstName) );
-        dict.insert( "MiddleName", new int(Qtopia::MiddleName) );
-        dict.insert( "LastName", new int(Qtopia::LastName) );
-        dict.insert( "Suffix", new int(Qtopia::Suffix) );
-        dict.insert( "FileAs", new int(Qtopia::FileAs) );
-        dict.insert( "Categories", new int(Qtopia::AddressCategory) );
-        dict.insert( "DefaultEmail", new int(Qtopia::DefaultEmail) );
-        dict.insert( "Emails", new int(Qtopia::Emails) );
-        dict.insert( "HomeStreet", new int(Qtopia::HomeStreet) );
-        dict.insert( "HomeCity", new int(Qtopia::HomeCity) );
-        dict.insert( "HomeState", new int(Qtopia::HomeState) );
-        dict.insert( "HomeZip", new int(Qtopia::HomeZip) );
-        dict.insert( "HomeCountry", new int(Qtopia::HomeCountry) );
-        dict.insert( "HomePhone", new int(Qtopia::HomePhone) );
-        dict.insert( "HomeFax", new int(Qtopia::HomeFax) );
-        dict.insert( "HomeMobile", new int(Qtopia::HomeMobile) );
-        dict.insert( "HomeWebPage", new int(Qtopia::HomeWebPage) );
-        dict.insert( "Company", new int(Qtopia::Company) );
-        dict.insert( "BusinessStreet", new int(Qtopia::BusinessStreet) );
-        dict.insert( "BusinessCity", new int(Qtopia::BusinessCity) );
-        dict.insert( "BusinessState", new int(Qtopia::BusinessState) );
-        dict.insert( "BusinessZip", new int(Qtopia::BusinessZip) );
-        dict.insert( "BusinessCountry", new int(Qtopia::BusinessCountry) );
-        dict.insert( "BusinessWebPage", new int(Qtopia::BusinessWebPage) );
-        dict.insert( "JobTitle", new int(Qtopia::JobTitle) );
-        dict.insert( "Department", new int(Qtopia::Department) );
-        dict.insert( "Office", new int(Qtopia::Office) );
-        dict.insert( "BusinessPhone", new int(Qtopia::BusinessPhone) );
-        dict.insert( "BusinessFax", new int(Qtopia::BusinessFax) );
-        dict.insert( "BusinessMobile", new int(Qtopia::BusinessMobile) );
-        dict.insert( "BusinessPager", new int(Qtopia::BusinessPager) );
-        dict.insert( "Profession", new int(Qtopia::Profession) );
-        dict.insert( "Assistant", new int(Qtopia::Assistant) );
-        dict.insert( "Manager", new int(Qtopia::Manager) );
-        dict.insert( "Spouse", new int(Qtopia::Spouse) );
-        dict.insert( "Children", new int(Qtopia::Children) );
-        dict.insert( "Gender", new int(Qtopia::Gender) );
-        dict.insert( "Birthday", new int(Qtopia::Birthday) );
-        dict.insert( "Anniversary", new int(Qtopia::Anniversary) );
-        dict.insert( "Nickname", new int(Qtopia::Nickname) );
-        dict.insert( "Notes", new int(Qtopia::Notes) );
-        dict.insert( "action", new int(JOURNALACTION) );
-        dict.insert( "actionrow", new int(JOURNALROW) );
-
-        //qWarning( "OPimContactDefaultBackEnd::loading %s", filename.latin1() );
-
-        XMLElement *root = XMLElement::load( filename );
-        if(root != 0l ){ // start parsing
-                /* Parse all XML-Elements and put the data into the
-                 * Contact-Class
-                 */
-                XMLElement *element = root->firstChild();
-                //qWarning("OPimContactAccess::load tagName(): %s", root->tagName().latin1() );
-                element = element->firstChild();
-
-                /* Search Tag "Contacts" which is the parent of all Contacts */
-                while( element && !isJournal ){
-                        if( element->tagName() != QString::fromLatin1("Contacts") ){
-                                //qWarning ("OPimContactDefBack::Searching for Tag \"Contacts\"! Found: %s",
-                                        //  element->tagName().latin1());
-                                element = element->nextChild();
-                        } else {
-                                element = element->firstChild();
-                                break;
-                        }
-                }
-                /* Parse all Contacts and ignore unknown tags */
-                while( element ){
-                        if( element->tagName() != QString::fromLatin1("Contact") ){
-                                //qWarning ("OPimContactDefBack::Searching for Tag \"Contact\"! Found: %s",
-                                        //  element->tagName().latin1());
-                                element = element->nextChild();
-                                continue;
-                        }
-                        /* Found alement with tagname "contact", now parse and store all
-                         * attributes contained
-                         */
-                        //qWarning("OPimContactDefBack::load element tagName() : %s",
-                                // element->tagName().latin1() );
-                        QString dummy;
-                        foundAction = false;
-
-                        XMLElement::AttributeMap aMap = element->attributes();
-                        XMLElement::AttributeMap::Iterator it;
-                        contactMap.clear();
-                        customMap.clear();
-                        for( it = aMap.begin(); it != aMap.end(); ++it ){
-                                // qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
-
-                                int *find = dict[ it.key() ];
-                                /* Unknown attributes will be stored as "Custom" elements */
-                                if ( !find ) {
-                                        // qWarning("Attribute %s not known.", it.key().latin1());
-                                        //contact.setCustomField(it.key(), it.data());
-                                        customMap.insert( it.key(),  it.data() );
-                                        continue;
-                                }
-
-                                /* Check if special conversion is needed and add attribute
-                                 * into Contact class
-                                 */
-                                switch( *find ) {
-                                        /*
-                                          case Qtopia::AddressUid:
-                                          contact.setUid( it.data().toInt() );
-                                          break;
-                                          case Qtopia::AddressCategory:
-                                          contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
-                                          break;
-                                        */
-                                case JOURNALACTION:
-                                        action = journal_action(it.data().toInt());
-                                        foundAction = true;
-                                        qWarning ("ODefBack(journal)::ACTION found: %d", action);
-                                        break;
-                                case JOURNALROW:
-                                        journalKey = it.data().toInt();
-                                        break;
-                                default: // no conversion needed add them to the map
-                                        contactMap.insert( *find, it.data() );
-                                        break;
-                                }
-                        }
-                        /* now generate the Contact contact */
-                        OPimContact contact( contactMap );
-
-                        for (customIt = customMap.begin(); customIt != customMap.end(); ++customIt ) {
-                                contact.setCustomField( customIt.key(),  customIt.data() );
-                        }
-
-                        if (foundAction){
-                                foundAction = false;
-                                switch ( action ) {
-                                case ACTION_ADD:
-                                        addContact_p (contact);
-                                        break;
-                                case ACTION_REMOVE:
-                                        if ( !remove (contact.uid()) )
-                                                qWarning ("ODefBack(journal)::Unable to remove uid: %d",
-                                                          contact.uid() );
-                                        break;
-                                case ACTION_REPLACE:
-                                        if ( !replace ( contact ) )
-                                                qWarning ("ODefBack(journal)::Unable to replace uid: %d",
-                                                          contact.uid() );
-                                        break;
-                                default:
-                                        qWarning ("Unknown action: ignored !");
-                                        break;
-                                }
-                        }else{
-                                /* Add contact to list */
-                                addContact_p (contact);
-                        }
-
-                        /* Move to next element */
-                        element = element->nextChild();
-                }
-        }else {
-                qWarning("ODefBack::could not load");
-        }
-        delete root;
-        qWarning("returning from loading" );
-        return true;
+    /* We use the time of the last read to check if the file was
+     * changed externally.
+     */
+    if ( !isJournal ){
+        QFileInfo fi( filename );
+        m_readtime = fi.lastModified ();
+    }
+
+    const int JOURNALACTION = Qtopia::Notes + 1;
+    const int JOURNALROW = JOURNALACTION + 1;
+
+    bool foundAction = false;
+    journal_action action = ACTION_ADD;
+    int journalKey = 0;
+    QMap<int, QString> contactMap;
+    QMap<QString, QString> customMap;
+    QMap<QString, QString>::Iterator customIt;
+    QAsciiDict<int> dict( 47 );
+
+    dict.setAutoDelete( TRUE );
+    dict.insert( "Uid", new int(Qtopia::AddressUid) );
+    dict.insert( "Title", new int(Qtopia::Title) );
+    dict.insert( "FirstName", new int(Qtopia::FirstName) );
+    dict.insert( "MiddleName", new int(Qtopia::MiddleName) );
+    dict.insert( "LastName", new int(Qtopia::LastName) );
+    dict.insert( "Suffix", new int(Qtopia::Suffix) );
+    dict.insert( "FileAs", new int(Qtopia::FileAs) );
+    dict.insert( "Categories", new int(Qtopia::AddressCategory) );
+    dict.insert( "DefaultEmail", new int(Qtopia::DefaultEmail) );
+    dict.insert( "Emails", new int(Qtopia::Emails) );
+    dict.insert( "HomeStreet", new int(Qtopia::HomeStreet) );
+    dict.insert( "HomeCity", new int(Qtopia::HomeCity) );
+    dict.insert( "HomeState", new int(Qtopia::HomeState) );
+    dict.insert( "HomeZip", new int(Qtopia::HomeZip) );
+    dict.insert( "HomeCountry", new int(Qtopia::HomeCountry) );
+    dict.insert( "HomePhone", new int(Qtopia::HomePhone) );
+    dict.insert( "HomeFax", new int(Qtopia::HomeFax) );
+    dict.insert( "HomeMobile", new int(Qtopia::HomeMobile) );
+    dict.insert( "HomeWebPage", new int(Qtopia::HomeWebPage) );
+    dict.insert( "Company", new int(Qtopia::Company) );
+    dict.insert( "BusinessStreet", new int(Qtopia::BusinessStreet) );
+    dict.insert( "BusinessCity", new int(Qtopia::BusinessCity) );
+    dict.insert( "BusinessState", new int(Qtopia::BusinessState) );
+    dict.insert( "BusinessZip", new int(Qtopia::BusinessZip) );
+    dict.insert( "BusinessCountry", new int(Qtopia::BusinessCountry) );
+    dict.insert( "BusinessWebPage", new int(Qtopia::BusinessWebPage) );
+    dict.insert( "JobTitle", new int(Qtopia::JobTitle) );
+    dict.insert( "Department", new int(Qtopia::Department) );
+    dict.insert( "Office", new int(Qtopia::Office) );
+    dict.insert( "BusinessPhone", new int(Qtopia::BusinessPhone) );
+    dict.insert( "BusinessFax", new int(Qtopia::BusinessFax) );
+    dict.insert( "BusinessMobile", new int(Qtopia::BusinessMobile) );
+    dict.insert( "BusinessPager", new int(Qtopia::BusinessPager) );
+    dict.insert( "Profession", new int(Qtopia::Profession) );
+    dict.insert( "Assistant", new int(Qtopia::Assistant) );
+    dict.insert( "Manager", new int(Qtopia::Manager) );
+    dict.insert( "Spouse", new int(Qtopia::Spouse) );
+    dict.insert( "Children", new int(Qtopia::Children) );
+    dict.insert( "Gender", new int(Qtopia::Gender) );
+    dict.insert( "Birthday", new int(Qtopia::Birthday) );
+    dict.insert( "Anniversary", new int(Qtopia::Anniversary) );
+    dict.insert( "Nickname", new int(Qtopia::Nickname) );
+    dict.insert( "Notes", new int(Qtopia::Notes) );
+    dict.insert( "action", new int(JOURNALACTION) );
+    dict.insert( "actionrow", new int(JOURNALROW) );
+
+    //owarn << "OPimContactDefaultBackEnd::loading " << filename << "" << oendl;
+
+    XMLElement *root = XMLElement::load( filename );
+    if(root != 0l ){ // start parsing
+        /* Parse all XML-Elements and put the data into the
+         * Contact-Class
+         */
+        XMLElement *element = root->firstChild();
+        //owarn << "OPimContactAccess::load tagName(): " << root->tagName() << "" << oendl;
+        element = element->firstChild();
+
+        /* Search Tag "Contacts" which is the parent of all Contacts */
+        while( element && !isJournal ){
+            if( element->tagName() != QString::fromLatin1("Contacts") ){
+                //qWarning ("OPimContactDefBack::Searching for Tag \"Contacts\"! Found: %s",
+                //    element->tagName().latin1());
+                element = element->nextChild();
+            } else {
+                element = element->firstChild();
+                break;
+            }
+        }
+        /* Parse all Contacts and ignore unknown tags */
+        while( element ){
+            if( element->tagName() != QString::fromLatin1("Contact") ){
+                //qWarning ("OPimContactDefBack::Searching for Tag \"Contact\"! Found: %s",
+                //    element->tagName().latin1());
+                element = element->nextChild();
+                continue;
+            }
+            /* Found alement with tagname "contact", now parse and store all
+             * attributes contained
+             */
+            //qWarning("OPimContactDefBack::load element tagName() : %s",
+            //   element->tagName().latin1() );
+            QString dummy;
+            foundAction = false;
+
+            XMLElement::AttributeMap aMap = element->attributes();
+            XMLElement::AttributeMap::Iterator it;
+            contactMap.clear();
+            customMap.clear();
+            for( it = aMap.begin(); it != aMap.end(); ++it ){
+                // qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
+
+                int *find = dict[ it.key() ];
+                /* Unknown attributes will be stored as "Custom" elements */
+                if ( !find ) {
+                    // owarn << "Attribute " << it.key() << " not known." << oendl;
+                    //contact.setCustomField(it.key(), it.data());
+                    customMap.insert( it.key(),  it.data() );
+                    continue;
+                }
+
+                /* Check if special conversion is needed and add attribute
+                 * into Contact class
+                 */
+                switch( *find ) {
+                    /*
+                      case Qtopia::AddressUid:
+                      contact.setUid( it.data().toInt() );
+                      break;
+                      case Qtopia::AddressCategory:
+                      contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
+                      break;
+                    */
+                case JOURNALACTION:
+                    action = journal_action(it.data().toInt());
+                    foundAction = true;
+                    qWarning ("ODefBack(journal)::ACTION found: %d", action);
+                    break;
+                case JOURNALROW:
+                    journalKey = it.data().toInt();
+                    break;
+                default: // no conversion needed add them to the map
+                    contactMap.insert( *find, it.data() );
+                    break;
+                }
+            }
+            /* now generate the Contact contact */
+            OPimContact contact( contactMap );
+
+            for (customIt = customMap.begin(); customIt != customMap.end(); ++customIt ) {
+                contact.setCustomField( customIt.key(),  customIt.data() );
+            }
+
+            if (foundAction){
+                foundAction = false;
+                switch ( action ) {
+                case ACTION_ADD:
+                    addContact_p (contact);
+                    break;
+                case ACTION_REMOVE:
+                    if ( !remove (contact.uid()) )
+                        qWarning ("ODefBack(journal)::Unable to remove uid: %d",
+                              contact.uid() );
+                    break;
+                case ACTION_REPLACE:
+                    if ( !replace ( contact ) )
+                        qWarning ("ODefBack(journal)::Unable to replace uid: %d",
+                              contact.uid() );
+                    break;
+                default:
+                    qWarning ("Unknown action: ignored !");
+                    break;
+                }
+            }else{
+                /* Add contact to list */
+                addContact_p (contact);
+            }
+
+            /* Move to next element */
+            element = element->nextChild();
+        }
+    }else {
+        owarn << "ODefBack::could not load" << oendl;
+    }
+    delete root;
+    owarn << "returning from loading" << oendl;
+    return true;
 }
 
 
 void OPimContactAccessBackend_XML::updateJournal( const OPimContact& cnt,
-                                               journal_action action )
+                           journal_action action )
 {
-        QFile f( m_journalName );
-        bool created = !f.exists();
-        if ( !f.open(IO_WriteOnly|IO_Append) )
-                return;
-
-        QString buf;
-        QCString str;
-
-        // if the file was created, we have to set the Tag "<CONTACTS>" to
-        // get a XML-File which is readable by our parser.
-        // This is just a cheat, but better than rewrite the parser.
-        if ( created ){
-                buf = "<Contacts>";
-                QCString cstr = buf.utf8();
-                f.writeBlock( cstr.data(), cstr.length() );
-        }
-
-        buf = "<Contact ";
-        cnt.save( buf );
-        buf += " action=\"" + QString::number( (int)action ) + "\" ";
-        buf += "/>\n";
-        QCString cstr = buf.utf8();
-        f.writeBlock( cstr.data(), cstr.length() );
+    QFile f( m_journalName );
+    bool created = !f.exists();
+    if ( !f.open(IO_WriteOnly|IO_Append) )
+        return;
+
+    QString buf;
+    QCString str;
+
+    // if the file was created, we have to set the Tag "<CONTACTS>" to
+    // get a XML-File which is readable by our parser.
+    // This is just a cheat, but better than rewrite the parser.
+    if ( created ){
+        buf = "<Contacts>";
+        QCString cstr = buf.utf8();
+        f.writeBlock( cstr.data(), cstr.length() );
+    }
+
+    buf = "<Contact ";
+    cnt.save( buf );
+    buf += " action=\"" + QString::number( (int)action ) + "\" ";
+    buf += "/>\n";
+    QCString cstr = buf.utf8();
+    f.writeBlock( cstr.data(), cstr.length() );
 }
 
 void OPimContactAccessBackend_XML::removeJournal()
 {
-        QFile f ( m_journalName );
-        if ( f.exists() )
-                f.remove();
+    QFile f ( m_journalName );
+    if ( f.exists() )
+        f.remove();
 }
 
 }
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index f4f3c94..105c106 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -1,454 +1,459 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
 /*
  * SQL Backend for the OPIE-Calender Database.
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <qarray.h>
-#include <qstringlist.h>
-
-#include <qpe/global.h>
-
+/* OPIE */
 #include <opie2/osqldriver.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include <opie2/opimrecurrence.h>
 #include <opie2/odatebookaccessbackend_sql.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
+
+/* QT */
+#include <qarray.h>
+#include <qstringlist.h>
+
+/* STD */
+#include <stdio.h>
+#include <stdlib.h>
+
 
 using namespace Opie::DB;
 
 namespace {
-        /**
-         * a find query for custom elements
-         */
-        class FindCustomQuery : public OSQLQuery {
-        public:
-                FindCustomQuery(int uid);
-                FindCustomQuery(const QArray<int>& );
-                ~FindCustomQuery();
-                QString query()const;
-        private:
-                QString single()const;
-                QString multi()const;
-                QArray<int> m_uids;
-                int m_uid;
-        };
-
-        FindCustomQuery::FindCustomQuery(int uid)
-                : OSQLQuery(), m_uid( uid ) {
-        }
-        FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
-                : OSQLQuery(), m_uids( ints ){
-        }
-        FindCustomQuery::~FindCustomQuery() {
-        }
-        QString FindCustomQuery::query()const{
-        //      if ( m_uids.count() == 0 )
-                        return single();
-        }
-        QString FindCustomQuery::single()const{
-                QString qu = "select uid, type, value from custom_data where uid = ";
-                qu += QString::number(m_uid);
-                return qu;
-        }
+    /**
+     * a find query for custom elements
+     */
+    class FindCustomQuery : public OSQLQuery {
+    public:
+        FindCustomQuery(int uid);
+        FindCustomQuery(const QArray<int>& );
+        ~FindCustomQuery();
+        QString query()const;
+    private:
+        QString single()const;
+        QString multi()const;
+        QArray<int> m_uids;
+        int m_uid;
+    };
+
+    FindCustomQuery::FindCustomQuery(int uid)
+        : OSQLQuery(), m_uid( uid ) {
+    }
+    FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
+        : OSQLQuery(), m_uids( ints ){
+    }
+    FindCustomQuery::~FindCustomQuery() {
+    }
+    QString FindCustomQuery::query()const{
+//      if ( m_uids.count() == 0 )
+            return single();
+    }
+    QString FindCustomQuery::single()const{
+        QString qu = "select uid, type, value from custom_data where uid = ";
+        qu += QString::number(m_uid);
+        return qu;
+    }
 }
 
 
 namespace Opie {
 
 
 ODateBookAccessBackend_SQL::ODateBookAccessBackend_SQL( const QString& ,
                                                         const QString& fileName )
-        : ODateBookAccessBackend(), m_driver( NULL ) 
+    : ODateBookAccessBackend(), m_driver( NULL )
 {
-        m_fileName = fileName.isEmpty() ? Global::applicationFileName( "datebook", "datebook.db" ) : fileName;
+    m_fileName = fileName.isEmpty() ? Global::applicationFileName( "datebook", "datebook.db" ) : fileName;
 
     // Get the standart sql-driver from the OSQLManager..
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl( m_fileName );
 
     initFields();
 
     load();
 }
 
 ODateBookAccessBackend_SQL::~ODateBookAccessBackend_SQL() {
-        if( m_driver )
-                delete m_driver;
+    if( m_driver )
+        delete m_driver;
 }
 
 void ODateBookAccessBackend_SQL::initFields()
 {
 
-        // This map contains the translation of the fieldtype id's to 
-        // the names of the table columns
-        m_fieldMap.insert( OPimEvent::FUid, "uid" );
-        m_fieldMap.insert( OPimEvent::FCategories, "Categories" );
-        m_fieldMap.insert( OPimEvent::FDescription, "Description" );
-        m_fieldMap.insert( OPimEvent::FLocation, "Location" );
-        m_fieldMap.insert( OPimEvent::FType, "Type" );
-        m_fieldMap.insert( OPimEvent::FAlarm, "Alarm" );
-        m_fieldMap.insert( OPimEvent::FSound, "Sound" );
-        m_fieldMap.insert( OPimEvent::FRType, "RType" );
-        m_fieldMap.insert( OPimEvent::FRWeekdays, "RWeekdays" );
-        m_fieldMap.insert( OPimEvent::FRPosition, "RPosition" );
-        m_fieldMap.insert( OPimEvent::FRFreq, "RFreq" );
-        m_fieldMap.insert( OPimEvent::FRHasEndDate, "RHasEndDate" );
-        m_fieldMap.insert( OPimEvent::FREndDate, "REndDate" );
-        m_fieldMap.insert( OPimEvent::FRCreated, "RCreated" );
-        m_fieldMap.insert( OPimEvent::FRExceptions, "RExceptions" );
-        m_fieldMap.insert( OPimEvent::FStart, "Start" );
-        m_fieldMap.insert( OPimEvent::FEnd, "End" );
-        m_fieldMap.insert( OPimEvent::FNote, "Note" );
-        m_fieldMap.insert( OPimEvent::FTimeZone, "TimeZone" );
-        m_fieldMap.insert( OPimEvent::FRecParent, "RecParent" );
-        m_fieldMap.insert( OPimEvent::FRecChildren, "Recchildren" );
-
-        // Create a map that maps the column name to the id
-        QMapConstIterator<int, QString> it;
-        for ( it = m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
-                m_reverseFieldMap.insert( it.data(), it.key() );
-        }
-        
+    // This map contains the translation of the fieldtype id's to
+    // the names of the table columns
+    m_fieldMap.insert( OPimEvent::FUid, "uid" );
+    m_fieldMap.insert( OPimEvent::FCategories, "Categories" );
+    m_fieldMap.insert( OPimEvent::FDescription, "Description" );
+    m_fieldMap.insert( OPimEvent::FLocation, "Location" );
+    m_fieldMap.insert( OPimEvent::FType, "Type" );
+    m_fieldMap.insert( OPimEvent::FAlarm, "Alarm" );
+    m_fieldMap.insert( OPimEvent::FSound, "Sound" );
+    m_fieldMap.insert( OPimEvent::FRType, "RType" );
+    m_fieldMap.insert( OPimEvent::FRWeekdays, "RWeekdays" );
+    m_fieldMap.insert( OPimEvent::FRPosition, "RPosition" );
+    m_fieldMap.insert( OPimEvent::FRFreq, "RFreq" );
+    m_fieldMap.insert( OPimEvent::FRHasEndDate, "RHasEndDate" );
+    m_fieldMap.insert( OPimEvent::FREndDate, "REndDate" );
+    m_fieldMap.insert( OPimEvent::FRCreated, "RCreated" );
+    m_fieldMap.insert( OPimEvent::FRExceptions, "RExceptions" );
+    m_fieldMap.insert( OPimEvent::FStart, "Start" );
+    m_fieldMap.insert( OPimEvent::FEnd, "End" );
+    m_fieldMap.insert( OPimEvent::FNote, "Note" );
+    m_fieldMap.insert( OPimEvent::FTimeZone, "TimeZone" );
+    m_fieldMap.insert( OPimEvent::FRecParent, "RecParent" );
+    m_fieldMap.insert( OPimEvent::FRecChildren, "Recchildren" );
+
+    // Create a map that maps the column name to the id
+    QMapConstIterator<int, QString> it;
+    for ( it = m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
+        m_reverseFieldMap.insert( it.data(), it.key() );
+    }
+
 }
 
-bool ODateBookAccessBackend_SQL::load() 
+bool ODateBookAccessBackend_SQL::load()
 {
-        if (!m_driver->open() )
-                return false;
-
-        // Don't expect that the database exists.
-        // It is save here to create the table, even if it
-        // do exist. ( Is that correct for all databases ?? )
-                QStringqu = "create table datebook( uid INTEGER PRIMARY KEY ";
-        
-        QMap<int, QString>::Iterator it;
-        for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
-                qu += QString( ",%1 VARCHAR(10)" ).arg( it.data() );
-        }
-        qu += " );";
-                
-        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
-
-        qWarning( "command: %s", qu.latin1() );
-
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success )
-                return false;
-
-        update();
-
-        return true;
+    if (!m_driver->open() )
+        return false;
+
+    // Don't expect that the database exists.
+    // It is save here to create the table, even if it
+    // do exist. ( Is that correct for all databases ?? )
+    QString qu = "create table datebook( uid INTEGER PRIMARY KEY ";
+
+    QMap<int, QString>::Iterator it;
+    for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
+        qu += QString( ",%1 VARCHAR(10)" ).arg( it.data() );
+    }
+    qu += " );";
+
+    qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
+
+    owarn << "command: " << qu << "" << oendl;
+
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success )
+        return false;
+
+    update();
+
+    return true;
 }
 
 void ODateBookAccessBackend_SQL::update()
 {
 
-        QString qu = "select uid from datebook";
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                // m_uids.clear();
-                return;
-        }
-        
-        m_uids = extractUids( res );
-        
+    QString qu = "select uid from datebook";
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        // m_uids.clear();
+        return;
+    }
+
+    m_uids = extractUids( res );
+
 }
 
-bool ODateBookAccessBackend_SQL::reload() 
+bool ODateBookAccessBackend_SQL::reload()
 {
-        return load();
+    return load();
 }
 
-bool ODateBookAccessBackend_SQL::save() 
+bool ODateBookAccessBackend_SQL::save()
 {
-        return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
+    return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 
-QArray<int> ODateBookAccessBackend_SQL::allRecords()const 
+QArray<int> ODateBookAccessBackend_SQL::allRecords()const
 {
-        return m_uids;
+    return m_uids;
 }
 
 QArray<int> ODateBookAccessBackend_SQL::queryByExample(const OPimEvent&, int,  const QDateTime& ) {
-        return QArray<int>();
+    return QArray<int>();
 }
 
-void ODateBookAccessBackend_SQL::clear() 
+void ODateBookAccessBackend_SQL::clear()
 {
-        QString qu = "drop table datebook;";
-        qu += "drop table custom_data;";
+    QString qu = "drop table datebook;";
+    qu += "drop table custom_data;";
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
 
-        reload();
+    reload();
 }
 
 
 OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
-        qDebug( "ODateBookAccessBackend_SQL::find( %d )", uid ); 
+    odebug << "ODateBookAccessBackend_SQL::find( " << uid << " )" << oendl;
 
-        QString qu = "select *";
-        qu += "from datebook where uid = " + QString::number(uid);
+    QString qu = "select *";
+    qu += "from datebook where uid = " + QString::number(uid);
 
-        qDebug( "Query: %s", qu.latin1() );
+    odebug << "Query: " << qu << "" << oendl;
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
 
-        OSQLResultItem resItem = res.first();
+    OSQLResultItem resItem = res.first();
 
-        // Create Map for date event and insert UID
-        QMap<int,QString> dateEventMap;
-        dateEventMap.insert( OPimEvent::FUid, QString::number( uid ) );
+    // Create Map for date event and insert UID
+    QMap<int,QString> dateEventMap;
+    dateEventMap.insert( OPimEvent::FUid, QString::number( uid ) );
 
-        // Now insert the data out of the columns into the map.
-        QMapConstIterator<int, QString> it;
-        for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
-                dateEventMap.insert( m_reverseFieldMap[*it], resItem.data( *it ) );
-        }
+    // Now insert the data out of the columns into the map.
+    QMapConstIterator<int, QString> it;
+    for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
+        dateEventMap.insert( m_reverseFieldMap[*it], resItem.data( *it ) );
+    }
 
-        // Last step: Put map into date event, add custom map and return it
-        OPimEvent retDate( dateEventMap );
-        retDate.setExtraMap( requestCustom( uid ) );
+    // Last step: Put map into date event, add custom map and return it
+    OPimEvent retDate( dateEventMap );
+    retDate.setExtraMap( requestCustom( uid ) );
 
-        qDebug( "ODateBookAccessBackend_SQL::find( %d ) end", uid ); 
-        return retDate;
+    odebug << "ODateBookAccessBackend_SQL::find( " << uid << " ) end" << oendl;
+    return retDate;
 }
 
 // FIXME: Speed up update of uid's..
-bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev ) 
+bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev )
 {
-        QMap<int,QString> eventMap = ev.toMap();
-
-        QString qu = "insert into datebook VALUES( " + QString::number( ev.uid() );
-        QMap<int, QString>::Iterator it;
-        for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
-                if ( !eventMap[it.key()].isEmpty() )
-                        qu += QString( ",\"%1\"" ).arg( eventMap[it.key()] );
-                else
-                        qu += QString( ",\"\"" );
-        }
-        qu += " );";
-
-        // Add custom entries
-        int id = 0;
-        QMap<QString, QString> customMap = ev.toExtraMap();
-        for( QMap<QString, QString>::Iterator it = customMap.begin(); 
-             it != customMap.end(); ++it ){
-                qu  += "insert into custom_data VALUES(" 
-                        +  QString::number( ev.uid() )
-                        + ","
-                        +  QString::number( id++ ) 
-                        + ",'" 
-                        + it.key() //.latin1()
-                        + "',"
-                        + "0" // Priority for future enhancements
-                        + ",'" 
-                        + it.data() //.latin1()
-                        + "');";
-                }       
-        qWarning("add %s", qu.latin1() );
-
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                return false;
-        }
-
-        // Update list of uid's 
-        update();
-        
-        return true;
+    QMap<int,QString> eventMap = ev.toMap();
+
+    QString qu = "insert into datebook VALUES( " + QString::number( ev.uid() );
+    QMap<int, QString>::Iterator it;
+    for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
+        if ( !eventMap[it.key()].isEmpty() )
+            qu += QString( ",\"%1\"" ).arg( eventMap[it.key()] );
+        else
+            qu += QString( ",\"\"" );
+    }
+    qu += " );";
+
+    // Add custom entries
+    int id = 0;
+    QMap<QString, QString> customMap = ev.toExtraMap();
+    for( QMap<QString, QString>::Iterator it = customMap.begin();
+         it != customMap.end(); ++it ){
+        qu  += "insert into custom_data VALUES("
+            +  QString::number( ev.uid() )
+            + ","
+            +  QString::number( id++ )
+            + ",'"
+            + it.key() //.latin1()
+            + "',"
+            + "0" // Priority for future enhancements
+            + ",'"
+            + it.data() //.latin1()
+            + "');";
+    }
+    owarn << "add " << qu << "" << oendl;
+
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        return false;
+    }
+
+    // Update list of uid's
+    update();
+
+    return true;
 }
 
 // FIXME: Speed up update of uid's..
-bool ODateBookAccessBackend_SQL::remove( int uid ) 
+bool ODateBookAccessBackend_SQL::remove( int uid )
 {
-        QString qu = "DELETE from datebook where uid = " 
-                + QString::number( uid ) + ";";
-        qu += "DELETE from custom_data where uid = " 
-                + QString::number( uid ) + ";";
-        
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                return false;
-        }
-
-        // Update list of uid's
-        update();
-
-        return true;
+    QString qu = "DELETE from datebook where uid = "
+        + QString::number( uid ) + ";";
+    qu += "DELETE from custom_data where uid = "
+        + QString::number( uid ) + ";";
+
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        return false;
+    }
+
+    // Update list of uid's
+    update();
+
+    return true;
 }
 
-bool ODateBookAccessBackend_SQL::replace( const OPimEvent& ev ) 
+bool ODateBookAccessBackend_SQL::replace( const OPimEvent& ev )
 {
     remove( ev.uid() );
     return add( ev );
 }
 
-QArray<int> ODateBookAccessBackend_SQL::rawEvents()const 
+QArray<int> ODateBookAccessBackend_SQL::rawEvents()const
 {
     return allRecords();
 }
 
-QArray<int> ODateBookAccessBackend_SQL::rawRepeats()const 
+QArray<int> ODateBookAccessBackend_SQL::rawRepeats()const
 {
-        QString qu = "select uid from datebook where RType!=\"\" AND RType!=\"NoRepeat\"";
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                QArray<int> nix;
-                return nix;
-        }
-        
-        return extractUids( res );
+    QString qu = "select uid from datebook where RType!=\"\" AND RType!=\"NoRepeat\"";
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        QArray<int> nix;
+        return nix;
+    }
+
+    return extractUids( res );
 }
 
-QArray<int> ODateBookAccessBackend_SQL::nonRepeats()const 
+QArray<int> ODateBookAccessBackend_SQL::nonRepeats()const
 {
-        QString qu = "select uid from datebook where RType=\"\" or RType=\"NoRepeat\"";
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
-        if ( res.state() != OSQLResult::Success ){
-                QArray<int> nix;
-                return nix;
-        }
-        
-        return extractUids( res );
+    QString qu = "select uid from datebook where RType=\"\" or RType=\"NoRepeat\"";
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+    if ( res.state() != OSQLResult::Success ){
+        QArray<int> nix;
+        return nix;
+    }
+
+    return extractUids( res );
 }
 
-OPimEvent::ValueList ODateBookAccessBackend_SQL::directNonRepeats() 
+OPimEvent::ValueList ODateBookAccessBackend_SQL::directNonRepeats()
 {
-        QArray<int> nonRepUids = nonRepeats();
-        OPimEvent::ValueList list;
+    QArray<int> nonRepUids = nonRepeats();
+    OPimEvent::ValueList list;
 
-        for (uint i = 0; i < nonRepUids.count(); ++i ){
-                list.append( find( nonRepUids[i] ) );
-        }
+    for (uint i = 0; i < nonRepUids.count(); ++i ){
+        list.append( find( nonRepUids[i] ) );
+    }
 
-        return list;
+    return list;
 
 }
-OPimEvent::ValueList ODateBookAccessBackend_SQL::directRawRepeats() 
+OPimEvent::ValueList ODateBookAccessBackend_SQL::directRawRepeats()
 {
-        QArray<int> rawRepUids = rawRepeats();
-        OPimEvent::ValueList list;
+    QArray<int> rawRepUids = rawRepeats();
+    OPimEvent::ValueList list;
 
-        for (uint i = 0; i < rawRepUids.count(); ++i ){
-                list.append( find( rawRepUids[i] ) );
-        }
+    for (uint i = 0; i < rawRepUids.count(); ++i ){
+        list.append( find( rawRepUids[i] ) );
+    }
 
-        return list;
+    return list;
 }
 
 
 QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 {
 
-        QString qu = "SELECT uid FROM datebook WHERE (";
+    QString qu = "SELECT uid FROM datebook WHERE (";
 
-        // Do it make sense to search other fields, too ?
-        qu += " rlike(\""+ r.pattern() + "\", Location ) OR";
-        qu += " rlike(\""+ r.pattern() + "\", Note )";
-                
-        qu += " )";
+    // Do it make sense to search other fields, too ?
+    qu += " rlike(\""+ r.pattern() + "\", Location ) OR";
+    qu += " rlike(\""+ r.pattern() + "\", Note )";
 
-        qDebug( "query: %s", qu.latin1() );
+    qu += " )";
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    odebug << "query: " << qu << "" << oendl;
 
-        return extractUids( res );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
+
+    return extractUids( res );
 
 
 
 }
 
 /* ===== Private Functions ========================================== */
 
 QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-        qWarning("extractUids");
-        QTime t;
-        t.start();
-        OSQLResultItem::ValueList list = res.results();
-        OSQLResultItem::ValueList::Iterator it;
-        QArray<int> ints(list.count() );
-        qWarning(" count = %d", list.count() );
-
-        int i = 0;
-        for (it = list.begin(); it != list.end(); ++it ) {
-                ints[i] =  (*it).data("uid").toInt();
-                i++;
-        }
-        qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
-
-        return ints;
+    owarn << "extractUids" << oendl;
+    QTime t;
+    t.start();
+    OSQLResultItem::ValueList list = res.results();
+    OSQLResultItem::ValueList::Iterator it;
+    QArray<int> ints(list.count() );
+    owarn << " count = " << list.count() << "" << oendl;
+
+    int i = 0;
+    for (it = list.begin(); it != list.end(); ++it ) {
+        ints[i] =  (*it).data("uid").toInt();
+        i++;
+    }
+    owarn << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl;
+
+    return ints;
 
 }
 
 QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) const
 {
-        QTime t;
-        t.start();
-
-        QMap<QString, QString> customMap;
-        
-        FindCustomQuery query( uid );
-        OSQLResult res_custom = m_driver->query( &query );
-
-        if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
-                QMap<QString, QString> empty;
-                return empty;
-        }
-
-        OSQLResultItem::ValueList list = res_custom.results();
-        OSQLResultItem::ValueList::Iterator it = list.begin();
-        for ( ; it != list.end(); ++it ) {
-                customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
-        }
-
-        qDebug("RequestCustom needed: %d ms", t.elapsed() );
-        return customMap;
+    QTime t;
+    t.start();
+
+    QMap<QString, QString> customMap;
+
+    FindCustomQuery query( uid );
+    OSQLResult res_custom = m_driver->query( &query );
+
+    if ( res_custom.state() == OSQLResult::Failure ) {
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
+        QMap<QString, QString> empty;
+        return empty;
+    }
+
+    OSQLResultItem::ValueList list = res_custom.results();
+    OSQLResultItem::ValueList::Iterator it = list.begin();
+    for ( ; it != list.end(); ++it ) {
+        customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
+    }
+
+    odebug << "RequestCustom needed: " << t.elapsed() << " ms" << oendl;
+    return customMap;
 }
 
 
 }
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
index 77c0253..2ff36e3 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
@@ -1,645 +1,651 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
+
+/* OPIE */
+#include <opie2/opimnotifymanager.h>
+#include <opie2/opimrecurrence.h>
+#include <opie2/opimtimezone.h>
+#include <opie2/odatebookaccessbackend_xml.h>
+#include <opie2/odebug.h>
+
+#include <qtopia/global.h>
+#include <qtopia/stringutil.h>
+#include <qtopia/timeconversion.h>
+
+/* QT */
+#include <qasciidict.h>
+#include <qfile.h>
+
+/* STD */
 #include <errno.h>
 #include <fcntl.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <unistd.h>
 
-#include <qasciidict.h>
-#include <qfile.h>
-
-#include <qtopia/global.h>
-#include <qtopia/stringutil.h>
-#include <qtopia/timeconversion.h>
-
-#include <opie2/opimnotifymanager.h>
-#include <opie2/opimrecurrence.h>
-#include <opie2/opimtimezone.h>
-#include <opie2/odatebookaccessbackend_xml.h>
 
 using namespace Opie;
 
 namespace {
     // FROM TT again
 char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen)
 {
     char needleChar;
     char haystackChar;
     if (!needle || !haystack || !hLen || !nLen)
-        return 0;
+    return 0;
 
     const char* hsearch = haystack;
 
     if ((needleChar = *needle++) != 0) {
-        nLen--; //(to make up for needle++)
-        do {
-            do {
-                if ((haystackChar = *hsearch++) == 0)
-                    return (0);
-                if (hsearch >= haystack + hLen)
-                    return (0);
-            } while (haystackChar != needleChar);
-        } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
-        hsearch--;
+    nLen--; //(to make up for needle++)
+    do {
+        do {
+        if ((haystackChar = *hsearch++) == 0)
+            return (0);
+        if (hsearch >= haystack + hLen)
+            return (0);
+        } while (haystackChar != needleChar);
+    } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
+    hsearch--;
     }
     return ((char *)hsearch);
 }
 }
 
 namespace {
     time_t start, end, created, rp_end;
     OPimRecurrence* rec;
     OPimRecurrence* recur() {
         if (!rec)
             rec = new OPimRecurrence;
 
         return rec;
     }
     int alarmTime;
     int snd;
     enum Attribute{
         FDescription = 0,
         FLocation,
         FCategories,
         FUid,
         FType,
-        FAlarm,
-        FSound,
-        FRType,
-        FRWeekdays,
-        FRPosition,
-        FRFreq,
-        FRHasEndDate,
-        FREndDate,
-        FRStart,
-        FREnd,
-        FNote,
-        FCreated,      // Should't this be called FRCreated ?
+    FAlarm,
+    FSound,
+    FRType,
+    FRWeekdays,
+    FRPosition,
+    FRFreq,
+    FRHasEndDate,
+    FREndDate,
+    FRStart,
+    FREnd,
+    FNote,
+    FCreated,      // Should't this be called FRCreated ?
         FTimeZone,
         FRecParent,
         FRecChildren,
         FExceptions
     };
 
     // FIXME: Use OPimEvent::toMap() here !! (eilers)
     inline void save( const OPimEvent& ev, QString& buf ) {
-        qWarning("Saving %d %s", ev.uid(), ev.description().latin1() );
+        owarn << "Saving " << ev.uid() << " " << ev.description() << "" << oendl;
         buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\"";
         if (!ev.location().isEmpty() )
             buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\"";
 
         buf += " categories=\""+ Qtopia::escapeString( Qtopia::Record::idsToString( ev.categories() ) ) + "\"";
         buf += " uid=\"" + QString::number( ev.uid() ) + "\"";
 
         if (ev.isAllDay() )
-                buf += " type=\"AllDay\""; // is that all ?? (eilers)
+        buf += " type=\"AllDay\""; // is that all ?? (eilers)
 
         if (ev.hasNotifiers() ) {
             OPimAlarm alarm = ev.notifiers().alarms()[0]; // take only the first
             int minutes = alarm.dateTime().secsTo( ev.startDateTime() ) / 60;
             buf += " alarm=\"" + QString::number(minutes) + "\" sound=\"";
             if ( alarm.sound() == OPimAlarm::Loud )
                 buf += "loud";
             else
                 buf += "silent";
             buf += "\"";
         }
         if ( ev.hasRecurrence() ) {
             buf += ev.recurrence().toString();
         }
 
         /*
          * fscking timezones :) well, we'll first convert
          * the QDateTime to a QDateTime in UTC time
          * and then we'll create a nice time_t
          */
         OPimTimeZone zone( ev.timeZone().isEmpty() ? OPimTimeZone::current() : ev.timeZone() );
         buf += " start=\"" + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.startDateTime(), OPimTimeZone::utc() ) ) )  + "\"";
         buf += " end=\""   + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.endDateTime()  , OPimTimeZone::utc() ) ) )   + "\"";
         if (!ev.note().isEmpty() ) {
             buf += " note=\"" + Qtopia::escapeString( ev.note() ) + "\"";
         }
 
         buf += " timezone=\"";
         if ( ev.timeZone().isEmpty() )
             buf += "None";
         else
             buf += ev.timeZone();
         buf += "\"";
 
         if (ev.parent() != 0 ) {
             buf += " recparent=\""+QString::number(ev.parent() )+"\"";
         }
 
         if (ev.children().count() != 0 ) {
             QArray<int> children = ev.children();
             buf += " recchildren=\"";
             for ( uint i = 0; i < children.count(); i++ ) {
                 if ( i != 0 ) buf += " ";
                 buf += QString::number( children[i] );
             }
             buf+= "\"";
         }
 
         // skip custom writing
     }
 
     inline bool forAll( const QMap<int, OPimEvent>& list, QFile& file ) {
         QMap<int, OPimEvent>::ConstIterator it;
         QString buf;
         QCString str;
         int total_written;
         for ( it = list.begin(); it != list.end(); ++it ) {
             buf = "<event";
             save( it.data(), buf );
             buf += " />\n";
             str = buf.utf8();
 
             total_written = file.writeBlock(str.data(), str.length() );
             if ( total_written != int(str.length() ) )
                 return false;
         }
         return true;
     }
 }
 
 namespace Opie {
 ODateBookAccessBackend_XML::ODateBookAccessBackend_XML( const QString& ,
                                                         const QString& fileName )
     : ODateBookAccessBackend() {
     m_name = fileName.isEmpty() ? Global::applicationFileName( "datebook", "datebook.xml" ) : fileName;
     m_changed = false;
 }
 ODateBookAccessBackend_XML::~ODateBookAccessBackend_XML() {
 }
 bool ODateBookAccessBackend_XML::load() {
     return loadFile();
 }
 bool ODateBookAccessBackend_XML::reload() {
     clear();
     return load();
 }
 bool ODateBookAccessBackend_XML::save() {
     if (!m_changed) return true;
 
     int total_written;
     QString strFileNew = m_name + ".new";
 
     QFile f( strFileNew );
     if (!f.open( IO_WriteOnly | IO_Raw ) ) return false;
 
     QString buf( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
     buf += "<!DOCTYPE DATEBOOK><DATEBOOK>\n";
     buf += "<events>\n";
     QCString str = buf.utf8();
     total_written = f.writeBlock( str.data(), str.length() );
     if ( total_written != int(str.length() ) ) {
         f.close();
         QFile::remove( strFileNew );
         return false;
     }
 
     if (!forAll( m_raw, f ) ) {
         f.close();
         QFile::remove( strFileNew );
         return false;
     }
     if (!forAll( m_rep, f ) ) {
         f.close();
         QFile::remove( strFileNew );
         return false;
     }
 
     buf = "</events>\n</DATEBOOK>\n";
     str = buf.utf8();
     total_written = f.writeBlock( str.data(), str.length() );
     if ( total_written != int(str.length() ) ) {
         f.close();
         QFile::remove( strFileNew );
         return false;
     }
     f.close();
 
     if ( ::rename( strFileNew, m_name ) < 0 ) {
         QFile::remove( strFileNew );
         return false;
     }
 
     m_changed = false;
     return true;
 }
 QArray<int> ODateBookAccessBackend_XML::allRecords()const {
     QArray<int> ints( m_raw.count()+ m_rep.count() );
     uint i = 0;
     QMap<int, OPimEvent>::ConstIterator it;
 
     for ( it = m_raw.begin(); it != m_raw.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
     for ( it = m_rep.begin(); it != m_rep.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
 
     return ints;
 }
 QArray<int> ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int,  const QDateTime& ) {
     return QArray<int>();
 }
 void ODateBookAccessBackend_XML::clear() {
     m_changed = true;
     m_raw.clear();
     m_rep.clear();
 }
 OPimEvent ODateBookAccessBackend_XML::find( int uid ) const{
     if ( m_raw.contains( uid ) )
         return m_raw[uid];
     else
         return m_rep[uid];
 }
 bool ODateBookAccessBackend_XML::add( const OPimEvent& ev ) {
     m_changed = true;
     if (ev.hasRecurrence() )
         m_rep.insert( ev.uid(), ev );
     else
         m_raw.insert( ev.uid(), ev );
 
     return true;
 }
 bool ODateBookAccessBackend_XML::remove( int uid ) {
     m_changed = true;
     m_rep.remove( uid );
     m_rep.remove( uid );
 
     return true;
 }
 bool ODateBookAccessBackend_XML::replace( const OPimEvent& ev ) {
     replace( ev.uid() ); // ??? Shouldn't this be "remove( ev.uid() ) ??? (eilers)
     return add( ev );
 }
 QArray<int> ODateBookAccessBackend_XML::rawEvents()const {
     return allRecords();
 }
 QArray<int> ODateBookAccessBackend_XML::rawRepeats()const {
     QArray<int> ints( m_rep.count() );
     uint i = 0;
     QMap<int, OPimEvent>::ConstIterator it;
 
     for ( it = m_rep.begin(); it != m_rep.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
 
     return ints;
 }
 QArray<int> ODateBookAccessBackend_XML::nonRepeats()const {
     QArray<int> ints( m_raw.count() );
     uint i = 0;
     QMap<int, OPimEvent>::ConstIterator it;
 
     for ( it = m_raw.begin(); it != m_raw.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
 
     return ints;
 }
 OPimEvent::ValueList ODateBookAccessBackend_XML::directNonRepeats() {
     OPimEvent::ValueList list;
     QMap<int, OPimEvent>::ConstIterator it;
     for (it = m_raw.begin(); it != m_raw.end(); ++it )
         list.append( it.data() );
 
     return list;
 }
 OPimEvent::ValueList ODateBookAccessBackend_XML::directRawRepeats() {
     OPimEvent::ValueList list;
     QMap<int, OPimEvent>::ConstIterator it;
     for (it = m_rep.begin(); it != m_rep.end(); ++it )
         list.append( it.data() );
 
     return list;
 }
 
 // FIXME: Use OPimEvent::fromMap() (eilers)
 bool ODateBookAccessBackend_XML::loadFile() {
     m_changed = false;
 
     int fd = ::open( QFile::encodeName(m_name).data(), O_RDONLY );
     if ( fd < 0 ) return false;
 
     struct stat attribute;
     if ( ::fstat(fd, &attribute ) == -1 ) {
         ::close( fd );
         return false;
     }
     void* map_addr = ::mmap(NULL, attribute.st_size, PROT_READ, MAP_SHARED, fd, 0 );
     if ( map_addr == ( (caddr_t)-1) ) {
         ::close( fd );
         return false;
     }
 
     ::madvise( map_addr, attribute.st_size, MADV_SEQUENTIAL );
     ::close( fd );
 
     QAsciiDict<int> dict(FExceptions+1);
     dict.setAutoDelete( true );
     dict.insert( "description", new int(FDescription) );
     dict.insert( "location", new int(FLocation) );
     dict.insert( "categories", new int(FCategories) );
     dict.insert( "uid", new int(FUid) );
     dict.insert( "type", new int(FType) );
     dict.insert( "alarm", new int(FAlarm) );
     dict.insert( "sound", new int(FSound) );
     dict.insert( "rtype", new int(FRType) );
     dict.insert( "rweekdays", new int(FRWeekdays) );
     dict.insert( "rposition", new int(FRPosition) );
     dict.insert( "rfreq", new int(FRFreq) );
     dict.insert( "rhasenddate", new int(FRHasEndDate) );
     dict.insert( "enddt", new int(FREndDate) );
     dict.insert( "start", new int(FRStart) );
     dict.insert( "end", new int(FREnd) );
     dict.insert( "note", new int(FNote) );
     dict.insert( "created", new int(FCreated) );  // Shouldn't this be FRCreated ??
     dict.insert( "recparent", new int(FRecParent) );
     dict.insert( "recchildren", new int(FRecChildren) );
     dict.insert( "exceptions", new int(FExceptions) );
     dict.insert( "timezone", new int(FTimeZone) );
 
     char* dt = (char*)map_addr;
     int len = attribute.st_size;
     int i = 0;
     char* point;
     const char* collectionString = "<event ";
     int strLen = ::strlen(collectionString);
     int *find;
     while ( (  point = ::strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0  ) {
         i = point -dt;
         i+= strLen;
 
         alarmTime = -1;
         snd = 0; // silent
 
         OPimEvent ev;
         rec = 0;
 
         while ( TRUE ) {
             while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
-                ++i;
-            if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
-                break;
-
-
-            // we have another attribute, read it.
-            int j = i;
-            while ( j < len && dt[j] != '=' )
-                ++j;
-            QCString attr( dt+i, j-i+1);
-
-            i = ++j; // skip =
-
-            // find the start of quotes
-            while ( i < len && dt[i] != '"' )
-                ++i;
-            j = ++i;
-
-            bool haveUtf = FALSE;
-            bool haveEnt = FALSE;
-            while ( j < len && dt[j] != '"' ) {
-                if ( ((unsigned char)dt[j]) > 0x7f )
-                    haveUtf = TRUE;
-                if ( dt[j] == '&' )
-                    haveEnt = TRUE;
-                ++j;
-            }
-            if ( i == j ) {
-                // empty value
-                i = j + 1;
-                continue;
-            }
-
-            QCString value( dt+i, j-i+1 );
-            i = j + 1;
-
-            QString str = (haveUtf ? QString::fromUtf8( value )
-                    : QString::fromLatin1( value ) );
-            if ( haveEnt )
-                str = Qtopia::plainString( str );
+        ++i;
+        if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
+        break;
+
+
+        // we have another attribute, read it.
+        int j = i;
+        while ( j < len && dt[j] != '=' )
+        ++j;
+        QCString attr( dt+i, j-i+1);
+
+        i = ++j; // skip =
+
+        // find the start of quotes
+        while ( i < len && dt[i] != '"' )
+        ++i;
+        j = ++i;
+
+        bool haveUtf = FALSE;
+        bool haveEnt = FALSE;
+        while ( j < len && dt[j] != '"' ) {
+        if ( ((unsigned char)dt[j]) > 0x7f )
+            haveUtf = TRUE;
+        if ( dt[j] == '&' )
+            haveEnt = TRUE;
+        ++j;
+        }
+        if ( i == j ) {
+        // empty value
+        i = j + 1;
+        continue;
+        }
+
+        QCString value( dt+i, j-i+1 );
+        i = j + 1;
+
+        QString str = (haveUtf ? QString::fromUtf8( value )
+            : QString::fromLatin1( value ) );
+        if ( haveEnt )
+        str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             find = dict[attr.data()];
             if (!find)
                 ev.setCustomField( attr, str );
             else {
                 setField( ev, *find, str );
             }
         }
         /* time to finalize */
         finalizeRecord( ev );
         delete rec;
     }
     ::munmap(map_addr, attribute.st_size );
     m_changed = false; // changed during add
 
     return true;
 }
 
 // FIXME: Use OPimEvent::fromMap() which makes this obsolete.. (eilers)
 void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) {
     /* AllDay is alway in UTC */
     if ( ev.isAllDay() ) {
         OPimTimeZone utc = OPimTimeZone::utc();
         ev.setStartDateTime( utc.fromUTCDateTime( start ) );
         ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
         ev.setTimeZone( "UTC"); // make sure it is really utc
     }else {
         /* to current date time */
-        // qWarning(" Start is %d", start );
+        // owarn << " Start is " << start << "" << oendl;
         OPimTimeZone zone( ev.timeZone().isEmpty() ? OPimTimeZone::current() : ev.timeZone() );
         QDateTime date = zone.toDateTime( start );
-        qWarning(" Start is %s", date.toString().latin1() );
+        owarn << " Start is " << date.toString() << "" << oendl;
         ev.setStartDateTime( zone.toDateTime( date, OPimTimeZone::current() ) );
 
         date = zone.toDateTime( end );
         ev.setEndDateTime  ( zone.toDateTime( date, OPimTimeZone::current()   ) );
     }
     if ( rec && rec->doesRecur() ) {
         OPimTimeZone utc = OPimTimeZone::utc();
         OPimRecurrence recu( *rec ); // call copy c'tor;
         recu.setEndDate ( utc.fromUTCDateTime( rp_end ).date() );
         recu.setCreatedDateTime( utc.fromUTCDateTime( created ) );
         recu.setStart( ev.startDateTime().date() );
         ev.setRecurrence( recu );
     }
 
     if (alarmTime != -1 ) {
         QDateTime dt = ev.startDateTime().addSecs( -1*alarmTime*60 );
         OPimAlarm al( snd ,  dt  );
         ev.notifiers().add( al );
     }
     if ( m_raw.contains( ev.uid() ) || m_rep.contains( ev.uid() ) ) {
-        qWarning("already contains assign uid");
+        owarn << "already contains assign uid" << oendl;
         ev.setUid( 1 );
     }
-    qWarning("addind %d %s", ev.uid(), ev.description().latin1() );
+    owarn << "addind " << ev.uid() << " " << ev.description() << "" << oendl;
     if ( ev.hasRecurrence() )
         m_rep.insert( ev.uid(), ev );
     else
         m_raw.insert( ev.uid(), ev );
 
 }
 void ODateBookAccessBackend_XML::setField( OPimEvent& e, int id, const QString& value) {
-//    qWarning(" setting %s", value.latin1() );
+//    owarn << " setting " << value << "" << oendl;
     switch( id ) {
     case FDescription:
         e.setDescription( value );
         break;
     case FLocation:
         e.setLocation( value );
         break;
     case FCategories:
         e.setCategories( e.idsFromString( value ) );
         break;
     case FUid:
         e.setUid( value.toInt() );
         break;
     case FType:
         if ( value == "AllDay" ) {
             e.setAllDay( true );
             e.setTimeZone( "UTC" );
         }
         break;
     case FAlarm:
         alarmTime = value.toInt();
         break;
     case FSound:
         snd = value == "loud" ? OPimAlarm::Loud : OPimAlarm::Silent;
         break;
         // recurrence stuff
     case FRType:
         if ( value == "Daily" )
             recur()->setType( OPimRecurrence::Daily );
         else if ( value == "Weekly" )
             recur()->setType( OPimRecurrence::Weekly);
         else if ( value == "MonthlyDay" )
             recur()->setType( OPimRecurrence::MonthlyDay );
         else if ( value == "MonthlyDate" )
             recur()->setType( OPimRecurrence::MonthlyDate );
         else if ( value == "Yearly" )
             recur()->setType( OPimRecurrence::Yearly );
         else
             recur()->setType( OPimRecurrence::NoRepeat );
         break;
     case FRWeekdays:
         recur()->setDays( value.toInt() );
         break;
     case FRPosition:
         recur()->setPosition( value.toInt() );
         break;
     case FRFreq:
         recur()->setFrequency( value.toInt() );
         break;
     case FRHasEndDate:
         recur()->setHasEndDate( value.toInt() );
         break;
     case FREndDate: {
         rp_end = (time_t) value.toLong();
         break;
     }
     case FRStart: {
         start =  (time_t) value.toLong();
         break;
     }
     case FREnd: {
         end = ( (time_t) value.toLong() );
         break;
     }
     case FNote:
         e.setNote( value );
         break;
     case FCreated:
         created = value.toInt();
         break;
     case FRecParent:
         e.setParent( value.toInt() );
         break;
     case FRecChildren:{
         QStringList list = QStringList::split(' ', value );
         for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             e.addChild( (*it).toInt() );
         }
     }
         break;
     case FExceptions:{
         QStringList list = QStringList::split(' ', value );
         for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             QDate date( (*it).left(4).toInt(), (*it).mid(4, 2).toInt(), (*it).right(2).toInt() );
-            qWarning("adding exception %s", date.toString().latin1() );
+            owarn << "adding exception " << date.toString() << "" << oendl;
             recur()->exceptions().append( date );
         }
     }
         break;
     case FTimeZone:
         if ( value != "None" )
             e.setTimeZone( value );
         break;
     default:
         break;
     }
 }
 QArray<int> ODateBookAccessBackend_XML::matchRegexp(  const QRegExp &r ) const
 {
     QArray<int> m_currentQuery( m_raw.count()+ m_rep.count() );
     uint arraycounter = 0;
     QMap<int, OPimEvent>::ConstIterator it;
 
     for ( it = m_raw.begin(); it != m_raw.end(); ++it )
         if ( it.data().match( r ) )
             m_currentQuery[arraycounter++] = it.data().uid();
     for ( it = m_rep.begin(); it != m_rep.end(); ++it )
         if ( it.data().match( r ) )
             m_currentQuery[arraycounter++] = it.data().uid();
 
     // Shrink to fit..
     m_currentQuery.resize(arraycounter);
 
     return m_currentQuery;
 }
 
 }
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 132b5a6..6f65c48 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -1,880 +1,884 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
                              Copyright (C) Holger Freyther (zecke@handhelds.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.
 */
 
-#include <qdatetime.h>
-#include <qmap.h>
-#include <qstring.h>
-
-#include <qpe/global.h>
-
+/* OPIE */
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include <opie2/otodoaccesssql.h>
 #include <opie2/opimstate.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimrecurrence.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
+
+/* QT */
+#include <qdatetime.h>
+#include <qmap.h>
+#include <qstring.h>
+
 
 using namespace Opie::DB;
 
 using namespace Opie;
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
      */
     class CreateQuery : public OSQLQuery {
     public:
         CreateQuery();
         ~CreateQuery();
         QString query()const;
     };
 
     /**
      * LoadQuery
      * this one queries for all uids
      */
     class LoadQuery : public OSQLQuery {
     public:
         LoadQuery();
         ~LoadQuery();
         QString query()const;
     };
 
     /**
      * inserts/adds a OPimTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OPimTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OPimTodo m_todo;
     };
 
     /**
      * removes one from the table
      */
     class RemoveQuery : public OSQLQuery {
     public:
         RemoveQuery(int uid );
         ~RemoveQuery();
         QString query()const;
     private:
         int m_uid;
     };
 
     /**
      * Clears (delete) a Table
      */
     class ClearQuery : public OSQLQuery {
     public:
         ClearQuery();
         ~ClearQuery();
         QString query()const;
 
     };
 
     /**
      * a find query
      */
     class FindQuery : public OSQLQuery {
     public:
         FindQuery(int uid);
         FindQuery(const QArray<int>& );
         ~FindQuery();
         QString query()const;
     private:
         QString single()const;
         QString multi()const;
         QArray<int> m_uids;
         int m_uid;
     };
 
     /**
      * overdue query
      */
     class OverDueQuery : public OSQLQuery {
     public:
         OverDueQuery();
         ~OverDueQuery();
         QString query()const;
     };
     class EffQuery : public OSQLQuery {
     public:
         EffQuery( const QDate&, const QDate&, bool inc );
         ~EffQuery();
         QString query()const;
     private:
         QString with()const;
         QString out()const;
         QDate m_start;
         QDate m_end;
         bool m_inc :1;
     };
 
 
-        /**
-         * a find query for custom elements
-         */
-        class FindCustomQuery : public OSQLQuery {
-        public:
-                FindCustomQuery(int uid);
-                FindCustomQuery(const QArray<int>& );
-                ~FindCustomQuery();
-                QString query()const;
-        private:
-                QString single()const;
-                QString multi()const;
-                QArray<int> m_uids;
-                int m_uid;
-        };
+    /**
+     * a find query for custom elements
+     */
+    class FindCustomQuery : public OSQLQuery {
+    public:
+        FindCustomQuery(int uid);
+        FindCustomQuery(const QArray<int>& );
+        ~FindCustomQuery();
+        QString query()const;
+    private:
+        QString single()const;
+        QString multi()const;
+        QArray<int> m_uids;
+        int m_uid;
+    };
 
 
 
     CreateQuery::CreateQuery() : OSQLQuery() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
-        // This is the recurrance-stuff .. Exceptions are currently not supported (see OPimRecurrence.cpp) ! (eilers)
-        qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, ";
-        qu += "reminders, alarms, maintainer, startdate, completeddate);";
-        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
+    // This is the recurrance-stuff .. Exceptions are currently not supported (see OPimRecurrence.cpp) ! (eilers)
+    qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, ";
+    qu += "reminders, alarms, maintainer, startdate, completeddate);";
+    qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
         return qu;
     }
 
     LoadQuery::LoadQuery() : OSQLQuery() {}
     LoadQuery::~LoadQuery() {}
     QString LoadQuery::query()const {
         QString qu;
-        // We do not need "distinct" here. The primary key is always unique..
+    // We do not need "distinct" here. The primary key is always unique..
         //qu += "select distinct uid from todolist";
         qu += "select uid from todolist";
 
         return qu;
     }
 
     InsertQuery::InsertQuery( const OPimTodo& todo )
         : OSQLQuery(), m_todo( todo ) {
     }
     InsertQuery::~InsertQuery() {
     }
     /*
      * converts from a OPimTodo to a query
      * we leave out X-Ref + Maintainer
      * FIXME: Implement/Finish toMap()/fromMap() into OpimTodo to move the encoding
      *        decoding stuff there.. (eilers)
      */
     QString InsertQuery::query()const{
 
         int year, month, day;
         year = month = day = 0;
         if (m_todo.hasDueDate() ) {
             QDate date = m_todo.dueDate();
             year = date.year();
             month = date.month();
             day = date.day();
-        }
-        int sYear = 0, sMonth = 0, sDay = 0;
-        if( m_todo.hasStartDate() ){
-                QDate sDate = m_todo.startDate();
-                sYear = sDate.year();
-                sMonth= sDate.month();
-                sDay  = sDate.day();
-        }
-
-        int eYear = 0, eMonth = 0, eDay = 0;
-        if( m_todo.hasCompletedDate() ){
-                QDate eDate = m_todo.completedDate();
-                eYear = eDate.year();
-                eMonth= eDate.month();
-                eDay  = eDate.day();
-        }
+    }
+    int sYear = 0, sMonth = 0, sDay = 0;
+    if( m_todo.hasStartDate() ){
+        QDate sDate = m_todo.startDate();
+        sYear = sDate.year();
+        sMonth= sDate.month();
+        sDay  = sDate.day();
+    }
+
+    int eYear = 0, eMonth = 0, eDay = 0;
+    if( m_todo.hasCompletedDate() ){
+        QDate eDate = m_todo.completedDate();
+        eYear = eDate.year();
+        eMonth= eDate.month();
+        eDay  = eDate.day();
+    }
         QString qu;
-        QMap<int, QString> recMap = m_todo.recurrence().toMap();
+    QMap<int, QString> recMap = m_todo.recurrence().toMap();
         qu  = "insert into todolist VALUES("
-                +  QString::number( m_todo.uid() ) + ","
-                + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
-                +       QString::number( m_todo.isCompleted() )         + ","
-                + "'" + m_todo.description()                      + "'" + ","
-                + "'" + m_todo.summary()                          + "'" + ","
-                +       QString::number(m_todo.priority() )             + ","
-                + "'" + QString::number(year).rightJustify( 4, '0' ) + "-"
-                +       QString::number(month).rightJustify( 2, '0' )
-                +       "-" + QString::number( day ).rightJustify( 2, '0' )+ "'" + ","
-                +       QString::number( m_todo.progress() )            + ","
-                +       QString::number( m_todo.state().state() )       + ","
-                + "'" + recMap[ OPimRecurrence::RType ]                   + "'" + ","
-                + "'" + recMap[ OPimRecurrence::RWeekdays ]               + "'" + ","
-                + "'" + recMap[ OPimRecurrence::RPosition ]               + "'" + ","
-                + "'" + recMap[ OPimRecurrence::RFreq ]                   + "'" + ","
-                + "'" + recMap[ OPimRecurrence::RHasEndDate ]             + "'" + ","
-                + "'" + recMap[ OPimRecurrence::EndDate ]                 + "'" + ","
-                + "'" + recMap[ OPimRecurrence::Created ]                 + "'" + ","
-                + "'" + recMap[ OPimRecurrence::Exceptions ]              + "'" + ",";
-
-        if ( m_todo.hasNotifiers() ) {
-                OPimNotifyManager manager = m_todo.notifiers();
-                qu += "'" + manager.remindersToString()           + "'" + ","
-                        + "'" + manager.alarmsToString()          + "'" + ",";
-        }
-        else{
-                qu += QString( "''" )                                   + ","
-                        + "''"                                          + ",";
-        }
-
-        qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
-                + "'" + QString::number(sYear).rightJustify( 4, '0' ) + "-"
-                + QString::number(sMonth).rightJustify( 2, '0' )
-                + "-" + QString::number(sDay).rightJustify( 2, '0' )+ "'" + ","
-                + "'" + QString::number(eYear).rightJustify( 4, '0' ) + "-"
-                +       QString::number(eMonth).rightJustify( 2, '0' )
-                +       "-"+QString::number(eDay).rightJustify( 2, '0' ) + "'"
-                + "); ";
-
-        // Save custom Entries:
-        int id = 0;
-        id = 0;
-        QMap<QString, QString> customMap = m_todo.toExtraMap();
-        for( QMap<QString, QString>::Iterator it = customMap.begin();
-             it != customMap.end(); ++it ){
-                qu  += "insert into custom_data VALUES("
-                        +  QString::number( m_todo.uid() )
-                        + ","
-                        +  QString::number( id++ )
-                        + ",'"
-                        + it.key()
-                        + "',"
-                        + "0" // Priority for future enhancements
-                        + ",'"
-                        + it.data()
-                        + "');";
-        }
-
-
-        qDebug("add %s", qu.latin1() );
+        +  QString::number( m_todo.uid() ) + ","
+        + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
+        +       QString::number( m_todo.isCompleted() )         + ","
+        + "'" + m_todo.description()                      + "'" + ","
+        + "'" + m_todo.summary()                          + "'" + ","
+        +       QString::number(m_todo.priority() )             + ","
+        + "'" + QString::number(year).rightJustify( 4, '0' ) + "-"
+        +       QString::number(month).rightJustify( 2, '0' )
+        +       "-" + QString::number( day ).rightJustify( 2, '0' )+ "'" + ","
+        +       QString::number( m_todo.progress() )            + ","
+        +       QString::number( m_todo.state().state() )       + ","
+        + "'" + recMap[ OPimRecurrence::RType ]                   + "'" + ","
+        + "'" + recMap[ OPimRecurrence::RWeekdays ]               + "'" + ","
+        + "'" + recMap[ OPimRecurrence::RPosition ]               + "'" + ","
+        + "'" + recMap[ OPimRecurrence::RFreq ]                   + "'" + ","
+        + "'" + recMap[ OPimRecurrence::RHasEndDate ]             + "'" + ","
+        + "'" + recMap[ OPimRecurrence::EndDate ]                 + "'" + ","
+        + "'" + recMap[ OPimRecurrence::Created ]                 + "'" + ","
+        + "'" + recMap[ OPimRecurrence::Exceptions ]              + "'" + ",";
+
+    if ( m_todo.hasNotifiers() ) {
+        OPimNotifyManager manager = m_todo.notifiers();
+        qu += "'" + manager.remindersToString()           + "'" + ","
+            + "'" + manager.alarmsToString()          + "'" + ",";
+    }
+    else{
+        qu += QString( "''" )                                   + ","
+            + "''"                                          + ",";
+    }
+
+    qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
+        + "'" + QString::number(sYear).rightJustify( 4, '0' ) + "-"
+        + QString::number(sMonth).rightJustify( 2, '0' )
+        + "-" + QString::number(sDay).rightJustify( 2, '0' )+ "'" + ","
+        + "'" + QString::number(eYear).rightJustify( 4, '0' ) + "-"
+        +       QString::number(eMonth).rightJustify( 2, '0' )
+        +       "-"+QString::number(eDay).rightJustify( 2, '0' ) + "'"
+        + "); ";
+
+    // Save custom Entries:
+    int id = 0;
+    id = 0;
+    QMap<QString, QString> customMap = m_todo.toExtraMap();
+    for( QMap<QString, QString>::Iterator it = customMap.begin();
+         it != customMap.end(); ++it ){
+        qu  += "insert into custom_data VALUES("
+            +  QString::number( m_todo.uid() )
+            + ","
+            +  QString::number( id++ )
+            + ",'"
+            + it.key()
+            + "',"
+            + "0" // Priority for future enhancements
+            + ",'"
+            + it.data()
+            + "');";
+    }
+
+
+        odebug << "add " << qu << "" << oendl;
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
     QString RemoveQuery::query()const {
         QString qu = "DELETE FROM todolist WHERE uid = " + QString::number(m_uid) + " ;";
-        qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid);
+    qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
     ClearQuery::~ClearQuery() {}
     QString ClearQuery::query()const {
         QString qu = "drop table todolist";
         return qu;
     }
     FindQuery::FindQuery(int uid)
         : OSQLQuery(), m_uid(uid ) {
     }
     FindQuery::FindQuery(const QArray<int>& ints)
         : OSQLQuery(), m_uids(ints){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
         if (m_uids.count() == 0 )
             return single();
         else
             return multi();
     }
     QString FindQuery::single()const{
         QString qu = "select * from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select * from todolist where ";
         for (uint i = 0; i < m_uids.count(); i++ ) {
             qu += " UID = " + QString::number( m_uids[i] ) + " OR";
         }
         qu.remove( qu.length()-2, 2 );
         return qu;
     }
 
     OverDueQuery::OverDueQuery(): OSQLQuery() {}
     OverDueQuery::~OverDueQuery() {}
     QString OverDueQuery::query()const {
         QDate date = QDate::currentDate();
         QString str;
         str = QString("select uid from todolist where DueDate ='%1-%2-%3'")
-                .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( date.day() ) .rightJustify( 2, '0' ) );
+        .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( date.day() ) .rightJustify( 2, '0' ) );
 
         return str;
     }
 
 
     EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc )
         : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {}
     EffQuery::~EffQuery() {}
     QString EffQuery::query()const {
         return m_inc ? with() : out();
     }
     QString EffQuery::with()const {
         QString str;
         str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ")
-                .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
+        .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
         return str;
     }
     QString EffQuery::out()const {
         QString str;
         str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND  DueDate <= '%4-%5-%6'")
-                .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
+        .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
 
         return str;
     }
 
-        FindCustomQuery::FindCustomQuery(int uid)
-                : OSQLQuery(), m_uid( uid ) {
-        }
-        FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
-                : OSQLQuery(), m_uids( ints ){
-        }
-        FindCustomQuery::~FindCustomQuery() {
-        }
-        QString FindCustomQuery::query()const{
-                return single(); // Multiple requests not supported !
-        }
-        QString FindCustomQuery::single()const{
-                QString qu = "select uid, type, value from custom_data where uid = ";
-                qu += QString::number(m_uid);
-                return qu;
-        }
+    FindCustomQuery::FindCustomQuery(int uid)
+        : OSQLQuery(), m_uid( uid ) {
+    }
+    FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
+        : OSQLQuery(), m_uids( ints ){
+    }
+    FindCustomQuery::~FindCustomQuery() {
+    }
+    QString FindCustomQuery::query()const{
+        return single(); // Multiple requests not supported !
+    }
+    QString FindCustomQuery::single()const{
+        QString qu = "select uid, type, value from custom_data where uid = ";
+        qu += QString::number(m_uid);
+        return qu;
+    }
 
 };
 
 
 namespace Opie {
 OPimTodoAccessBackendSQL::OPimTodoAccessBackendSQL( const QString& file )
-        : OPimTodoAccessBackend(),/* m_dict(15),*/ m_driver(NULL), m_dirty(true)
+    : OPimTodoAccessBackend(),/* m_dict(15),*/ m_driver(NULL), m_dirty(true)
 {
     QString fi = file;
     if ( fi.isEmpty() )
         fi = Global::applicationFileName( "todolist", "todolist.db" );
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl(fi);
     // fillDict();
 }
 
 OPimTodoAccessBackendSQL::~OPimTodoAccessBackendSQL(){
-        if( m_driver )
-                delete m_driver;
+    if( m_driver )
+        delete m_driver;
 }
 
 bool OPimTodoAccessBackendSQL::load(){
     if (!m_driver->open() )
         return false;
 
     CreateQuery creat;
     OSQLResult res = m_driver->query(&creat );
 
     m_dirty = true;
     return true;
 }
 bool OPimTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OPimTodoAccessBackendSQL::save(){
     return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 QArray<int> OPimTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
 QArray<int> OPimTodoAccessBackendSQL::queryByExample( const OPimTodo& , int, const QDateTime& ){
     QArray<int> ints(0);
     return ints;
 }
 OPimTodo OPimTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return todo( m_driver->query(&query) );
 
 }
 OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     uint CACHE = readAhead();
-    qDebug("searching for %d", uid );
+    odebug << "searching for " << uid << "" << oendl;
     QArray<int> search( CACHE );
     uint size =0;
     OPimTodo to;
 
     // we try to cache CACHE items
     switch( dir ) {
         /* forward */
     case 0: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i < ints.count() && size < CACHE; i++ ) {
-            qDebug("size %d %d", size,  ints[i] );
+            odebug << "size " << size << " " << ints[i] << "" << oendl;
             search[size] = ints[i];
             size++;
         }
         break;
         /* reverse */
     case 1: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i != 0 && size <  CACHE; i-- ) {
             search[size] = ints[i];
             size++;
         }
         break;
     }
     search.resize( size );
     FindQuery query( search );
     OSQLResult res = m_driver->query( &query  );
     if ( res.state() != OSQLResult::Success )
         return to;
 
     return todo( res );
 }
 void OPimTodoAccessBackendSQL::clear() {
     ClearQuery cle;
     OSQLResult res = m_driver->query( &cle );
     CreateQuery qu;
     res = m_driver->query(&qu);
 }
 bool OPimTodoAccessBackendSQL::add( const OPimTodo& t) {
     InsertQuery ins( t );
     OSQLResult res = m_driver->query( &ins );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
     int c = m_uids.count();
     m_uids.resize( c+1 );
     m_uids[c] = t.uid();
 
     return true;
 }
 bool OPimTodoAccessBackendSQL::remove( int uid ) {
     RemoveQuery rem( uid );
     OSQLResult res = m_driver->query(&rem );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
 
     m_dirty = true;
     return true;
 }
 /*
  * FIXME better set query
  * but we need the cache for that
  * now we remove
  */
 bool OPimTodoAccessBackendSQL::replace( const OPimTodo& t) {
     remove( t.uid() );
     bool b= add(t);
     m_dirty = false; // we changed some stuff but the UID stayed the same
     return b;
 }
 QArray<int> OPimTodoAccessBackendSQL::overDue() {
     OverDueQuery qu;
     return uids( m_driver->query(&qu ) );
 }
 QArray<int> OPimTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
 /*
  *
  */
 QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                            int sortFilter, int cat ) {
-    qDebug("sorted %d, %d", asc, sortOrder );
+    odebug << "sorted " << asc << ", " << sortOrder << "" << oendl;
     QString query;
     query = "select uid from todolist WHERE ";
 
     /*
      * Sort Filter stuff
      * not that straight forward
      * FIXME: Replace magic numbers
      *
      */
     /* Category */
     if ( sortFilter & 1 ) {
         QString str;
         if (cat != 0 ) str = QString::number( cat );
         query += " categories like '%" +str+"%' AND";
     }
     /* Show only overdue */
     if ( sortFilter & 2 ) {
         QDate date = QDate::currentDate();
         QString due;
         QString base;
         base = QString("DueDate <= '%1-%2-%3' AND completed = 0")
-                .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
-                .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
-                .arg( QString::number( date.day() ).rightJustify( 2, '0' ) );
+        .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
+        .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
+        .arg( QString::number( date.day() ).rightJustify( 2, '0' ) );
         query += " " + base + " AND";
     }
     /* not show completed */
     if ( sortFilter & 4 ) {
         query += " completed = 0 AND";
     }else{
        query += " ( completed = 1 OR  completed = 0) AND";
     }
     /* strip the end */
     query = query.remove( query.length()-3, 3 );
 
 
     /*
      * sort order stuff
      * quite straight forward
      */
     query += "ORDER BY ";
     switch( sortOrder ) {
         /* completed */
     case 0:
         query += "completed";
         break;
     case 1:
         query += "priority";
         break;
     case 2:
         query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
     }
 
     if ( !asc ) {
-        qDebug("not ascending!");
+        odebug << "not ascending!" << oendl;
         query += " DESC";
     }
 
-    qDebug( query );
+    odebug << query << oendl;
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 bool OPimTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
     if ( str == "0-0-0" )
         return false;
     else{
         int day, year, month;
         QStringList list = QStringList::split("-", str );
         year = list[0].toInt();
         month = list[1].toInt();
         day = list[2].toInt();
         da.setYMD( year, month, day );
         return true;
     }
 }
 OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
     if ( res.state() == OSQLResult::Failure ) {
         OPimTodo to;
         return to;
     }
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
-    qDebug("todo1");
+    odebug << "todo1" << oendl;
     OPimTodo to = todo( (*it) );
     cache( to );
     ++it;
 
     for ( ; it != list.end(); ++it ) {
-        qDebug("caching");
+        odebug << "caching" << oendl;
         cache( todo( (*it) ) );
     }
     return to;
 }
 OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
-    qDebug("todo(ResultItem)");
+    odebug << "todo(ResultItem)" << oendl;
 
     // Request information from addressbook table and create the OPimTodo-object.
 
     bool hasDueDate = false; QDate dueDate = QDate::currentDate();
     hasDueDate = date( dueDate, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
-    qDebug("Item is completed: %d", item.data("completed").toInt() );
+    odebug << "Item is completed: " << item.data("completed").toInt() << "" << oendl;
 
     OPimTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), hasDueDate, dueDate,
               item.data("uid").toInt() );
 
     bool isOk;
     int prioInt = QString( item.data("priority") ).toInt( &isOk );
     if ( isOk )
-            to.setPriority( prioInt );
+        to.setPriority( prioInt );
 
     bool hasStartDate = false; QDate startDate = QDate::currentDate();
     hasStartDate = date( startDate, item.data("startdate") );
     bool hasCompletedDate = false; QDate completedDate = QDate::currentDate();
     hasCompletedDate = date( completedDate, item.data("completeddate") );
 
     if ( hasStartDate )
-            to.setStartDate( startDate );
+        to.setStartDate( startDate );
     if ( hasCompletedDate )
-            to.setCompletedDate( completedDate );
+        to.setCompletedDate( completedDate );
 
     OPimNotifyManager& manager = to.notifiers();
     manager.alarmsFromString( item.data("alarms") );
     manager.remindersFromString( item.data("reminders") );
 
     OPimState pimState;
     pimState.setState( QString( item.data("state") ).toInt() );
     to.setState( pimState );
 
     QMap<int, QString> recMap;
     recMap.insert( OPimRecurrence::RType      , item.data("RType") );
     recMap.insert( OPimRecurrence::RWeekdays  , item.data("RWeekdays") );
     recMap.insert( OPimRecurrence::RPosition  , item.data("RPosition") );
     recMap.insert( OPimRecurrence::RFreq      , item.data("RFreq") );
     recMap.insert( OPimRecurrence::RHasEndDate, item.data("RHasEndDate") );
     recMap.insert( OPimRecurrence::EndDate    , item.data("EndDate") );
     recMap.insert( OPimRecurrence::Created    , item.data("Created") );
     recMap.insert( OPimRecurrence::Exceptions , item.data("Exceptions") );
 
     OPimRecurrence recur;
     recur.fromMap( recMap );
     to.setRecurrence( recur );
 
     // Finally load the custom-entries for this UID and put it into the created object
     to.setExtraMap( requestCustom( to.uid() ) );
 
     return to;
 }
 OPimTodo OPimTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OPimTodoAccessBackendSQL::fillDict() {
 
 #if 0
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      * FIXME: Isn't this dict obsolete ? (eilers)
      */
     m_dict.setAutoDelete( TRUE );
     m_dict.insert("Categories" ,     new int(OPimTodo::Category)         );
     m_dict.insert("Uid" ,            new int(OPimTodo::Uid)              );
     m_dict.insert("HasDate" ,        new int(OPimTodo::HasDate)          );
     m_dict.insert("Completed" ,      new int(OPimTodo::Completed)        );
     m_dict.insert("Description" ,    new int(OPimTodo::Description)      );
     m_dict.insert("Summary" ,        new int(OPimTodo::Summary)          );
     m_dict.insert("Priority" ,       new int(OPimTodo::Priority)         );
     m_dict.insert("DateDay" ,        new int(OPimTodo::DateDay)          );
     m_dict.insert("DateMonth" ,      new int(OPimTodo::DateMonth)        );
     m_dict.insert("DateYear" ,       new int(OPimTodo::DateYear)         );
     m_dict.insert("Progress" ,       new int(OPimTodo::Progress)         );
     m_dict.insert("Completed",       new int(OPimTodo::Completed)        ); // Why twice ? (eilers)
     m_dict.insert("CrossReference",  new int(OPimTodo::CrossReference)   );
 //    m_dict.insert("HasAlarmDateTime",new int(OPimTodo::HasAlarmDateTime) ); // old stuff (eilers)
 //    m_dict.insert("AlarmDateTime",   new int(OPimTodo::AlarmDateTime)    ); // old stuff (eilers)
 
 #endif
 }
 /*
  * need to be const so let's fool the
  * compiler :(
  */
 void OPimTodoAccessBackendSQL::update()const {
     ((OPimTodoAccessBackendSQL*)this)->m_dirty = false;
     LoadQuery lo;
     OSQLResult res = m_driver->query(&lo);
     if ( res.state() != OSQLResult::Success )
         return;
 
     ((OPimTodoAccessBackendSQL*)this)->m_uids = uids( res );
 }
 QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
-    qDebug(" count = %d", list.count() );
+    odebug << " count = " << list.count() << "" << oendl;
 
     int i = 0;
     for (it = list.begin(); it != list.end(); ++it ) {
         ints[i] =  (*it).data("uid").toInt();
         i++;
     }
     return ints;
 }
 
 QArray<int> OPimTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 {
 
 #if 0
-        QArray<int> empty;
-        return empty;
+    QArray<int> empty;
+    return empty;
 
 #else
-        QString qu = "SELECT uid FROM todolist WHERE (";
+    QString qu = "SELECT uid FROM todolist WHERE (";
 
-        // Do it make sense to search other fields, too ?
-        qu += " rlike(\""+ r.pattern() + "\",\"description\") OR";
-        qu += " rlike(\""+ r.pattern() + "\",\"summary\")";
+    // Do it make sense to search other fields, too ?
+    qu += " rlike(\""+ r.pattern() + "\",\"description\") OR";
+    qu += " rlike(\""+ r.pattern() + "\",\"summary\")";
 
-        qu += ")";
+    qu += ")";
 
-        qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
 
-        return uids( res );
+    return uids( res );
 
 
 #endif
 
 }
 QBitArray OPimTodoAccessBackendSQL::supports()const {
 
-        return sup();
+    return sup();
 }
 
 QBitArray OPimTodoAccessBackendSQL::sup() const{
 
-        QBitArray ar( OPimTodo::CompletedDate + 1 );
-        ar.fill( true );
-        ar[OPimTodo::CrossReference] = false;
-        ar[OPimTodo::State ] = false;
-        ar[OPimTodo::Reminders] = false;
-        ar[OPimTodo::Notifiers] = false;
-        ar[OPimTodo::Maintainer] = false;
+    QBitArray ar( OPimTodo::CompletedDate + 1 );
+    ar.fill( true );
+    ar[OPimTodo::CrossReference] = false;
+    ar[OPimTodo::State ] = false;
+    ar[OPimTodo::Reminders] = false;
+    ar[OPimTodo::Notifiers] = false;
+    ar[OPimTodo::Maintainer] = false;
 
-        return ar;
+    return ar;
 }
 
 void OPimTodoAccessBackendSQL::removeAllCompleted(){
-        // First we need the uids from all entries which are
-        // completed. Then, we just have to remove them...
+    // First we need the uids from all entries which are
+    // completed. Then, we just have to remove them...
 
-        QString qu = "SELECT uid FROM todolist WHERE completed = 1";
+    QString qu = "SELECT uid FROM todolist WHERE completed = 1";
 
-        OSQLRawQuery raw( qu );
-        OSQLResult res = m_driver->query( &raw );
+    OSQLRawQuery raw( qu );
+    OSQLResult res = m_driver->query( &raw );
 
-        QArray<int> completed_uids = uids( res );
+    QArray<int> completed_uids = uids( res );
 
-        qDebug( "Number of completed: %d", completed_uids.size() );
+    odebug << "Number of completed: " << completed_uids.size() << "" << oendl;
 
-        if ( completed_uids.size() == 0 )
-                return;
+    if ( completed_uids.size() == 0 )
+        return;
 
-        qu = "DELETE FROM todolist WHERE (";
-        QString query;
+    qu = "DELETE FROM todolist WHERE (";
+    QString query;
 
-        for ( int i = 0; i < completed_uids.size(); i++ ){
-                if ( !query.isEmpty() )
-                        query += " OR ";
-                query += QString( "uid = %1" ).arg( completed_uids[i] );
-        }
-        qu += query + " );";
+    for ( int i = 0; i < completed_uids.size(); i++ ){
+        if ( !query.isEmpty() )
+            query += " OR ";
+        query += QString( "uid = %1" ).arg( completed_uids[i] );
+    }
+    qu += query + " );";
 
-        // Put remove of custom entries in this query to speed up..
-         qu += "DELETE FORM custom_data WHERE (";
-         query = "";
+    // Put remove of custom entries in this query to speed up..
+    qu += "DELETE FORM custom_data WHERE (";
+    query = "";
 
-        for ( int i = 0; i < completed_uids.size(); i++ ){
-                if ( !query.isEmpty() )
-                        query += " OR ";
-                query += QString( "uid = %1" ).arg( completed_uids[i] );
-        }
-        qu += query + " );";
+    for ( int i = 0; i < completed_uids.size(); i++ ){
+        if ( !query.isEmpty() )
+            query += " OR ";
+        query += QString( "uid = %1" ).arg( completed_uids[i] );
+    }
+    qu += query + " );";
 
-        qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
-        OSQLRawQuery raw2( qu );
-        res = m_driver->query( &raw2 );
-        if ( res.state() == OSQLResult::Failure ) {
-                qWarning("OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: %s", qu.latin1() );
-        }
+    OSQLRawQuery raw2( qu );
+    res = m_driver->query( &raw2 );
+    if ( res.state() == OSQLResult::Failure ) {
+        owarn << "OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: " << qu << "" << oendl;
+    }
 }
 
 
 QMap<QString, QString>  OPimTodoAccessBackendSQL::requestCustom( int uid ) const
 {
-        QMap<QString, QString> customMap;
+    QMap<QString, QString> customMap;
 
-        FindCustomQuery query( uid );
-        OSQLResult res_custom = m_driver->query( &query );
+    FindCustomQuery query( uid );
+    OSQLResult res_custom = m_driver->query( &query );
 
-        if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
-                QMap<QString, QString> empty;
-                return empty;
-        }
+    if ( res_custom.state() == OSQLResult::Failure ) {
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
+        QMap<QString, QString> empty;
+        return empty;
+    }
 
-        OSQLResultItem::ValueList list = res_custom.results();
-        OSQLResultItem::ValueList::Iterator it = list.begin();
-        for ( ; it != list.end(); ++it ) {
-                customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
-        }
+    OSQLResultItem::ValueList list = res_custom.results();
+    OSQLResultItem::ValueList::Iterator it = list.begin();
+    for ( ; it != list.end(); ++it ) {
+        customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
+    }
 
-        return customMap;
+    return customMap;
 }
 
 
 
 
 }
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp
index 03d4479..14a325e 100644
--- a/libopie2/opiepim/backend/otodoaccessvcal.cpp
+++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp
@@ -1,285 +1,289 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
 
-/* OPIE */
 #include "vobject_p.h"
-#include <qpe/timeconversion.h>
+
+/* OPIE */
 #include <opie2/otodoaccessvcal.h>
+#include <opie2/odebug.h>
 
+#include <qpe/timeconversion.h>
+
+/* QT */
 //FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
 #define protected public
 #include <qfile.h>
 #undef protected
 
 using namespace Opie;
 
 namespace {
     static OPimTodo eventByVObj( VObject *obj ){
         OPimTodo event;
         VObject *ob;
         QCString name;
         // no uid, attendees, ... and no fun
         // description
         if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
             name = vObjectStringZValue( ob );
 #if 0
             event.setDescription( name );
 #else
             event.setSummary( name );
 #endif
         }
         // summary
         if ( ( ob = isAPropertyOf( obj,  VCSummaryProp ) ) != 0 ) {
             name = vObjectStringZValue( ob );
 #if 0
             event.setSummary( name );
 #else
             event.setDescription( name );
 #endif
         }
         // completed
         if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){
             name = vObjectStringZValue( ob );
             if( name == "COMPLETED" ){
                 event.setCompleted( true );
             }else{
                 event.setCompleted( false );
             }
         }else
             event.setCompleted( false );
         // priority
         if ((ob = isAPropertyOf(obj, VCPriorityProp))) {
             name = vObjectStringZValue( ob );
             bool ok;
             event.setPriority(name.toInt(&ok) );
         }
         //due date
         if((ob = isAPropertyOf(obj, VCDueProp)) ){
             event.setHasDueDate( true );
             name = vObjectStringZValue( ob );
             event.setDueDate( TimeConversion::fromISO8601( name).date() );
         }
         // categories
         if((ob = isAPropertyOf( obj, VCCategoriesProp )) != 0 ){
             name = vObjectStringZValue( ob );
-            qWarning("Categories:%s", name.data() );
+            owarn << "Categories:" << name.data() << "" << oendl;
         }
 
         event.setUid( 1 );
         return event;
     };
     static VObject *vobjByEvent( const OPimTodo &event )  {
         VObject *task = newVObject( VCTodoProp );
         if( task == 0 )
             return 0l;
 
         if( event.hasDueDate() ) {
             QTime time(0, 0, 0);
             QDateTime date(event.dueDate(), time );
             addPropValue( task, VCDueProp,
                           TimeConversion::toISO8601( date ) );
         }
 
         if( event.isCompleted() )
             addPropValue( task, VCStatusProp, "COMPLETED");
 
         QString string = QString::number(event.priority() );
         addPropValue( task, VCPriorityProp, string.local8Bit() );
 
         addPropValue( task, VCCategoriesProp,
                       event.idsToString( event.categories() ).local8Bit() );
 
 #if 0
 
-        // There seems a misrepresentation between summary in otodoevent
-        // and summary in vcard. 
-        // The same with description..
-        // Description is summary and vice versa.. Argh.. (eilers)
+    // There seems a misrepresentation between summary in otodoevent
+    // and summary in vcard.
+    // The same with description..
+    // Description is summary and vice versa.. Argh.. (eilers)
 
 
         addPropValue( task, VCDescriptionProp,
                       event.description().local8Bit() );
 
         addPropValue( task, VCSummaryProp,
                       event.summary().local8Bit() );
 
 #else
         addPropValue( task, VCDescriptionProp,
                       event.summary().local8Bit() );
 
         addPropValue( task, VCSummaryProp,
                       event.description().local8Bit() );
-#endif 
+#endif
   return task;
 };
 }
 
 namespace Opie {
 OPimTodoAccessVCal::OPimTodoAccessVCal( const QString& path )
     : m_dirty(false), m_file( path )
 {
 }
 OPimTodoAccessVCal::~OPimTodoAccessVCal() {
 }
 bool OPimTodoAccessVCal::load() {
     m_map.clear();
     m_dirty = false;
 
     VObject* vcal = 0l;
     vcal = Parse_MIME_FromFileName( QFile::encodeName(m_file).data() );
     if (!vcal )
         return false;
 
     // Iterate over the list
     VObjectIterator it;
     VObject* vobj;
 
     initPropIterator(&it, vcal);
 
     while( moreIteration( &it ) ) {
         vobj = ::nextVObject( &it );
         QCString name = ::vObjectName( vobj );
         if( name == VCTodoProp ){
             OPimTodo to = eventByVObj( vobj );
             m_map.insert( to.uid(), to );
         }
     }
 
     // Should I do a delete vcal?
 
     return true;
 }
 bool OPimTodoAccessVCal::reload() {
     return load();
 }
 bool OPimTodoAccessVCal::save() {
     if (!m_dirty )
         return true;
 
     QFile file( m_file );
     if (!file.open(IO_WriteOnly ) )
         return false;
 
     VObject *obj;
     obj = newVObject( VCCalProp );
     addPropValue( obj, VCVersionProp, "1.0" );
     VObject *vo;
     for(QMap<int, OPimTodo>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
         vo = vobjByEvent( it.data() );
         addVObjectProp(obj, vo );
     }
     writeVObject( file.fh, obj ); //FIXME: HACK!!!
     cleanVObject( obj );
     cleanStrTbl();
 
     m_dirty = false;
     return true;
 }
 void OPimTodoAccessVCal::clear() {
     m_map.clear();
     m_dirty = true;
 }
 bool OPimTodoAccessVCal::add( const OPimTodo& to ) {
     m_map.insert( to.uid(), to );
     m_dirty = true;
     return true;
 }
 bool OPimTodoAccessVCal::remove( int uid ) {
     m_map.remove( uid );
     m_dirty = true;
     return true;
 }
 void OPimTodoAccessVCal::removeAllCompleted() {
     for ( QMap<int, OPimTodo>::Iterator it = m_map.begin(); it != m_map.end(); ++it ) {
         if ( (*it).isCompleted() )
             m_map.remove( it );
     }
 }
 bool OPimTodoAccessVCal::replace( const OPimTodo& to ) {
     m_map.replace( to.uid(), to );
     m_dirty = true;
     return true;
 }
 OPimTodo OPimTodoAccessVCal::find(int uid )const {
     return m_map[uid];
 }
 QArray<int> OPimTodoAccessVCal::sorted( bool, int, int, int ) {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OPimTodoAccessVCal::allRecords()const {
     QArray<int> ar( m_map.count() );
     QMap<int, OPimTodo>::ConstIterator it;
     int i = 0;
     for ( it = m_map.begin(); it != m_map.end(); ++it ) {
         ar[i] = it.key();
         i++;
     }
     return ar;
 }
 QArray<int> OPimTodoAccessVCal::matchRegexp(const QRegExp& /* r */)const {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OPimTodoAccessVCal::queryByExample( const OPimTodo&, int, const QDateTime& ) {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OPimTodoAccessVCal::effectiveToDos( const QDate& ,
                                              const QDate& ,
                                              bool  ) {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OPimTodoAccessVCal::overDue() {
     QArray<int> ar(0);
     return ar;
 }
 QBitArray OPimTodoAccessVCal::supports()const {
     static QBitArray ar = sup();
 
     return ar;
 }
 QBitArray OPimTodoAccessVCal::sup() {
     QBitArray ar ( OPimTodo::CompletedDate +1 );
     ar.fill( true );
 
     ar[OPimTodo::CrossReference] = false;
     ar[OPimTodo::State ] = false;
     ar[OPimTodo::Reminders] = false;
     ar[OPimTodo::Notifiers] = false;
     ar[OPimTodo::Maintainer] = false;
     ar[OPimTodo::Progress] = false;
     ar[OPimTodo::Alarms ] = false;
     ar[OPimTodo::Recurrence] = false;
 
     return ar;
 }
 
 }
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index cce6111..3e06d88 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -1,909 +1,914 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
+
+/* OPIE */
+#include <opie2/opimdateconversion.h>
+#include <opie2/opimstate.h>
+#include <opie2/opimtimezone.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/opimrecurrence.h>
+#include <opie2/otodoaccessxml.h>
+#include <opie2/odebug.h>
+
+#include <qpe/global.h>
+#include <qpe/stringutil.h>
+#include <qpe/timeconversion.h>
+
+/* QT */
+#include <qfile.h>
+#include <qvector.h>
+
+/* STD */
 #include <errno.h>
 #include <fcntl.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <unistd.h>
 
 
-#include <qfile.h>
-#include <qvector.h>
-
-#include <qpe/global.h>
-#include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
-
-#include <opie2/opimdateconversion.h>
-#include <opie2/opimstate.h>
-#include <opie2/opimtimezone.h>
-#include <opie2/opimnotifymanager.h>
-#include <opie2/opimrecurrence.h>
-#include <opie2/otodoaccessxml.h>
-
 using namespace Opie;
 
 namespace {
     time_t rp_end;
     OPimRecurrence* rec;
     OPimRecurrence *recur() {
         if (!rec ) rec = new OPimRecurrence;
         return rec;
     }
     int snd;
     enum MoreAttributes {
         FRType = OPimTodo::CompletedDate + 2,
         FRWeekdays,
         FRPosition,
         FRFreq,
         FRHasEndDate,
         FREndDate,
         FRStart,
         FREnd
     };
     // FROM TT again
 char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen)
 {
     char needleChar;
     char haystackChar;
     if (!needle || !haystack || !hLen || !nLen)
-        return 0;
+    return 0;
 
     const char* hsearch = haystack;
 
     if ((needleChar = *needle++) != 0) {
-        nLen--; //(to make up for needle++)
-        do {
-            do {
-                if ((haystackChar = *hsearch++) == 0)
-                    return (0);
-                if (hsearch >= haystack + hLen)
-                    return (0);
-            } while (haystackChar != needleChar);
-        } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
-        hsearch--;
+    nLen--; //(to make up for needle++)
+    do {
+        do {
+        if ((haystackChar = *hsearch++) == 0)
+            return (0);
+        if (hsearch >= haystack + hLen)
+            return (0);
+        } while (haystackChar != needleChar);
+    } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
+    hsearch--;
     }
     return ((char *)hsearch);
 }
 }
 
 namespace Opie {
 
 OPimTodoAccessXML::OPimTodoAccessXML( const QString& appName,
                                 const QString& fileName )
     : OPimTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
 {
     if (!fileName.isEmpty() )
         m_file = fileName;
     else
         m_file = Global::applicationFileName( "todolist", "todolist.xml" );
 }
 OPimTodoAccessXML::~OPimTodoAccessXML() {
 
 }
 bool OPimTodoAccessXML::load() {
     rec = 0;
     m_opened = true;
     m_changed = false;
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      */
     QAsciiDict<int> dict(26);
     dict.setAutoDelete( TRUE );
     dict.insert("Categories" ,     new int(OPimTodo::Category)         );
     dict.insert("Uid" ,            new int(OPimTodo::Uid)              );
     dict.insert("HasDate" ,        new int(OPimTodo::HasDate)          );
     dict.insert("Completed" ,      new int(OPimTodo::Completed)        );
     dict.insert("Description" ,    new int(OPimTodo::Description)      );
     dict.insert("Summary" ,        new int(OPimTodo::Summary)          );
     dict.insert("Priority" ,       new int(OPimTodo::Priority)         );
     dict.insert("DateDay" ,        new int(OPimTodo::DateDay)          );
     dict.insert("DateMonth" ,      new int(OPimTodo::DateMonth)        );
     dict.insert("DateYear" ,       new int(OPimTodo::DateYear)         );
     dict.insert("Progress" ,       new int(OPimTodo::Progress)         );
     dict.insert("CompletedDate",   new int(OPimTodo::CompletedDate)    );
     dict.insert("StartDate",       new int(OPimTodo::StartDate)        );
     dict.insert("CrossReference",  new int(OPimTodo::CrossReference)   );
     dict.insert("State",           new int(OPimTodo::State)            );
     dict.insert("Alarms",          new int(OPimTodo::Alarms)           );
     dict.insert("Reminders",       new int(OPimTodo::Reminders)        );
     dict.insert("Notifiers",       new int(OPimTodo::Notifiers)        );
     dict.insert("Maintainer",      new int(OPimTodo::Maintainer)       );
     dict.insert("rtype",           new int(FRType)                  );
     dict.insert("rweekdays",       new int(FRWeekdays)              );
     dict.insert("rposition",       new int(FRPosition)              );
     dict.insert("rfreq",           new int(FRFreq)                  );
     dict.insert("start",           new int(FRStart)                 );
     dict.insert("rhasenddate",     new int(FRHasEndDate)            );
     dict.insert("enddt",           new int(FREndDate)               );
 
     // here the custom XML parser from TT it's GPL
     // but we want to push OpiePIM... to TT.....
     // mmap part from zecke :)
     int fd = ::open( QFile::encodeName(m_file).data(), O_RDONLY );
     struct stat attribut;
     if ( fd < 0 ) return false;
 
     if ( fstat(fd, &attribut ) == -1 ) {
         ::close( fd );
         return false;
     }
     void* map_addr = ::mmap(NULL,  attribut.st_size, PROT_READ, MAP_SHARED, fd, 0 );
     if ( map_addr == ( (caddr_t)-1) ) {
         ::close(fd );
         return false;
     }
     /* advise the kernel who we want to read it */
     ::madvise( map_addr,  attribut.st_size,  MADV_SEQUENTIAL );
     /* we do not the file any more */
     ::close( fd );
 
     char* dt = (char*)map_addr;
     int len = attribut.st_size;
     int i = 0;
     char *point;
     const char* collectionString = "<Task ";
     int strLen = strlen(collectionString);
     while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) {
         i = point -dt;
         i+= strLen;
-        qWarning("Found a start at %d %d", i,  (point-dt) );
+        owarn << "Found a start at " << i << " " << (point-dt) << "" << oendl;
 
         OPimTodo ev;
         m_year = m_month = m_day = 0;
 
         while ( TRUE ) {
             while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
-                ++i;
-            if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
-                break;
-
-            // we have another attribute, read it.
-            int j = i;
-            while ( j < len && dt[j] != '=' )
-                ++j;
-            QCString attr( dt+i, j-i+1);
-
-            i = ++j; // skip =
-
-            // find the start of quotes
-            while ( i < len && dt[i] != '"' )
-                ++i;
-            j = ++i;
-
-            bool haveUtf = FALSE;
-            bool haveEnt = FALSE;
-            while ( j < len && dt[j] != '"' ) {
-                if ( ((unsigned char)dt[j]) > 0x7f )
-                    haveUtf = TRUE;
-                if ( dt[j] == '&' )
-                    haveEnt = TRUE;
-                ++j;
-            }
-            if ( i == j ) {
-                // empty value
-                i = j + 1;
-                continue;
-            }
-
-            QCString value( dt+i, j-i+1 );
-            i = j + 1;
-
-            QString str = (haveUtf ? QString::fromUtf8( value )
-                    : QString::fromLatin1( value ) );
-            if ( haveEnt )
-                str = Qtopia::plainString( str );
+        ++i;
+        if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
+        break;
+
+        // we have another attribute, read it.
+        int j = i;
+        while ( j < len && dt[j] != '=' )
+        ++j;
+        QCString attr( dt+i, j-i+1);
+
+        i = ++j; // skip =
+
+        // find the start of quotes
+        while ( i < len && dt[i] != '"' )
+        ++i;
+        j = ++i;
+
+        bool haveUtf = FALSE;
+        bool haveEnt = FALSE;
+        while ( j < len && dt[j] != '"' ) {
+        if ( ((unsigned char)dt[j]) > 0x7f )
+            haveUtf = TRUE;
+        if ( dt[j] == '&' )
+            haveEnt = TRUE;
+        ++j;
+        }
+        if ( i == j ) {
+        // empty value
+        i = j + 1;
+        continue;
+        }
+
+        QCString value( dt+i, j-i+1 );
+        i = j + 1;
+
+        QString str = (haveUtf ? QString::fromUtf8( value )
+            : QString::fromLatin1( value ) );
+        if ( haveEnt )
+        str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             todo( &dict, ev, attr, str );
 
         }
         /*
          * now add it
          */
-        qWarning("End at %d", i );
+        owarn << "End at " << i << "" << oendl;
         if (m_events.contains( ev.uid() ) || ev.uid() == 0) {
             ev.setUid( 1 );
             m_changed = true;
         }
         if ( ev.hasDueDate() ) {
             ev.setDueDate( QDate(m_year, m_month, m_day) );
         }
         if ( rec && rec->doesRecur() ) {
             OPimTimeZone utc = OPimTimeZone::utc();
             OPimRecurrence recu( *rec ); // call copy c'tor
             recu.setEndDate( utc.fromUTCDateTime( rp_end ).date() );
             recu.setStart( ev.dueDate() );
             ev.setRecurrence( recu );
         }
         m_events.insert(ev.uid(), ev );
         m_year = m_month = m_day = -1;
         delete rec;
         rec = 0;
     }
 
     munmap(map_addr, attribut.st_size );
 
-    qWarning("counts %d records loaded!", m_events.count() );
+    owarn << "counts " << m_events.count() << " records loaded!" << oendl;
     return true;
 }
 bool OPimTodoAccessXML::reload() {
     m_events.clear();
     return load();
 }
 bool OPimTodoAccessXML::save() {
-//    qWarning("saving");
+//    owarn << "saving" << oendl;
     if (!m_opened || !m_changed ) {
-//        qWarning("not saving");
+//        owarn << "not saving" << oendl;
         return true;
     }
     QString strNewFile = m_file + ".new";
     QFile f( strNewFile );
     if (!f.open( IO_WriteOnly|IO_Raw ) )
         return false;
 
     int written;
     QString out;
     out = "<!DOCTYPE Tasks>\n<Tasks>\n";
 
     // for all todos
     QMap<int, OPimTodo>::Iterator it;
     for (it = m_events.begin(); it != m_events.end(); ++it ) {
         out+= "<Task " + toString( (*it) ) + " />\n";
         QCString cstr = out.utf8();
         written = f.writeBlock( cstr.data(),  cstr.length() );
 
         /* less written then we wanted */
         if ( written != (int)cstr.length() ) {
             f.close();
             QFile::remove( strNewFile );
             return false;
         }
         out = QString::null;
     }
 
     out +=  "</Tasks>";
     QCString cstr = out.utf8();
     written = f.writeBlock( cstr.data(), cstr.length() );
 
     if ( written != (int)cstr.length() ) {
         f.close();
         QFile::remove( strNewFile );
         return false;
     }
     /* flush before renaming */
     f.close();
 
     if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
-//        qWarning("error renaming");
+//        owarn << "error renaming" << oendl;
         QFile::remove( strNewFile );
     }
 
     m_changed = false;
     return true;
 }
 QArray<int> OPimTodoAccessXML::allRecords()const {
     QArray<int> ids( m_events.count() );
     QMap<int, OPimTodo>::ConstIterator it;
     int i = 0;
 
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
         ids[i] = it.key();
         i++;
     }
     return ids;
 }
 QArray<int> OPimTodoAccessXML::queryByExample( const OPimTodo&, int, const QDateTime& ) {
     QArray<int> ids(0);
     return ids;
 }
 OPimTodo OPimTodoAccessXML::find( int uid )const {
     OPimTodo todo;
     todo.setUid( 0 ); // isEmpty()
     QMap<int, OPimTodo>::ConstIterator it = m_events.find( uid );
     if ( it != m_events.end() )
         todo = it.data();
 
     return todo;
 }
 void OPimTodoAccessXML::clear() {
     if (m_opened )
         m_changed = true;
 
     m_events.clear();
 }
 bool OPimTodoAccessXML::add( const OPimTodo& todo ) {
-//    qWarning("add");
+//    owarn << "add" << oendl;
     m_changed = true;
     m_events.insert( todo.uid(), todo );
 
     return true;
 }
 bool OPimTodoAccessXML::remove( int uid ) {
     m_changed = true;
     m_events.remove( uid );
 
     return true;
 }
 bool OPimTodoAccessXML::replace( const OPimTodo& todo) {
     m_changed = true;
     m_events.replace( todo.uid(), todo );
 
     return true;
 }
 QArray<int> OPimTodoAccessXML::effectiveToDos( const QDate& start,
                                             const QDate& end,
                                             bool includeNoDates ) {
     QArray<int> ids( m_events.count() );
     QMap<int, OPimTodo>::Iterator it;
 
     int i = 0;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
         if ( !it.data().hasDueDate() ) {
             if ( includeNoDates ) {
                 ids[i] = it.key();
                 i++;
             }
         }else if ( it.data().dueDate() >= start &&
                    it.data().dueDate() <= end ) {
             ids[i] = it.key();
             i++;
         }
     }
     ids.resize( i );
     return ids;
 }
 QArray<int> OPimTodoAccessXML::overDue() {
     QArray<int> ids( m_events.count() );
     int i = 0;
 
     QMap<int, OPimTodo>::Iterator it;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
         if ( it.data().isOverdue() ) {
             ids[i] = it.key();
             i++;
         }
     }
     ids.resize( i );
     return ids;
 }
 
 
 /* private */
 void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
                             const QCString& attr, const QString& val) {
-//    qWarning("parse to do from XMLElement" );
+//    owarn << "parse to do from XMLElement" << oendl;
 
     int *find=0;
 
     find = (*dict)[ attr.data() ];
     if (!find ) {
-//            qWarning("Unknown option" + it.key() );
+//            owarn << "Unknown option" + it.key() << oendl;
         ev.setCustomField( attr, val );
         return;
     }
 
     switch( *find ) {
     case OPimTodo::Uid:
         ev.setUid( val.toInt() );
         break;
     case OPimTodo::Category:
         ev.setCategories( ev.idsFromString( val ) );
         break;
     case OPimTodo::HasDate:
         ev.setHasDueDate( val.toInt() );
         break;
     case OPimTodo::Completed:
         ev.setCompleted( val.toInt() );
         break;
     case OPimTodo::Description:
         ev.setDescription( val );
         break;
     case OPimTodo::Summary:
         ev.setSummary( val );
         break;
     case OPimTodo::Priority:
         ev.setPriority( val.toInt() );
         break;
     case OPimTodo::DateDay:
         m_day = val.toInt();
         break;
     case OPimTodo::DateMonth:
         m_month = val.toInt();
         break;
     case OPimTodo::DateYear:
         m_year = val.toInt();
         break;
     case OPimTodo::Progress:
         ev.setProgress( val.toInt() );
         break;
     case OPimTodo::CompletedDate:
         ev.setCompletedDate( OPimDateConversion::dateFromString( val ) );
         break;
     case OPimTodo::StartDate:
         ev.setStartDate( OPimDateConversion::dateFromString( val ) );
         break;
     case OPimTodo::State:
         ev.setState( val.toInt() );
         break;
     case OPimTodo::Alarms:{
         OPimNotifyManager &manager = ev.notifiers();
         QStringList als = QStringList::split(";", val );
         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(), OPimDateConversion::dateTimeFromString( alarm[0] ).toString().latin1() );
+            owarn << "alarm: " << alarm.join("___") << "" << oendl;
+            owarn << "alarm[0]: " << alarm[0] << " " << OPimDateConversion::dateTimeFromString( alarm[0] ).toString() << "" << oendl;
             OPimAlarm al( alarm[2].toInt(), OPimDateConversion::dateTimeFromString( alarm[0] ), alarm[1].toInt() );
             manager.add( al );
         }
     }
         break;
     case OPimTodo::Reminders:{
         OPimNotifyManager &manager = ev.notifiers();
         QStringList rems = QStringList::split(";", val );
         for (QStringList::Iterator it = rems.begin(); it != rems.end(); ++it ) {
             OPimReminder rem( (*it).toInt() );
             manager.add( rem );
         }
     }
         break;
     case OPimTodo::CrossReference:
     {
         /*
          * A cross refernce looks like
          * appname,id;appname,id
          * we need to split it up
          */
         QStringList  refs = QStringList::split(';', val );
         QStringList::Iterator strIt;
         for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) {
             int pos = (*strIt).find(',');
             if ( pos > -1 )
                 ; // ev.addRelation( (*strIt).left(pos),  (*strIt).mid(pos+1).toInt() );
 
         }
         break;
     }
     /* Recurrence stuff below + post processing later */
     case FRType:
         if ( val == "Daily" )
             recur()->setType( OPimRecurrence::Daily );
         else if ( val == "Weekly" )
             recur()->setType( OPimRecurrence::Weekly);
         else if ( val == "MonthlyDay" )
             recur()->setType( OPimRecurrence::MonthlyDay );
         else if ( val == "MonthlyDate" )
             recur()->setType( OPimRecurrence::MonthlyDate );
         else if ( val == "Yearly" )
             recur()->setType( OPimRecurrence::Yearly );
         else
             recur()->setType( OPimRecurrence::NoRepeat );
         break;
     case FRWeekdays:
         recur()->setDays( val.toInt() );
         break;
     case FRPosition:
         recur()->setPosition( val.toInt() );
         break;
     case FRFreq:
         recur()->setFrequency( val.toInt() );
         break;
     case FRHasEndDate:
         recur()->setHasEndDate( val.toInt() );
         break;
     case FREndDate: {
         rp_end = (time_t) val.toLong();
         break;
     }
     default:
         ev.setCustomField( attr, val );
         break;
     }
 }
 
 // from PalmtopRecord... GPL ### FIXME
 namespace {
 QString customToXml(const QMap<QString, QString>& customMap )
 {
-    //qWarning(QString("writing custom %1").arg(customMap.count()));
+    //owarn << QString("writing custom %1").arg(customMap.count()) << oendl;
     QString buf(" ");
     for ( QMap<QString, QString>::ConstIterator cit = customMap.begin();
-            cit != customMap.end(); ++cit) {
-        // qWarning(".ITEM.");
-        buf += cit.key();
-        buf += "=\"";
-        buf += Qtopia::escapeString(cit.data());
-        buf += "\" ";
+        cit != customMap.end(); ++cit) {
+//  owarn << ".ITEM." << oendl;
+    buf += cit.key();
+    buf += "=\"";
+    buf += Qtopia::escapeString(cit.data());
+    buf += "\" ";
     }
     return buf;
 }
 
 
 }
 
 QString OPimTodoAccessXML::toString( const OPimTodo& ev )const {
     QString str;
 
     str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" ";
     str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" ";
     str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
     str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
 
     str += "Categories=\"" + toString( ev.categories() ) + "\" ";
     str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
     str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
 
     if ( ev.hasDueDate() ) {
         str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
         str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
         str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
     }
-//    qWarning( "Uid %d",  ev.uid() );
+//    owarn << "Uid " << ev.uid() << "" << oendl;
     str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 
 // append the extra options
     /* FIXME Qtopia::Record this is currently not
      * possible you can set custom fields
      * but don' iterate over the list
      * I may do #define private protected
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
     for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
         str += extIt.key() + "=\"" +  extIt.data() + "\" ";
     */
     // cross refernce
     if ( ev.hasRecurrence() ) {
         str += ev.recurrence().toString();
     }
     if ( ev.hasStartDate() )
         str += "StartDate=\""+ OPimDateConversion::dateToString( ev.startDate() ) +"\" ";
     if ( ev.hasCompletedDate() )
         str += "CompletedDate=\""+ OPimDateConversion::dateToString( ev.completedDate() ) +"\" ";
     if ( ev.hasState() )
         str += "State=\""+QString::number( ev.state().state() )+"\" ";
 
     /*
      * save reminders and notifiers!
      * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER_DURATION:SOUND:....
      */
     if ( ev.hasNotifiers() ) {
         OPimNotifyManager manager = ev.notifiers();
         OPimNotifyManager::Alarms alarms = manager.alarms();
         if (!alarms.isEmpty() ) {
             QStringList als;
             OPimNotifyManager::Alarms::Iterator it = alarms.begin();
             for ( ; it != alarms.end(); ++it ) {
                 /* only if time is valid */
                 if ( (*it).dateTime().isValid() ) {
                     als << OPimDateConversion::dateTimeToString( (*it).dateTime() )
                         + ":" + QString::number( (*it).duration() )
                         + ":" + QString::number( (*it).sound() )
                         + ":";
                 }
             }
             // now write the list
-            qWarning("als: %s", als.join("____________").latin1() );
+            owarn << "als: " << als.join("____________") << "" << oendl;
             str += "Alarms=\""+als.join(";") +"\" ";
         }
 
         /*
          * now the same for reminders but more easy. We just save the uid of the OPimEvent.
          */
         OPimNotifyManager::Reminders reminders = manager.reminders();
         if (!reminders.isEmpty() ) {
             OPimNotifyManager::Reminders::Iterator it = reminders.begin();
             QStringList records;
             for ( ; it != reminders.end(); ++it ) {
                 records << QString::number( (*it).recordUid() );
             }
             str += "Reminders=\""+ records.join(";") +"\" ";
         }
     }
     str += customToXml( ev.toExtraMap() );
 
 
     return str;
 }
 QString OPimTodoAccessXML::toString( const QArray<int>& ints ) const {
     return Qtopia::Record::idsToString( ints );
 }
 
 /* internal class for sorting
  *
  * Inspired by todoxmlio.cpp from TT
  */
 
 struct OPimTodoXMLContainer {
     OPimTodo todo;
 };
 
 namespace {
     inline QString string( const OPimTodo& todo) {
         return  todo.summary().isEmpty() ?
             todo.description().left(20 ) :
             todo.summary();
     }
     inline int completed( const OPimTodo& todo1, const OPimTodo& todo2) {
         int ret = 0;
         if ( todo1.isCompleted() ) ret++;
         if ( todo2.isCompleted() ) ret--;
         return ret;
     }
     inline int priority( const OPimTodo& t1, const OPimTodo& t2) {
         return ( t1.priority() - t2.priority() );
     }
     inline int description( const OPimTodo& t1, const OPimTodo& t2) {
         return QString::compare( string(t1), string(t2) );
     }
     inline int deadline( const OPimTodo& t1, const OPimTodo& t2) {
         int ret = 0;
         if ( t1.hasDueDate() &&
              t2.hasDueDate() )
             ret = t2.dueDate().daysTo( t1.dueDate() );
         else if ( t1.hasDueDate() )
             ret = -1;
         else if ( t2.hasDueDate() )
             ret = 1;
         else
             ret = 0;
 
         return ret;
     }
 
 };
 
 /*
    * Returns:
    *       0 if item1 == item2
    *
    *   non-zero if item1 != item2
    *
    *   This function returns int rather than bool so that reimplementations
    *   can return one of three values and use it to sort by:
    *
    *   0 if item1 == item2
    *
    *   > 0 (positive integer) if item1 > item2
    *
    *   < 0 (negative integer) if item1 < item2
    *
    */
 class OPimTodoXMLVector : public QVector<OPimTodoXMLContainer> {
 public:
     OPimTodoXMLVector(int size, bool asc,  int sort)
         : QVector<OPimTodoXMLContainer>( size )
         {
             setAutoDelete( true );
             m_asc = asc;
             m_sort = sort;
         }
         /* return the summary/description */
     QString string( const OPimTodo& todo) {
         return  todo.summary().isEmpty() ?
             todo.description().left(20 ) :
             todo.summary();
     }
     /**
      * we take the sortorder( switch on it )
      *
      */
     int compareItems( Item d1, Item d2 ) {
         bool seComp, sePrio, seDesc, seDeadline;
         seComp = sePrio = seDeadline = seDesc = false;
         int ret =0;
         OPimTodoXMLContainer* con1 = (OPimTodoXMLContainer*)d1;
         OPimTodoXMLContainer* con2 = (OPimTodoXMLContainer*)d2;
 
         /* same item */
         if ( con1->todo.uid() == con2->todo.uid() )
             return 0;
 
         switch ( m_sort ) {
             /* completed */
         case 0: {
             ret = completed( con1->todo, con2->todo );
             seComp = TRUE;
             break;
         }
             /* priority */
         case 1: {
             ret = priority( con1->todo, con2->todo );
             sePrio = TRUE;
             break;
         }
             /* description */
         case 2: {
             ret  = description( con1->todo, con2->todo );
             seDesc = TRUE;
             break;
         }
             /* deadline */
         case 3: {
             ret = deadline( con1->todo, con2->todo );
             seDeadline = TRUE;
             break;
         }
         default:
             ret = 0;
             break;
         };
         /*
          * FIXME do better sorting if the first sort criteria
          * ret equals 0 start with complete and so on...
          */
 
         /* twist it we're not ascending*/
         if (!m_asc)
             ret = ret * -1;
 
         if ( ret )
             return ret;
 
         // default did not gave difference let's try it other way around
         /*
          * General try if already checked if not test
          * and return
          * 1.Completed
          * 2.Priority
          * 3.Description
          * 4.DueDate
          */
         if (!seComp ) {
             if ( (ret = completed( con1->todo, con2->todo ) ) ) {
                 if (!m_asc ) ret *= -1;
                 return ret;
             }
         }
         if (!sePrio ) {
             if ( (ret = priority( con1->todo, con2->todo ) ) ) {
                 if (!m_asc ) ret *= -1;
                 return ret;
             }
         }
         if (!seDesc ) {
             if ( (ret = description(con1->todo, con2->todo ) ) ) {
                 if (!m_asc) ret *= -1;
                 return ret;
             }
         }
         if (!seDeadline) {
             if ( (ret = deadline( con1->todo, con2->todo ) ) ) {
                 if (!m_asc) ret *= -1;
                 return ret;
             }
         }
 
         return 0;
     }
  private:
     bool m_asc;
     int m_sort;
 
 };
 
 QArray<int> OPimTodoAccessXML::sorted( bool asc,  int sortOrder,
                                     int sortFilter,  int cat ) {
     OPimTodoXMLVector vector(m_events.count(), asc,sortOrder );
     QMap<int, OPimTodo>::Iterator it;
     int item = 0;
 
     bool bCat = sortFilter & 1 ? true : false;
     bool bOnly = sortFilter & 2 ? true : false;
     bool comp = sortFilter & 4 ? true : false;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
 
         /* show category */
         /* -1 == unfiled */
         if ( bCat && cat == -1 ) {
             if(!(*it).categories().isEmpty() )
                 continue;
         }else if ( bCat && cat != 0)
             if (!(*it).categories().contains( cat ) ) {
                 continue;
             }
         /* isOverdue but we should not show overdue - why?*/
 /*        if ( (*it).isOverdue() &&  !bOnly  ) {
-            qWarning("item is overdue but !bOnly");
+            owarn << "item is overdue but !bOnly" << oendl;
             continue;
         }
 */
         if ( !(*it).isOverdue() && bOnly ) {
             continue;
         }
 
         if ((*it).isCompleted() && comp ) {
             continue;
         }
 
 
         OPimTodoXMLContainer* con = new OPimTodoXMLContainer();
         con->todo = (*it);
         vector.insert(item, con );
         item++;
     }
     vector.resize( item );
     /* sort it now */
     vector.sort();
     /* now get the uids */
     QArray<int> array( vector.count() );
     for (uint i= 0; i < vector.count(); i++ ) {
         array[i] = ( vector.at(i) )->todo.uid();
     }
     return array;
 };
 void OPimTodoAccessXML::removeAllCompleted() {
     QMap<int, OPimTodo> events = m_events;
     for ( QMap<int, OPimTodo>::Iterator it = m_events.begin(); it != m_events.end(); ++it ) {
         if ( (*it).isCompleted() )
             events.remove( it.key() );
     }
     m_events = events;
 }
 QBitArray OPimTodoAccessXML::supports()const {
     static QBitArray ar = sup();
     return ar;
 }
 QBitArray OPimTodoAccessXML::sup() {
     QBitArray ar( OPimTodo::CompletedDate +1 );
     ar.fill( true );
     ar[OPimTodo::CrossReference] = false;
     ar[OPimTodo::State ] = false;
     ar[OPimTodo::Reminders] = false;
     ar[OPimTodo::Notifiers] = false;
     ar[OPimTodo::Maintainer] = false;
 
     return ar;
 }
 QArray<int> OPimTodoAccessXML::matchRegexp(  const QRegExp &r ) const
 {
-        QArray<int> m_currentQuery( m_events.count() );
-        uint arraycounter = 0;
+    QArray<int> m_currentQuery( m_events.count() );
+    uint arraycounter = 0;
 
         QMap<int, OPimTodo>::ConstIterator it;
         for (it = m_events.begin(); it != m_events.end(); ++it ) {
-                if ( it.data().match( r ) )
-                        m_currentQuery[arraycounter++] = it.data().uid();
+        if ( it.data().match( r ) )
+            m_currentQuery[arraycounter++] = it.data().uid();
 
-        }
-        // Shrink to fit..
-        m_currentQuery.resize(arraycounter);
+    }
+    // Shrink to fit..
+    m_currentQuery.resize(arraycounter);
 
-        return m_currentQuery;
+    return m_currentQuery;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp
index c1e06c8..48a74d0 100644
--- a/libopie2/opiepim/core/opimcontact.cpp
+++ b/libopie2/opiepim/core/opimcontact.cpp
@@ -1,345 +1,347 @@
 /*
                              This file is part of the Opie Project
                              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.
 */
 
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include "opimcontact.h"
 
 /* OPIE */
 #include <opie2/opimresolver.h>
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
+
 #include <qpe/stringutil.h>
 #include <qpe/timestring.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qstylesheet.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
 {
 /*!
   Creates a new, empty contact.
 */
 OPimContact::OPimContact():OPimRecord(), mMap(), d( 0 )
 {}
 
 /*!
   \internal
   Creates a new contact.  The properties of the contact are
   set from \a fromMap.
 */
 OPimContact::OPimContact( 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 ) )
     {
-        qWarning( "Invalid UID found. Generate new one.." );
+        owarn << "Invalid UID found. Generate new one.." << oendl;
         setUid( uidGen().generate() );
     }
     else
         setUid( uidStr.toInt() );
 
     //     if ( !uidStr.isEmpty() )
-            // setUid( uidStr.toInt() );
+    //  setUid( uidStr.toInt() );
 }
 
 /*!
   Destroys a contact.
 */
 OPimContact::~OPimContact()
 {}
 
 /*! \fn void OPimContact::setTitle( const QString &str )
   Sets the title of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setFirstName( const QString &str )
   Sets the first name of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setMiddleName( const QString &str )
   Sets the middle name of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setLastName( const QString &str )
   Sets the last name of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setSuffix( const QString &str )
   Sets the suffix of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setFileAs( const QString &str )
   Sets the contact to filed as \a str.
 */
 
 /*! \fn void OPimContact::setDefaultEmail( const QString &str )
   Sets the default email of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeStreet( const QString &str )
   Sets the home street address of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeCity( const QString &str )
   Sets the home city of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeState( const QString &str )
   Sets the home state of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeZip( const QString &str )
   Sets the home zip code of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeCountry( const QString &str )
   Sets the home country of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomePhone( const QString &str )
   Sets the home phone number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeFax( const QString &str )
   Sets the home fax number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeMobile( const QString &str )
   Sets the home mobile phone number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setHomeWebpage( const QString &str )
   Sets the home webpage of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setCompany( const QString &str )
   Sets the company for contact to \a str.
 */
 
 /*! \fn void OPimContact::setJobTitle( const QString &str )
   Sets the job title of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setDepartment( const QString &str )
   Sets the department for contact to \a str.
 */
 
 /*! \fn void OPimContact::setOffice( const QString &str )
   Sets the office for contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessStreet( const QString &str )
   Sets the business street address of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessCity( const QString &str )
   Sets the business city of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessState( const QString &str )
   Sets the business state of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessZip( const QString &str )
   Sets the business zip code of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessCountry( const QString &str )
   Sets the business country of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessPhone( const QString &str )
   Sets the business phone number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessFax( const QString &str )
   Sets the business fax number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessMobile( const QString &str )
   Sets the business mobile phone number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessPager( const QString &str )
   Sets the business pager number of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setBusinessWebpage( const QString &str )
   Sets the business webpage of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setProfession( const QString &str )
   Sets the profession of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setAssistant( const QString &str )
   Sets the assistant of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setManager( const QString &str )
   Sets the manager of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setSpouse( const QString &str )
   Sets the spouse of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setGender( const QString &str )
   Sets the gender of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setNickname( const QString &str )
   Sets the nickname of the contact to \a str.
 */
 
 /*! \fn void OPimContact::setNotes( const QString &str )
   Sets the notes about the contact to \a str.
 */
 
 /*! \fn QString OPimContact::title() const
   Returns the title of the contact.
 */
 
 /*! \fn QString OPimContact::firstName() const
   Returns the first name of the contact.
 */
 
 /*! \fn QString OPimContact::middleName() const
   Returns the middle name of the contact.
 */
 
 /*! \fn QString OPimContact::lastName() const
   Returns the last name of the contact.
 */
 
 /*! \fn QString OPimContact::suffix() const
   Returns the suffix of the contact.
 */
 
 /*! \fn QString OPimContact::fileAs() const
   Returns the string the contact is filed as.
 */
 
 /*! \fn QString OPimContact::defaultEmail() const
   Returns the default email address of the contact.
 */
 
 /*! \fn QString OPimContact::emails() const
   Returns the list of email address for a contact separated by ';'s in a single
   string.
 */
 
 /*! \fn QString OPimContact::homeStreet() const
   Returns the home street address of the contact.
 */
 
 /*! \fn QString OPimContact::homeCity() const
   Returns the home city of the contact.
 */
 
 /*! \fn QString OPimContact::homeState() const
   Returns the home state of the contact.
 */
 
 /*! \fn QString OPimContact::homeZip() const
   Returns the home zip of the contact.
 */
 
 /*! \fn QString OPimContact::homeCountry() const
   Returns the home country of the contact.
 */
 
 /*! \fn QString OPimContact::homePhone() const
   Returns the home phone number of the contact.
 */
 
 /*! \fn QString OPimContact::homeFax() const
   Returns the home fax number of the contact.
 */
 
 /*! \fn QString OPimContact::homeMobile() const
   Returns the home mobile number of the contact.
 */
 
 /*! \fn QString OPimContact::homeWebpage() const
   Returns the home webpage of the contact.
 */
 
 /*! \fn QString OPimContact::company() const
   Returns the company for the contact.
 */
 
 /*! \fn QString OPimContact::department() const
   Returns the department for the contact.
 */
 
 /*! \fn QString OPimContact::office() const
   Returns the office for the contact.
 */
 
 /*! \fn QString OPimContact::jobTitle() const
   Returns the job title of the contact.
 */
 
 /*! \fn QString OPimContact::profession() const
   Returns the profession of the contact.
 */
 
 /*! \fn QString OPimContact::assistant() const
   Returns the assistant of the contact.
 */
 
 /*! \fn QString OPimContact::manager() const
   Returns the manager of the contact.
 */
 
 /*! \fn QString OPimContact::businessStreet() const
   Returns the business street address of the contact.
 */
@@ -678,612 +680,612 @@ QString OPimContact::toRichText() const
     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() )
     {
         text += "<br><b><img src=\"addressbook/faxhome\"> " + QObject::tr( "Home Fax: " ) + "</b>"
                 + Qtopia::escapeString( str );
         marker = true;
     }
     str = homeMobile();
     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 )
     {
         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() )
     {
         str = TimeString::numberDateString( birthday() );
         text += "<br><b>" + QObject::tr( "Birthday: " ) + "</b>"
                 + Qtopia::escapeString( str );
     }
     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() )
     {
         text += "<br><b>" + QObject::tr( "Category:" ) + "</b> ";
         text += categoryNames( "Contacts" ).join( ", " );
     }
 
     // notes last
     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 OPimContact::insert( int key, const QString &v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.insert( key, value );
 }
 
 /*!
   \internal
 */
 void OPimContact::replace( int key, const QString & v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.replace( key, value );
 }
 
 /*!
   \internal
 */
 QString OPimContact::find( int key ) const
 {
     return mMap[ key ];
 }
 
 /*!
   \internal
 */
 QString OPimContact::displayAddress( const QString &street,
                                   const QString &city,
                                   const QString &state,
                                   const QString &zip,
                                   const QString &country ) const
 {
     QString s = street;
     if ( !street.isEmpty() )
         s += "\n";
     s += city;
     if ( !city.isEmpty() && !state.isEmpty() )
         s += ", ";
     s += state;
     if ( !state.isEmpty() && !zip.isEmpty() )
         s += "  ";
     s += zip;
     if ( !country.isEmpty() && !s.isEmpty() )
         s += "\n";
     s += country;
     return s;
 }
 
 /*!
   \internal
 */
 QString OPimContact::displayBusinessAddress() const
 {
     return displayAddress( businessStreet(), businessCity(),
                            businessState(), businessZip(),
                            businessCountry() );
 }
 
 /*!
   \internal
 */
 QString OPimContact::displayHomeAddress() const
 {
     return displayAddress( homeStreet(), homeCity(),
                            homeState(), homeZip(),
                            homeCountry() );
 }
 
 /*!
   Returns the full name of the contact
 */
 QString OPimContact::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 ( !name.isEmpty() )
             name += " ";
         name += firstName;
     }
     if ( !middleName.isEmpty() )
     {
         if ( !name.isEmpty() )
             name += " ";
         name += middleName;
     }
     if ( !lastName.isEmpty() )
     {
         if ( !name.isEmpty() )
             name += " ";
         name += lastName;
     }
     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 OPimContact::childrenList() const
 {
     return QStringList::split( " ", find( Qtopia::Children ) );
 }
 
 /*! \fn void OPimContact::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 OPimContact::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 OPimContact::clearEmails()
 
   Clears the email list.
  */
 
 /*! \fn void OPimContact::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 OPimContact::emailList() const
 {
     QString emailStr = emails();
 
     QStringList r;
     if ( !emailStr.isEmpty() )
     {
-        qDebug( " emailstr " );
+        odebug << " emailstr " << oendl;
         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 OPimContact::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 OPimContact::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 )
     {
         const QString &value = it.data();
         int key = it.key();
         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 OPimContact::fields()
 {
     QStringList list;
 
     list.append( "Title" );  // Not Used!
     list.append( "FirstName" );
     list.append( "MiddleName" );
     list.append( "LastName" );
     list.append( "Suffix" );
     list.append( "FileAs" );
 
     list.append( "JobTitle" );
     list.append( "Department" );
     list.append( "Company" );
     list.append( "BusinessPhone" );
     list.append( "BusinessFax" );
     list.append( "BusinessMobile" );
 
     list.append( "DefaultEmail" );
     list.append( "Emails" );
 
     list.append( "HomePhone" );
     list.append( "HomeFax" );
     list.append( "HomeMobile" );
 
     list.append( "BusinessStreet" );
     list.append( "BusinessCity" );
     list.append( "BusinessState" );
     list.append( "BusinessZip" );
     list.append( "BusinessCountry" );
     list.append( "BusinessPager" );
     list.append( "BusinessWebPage" );
 
     list.append( "Office" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
 
     list.append( "HomeStreet" );
     list.append( "HomeCity" );
     list.append( "HomeState" );
     list.append( "HomeZip" );
     list.append( "HomeCountry" );
     list.append( "HomeWebPage" );
 
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
     list.append( "Children" );
 
     list.append( "Notes" );
     list.append( "Groups" );
 
     return list;
 }
 
 
 /*!
   Sets the list of email address for contact to those contained in \a str.
   Email address should be separated by ';'s.
 */
 void OPimContact::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 OPimContact::setChildren( const QString &str )
 {
     replace( Qtopia::Children, str );
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OPimContact::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 )
         {
             setLastHitField( it.key() );
             match = true;
             break;
         }
     }
     return match;
 }
 
 
 QString OPimContact::toShortText() const
 {
     return ( fullName() );
 }
 
 
 QString OPimContact::type() const
 {
     return QString::fromLatin1( "OPimContact" );
 }
 
 
 class QString OPimContact::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 OPimContact::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 OPimContact::setBirthday( const QDate &v )
 {
     if ( v.isNull() )
     {
-        qWarning( "Remove Birthday" );
+        owarn << "Remove Birthday" << oendl;
         replace( Qtopia::Birthday, QString::null );
         return ;
     }
 
     if ( v.isValid() )
         replace( Qtopia::Birthday, OPimDateConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OPimContact::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 OPimContact::setAnniversary( const QDate &v )
 {
     if ( v.isNull() )
     {
-        qWarning( "Remove Anniversary" );
+        owarn << "Remove Anniversary" << oendl;
         replace( Qtopia::Anniversary, QString::null );
         return ;
     }
 
     if ( v.isValid() )
         replace( Qtopia::Anniversary, OPimDateConversion::dateToString( v ) );
 }
 
 
 /*! \fn QDate OPimContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OPimContact::birthday() const
 {
     QString str = find( Qtopia::Birthday );
     // qWarning ("Birthday %s", str.latin1() );
     if ( !str.isEmpty() )
         return OPimDateConversion::dateFromString ( str );
     else
         return QDate();
 }
 
 
 /*! \fn QDate OPimContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OPimContact::anniversary() const
 {
     QDate empty;
     QString str = find( Qtopia::Anniversary );
     // qWarning ("Anniversary %s", str.latin1() );
     if ( !str.isEmpty() )
         return OPimDateConversion::dateFromString ( str );
     else
         return empty;
 }
 
 
 void OPimContact::insertEmail( const QString &v )
 {
-    //qDebug("insertEmail %s", v.latin1());
+    //odebug << "insertEmail " << v << "" << oendl;
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
     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 OPimContact::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());
+    //odebug << " removing email from list " << e << "" << oendl;
     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 )
     {
-        //qDebug("removeEmail is default; setting new default");
+        //odebug << "removeEmail is default; setting new default" << oendl;
         if ( !emails.count() )
             clearEmails();
         else // setDefaultEmail will remove e from the list
             setDefaultEmail( emails.first() );
     }
 }
 
 
 void OPimContact::clearEmails()
 {
     mMap.remove( Qtopia::DefaultEmail );
     mMap.remove( Qtopia::Emails );
 }
 
 
 void OPimContact::setDefaultEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
 
-    //qDebug("OPimContact::setDefaultEmail %s", e.latin1());
+    //odebug << "OPimContact::setDefaultEmail " << e << "" << oendl;
     replace( Qtopia::DefaultEmail, e );
 
     if ( !e.isEmpty() )
         insertEmail( e );
 
 }
 
 
 void OPimContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
         insertEmail( *it );
 }
 
 
 int OPimContact::rtti() const
 {
     return OPimResolver::AddressBook;
 }
 
 
 void OPimContact::setUid( int i )
 {
     OPimRecord::setUid( i );
     replace( Qtopia::AddressUid , QString::number( i ) );
 }
 }
diff --git a/libopie2/opiepim/core/opimcontactfields.cpp b/libopie2/opiepim/core/opimcontactfields.cpp
index 120beb6..5d45d1f 100644
--- a/libopie2/opiepim/core/opimcontactfields.cpp
+++ b/libopie2/opiepim/core/opimcontactfields.cpp
@@ -1,516 +1,518 @@
 /*
                              This file is part of the Opie Project
                              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 "opimcontactfields.h"
 
 /* OPIE */
 #include <opie2/opimcontact.h>
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
 
 /* QT */
 #include <qobject.h>
 
 
 namespace Opie
 {
 /*!
   \internal
   Returns a list of personal field names for a contact.
 */
 QStringList OPimContactFields::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 ] );
     list.append( mapIdToStr[ Qtopia::Department ] );
     list.append( mapIdToStr[ Qtopia::Company ] );
 
     list.append( mapIdToStr[ Qtopia::Notes ] );
     list.append( mapIdToStr[ Qtopia::Groups ] );
 
     if ( sorted ) list.sort();
     return list;
 }
 
 /*!
   \internal
   Returns a list of details field names for a contact.
 */
 QStringList OPimContactFields::detailsfields( bool sorted, bool translated )
 {
     QStringList list;
     QMap<int, QString> mapIdToStr;
     if ( translated )
         mapIdToStr = idToTrFields();
     else
         mapIdToStr = idToUntrFields();
 
     list.append( mapIdToStr[ Qtopia::Office ] );
     list.append( mapIdToStr[ Qtopia::Profession ] );
     list.append( mapIdToStr[ Qtopia::Assistant ] );
     list.append( mapIdToStr[ Qtopia::Manager ] );
 
     list.append( mapIdToStr[ Qtopia::Spouse ] );
     list.append( mapIdToStr[ Qtopia::Gender ] );
     list.append( mapIdToStr[ Qtopia::Birthday ] );
     list.append( mapIdToStr[ Qtopia::Anniversary ] );
     list.append( mapIdToStr[ Qtopia::Nickname ] );
     list.append( mapIdToStr[ Qtopia::Children ] );
 
     if ( sorted ) list.sort();
     return list;
 }
 
 /*!
   \internal
   Returns a list of phone field names for a contact.
 */
 QStringList OPimContactFields::phonefields( bool sorted, bool translated )
 {
     QStringList list;
     QMap<int, QString> mapIdToStr;
     if ( translated )
         mapIdToStr = idToTrFields();
     else
         mapIdToStr = idToUntrFields();
 
     list.append( mapIdToStr[ Qtopia::BusinessPhone ] );
     list.append( mapIdToStr[ Qtopia::BusinessFax ] );
     list.append( mapIdToStr[ Qtopia::BusinessMobile ] );
     list.append( mapIdToStr[ Qtopia::BusinessPager ] );
     list.append( mapIdToStr[ Qtopia::BusinessWebPage ] );
 
     list.append( mapIdToStr[ Qtopia::DefaultEmail ] );
     list.append( mapIdToStr[ Qtopia::Emails ] );
 
     list.append( mapIdToStr[ Qtopia::HomePhone ] );
     list.append( mapIdToStr[ Qtopia::HomeFax ] );
     list.append( mapIdToStr[ Qtopia::HomeMobile ] );
     // list.append( mapIdToStr[Qtopia::HomePager] );
     list.append( mapIdToStr[ Qtopia::HomeWebPage ] );
 
     if ( sorted ) list.sort();
 
     return list;
 }
 
 /*!
   \internal
   Returns a list of field names for a contact.
 */
 QStringList OPimContactFields::fields( bool sorted, bool translated )
 {
     QStringList list;
     QMap<int, QString> mapIdToStr;
     if ( translated )
         mapIdToStr = idToTrFields();
     else
         mapIdToStr = idToUntrFields();
 
     list += personalfields( sorted, translated );
 
     list += phonefields( sorted, translated );
 
     list.append( mapIdToStr[ Qtopia::BusinessStreet ] );
     list.append( mapIdToStr[ Qtopia::BusinessCity ] );
     list.append( mapIdToStr[ Qtopia::BusinessState ] );
     list.append( mapIdToStr[ Qtopia::BusinessZip ] );
     list.append( mapIdToStr[ Qtopia::BusinessCountry ] );
 
     list.append( mapIdToStr[ Qtopia::HomeStreet ] );
     list.append( mapIdToStr[ Qtopia::HomeCity ] );
     list.append( mapIdToStr[ Qtopia::HomeState ] );
     list.append( mapIdToStr[ Qtopia::HomeZip ] );
     list.append( mapIdToStr[ Qtopia::HomeCountry ] );
 
     list += detailsfields( sorted, translated );
 
     if ( sorted ) list.sort();
 
     return list;
 }
 
 
 /*!
   \internal
   Returns an untranslated list of personal field names for a contact.
 */
 QStringList OPimContactFields::untrpersonalfields( bool sorted )
 {
     return personalfields( sorted, false );
 }
 
 
 /*!
   \internal
   Returns a translated list of personal field names for a contact.
 */
 QStringList OPimContactFields::trpersonalfields( bool sorted )
 {
     return personalfields( sorted, true );
 }
 
 
 /*!
   \internal
   Returns an untranslated list of details field names for a contact.
 */
 QStringList OPimContactFields::untrdetailsfields( bool sorted )
 {
     return detailsfields( sorted, false );
 }
 
 
 /*!
   \internal
   Returns a translated list of details field names for a contact.
 */
 QStringList OPimContactFields::trdetailsfields( bool sorted )
 {
     return detailsfields( sorted, true );
 }
 
 
 /*!
   \internal
   Returns a translated list of phone field names for a contact.
 */
 QStringList OPimContactFields::trphonefields( bool sorted )
 {
     return phonefields( sorted, true );
 }
 
 /*!
   \internal
   Returns an untranslated list of phone field names for a contact.
 */
 QStringList OPimContactFields::untrphonefields( bool sorted )
 {
     return phonefields( sorted, false );
 }
 
 
 /*!
   \internal
   Returns a translated list of field names for a contact.
 */
 QStringList OPimContactFields::trfields( bool sorted )
 {
     return fields( sorted, true );
 }
 
 /*!
   \internal
   Returns an untranslated list of field names for a contact.
 */
 QStringList OPimContactFields::untrfields( bool sorted )
 {
     return fields( sorted, false );
 }
 
 QMap<int, QString> OPimContactFields::idToTrFields()
 {
     QMap<int, QString> ret_map;
 
     ret_map.insert( Qtopia::AddressUid, QObject::tr( "User Id" ) );
     ret_map.insert( Qtopia::AddressCategory, QObject::tr( "Categories" ) );
 
     ret_map.insert( Qtopia::Title, QObject::tr( "Name Title" ) );
     ret_map.insert( Qtopia::FirstName, QObject::tr( "First Name" ) );
     ret_map.insert( Qtopia::MiddleName, QObject::tr( "Middle Name" ) );
     ret_map.insert( Qtopia::LastName, QObject::tr( "Last Name" ) );
     ret_map.insert( Qtopia::Suffix, QObject::tr( "Suffix" ) );
     ret_map.insert( Qtopia::FileAs, QObject::tr( "File As" ) );
 
     ret_map.insert( Qtopia::JobTitle, QObject::tr( "Job Title" ) );
     ret_map.insert( Qtopia::Department, QObject::tr( "Department" ) );
     ret_map.insert( Qtopia::Company, QObject::tr( "Company" ) );
     ret_map.insert( Qtopia::BusinessPhone, QObject::tr( "Business Phone" ) );
     ret_map.insert( Qtopia::BusinessFax, QObject::tr( "Business Fax" ) );
     ret_map.insert( Qtopia::BusinessMobile, QObject::tr( "Business Mobile" ) );
 
     // email
     ret_map.insert( Qtopia::DefaultEmail, QObject::tr( "Default Email" ) );
     ret_map.insert( Qtopia::Emails, QObject::tr( "Emails" ) );
 
     ret_map.insert( Qtopia::HomePhone, QObject::tr( "Home Phone" ) );
     ret_map.insert( Qtopia::HomeFax, QObject::tr( "Home Fax" ) );
     ret_map.insert( Qtopia::HomeMobile, QObject::tr( "Home Mobile" ) );
 
     // business
     ret_map.insert( Qtopia::BusinessStreet, QObject::tr( "Business Street" ) );
     ret_map.insert( Qtopia::BusinessCity, QObject::tr( "Business City" ) );
     ret_map.insert( Qtopia::BusinessState, QObject::tr( "Business State" ) );
     ret_map.insert( Qtopia::BusinessZip, QObject::tr( "Business Zip" ) );
     ret_map.insert( Qtopia::BusinessCountry, QObject::tr( "Business Country" ) );
     ret_map.insert( Qtopia::BusinessPager, QObject::tr( "Business Pager" ) );
     ret_map.insert( Qtopia::BusinessWebPage, QObject::tr( "Business WebPage" ) );
 
     ret_map.insert( Qtopia::Office, QObject::tr( "Office" ) );
     ret_map.insert( Qtopia::Profession, QObject::tr( "Profession" ) );
     ret_map.insert( Qtopia::Assistant, QObject::tr( "Assistant" ) );
     ret_map.insert( Qtopia::Manager, QObject::tr( "Manager" ) );
 
     // home
     ret_map.insert( Qtopia::HomeStreet, QObject::tr( "Home Street" ) );
     ret_map.insert( Qtopia::HomeCity, QObject::tr( "Home City" ) );
     ret_map.insert( Qtopia::HomeState, QObject::tr( "Home State" ) );
     ret_map.insert( Qtopia::HomeZip, QObject::tr( "Home Zip" ) );
     ret_map.insert( Qtopia::HomeCountry, QObject::tr( "Home Country" ) );
     ret_map.insert( Qtopia::HomeWebPage, QObject::tr( "Home Web Page" ) );
 
     //personal
     ret_map.insert( Qtopia::Spouse, QObject::tr( "Spouse" ) );
     ret_map.insert( Qtopia::Gender, QObject::tr( "Gender" ) );
     ret_map.insert( Qtopia::Birthday, QObject::tr( "Birthday" ) );
     ret_map.insert( Qtopia::Anniversary, QObject::tr( "Anniversary" ) );
     ret_map.insert( Qtopia::Nickname, QObject::tr( "Nickname" ) );
     ret_map.insert( Qtopia::Children, QObject::tr( "Children" ) );
 
     // other
     ret_map.insert( Qtopia::Notes, QObject::tr( "Notes" ) );
 
 
     return ret_map;
 }
 
 QMap<int, QString> OPimContactFields::idToUntrFields()
 {
     QMap<int, QString> ret_map;
 
     ret_map.insert( Qtopia::AddressUid, "User Id" );
     ret_map.insert( Qtopia::AddressCategory, "Categories" );
 
     ret_map.insert( Qtopia::Title, "Name Title" );
     ret_map.insert( Qtopia::FirstName, "First Name" );
     ret_map.insert( Qtopia::MiddleName, "Middle Name" );
     ret_map.insert( Qtopia::LastName, "Last Name" );
     ret_map.insert( Qtopia::Suffix, "Suffix" );
     ret_map.insert( Qtopia::FileAs, "File As" );
 
     ret_map.insert( Qtopia::JobTitle, "Job Title" );
     ret_map.insert( Qtopia::Department, "Department" );
     ret_map.insert( Qtopia::Company, "Company" );
     ret_map.insert( Qtopia::BusinessPhone, "Business Phone" );
     ret_map.insert( Qtopia::BusinessFax, "Business Fax" );
     ret_map.insert( Qtopia::BusinessMobile, "Business Mobile" );
 
     // email
     ret_map.insert( Qtopia::DefaultEmail, "Default Email" );
     ret_map.insert( Qtopia::Emails, "Emails" );
 
     ret_map.insert( Qtopia::HomePhone, "Home Phone" );
     ret_map.insert( Qtopia::HomeFax, "Home Fax" );
     ret_map.insert( Qtopia::HomeMobile, "Home Mobile" );
 
     // business
     ret_map.insert( Qtopia::BusinessStreet, "Business Street" );
     ret_map.insert( Qtopia::BusinessCity, "Business City" );
     ret_map.insert( Qtopia::BusinessState, "Business State" );
     ret_map.insert( Qtopia::BusinessZip, "Business Zip" );
     ret_map.insert( Qtopia::BusinessCountry, "Business Country" );
     ret_map.insert( Qtopia::BusinessPager, "Business Pager" );
     ret_map.insert( Qtopia::BusinessWebPage, "Business WebPage" );
 
     ret_map.insert( Qtopia::Office, "Office" );
     ret_map.insert( Qtopia::Profession, "Profession" );
     ret_map.insert( Qtopia::Assistant, "Assistant" );
     ret_map.insert( Qtopia::Manager, "Manager" );
 
     // home
     ret_map.insert( Qtopia::HomeStreet, "Home Street" );
     ret_map.insert( Qtopia::HomeCity, "Home City" );
     ret_map.insert( Qtopia::HomeState, "Home State" );
     ret_map.insert( Qtopia::HomeZip, "Home Zip" );
     ret_map.insert( Qtopia::HomeCountry, "Home Country" );
     ret_map.insert( Qtopia::HomeWebPage, "Home Web Page" );
 
     //personal
     ret_map.insert( Qtopia::Spouse, "Spouse" );
     ret_map.insert( Qtopia::Gender, "Gender" );
     ret_map.insert( Qtopia::Birthday, "Birthday" );
     ret_map.insert( Qtopia::Anniversary, "Anniversary" );
     ret_map.insert( Qtopia::Nickname, "Nickname" );
     ret_map.insert( Qtopia::Children, "Children" );
 
     // other
     ret_map.insert( Qtopia::Notes, "Notes" );
     ret_map.insert( Qtopia::Groups, "Groups" );
 
 
     return ret_map;
 }
 
 QMap<QString, int> OPimContactFields::trFieldsToId()
 {
     QMap<int, QString> idtostr = idToTrFields();
     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;
 }
 
 /* ======================================================================= */
 
 QMap<QString, int> OPimContactFields::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;
 }
 
 
 OPimContactFields::OPimContactFields() :
         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 );
 }
 
 OPimContactFields::~OPimContactFields()
 {
 
     // We will store the fieldorder into the config file
     // to reuse it for the future..
     if ( changedFieldOrder )
     {
         Config cfg ( "AddressBook" );
         cfg.setGroup( "ContactFieldOrder" );
         cfg.writeEntry( "General", globalFieldOrder );
     }
 }
 
 
 
 void OPimContactFields::saveToRecord( OPimContact &cnt )
 {
 
-    qDebug( "ocontactfields saveToRecord: >%s<", fieldOrder.latin1() );
+    odebug << "ocontactfields saveToRecord: >" << fieldOrder << "<" << oendl;
 
     // Store fieldorder into this contact.
     cnt.setCustomField( CONTACT_FIELD_ORDER_NAME, fieldOrder );
 
     globalFieldOrder = fieldOrder;
     changedFieldOrder = true;
 
 }
 
 void OPimContactFields::loadFromRecord( const OPimContact &cnt )
 {
-    qDebug( "ocontactfields loadFromRecord" );
-    qDebug( "loading >%s<", cnt.fullName().latin1() );
+    odebug << "ocontactfields loadFromRecord" << oendl;
+    odebug << "loading >" << cnt.fullName() << "<" << oendl;
 
     // 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() );
+    odebug << "fieldOrder from contact>" << fieldOrder << "<" << oendl;
 
     if ( fieldOrder.isEmpty() )
     {
         fieldOrder = globalFieldOrder;
     }
 
 
-    qDebug( "effective fieldOrder in loadFromRecord >%s<", fieldOrder.latin1() );
+    odebug << "effective fieldOrder in loadFromRecord >" << fieldOrder << "<" << oendl;
 }
 
 void OPimContactFields::setFieldOrder( int num, int index )
 {
-    qDebug( "qcontactfields setfieldorder pos %i -> %i", num, index );
+    odebug << "qcontactfields setfieldorder pos " << num << " -> " << index << "" << oendl;
 
     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() );
+    odebug << "fieldOrder >" << fieldOrder << "<" << oendl;
 }
 
 int OPimContactFields::getFieldOrder( int num, int defIndex )
 {
-    qDebug( "ocontactfields getFieldOrder" );
-    qDebug( "fieldOrder >%s<", fieldOrder.latin1() );
+    odebug << "ocontactfields getFieldOrder" << oendl;
+    odebug << "fieldOrder >" << fieldOrder << "<" << oendl;
 
     // 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 );
+    odebug << "returning >" << ret << "<" << oendl;
 
     return ret;
 
 }
 
 }
diff --git a/libopie2/opiepim/core/opimdateconversion.cpp b/libopie2/opiepim/core/opimdateconversion.cpp
index 8bf891b..c93e178 100644
--- a/libopie2/opiepim/core/opimdateconversion.cpp
+++ b/libopie2/opiepim/core/opimdateconversion.cpp
@@ -1,143 +1,145 @@
 /*

                             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/opimdateconversion.h>

+#include <opie2/odebug.h>

+

 #include <qpe/timeconversion.h>

 

 namespace Opie

 {

 

 QString OPimDateConversion::dateToString( const QDate &d )

 {

     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' );

 

     QString str = year + month + day;

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

+    //odebug << "\tPimContact dateToStr = " << str << "" << oendl;

 

     return str;

 }

 

 

 QDate OPimDateConversion::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" );

+        owarn << "PimContact year is not in range" << oendl;

         return date;

     }

     if ( month < 0 || month > 12 )

     {

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

+        owarn << "PimContact month is not in range" << oendl;

         return date;

     }

     if ( day < 0 || day > 31 )

     {

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

+        owarn << "PimContact day is not in range" << oendl;

         return date;

     }

 

     date.setYMD( year, month, day );

     if ( !date.isValid() )

     {

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

+        owarn << "PimContact date is not valid" << oendl;

         return date;

     }

 

     return date;

 }

 

 

 QString OPimDateConversion::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() );

 

     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 OPimDateConversion::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();

 

     QDate date( year, month, day );

     QTime time( hour, min, sec );

     QDateTime dt( date, time );

     return dt;

 }

 

 }

diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index 9d46651..8752fce 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -1,291 +1,293 @@
 /*
                              This file is part of the Opie Project
                              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 "opimevent.h"
 
 /* OPIE */
 #include <opie2/opimrecurrence.h>
 #include <opie2/opimresolver.h>
 #include <opie2/opimnotifymanager.h>
+#include <opie2/odebug.h>
+
 #include <qpe/categories.h>
 #include <qpe/stringutil.h>
 
 /* QT */
 
 namespace Opie
 {
 
 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 )
 {
     // 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 dayOfWeek = 1;
     char i = OPimRecurrence::MON;
     while ( !( i & day ) && i <= OPimRecurrence::SUN )
     {
         i <<= 1;
         ++dayOfWeek;
     }
     return dayOfWeek;
 }
 
 
 int OCalendarHelper::monthDiff( const QDate& first, const QDate& second )
 {
     return ( second.year() - first.year() ) * 12 +
            second.month() - first.month();
 }
 
 
 struct OPimEvent::Data : public QShared
 {
     Data() : QShared()
     {
         child = 0;
         recur = 0;
         manager = 0;
         isAllDay = false;
         parent = 0;
     }
     ~Data()
     {
         delete manager;
         delete recur;
     }
     QString description;
     QString location;
     OPimNotifyManager* manager;
     OPimRecurrence* recur;
     QString note;
     QDateTime created;
     QDateTime start;
     QDateTime end;
 bool isAllDay : 1;
     QString timezone;
     QArray<int>* child;
     int parent;
 };
 
 
 OPimEvent::OPimEvent( int uid )
         : OPimRecord( uid )
 {
     data = new Data;
 }
 
 
 OPimEvent::OPimEvent( const OPimEvent& ev )
         : OPimRecord( ev ), data( ev.data )
 {
     data->ref();
 }
 
 
 OPimEvent::OPimEvent( const QMap<int, QString> map )
         : OPimRecord( 0 )
 {
     data = new Data;
 
     fromMap( map );
 }
 
 
 OPimEvent::~OPimEvent()
 {
     if ( data->deref() )
     {
         delete data;
         data = 0;
     }
 }
 
 
 OPimEvent& OPimEvent::operator=( const OPimEvent& ev )
 {
     if ( this == &ev ) return * this;
 
     OPimRecord::operator=( ev );
     ev.data->ref();
     deref();
     data = ev.data;
 
 
     return *this;
 }
 
 
 QString OPimEvent::description() const
 {
     return data->description;
 }
 
 
 void OPimEvent::setDescription( const QString& description )
 {
     changeOrModify();
     data->description = description;
 }
 
 
 void OPimEvent::setLocation( const QString& loc )
 {
     changeOrModify();
     data->location = loc;
 }
 
 
 QString OPimEvent::location() const
 {
     return data->location;
 }
 
 
 OPimNotifyManager &OPimEvent::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 OPimEvent::hasNotifiers() const
 {
     if ( !data->manager )
         return false;
     if ( data->manager->reminders().isEmpty() &&
             data->manager->alarms().isEmpty() )
         return false;
 
     return true;
 }
 
 
 OPimRecurrence OPimEvent::recurrence() const
 {
     if ( !data->recur )
         data->recur = new OPimRecurrence;
 
     return *data->recur;
 }
 
 
 void OPimEvent::setRecurrence( const OPimRecurrence& rec )
 {
     changeOrModify();
     if ( data->recur )
         ( *data->recur ) = rec;
     else
         data->recur = new OPimRecurrence( rec );
 }
 
 
 bool OPimEvent::hasRecurrence() const
 {
     if ( !data->recur ) return false;
     return data->recur->doesRecur();
 }
 
 
 QString OPimEvent::note() const
 {
     return data->note;
 }
 
 
 void OPimEvent::setNote( const QString& note )
 {
     changeOrModify();
     data->note = note;
 }
 
 
 QDateTime OPimEvent::createdDateTime() const
 {
     return data->created;
 }
 
 
 void OPimEvent::setCreatedDateTime( const QDateTime& time )
 {
     changeOrModify();
     data->created = time;
 }
 
 
 QDateTime OPimEvent::startDateTime() const
 {
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime( 0, 0, 0 ) );
     return data->start;
 }
 
 
 QDateTime OPimEvent::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 == OPimTimeZone::current().timeZone() ) return startDateTime();
 
     OPimTimeZone zone( data->timezone );
     return zone.toDateTime( data->start, OPimTimeZone::current() );
 }
 
 
 void OPimEvent::setStartDateTime( const QDateTime& dt )
 {
     changeOrModify();
     data->start = dt;
 }
 
 
 QDateTime OPimEvent::endDateTime() const
@@ -302,623 +304,623 @@ QDateTime OPimEvent::endDateTime() const
 
 QDateTime OPimEvent::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 == OPimTimeZone::current().timeZone() ) return endDateTime();
 
     OPimTimeZone zone( data->timezone );
     return zone.toDateTime( data->end, OPimTimeZone::current() );
 }
 
 
 void OPimEvent::setEndDateTime( const QDateTime& dt )
 {
     changeOrModify();
     data->end = dt;
 }
 
 
 bool OPimEvent::isMultipleDay() const
 {
     return data->end.date().day() - data->start.date().day();
 }
 
 
 bool OPimEvent::isAllDay() const
 {
     return data->isAllDay;
 }
 
 
 void OPimEvent::setAllDay( bool allDay )
 {
     changeOrModify();
     data->isAllDay = allDay;
     if ( allDay ) data->timezone = "UTC";
 }
 
 
 void OPimEvent::setTimeZone( const QString& tz )
 {
     changeOrModify();
     data->timezone = tz;
 }
 
 
 QString OPimEvent::timeZone() const
 {
     if ( data->isAllDay ) return QString::fromLatin1( "UTC" );
     return data->timezone;
 }
 
 
 bool OPimEvent::match( const QRegExp& re ) const
 {
     if ( re.match( data->description ) != -1 )
     {
         setLastHitField( Qtopia::DatebookDescription );
         return true;
     }
     if ( re.match( data->note ) != -1 )
     {
         setLastHitField( Qtopia::Note );
         return true;
     }
     if ( re.match( data->location ) != -1 )
     {
         setLastHitField( Qtopia::Location );
         return true;
     }
     if ( re.match( data->start.toString() ) != -1 )
     {
         setLastHitField( Qtopia::StartDateTime );
         return true;
     }
     if ( re.match( data->end.toString() ) != -1 )
     {
         setLastHitField( Qtopia::EndDateTime );
         return true;
     }
     return false;
 }
 
 
 QString OPimEvent::toRichText() const
 {
     QString text, value;
 
     // description
     text += "<b><h3><img src=\"datebook/DateBook\">";
     if ( !description().isEmpty() )
     {
         text += Qtopia::escapeString( description() ).replace( QRegExp( "[\n]" ), "" );
     }
     text += "</h3></b><br><hr><br>";
 
     // location
     if ( !( value = location() ).isEmpty() )
     {
         text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
         text += Qtopia::escapeString( value ) + "<br>";
     }
 
     // all day event
     if ( isAllDay() )
     {
         text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
     }
     // multiple day event
     else if ( isMultipleDay () )
     {
         text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
     }
     // start & end times
     else
     {
         // start time
         if ( startDateTime().isValid() )
         {
             text += "<b>" + QObject::tr( "Start:" ) + "</b> ";
             text += Qtopia::escapeString( startDateTime().toString() ).
                     replace( QRegExp( "[\n]" ), "<br>" ) + "<br>";
         }
 
         // end time
         if ( endDateTime().isValid() )
         {
             text += "<b>" + QObject::tr( "End:" ) + "</b> ";
             text += Qtopia::escapeString( endDateTime().toString() ).
                     replace( QRegExp( "[\n]" ), "<br>" ) + "<br>";
         }
     }
 
     // categories
     if ( categoryNames( "Calendar" ).count() )
     {
         text += "<b>" + QObject::tr( "Category:" ) + "</b> ";
         text += categoryNames( "Calendar" ).join( ", " );
         text += "<br>";
     }
 
     //notes
     if ( !note().isEmpty() )
     {
         text += "<b>" + QObject::tr( "Note:" ) + "</b><br>";
         text += note();
         //         text += Qtopia::escapeString(note() ).
         //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
 
 
 QString OPimEvent::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 OPimEvent::type() const
 {
     return QString::fromLatin1( "OPimEvent" );
 }
 
 
 QString OPimEvent::recordField( int /*id */ ) const
 {
     return QString::null;
 }
 
 
 int OPimEvent::rtti() const
 {
     return OPimResolver::DateBook;
 }
 
 
 bool OPimEvent::loadFromStream( QDataStream& )
 {
     return true;
 }
 
 
 bool OPimEvent::saveToStream( QDataStream& ) const
 {
     return true;
 }
 
 
 void OPimEvent::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 OPimRecurrence( *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 )
         {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
         }
 
         data = d2;
     }
 }
 
 
 void OPimEvent::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> OPimEvent::toMap() const
 {
     QMap<int, QString> retMap;
 
     retMap.insert( OPimEvent::FUid, QString::number( uid() ) );
     retMap.insert( OPimEvent::FCategories, Qtopia::escapeString( Qtopia::Record::idsToString( categories() ) ) );
     retMap.insert( OPimEvent::FDescription, Qtopia::escapeString( description() ) );
     retMap.insert( OPimEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OPimEvent::FType, isAllDay() ? "AllDay" : "" );
-    if ( notifiers().alarms().count() ){ 
-            // Currently we just support one alarm.. (eilers)
-            OPimAlarm alarm = notifiers().alarms() [ 0 ];
-            retMap.insert( OPimEvent::FAlarm, QString::number( alarm.dateTime().secsTo( startDateTime() ) / 60 ) );
-            retMap.insert( OPimEvent::FSound, ( alarm.sound() == OPimAlarm::Loud ) ? "loud" : "silent" );
+    if ( notifiers().alarms().count() ){
+        // Currently we just support one alarm.. (eilers)
+        OPimAlarm alarm = notifiers().alarms() [ 0 ];
+        retMap.insert( OPimEvent::FAlarm, QString::number( alarm.dateTime().secsTo( startDateTime() ) / 60 ) );
+        retMap.insert( OPimEvent::FSound, ( alarm.sound() == OPimAlarm::Loud ) ? "loud" : "silent" );
     }
 
     OPimTimeZone zone( timeZone().isEmpty() ? OPimTimeZone::current() : timeZone() );
     retMap.insert( OPimEvent::FStart, QString::number( zone.fromUTCDateTime( zone.toDateTime( startDateTime(), OPimTimeZone::utc() ) ) ) );
     retMap.insert( OPimEvent::FEnd, QString::number( zone.fromUTCDateTime( zone.toDateTime( endDateTime(), OPimTimeZone::utc() ) ) ) );
     retMap.insert( OPimEvent::FNote, Qtopia::escapeString( note() ) );
     retMap.insert( OPimEvent::FTimeZone, timeZone().isEmpty() ? QString( "None" ) : timeZone() );
     if ( parent() )
         retMap.insert( OPimEvent::FRecParent, QString::number( parent() ) );
     if ( children().count() )
     {
         QArray<int> childr = children();
         QString buf;
         for ( uint i = 0; i < childr.count(); i++ )
         {
             if ( i != 0 ) buf += " ";
             buf += QString::number( childr[ i ] );
         }
         retMap.insert( OPimEvent::FRecChildren, buf );
     }
 
     // Add recurrence stuff
     if ( hasRecurrence() )
     {
         OPimRecurrence recur = recurrence();
         QMap<int, QString> recFields = recur.toMap();
         retMap.insert( OPimEvent::FRType, recFields[ OPimRecurrence::RType ] );
         retMap.insert( OPimEvent::FRWeekdays, recFields[ OPimRecurrence::RWeekdays ] );
         retMap.insert( OPimEvent::FRPosition, recFields[ OPimRecurrence::RPosition ] );
         retMap.insert( OPimEvent::FRFreq, recFields[ OPimRecurrence::RFreq ] );
         retMap.insert( OPimEvent::FRHasEndDate, recFields[ OPimRecurrence::RHasEndDate ] );
         retMap.insert( OPimEvent::FREndDate, recFields[ OPimRecurrence::EndDate ] );
         retMap.insert( OPimEvent::FRCreated, recFields[ OPimRecurrence::Created ] );
         retMap.insert( OPimEvent::FRExceptions, recFields[ OPimRecurrence::Exceptions ] );
     }
     else
     {
         OPimRecurrence recur = recurrence();
         QMap<int, QString> recFields = recur.toMap();
         retMap.insert( OPimEvent::FRType, recFields[ OPimRecurrence::RType ] );
     }
 
     return retMap;
 }
 
 
 void OPimEvent::fromMap( const QMap<int, QString>& map )
 {
 
     // We just want to set the UID if it is really stored.
     if ( !map[ OPimEvent::FUid ].isEmpty() )
         setUid( map[ OPimEvent::FUid ].toInt() );
 
     setCategories( idsFromString( map[ OPimEvent::FCategories ] ) );
     setDescription( map[ OPimEvent::FDescription ] );
     setLocation( map[ OPimEvent::FLocation ] );
 
     if ( map[ OPimEvent::FType ] == "AllDay" )
         setAllDay( true );
     else
         setAllDay( false );
 
     if ( !map[ OPimEvent::FTimeZone ].isEmpty() && ( map[ OPimEvent::FTimeZone ] != "None" ) )
     {
         setTimeZone( map[ OPimEvent::FTimeZone ] );
     }
 
     time_t start = ( time_t ) map[ OPimEvent::FStart ].toLong();
     time_t end = ( time_t ) map[ OPimEvent::FEnd ].toLong();
 
     /* AllDay is always in UTC */
     if ( isAllDay() )
     {
         OPimTimeZone utc = OPimTimeZone::utc();
         setStartDateTime( utc.fromUTCDateTime( start ) );
         setEndDateTime ( utc.fromUTCDateTime( end ) );
         setTimeZone( "UTC" ); // make sure it is really utc
     }
     else
     {
         /* to current date time */
-        // qWarning(" Start is %d", start );
+        // owarn << " Start is " << start << "" << oendl;
         OPimTimeZone zone( timeZone().isEmpty() ? OPimTimeZone::current() : timeZone() );
         QDateTime date = zone.toDateTime( start );
-        qWarning( " Start is %s", date.toString().latin1() );
+        owarn << " Start is " << date.toString() << "" << oendl;
         setStartDateTime( zone.toDateTime( date, OPimTimeZone::current() ) );
 
         date = zone.toDateTime( end );
         setEndDateTime ( zone.toDateTime( date, OPimTimeZone::current() ) );
     }
 
     int alarmTime = -1;
     if ( !map[ OPimEvent::FAlarm ].isEmpty() )
         alarmTime = map[ OPimEvent::FAlarm ].toInt();
 
     int sound = ( ( map[ OPimEvent::FSound ] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
     if ( ( alarmTime != -1 ) )
     {
-            QDateTime dt = startDateTime().addSecs( -1 * alarmTime * 60 );
-            OPimAlarm al( sound , dt );
-            notifiers().add( al );
+        QDateTime dt = startDateTime().addSecs( -1 * alarmTime * 60 );
+        OPimAlarm al( sound , dt );
+        notifiers().add( al );
     }
 
 
     if ( !map[ OPimEvent::FNote ].isEmpty() )
-            setNote( map[ OPimEvent::FNote ] );
+        setNote( map[ OPimEvent::FNote ] );
 
     if ( !map[ OPimEvent::FRecParent ].isEmpty() )
         setParent( map[ OPimEvent::FRecParent ].toInt() );
 
     if ( !map[ OPimEvent::FRecChildren ].isEmpty() )
     {
         QStringList list = QStringList::split( ' ', map[ OPimEvent::FRecChildren ] );
         for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
         {
             addChild( ( *it ).toInt() );
         }
     }
 
     // Fill recurrence stuff and put it directly into the OPimRecurrence-Object using fromMap..
     if ( !map[ OPimEvent::FRType ].isEmpty() )
     {
         QMap<int, QString> recFields;
         recFields.insert( OPimRecurrence::RType, map[ OPimEvent::FRType ] );
         recFields.insert( OPimRecurrence::RWeekdays, map[ OPimEvent::FRWeekdays ] );
         recFields.insert( OPimRecurrence::RPosition, map[ OPimEvent::FRPosition ] );
         recFields.insert( OPimRecurrence::RFreq, map[ OPimEvent::FRFreq ] );
         recFields.insert( OPimRecurrence::RHasEndDate, map[ OPimEvent::FRHasEndDate ] );
         recFields.insert( OPimRecurrence::EndDate, map[ OPimEvent::FREndDate ] );
         recFields.insert( OPimRecurrence::Created, map[ OPimEvent::FRCreated ] );
         recFields.insert( OPimRecurrence::Exceptions, map[ OPimEvent::FRExceptions ] );
         OPimRecurrence recur( recFields );
         setRecurrence( recur );
     }
 
 }
 
 
 int OPimEvent::parent() const
 {
     return data->parent;
 }
 
 
 void OPimEvent::setParent( int uid )
 {
     changeOrModify();
     data->parent = uid;
 }
 
 
 QArray<int> OPimEvent::children() const
 {
     if ( !data->child ) return QArray<int>();
     else
         return data->child->copy();
 }
 
 
 void OPimEvent::setChildren( const QArray<int>& arr )
 {
     changeOrModify();
     if ( data->child ) delete data->child;
 
     data->child = new QArray<int>( arr );
     data->child->detach();
 }
 
 
 void OPimEvent::addChild( int uid )
 {
     changeOrModify();
     if ( !data->child )
     {
         data->child = new QArray<int>( 1 );
         ( *data->child ) [ 0 ] = uid;
     }
     else
     {
         int count = data->child->count();
         data->child->resize( count + 1 );
         ( *data->child ) [ count ] = uid;
     }
 }
 
 
 void OPimEvent::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 )
         {
             newAr[ j ] = ( *data->child ) [ i ];
             j++;
         }
     }
     ( *data->child ) = newAr;
 }
 
 
 struct OEffectiveEvent::Data : public QShared
 {
     Data() : QShared()
     {}
     OPimEvent event;
     QDate date;
     QTime start, end;
     QDate startDate, endDate;
 bool dates : 1;
 };
 
 
 OEffectiveEvent::OEffectiveEvent()
 {
     data = new Data;
     data->date = QDate::currentDate();
     data->start = data->end = QTime::currentTime();
     data->dates = false;
 }
 
 
 OEffectiveEvent::OEffectiveEvent( const OPimEvent& ev, const QDate& startDate,
                                   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 )
 {
     data = ev.data;
     data->ref();
 }
 
 
 OEffectiveEvent::~OEffectiveEvent()
 {
     if ( data->deref() )
     {
         delete data;
         data = 0;
     }
 }
 
 
 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 )
 {
     changeOrModify();
     data->start = ti;
 }
 
 
 void OEffectiveEvent::setEndTime( const QTime& en )
 {
     changeOrModify();
     data->end = en;
 }
 
 
 void OEffectiveEvent::setEvent( const OPimEvent& ev )
 {
     changeOrModify();
     data->event = ev;
 }
 
 
 void OEffectiveEvent::setDate( const QDate& da )
 {
     changeOrModify();
     data->date = da;
 }
 
 
 void OEffectiveEvent::setEffectiveDates( const QDate& from,
         const QDate& to )
 {
     if ( !from.isValid() )
     {
         data->dates = false;
         return ;
     }
 
     data->startDate = from;
     data->endDate = to;
 }
 
 
 QString OEffectiveEvent::description() const
 {
     return data->event.description();
 }
 
 
 QString OEffectiveEvent::location() const
 {
     return data->event.location();
 }
 
 
 QString OEffectiveEvent::note() const
 {
     return data->event.note();
 }
 
 
 OPimEvent OEffectiveEvent::event() const
 {
     return data->event;
 }
 
 
 QTime OEffectiveEvent::startTime() const
 {
     return data->start;
 }
 
 
 QTime OEffectiveEvent::endTime() const
 {
     return data->end;
 }
 
 
 QDate OEffectiveEvent::date() const
 {
     return data->date;
 }
 
 
 int OEffectiveEvent::length() const
 {
     return ( data->end.hour() * 60 - data->start.hour() * 60 )
diff --git a/libopie2/opiepim/core/opimnotifymanager.cpp b/libopie2/opiepim/core/opimnotifymanager.cpp
index 573340a..0f863aa 100644
--- a/libopie2/opiepim/core/opimnotifymanager.cpp
+++ b/libopie2/opiepim/core/opimnotifymanager.cpp
@@ -1,249 +1,250 @@
 /*
                              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.
 */
 
 #include "opimnotifymanager.h"
 
 /* OPIE */
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
 
 /* QT */
 #include <qstringlist.h>
 
 namespace Opie
 {
 
 OPimNotifyManager::OPimNotifyManager( const Reminders& rem, const Alarms& al )
         : m_rem( rem ), m_al( al )
 {}
 
 
 OPimNotifyManager::~OPimNotifyManager()
 {}
 
 
 /* use static_cast and type instead of dynamic... */
 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" ) )
     {
         const OPimAlarm & al = static_cast<const OPimAlarm&>( noti );
         m_al.append( al );
     }
 }
 
 
 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" ) )
     {
         const OPimAlarm & al = static_cast<const OPimAlarm&>( noti );
         m_al.remove( al );
     }
 }
 
 
 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" ) )
     {
         const OPimAlarm & al = static_cast<const OPimAlarm&>( noti );
         m_al.remove( al );
         m_al.append( al );
     }
 }
 
 
 OPimNotifyManager::Reminders OPimNotifyManager::reminders() const
 {
     return m_rem;
 }
 
 
 OPimNotifyManager::Alarms OPimNotifyManager::alarms() const
 {
     return m_al;
 }
 
 
 OPimAlarm OPimNotifyManager::alarmAtDateTime( const QDateTime& when, bool& found ) const
 {
     Alarms::ConstIterator it;
     found = true;
 
     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 )
 {
     m_al = al;
 }
 
 
 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& )
 {
 }
 
 
 /* FIXME!!! */
 /**
  * same as above...
  * Also implement Url model
  * have a MainWindow....
  */
 void OPimNotifyManager::deregister( const OPimNotify& )
 {
 }
 
 
 bool OPimNotifyManager::isEmpty() const
 {
-    qWarning( "is Empty called on OPimNotifyManager %d %d", m_rem.count(), m_al.count() );
+    owarn << "is Empty called on OPimNotifyManager " << m_rem.count() << " " << m_al.count() << "" << oendl;
     if ( m_rem.isEmpty() && m_al.isEmpty() ) return true;
     else return false;
 }
 
 
 // Taken from otodoaccessxml.. code duplication bad. any alternative?
 QString OPimNotifyManager::alarmsToString() const
 {
     QString str;
 
     OPimNotifyManager::Alarms alarms = m_al;
     if ( !alarms.isEmpty() )
     {
         QStringList als;
         OPimNotifyManager::Alarms::Iterator it = alarms.begin();
         for ( ; it != alarms.end(); ++it )
         {
             /* only if time is valid */
             if ( ( *it ).dateTime().isValid() )
             {
                 als << OPimDateConversion::dateTimeToString( ( *it ).dateTime() )
                 + ":" + QString::number( ( *it ).duration() )
                 + ":" + QString::number( ( *it ).sound() )
                 + ":";
             }
         }
         // now write the list
-        qWarning( "als: %s", als.join( "____________" ).latin1() );
+        owarn << "als: " << als.join( "____________" ) << "" << oendl;
         str = als.join( ";" );
     }
 
     return str;
 }
 
 
 QString OPimNotifyManager::remindersToString() const
 {
     QString str;
 
     OPimNotifyManager::Reminders reminders = m_rem;
     if ( !reminders.isEmpty() )
     {
         OPimNotifyManager::Reminders::Iterator it = reminders.begin();
         QStringList records;
         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 )
     {
         QStringList alarm = QStringList::split( ":", ( *it ), TRUE ); // allow empty
-        qWarning( "alarm: %s", alarm.join( "___" ).latin1() );
+        owarn << "alarm: " << alarm.join( "___" ) << "" << oendl;
         qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(),
                   OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() );
         OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::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 )
     {
         OPimReminder rem( ( *it ).toInt() );
         add( rem );
     }
 
 }
 }
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index c783092..6546d99 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -1,273 +1,273 @@
 /*
                              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.
 */
 
 #include "opimrecord.h"
 
 /* OPIE */
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 /* QT */
 
 namespace Opie
 {
 Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia );
 
 
 OPimRecord::OPimRecord( int uid )
         : Qtopia::Record()
 {
 
     m_lastHit = -1;
     setUid( uid );
 }
 
 
 OPimRecord::~OPimRecord()
 {}
 
 
 OPimRecord::OPimRecord( const OPimRecord& rec )
         : Qtopia::Record( rec )
 {
     ( *this ) = 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 list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
     for ( uint i = 0; i < cats.count(); i++ )
     {
         list << catDB.label( appname, cats[ i ] );
     }
 
     return list;
 }
 
 
 void OPimRecord::setCategoryNames( const QStringList& )
 {
 }
 
 
 void OPimRecord::addCategoryName( const QString& )
 {
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
 
 
 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 );
+    //owarn << "IDS " + str << oendl; 
 
     return str;
     }*/
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid )
 {
     if ( uid == 1 )
         uid = uidGen().generate();
 
     Qtopia::Record::setUid( uid );
 };
 
 
 Qtopia::UidGen &OPimRecord::uidGen()
 {
     return m_uidGen;
 }
 
 
 OPimXRefManager &OPimRecord::xrefmanager()
 {
     return m_xrefman;
 }
 
 
 int OPimRecord::rtti() const
 {
     return 0;
 }
 
 /**
  * now let's put our data into the stream
  */
 /*
  * First read UID
  *            Categories
  *            XRef
  */
 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++ )
     {
         stream >> array[ i ];
     }
     setCategories( array );
 
     /*
      * now we do the X-Ref stuff
      */
     OPimXRef xref;
     stream >> UInt;
     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
 {
     /** UIDs */
 
     stream << uid();
 
     /** Categories  */
     stream << categories().count();
     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 )
     {
         flush( ( *it ).partner( OPimXRef::One ), stream );
         flush( ( *it ).partner( OPimXRef::Two ), stream );
     }
     return true;
 }
 
 
 void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const
 {
     str << par.service();
     str << par.uid();
     str << par.field();
 }
 
 
 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
 {
     m_lastHit = lastHit;
 }
 
 
 int OPimRecord::lastHitField() const
 {
     return m_lastHit;
 }
 
 
 QMap<QString, QString> OPimRecord::toExtraMap() const
 {
     return customMap;
 }
 
 
 void OPimRecord::setExtraMap( const QMap<QString, QString>& map )
 {
     customMap = map;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimtimezone.cpp b/libopie2/opiepim/core/opimtimezone.cpp
index be21b1b..fefceb5 100644
--- a/libopie2/opiepim/core/opimtimezone.cpp
+++ b/libopie2/opiepim/core/opimtimezone.cpp
@@ -1,188 +1,191 @@
 /*
                              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.
 */
 
 #include "opimtimezone.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 /* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
 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" );
 #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 );
 #else
 #warning "Need a replacement for MacOSX!!"
 
     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" );
 #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 );
 #else
 #warning "Need a replacement for MacOSX!!"
 
     time_t ti = ::mktime( &broken );
 #endif
 
     return ti;
 }
 }
 
 namespace Opie
 {
 OPimTimeZone::OPimTimeZone( const ZoneName& zone )
         : m_name( zone )
 {}
 
 
 OPimTimeZone::~OPimTimeZone()
 {}
 
 
 bool OPimTimeZone::isValid() const
 {
     return !m_name.isEmpty();
 }
 
 /*
  * we will get the current timezone
  * and ask it to convert to the timezone date
  */
 QDateTime OPimTimeZone::toLocalDateTime( const QDateTime& dt )
 {
     return OPimTimeZone::current().toDateTime( dt, *this );
 }
 
 
 QDateTime OPimTimeZone::toUTCDateTime( const QDateTime& dt )
 {
     return OPimTimeZone::utc().toDateTime( dt, *this );
 }
 
 
 QDateTime OPimTimeZone::fromUTCDateTime( time_t t )
 {
     return utcTime( t );
 }
 
 
 QDateTime OPimTimeZone::toDateTime( time_t t )
 {
     return utcTime( t, m_name );
 }
 
 
 /*
  * convert dt to utc using zone.m_name
  * convert utc -> timeZoneDT using this->m_name
  */
 QDateTime OPimTimeZone::toDateTime( const QDateTime& dt, const OPimTimeZone& zone )
 {
     time_t utc = to_Time_t( dt, zone.m_name );
-    qWarning( "%d %s", utc, zone.m_name.latin1() );
+    owarn << "" << utc << " " << zone.m_name << "" << oendl;
     return utcTime( utc, m_name );
 }
 
 
 time_t OPimTimeZone::fromDateTime( const QDateTime& time )
 {
     return to_Time_t( time, m_name );
 }
 
 
 time_t OPimTimeZone::fromUTCDateTime( const QDateTime& time )
 {
     return to_Time_t( time, "UTC" );
 }
 
 
 OPimTimeZone OPimTimeZone::current()
 {
     QCString str = ::getenv( "TZ" );
     OPimTimeZone zone( str );
     return zone;
 }
 
 
 OPimTimeZone OPimTimeZone::utc()
 {
     return OPimTimeZone( "UTC" );
 }
 
 
 QString OPimTimeZone::timeZone() const
 {
     return m_name;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimtodo.cpp b/libopie2/opiepim/core/opimtodo.cpp
index 47433e0..27b36a6 100644
--- a/libopie2/opiepim/core/opimtodo.cpp
+++ b/libopie2/opiepim/core/opimtodo.cpp
@@ -1,711 +1,713 @@
 /*
                              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.
 */
 
 #include "opimtodo.h"
 
 /* OPIE */
 #include <opie2/opimstate.h>
 #include <opie2/opimrecurrence.h>
 #include <opie2/opimmaintainer.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimresolver.h>
+#include <opie2/odebug.h>
+
 #include <qpe/palmtopuidgen.h>
 #include <qpe/palmtoprecord.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 #include <qpe/stringutil.h>
 
 /* QT */
 #include <qobject.h>
 #include <qshared.h>
 
 namespace Opie
 {
 
 struct OPimTodo::OPimTodoData : public QShared
 {
     OPimTodoData() : QShared()
     {
         recur = 0;
         state = 0;
         maintainer = 0;
         notifiers = 0;
     };
     ~OPimTodoData()
     {
         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;
     OPimRecurrence *recur;
     OPimMaintainer *maintainer;
     QDate start;
     QDate completed;
     OPimNotifyManager *notifiers;
 };
 
 
 OPimTodo::OPimTodo( const OPimTodo &event )
         : OPimRecord( event ), data( event.data )
 {
     data->ref();
-    //    qWarning("ref up");
+    //    owarn << "ref up" << oendl;
 }
 
 
 OPimTodo::~OPimTodo()
 {
 
-    //    qWarning("~OPimTodo "  );
+    //    owarn << "~OPimTodo " << oendl;
     if ( data->deref() )
     {
-        //        qWarning("OPimTodo::dereffing");
+        //        owarn << "OPimTodo::dereffing" << oendl;
         delete data;
         data = 0l;
     }
 }
 
 
 OPimTodo::OPimTodo( 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("OPimTodoData " + summary);
+    //    owarn << "OPimTodoData " + summary << oendl;
     setCategories( category );
 
     data = new OPimTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace( description );
 }
 
 
 OPimTodo::OPimTodo( bool completed, int priority,
               const QStringList &category,
               const QString& summary,
               const QString &description,
               ushort progress,
               bool hasDate, QDate date, int uid )
         : OPimRecord( uid )
 {
-    //    qWarning("OPimTodoData" + summary);
+    //    owarn << "OPimTodoData" + summary << oendl;
     setCategories( idsFromString( category.join( ";" ) ) );
 
     data = new OPimTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace( description );
 }
 
 
 bool OPimTodo::match( const QRegExp &regExp ) const
 {
     if ( QString::number( data->priority ).find( regExp ) != -1 )
     {
         setLastHitField( Priority );
         return true;
     }
     else if ( data->hasDate && data->date.toString().find( regExp ) != -1 )
     {
         setLastHitField( HasDate );
         return true;
     }
     else if ( data->desc.find( regExp ) != -1 )
     {
         setLastHitField( Description );
         return true;
     }
     else if ( data->sum.find( regExp ) != -1 )
     {
         setLastHitField( Summary );
         return true;
     }
     return false;
 }
 
 
 bool OPimTodo::isCompleted() const
 {
     return data->isCompleted;
 }
 
 
 bool OPimTodo::hasDueDate() const
 {
     return data->hasDate;
 }
 
 
 bool OPimTodo::hasStartDate() const
 {
     return data->start.isValid();
 }
 
 
 bool OPimTodo::hasCompletedDate() const
 {
     return data->completed.isValid();
 }
 
 
 int OPimTodo::priority() const
 {
     return data->priority;
 }
 
 
 QString OPimTodo::summary() const
 {
     return data->sum;
 }
 
 
 ushort OPimTodo::progress() const
 {
     return data->prog;
 }
 
 
 QDate OPimTodo::dueDate() const
 {
     return data->date;
 }
 
 
 QDate OPimTodo::startDate() const
 {
     return data->start;
 }
 
 
 QDate OPimTodo::completedDate() const
 {
     return data->completed;
 }
 
 
 QString OPimTodo::description() const
 {
     return data->desc;
 }
 
 
 bool OPimTodo::hasState() const
 {
     if ( !data->state ) return false;
     return ( data->state->state() != OPimState::Undefined );
 }
 
 
 OPimState OPimTodo::state() const
 {
     if ( !data->state )
     {
         OPimState state;
         return state;
     }
 
     return ( *data->state );
 }
 
 
 bool OPimTodo::hasRecurrence() const
 {
     if ( !data->recur ) return false;
     return data->recur->doesRecur();
 }
 
 
 OPimRecurrence OPimTodo::recurrence() const
 {
     if ( !data->recur ) return OPimRecurrence();
 
     return ( *data->recur );
 }
 
 
 bool OPimTodo::hasMaintainer() const
 {
     if ( !data->maintainer ) return false;
 
     return ( data->maintainer->mode() != OPimMaintainer::Undefined );
 }
 
 
 OPimMaintainer OPimTodo::maintainer() const
 {
     if ( !data->maintainer ) return OPimMaintainer();
 
     return ( *data->maintainer );
 }
 
 
 void OPimTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 
 
 void OPimTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 
 
 void OPimTodo::setDescription( const QString &desc )
 {
-    //    qWarning( "desc " + desc );
+    //    owarn << "desc " + desc << oendl;
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace( desc );
 }
 
 
 void OPimTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
 
 
 void OPimTodo::setPriority( int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 
 
 void OPimTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
 
 
 void OPimTodo::setStartDate( const QDate& date )
 {
     changeOrModify();
     data->start = date;
 }
 
 
 void OPimTodo::setCompletedDate( const QDate& date )
 {
     changeOrModify();
     data->completed = date;
 }
 
 
 void OPimTodo::setState( const OPimState& state )
 {
     changeOrModify();
     if ( data->state )
         ( *data->state ) = state;
     else
         data->state = new OPimState( state );
 }
 
 
 void OPimTodo::setRecurrence( const OPimRecurrence& rec )
 {
     changeOrModify();
     if ( data->recur )
         ( *data->recur ) = rec;
     else
         data->recur = new OPimRecurrence( rec );
 }
 
 
 void OPimTodo::setMaintainer( const OPimMaintainer& pim )
 {
     changeOrModify();
 
     if ( data->maintainer )
         ( *data->maintainer ) = pim;
     else
         data->maintainer = new OPimMaintainer( pim );
 }
 
 
 bool OPimTodo::isOverdue( )
 {
     if ( data->hasDate && !data->isCompleted )
         return QDate::currentDate() > data->date;
     return false;
 }
 
 
 void OPimTodo::setProgress( ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
 
 
 QString OPimTodo::toShortText() const
 {
     return summary();
 }
 
 
 /*!
   Returns a richt text string
 */
 QString OPimTodo::toRichText() const
 {
     QString text;
     QStringList catlist;
 
     // summary
     text += "<b><h3><img src=\"todo/TodoList\"> ";
     if ( !summary().isEmpty() )
     {
         text += Qtopia::escapeString( summary() ).replace( QRegExp( "[\n]" ), "" );
     }
     text += "</h3></b><br><hr><br>";
 
     // description
     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() )
     {
         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 OPimTodo::hasNotifiers() const
 {
     if ( !data->notifiers ) return false;
     return !data->notifiers->isEmpty();
 }
 
 
 OPimNotifyManager& OPimTodo::notifiers()
 {
     if ( !data->notifiers )
         data->notifiers = new OPimNotifyManager;
     return ( *data->notifiers );
 }
 
 
 const OPimNotifyManager& OPimTodo::notifiers() const
 {
     if ( !data->notifiers )
         data->notifiers = new OPimNotifyManager;
 
     return ( *data->notifiers );
 }
 
 
 bool OPimTodo::operator<( const OPimTodo &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
             return priority() < toDoEvent.priority();
         }
         else
         {
             return dueDate() < toDoEvent.dueDate();
         }
     }
     return false;
 }
 
 
 bool OPimTodo::operator<=( const OPimTodo &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
             return priority() <= toDoEvent.priority();
         }
         else
         {
             return dueDate() <= toDoEvent.dueDate();
         }
     }
     return true;
 }
 
 
 bool OPimTodo::operator>( const OPimTodo &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
             return priority() > toDoEvent.priority();
         }
         else
         {
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return false;
 }
 
 
 bool OPimTodo::operator>=( const OPimTodo &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
             return priority() > toDoEvent.priority();
         }
         else
         {
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return true;
 }
 
 
 bool OPimTodo::operator==( const OPimTodo &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 OPimTodo::deref()
 {
 
-    //    qWarning("deref in ToDoEvent");
+    //    owarn << "deref in ToDoEvent" << oendl;
     if ( data->deref() )
     {
-        //        qWarning("deleting");
+        //        owarn << "deleting" << oendl;
         delete data;
         data = 0;
     }
 }
 
 
 OPimTodo &OPimTodo::operator=( const OPimTodo &item )
 {
     if ( this == &item ) return * this;
 
     OPimRecord::operator=( item );
-    //qWarning("operator= ref ");
+    //owarn << "operator= ref " << oendl;
     item.data->ref();
     deref();
     data = item.data;
 
     return *this;
 }
 
 
 QMap<int, QString> OPimTodo::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 OPimTodo::changeOrModify()
 {
     if ( data->count != 1 )
     {
-        qWarning( "changeOrModify" );
+        owarn << "changeOrModify" << oendl;
         data->deref();
         OPimTodoData* d2 = new OPimTodoData();
         copy( data, d2 );
         data = d2;
     }
 }
 
 
 // WATCHOUT
 /*
  * if you add something to the Data struct
  * be sure to copy it here
  */
 void OPimTodo::copy( OPimTodoData* src, OPimTodoData* 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 OPimRecurrence( *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 OPimTodo::type() const
 {
     return QString::fromLatin1( "OPimTodo" );
 }
 
 
 QString OPimTodo::recordField( int /*id*/ ) const
 {
     return QString::null;
 }
 
 
 int OPimTodo::rtti() const
 {
     return OPimResolver::TodoList;
 }
 
 }
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp
index c4adbbd..26a68a0 100644
--- a/libopie2/opiepim/core/otodoaccess.cpp
+++ b/libopie2/opiepim/core/otodoaccess.cpp
@@ -1,101 +1,101 @@
 /*
                              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.
 */
 #include <qdatetime.h>
 
 #include <qpe/alarmserver.h>
 
 // #include "otodoaccesssql.h"
 #include <opie2/otodoaccess.h>
 #include <opie2/obackendfactory.h>
 #include <opie2/opimresolver.h>
 #include <opie2/opimglobal.h>
 
 namespace Opie {
 OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
     : QObject(), OPimAccessTemplate<OPimTodo>( end ),  m_todoBackEnd( end )
 {
 //     if (end == 0l )
 //         m_todoBackEnd = new OPimTodoAccessBackendSQL( QString::null);
 
         // Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben !
         if (end == 0l )
                 m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::defaultBackend (OPimGlobal::TODOLIST, QString::null);
 
     setBackEnd( m_todoBackEnd );
 }
 OPimTodoAccess::~OPimTodoAccess() {
-//    qWarning("~OPimTodoAccess");
+//    owarn << "~OPimTodoAccess" << oendl; 
 }
 void OPimTodoAccess::mergeWith( const QValueList<OPimTodo>& list ) {
     QValueList<OPimTodo>::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         replace( (*it) );
     }
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                const QDate& end,
                                                bool includeNoDates ) {
     QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
 
     List lis( ints, this );
     return lis;
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                bool includeNoDates ) {
     return effectiveToDos( start, QDate::currentDate(),
                            includeNoDates );
 }
 OPimTodoAccess::List OPimTodoAccess::overDue() {
     List lis( m_todoBackEnd->overDue(), this );
     return lis;
 }
 /* sort order */
 OPimTodoAccess::List OPimTodoAccess::sorted( bool ascending, int sort,int filter, int cat ) {
     QArray<int> ints = m_todoBackEnd->sorted( ascending, sort,
                                       filter, cat );
     OPimTodoAccess::List list( ints, this );
     return list;
 }
 void OPimTodoAccess::removeAllCompleted() {
     m_todoBackEnd->removeAllCompleted();
 }
 QBitArray OPimTodoAccess::backendSupport( const QString& ) const{
     return m_todoBackEnd->supports();
 }
 bool OPimTodoAccess::backendSupports( int attr,  const QString& ar) const{
     return backendSupport(ar).testBit( attr );
 }
 
 
 int OPimTodoAccess::rtti() const
 {
         return OPimResolver::TodoList;
 }
 
 }
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 40dc297..8ce2062 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -1,181 +1,188 @@
 /*
                              This file is part of the Opie Project
                              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 <qapplication.h>
-#include <qdatetime.h>
-#include <qcopchannel_qws.h>
+
+#include "opimmainwindow.h"
+
+/* OPIE */
+#include <opie2/opimresolver.h>
+#include <opie2/odebug.h>
 
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
-#include <opie2/opimresolver.h>
-#include "opimmainwindow.h"
+/* QT */
+#include <qapplication.h>
+#include <qdatetime.h>
+#include <qcopchannel_qws.h>
+
+
 
 namespace Opie {
 OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
                                 const char* name, WFlags flag )
     : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) {
 
     /*
      * let's generate our QCopChannel
      */
     m_str = QString("QPE/"+m_service).local8Bit();
     m_channel= new QCopChannel(m_str, this );
     connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ),
             this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
     connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
             this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
     /* connect flush and reload */
     connect(qApp, SIGNAL(flush() ),
             this, SLOT(flush() ) );
     connect(qApp, SIGNAL(reload() ),
             this, SLOT(reload() ) );
 }
 OPimMainWindow::~OPimMainWindow() {
     delete m_channel;
 }
 QCopChannel* OPimMainWindow::channel() {
     return m_channel;
 }
 void OPimMainWindow::doSetDocument( const QString&  ) {
 
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
     bool needShow = false;
     /*
      * create demands to create
      * a new record...
      */
     QDataStream stream(array, IO_ReadOnly);
     if ( cmd == "create()" ) {
         raise();
         int uid = create();
         QCopEnvelope e(m_str, "created(int)" );
         e << uid;
         needShow = true;
     }else if ( cmd == "remove(int)" ) {
         int uid;
         stream >> uid;
         bool rem = remove( uid );
         QCopEnvelope e(m_str, "removed(bool)" );
         e << rem;
         needShow = true;
     }else if ( cmd == "beam(int)" ) {
         int uid;
         stream >> uid;
         beam( uid);
     }else if ( cmd == "show(int)" ) {
         raise();
         int uid;
         stream >> uid;
         show( uid );
         needShow = true;
     }else if ( cmd == "edit(int)" ) {
         raise();
         int uid;
         stream >> uid;
         edit( uid );
     }else if ( cmd == "add(int,QByteArray)" ) {
         int rtti;
         QByteArray array;
         stream >> rtti;
         stream >> array;
         m_fallBack = record(rtti, array );
         if (!m_fallBack) return;
         add( *m_fallBack );
         delete m_fallBack;
     }else if ( cmd == "alarm(QDateTime,int)" ) {
         raise();
         QDateTime dt; int uid;
         stream >> dt;
         stream >> uid;
-        qWarning(" Date: %s Uid: %d", dt.toString().latin1(), uid );
+        owarn << " Date: " << dt.toString() << " Uid: " << uid << "" << oendl;
         QDateTime current = QDateTime::currentDateTime();
         if ( current.time().hour() != dt.time().hour() && current.time().minute() != dt.time().minute() )
             return;
         doAlarm( dt,  uid );
         needShow = true;
     }
 
     if (needShow )
         QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */
 void OPimMainWindow::setDocument( const QString& str) {
     doSetDocument( str );
 }
 /*
  * we now try to get the array demarshalled
  * check if the rtti matches this one
  */
 OPimRecord* OPimMainWindow::record( int rtti,  const QByteArray& array ) {
     if ( service() != rtti )
         return 0l;
 
     OPimRecord* record = OPimResolver::self()->record( rtti );
     QDataStream str(array, IO_ReadOnly );
     if ( !record || !record->loadFromStream(str) ) {
         delete record;
         record = 0l;
     }
 
     return record;
 }
 /*
  * get the rtti for the service
  */
 int OPimMainWindow::service() {
     if ( m_rtti == -1 )
         m_rtti  =  OPimResolver::self()->serviceId( m_service );
 
     return m_rtti;
 }
 void OPimMainWindow::doAlarm( const QDateTime&, int  ) {
 
 }
 void OPimMainWindow::startAlarm(int count  ) {
     m_alarmCount = count;
     m_playedCount = 0;
     Sound::soundAlarm();
     m_timerId = startTimer( 5000 );
 }
 void OPimMainWindow::killAlarm() {
     killTimer( m_timerId );
 }
 void OPimMainWindow::timerEvent( QTimerEvent* e) {
     if ( m_playedCount <m_alarmCount ) {
         m_playedCount++;
         Sound::soundAlarm();
     }else {
         killTimer( e->timerId() );
     }
 }
 
 }