7 files changed, 218 insertions, 207 deletions

diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index 6f46652..3680ded 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -31,30 +31,36 @@
  * ToDo: Use plugins
  * =====================================================================
  */
 #ifndef OPIE_BACKENDFACTORY_H_
 #define OPIE_BACKENDFACTORY_H_
 
-#include <qstring.h>
-#include <qasciidict.h>
-#include <qpe/config.h>
-
+/* OPIE */
 #include <opie2/opimaccessbackend.h>
 #include <opie2/opimglobal.h>
 #include <opie2/otodoaccessxml.h>
 #include <opie2/otodoaccessvcal.h>
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/ocontactaccessbackend_vcard.h>
 #include <opie2/odatebookaccessbackend_xml.h>
+#include <opie2/odebug.h>
 
 #ifdef __USE_SQL
 #include <opie2/otodoaccesssql.h>
 #include <opie2/ocontactaccessbackend_sql.h>
 #include <opie2/odatebookaccessbackend_sql.h>
 #endif
 
+#include <qpe/config.h>
+
+/* QT */
+#include <qstring.h>
+#include <qasciidict.h>
+
+
+
 using namespace Opie;
 using namespace Opie::Pim;
 
 namespace Opie {
 
 class OBackendPrivate;
@@ -75,150 +81,150 @@ class OBackendPrivate;
  * @version 0.1
  */
 template<class T>
 class OBackendFactory
 {
  public:
-        OBackendFactory() {};
+    OBackendFactory() {};
 
         /**
          * Returns a selected backend implementation
          * @param type the type of the backend
-         * @param database the type of the used database
+     * @param database the type of the used database
          * @param appName The name of your application. It will be passed on to the backend.
-         * @param filename Filename of the database file if you don't want to access the default 
-         * @see OPimGlobal()
+     * @param filename Filename of the database file if you don't want to access the default
+     * @see OPimGlobal()
          */
-        static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
-                          const QString& appName, const QString& filename = QString::null ){
-                qWarning("Selected backend for %d is: %d", type, database );
-                // If we should use the dafult database style, we have to request it
-                OPimGlobal::DatabaseStyle use_database = database;
-                if ( use_database == OPimGlobal::DEFAULT ){
-                        use_database = defaultDB( type );
-                }
-
-                switch ( type ){
-                case OPimGlobal::TODOLIST:
-
-                        switch ( use_database ){
-                        default: // Use SQL if something weird is given.
-                                // Fall through !!
-                        case OPimGlobal::SQL:
+    static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
+              const QString& appName, const QString& filename = QString::null ){
+        owarn << "Selected backend for " << type << " is: " << database << oendl;
+        // If we should use the dafult database style, we have to request it
+        OPimGlobal::DatabaseStyle use_database = database;
+        if ( use_database == OPimGlobal::DEFAULT ){
+            use_database = defaultDB( type );
+        }
+
+        switch ( type ){
+        case OPimGlobal::TODOLIST:
+
+            switch ( use_database ){
+            default: // Use SQL if something weird is given.
+                // Fall through !!
+            case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                                return (T*) new OPimTodoAccessBackendSQL( filename );
-                                break;
+                return (T*) new OPimTodoAccessBackendSQL( filename );
+                break;
 #else
-                                qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!");
-                                // Fall through !!
+                owarn << "OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!" << oendl;
+                // Fall through !!
 #endif
-                        case OPimGlobal::XML:
-                                return (T*) new OPimTodoAccessXML( appName, filename );
-                                break;
-                        case OPimGlobal::VCARD:
-                                return (T*) new OPimTodoAccessVCal( filename );
-                                break;
-                        }
-                case OPimGlobal::CONTACTLIST:
-                        switch ( use_database ){
-                        default: // Use SQL if something weird is given.
-                                // Fall through !!
-                        case OPimGlobal::SQL:
+            case OPimGlobal::XML:
+                return (T*) new OPimTodoAccessXML( appName, filename );
+                break;
+            case OPimGlobal::VCARD:
+                return (T*) new OPimTodoAccessVCal( filename );
+                break;
+            }
+        case OPimGlobal::CONTACTLIST:
+            switch ( use_database ){
+            default: // Use SQL if something weird is given.
+                // Fall through !!
+            case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                                return (T*) new OPimContactAccessBackend_SQL( appName, filename );
-                                break;
+                return (T*) new OPimContactAccessBackend_SQL( appName, filename );
+                break;
 #else
-                                qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!");
-                                // Fall through !!
+                owarn << "OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!" << oendl;
+                // Fall through !!
 #endif
-                        case OPimGlobal::XML:
-                                return (T*) new OPimContactAccessBackend_XML( appName, filename );
-                                break;
-                        case OPimGlobal::VCARD:
-                                return (T*) new OPimContactAccessBackend_VCard( appName, filename );
-                                break;
-                        }
-                case OPimGlobal::DATEBOOK:
-                        switch ( use_database ){
-                        default: // Use SQL if something weird is given.
-                                // Fall through !!
-                        case OPimGlobal::SQL:
+            case OPimGlobal::XML:
+                return (T*) new OPimContactAccessBackend_XML( appName, filename );
+                break;
+            case OPimGlobal::VCARD:
+                return (T*) new OPimContactAccessBackend_VCard( appName, filename );
+                break;
+            }
+        case OPimGlobal::DATEBOOK:
+            switch ( use_database ){
+            default: // Use SQL if something weird is given.
+                // Fall through !!
+            case OPimGlobal::SQL:
 #ifdef __USE_SQL
-                                return (T*) new ODateBookAccessBackend_SQL( appName, filename );
-                                break;
+                return (T*) new ODateBookAccessBackend_SQL( appName, filename );
+                break;
 #else
-                                qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!");
-                                // Fall through !!
+                owarn << "OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!" << oendl;
+                // Fall through !!
 #endif
-                        case OPimGlobal::XML:
-                                return (T*) new ODateBookAccessBackend_XML( appName, filename );
-                                break;
-                        case OPimGlobal::VCARD:
-                                qWarning("OBackendFactory:: VCal Backend for DATEBOOK not implemented!");
-                                return (T*) NULL;
-                                break;
-                        }
-                default:
-                        return (T*) NULL;
-                }
-
-        }
-
-        /**
-         * Returns the style of the default database which is used to contact PIM data.
+            case OPimGlobal::XML:
+                return (T*) new ODateBookAccessBackend_XML( appName, filename );
+                break;
+            case OPimGlobal::VCARD:
+                owarn << "OBackendFactory:: VCal Backend for DATEBOOK not implemented!" << oendl;
+                return (T*) NULL;
+                break;
+            }
+        default:
+            return (T*) NULL;
+        }
+
+    }
+
+    /**
+     * Returns the style of the default database which is used to contact PIM data.
          * @param type the type of the backend
-         * @see OPimGlobal()
-         */
-        static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){
-                QString group_name;
-                switch ( type ){
-                case OPimGlobal::TODOLIST:
-                        group_name = "todo";
-                        break;
-                case OPimGlobal::CONTACTLIST:
-                        group_name = "contact";
-                        break;
-                case OPimGlobal::DATEBOOK:
-                        group_name = "datebook";
-                        break;
-                default:
-                        group_name = "unknown";
-                }
-
-                Config config( "pimaccess" );
-                config.setGroup ( group_name );
-                QString db_String = config.readEntry( "usebackend", "xml" );
-
-                QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle );
-                dictDbTypes.setAutoDelete( TRUE );
-
-                dictDbTypes.insert( "xml", new int (OPimGlobal::XML) );
-                dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) );
-                dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) );
-
-                int* db_find = dictDbTypes[ db_String ];
-
-                if ( !db_find )
-                        return OPimGlobal::UNKNOWN;
-
-                return (OPimGlobal::DatabaseStyle) *db_find;
-        }
+     * @see OPimGlobal()
+     */
+    static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){
+        QString group_name;
+        switch ( type ){
+        case OPimGlobal::TODOLIST:
+            group_name = "todo";
+            break;
+        case OPimGlobal::CONTACTLIST:
+            group_name = "contact";
+            break;
+        case OPimGlobal::DATEBOOK:
+            group_name = "datebook";
+            break;
+        default:
+            group_name = "unknown";
+        }
+
+        Config config( "pimaccess" );
+        config.setGroup ( group_name );
+        QString db_String = config.readEntry( "usebackend", "xml" );
+
+        QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle );
+        dictDbTypes.setAutoDelete( TRUE );
+
+        dictDbTypes.insert( "xml", new int (OPimGlobal::XML) );
+        dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) );
+        dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) );
+
+            int* db_find = dictDbTypes[ db_String ];
+
+        if ( !db_find )
+            return OPimGlobal::UNKNOWN;
+
+        return (OPimGlobal::DatabaseStyle) *db_find;
+    }
 
 
         /**
          * Returns the default backend implementation for backendName. Which one is used, is defined
-         * by the configfile "pimaccess.conf".
+     * by the configfile "pimaccess.conf".
          * @param type The type of the backend (@see OPimGlobal())
          * @param appName The name of your application. It will be passed on to the backend
-         * @see OPimGlobal()
+     * @see OPimGlobal()
          */
-        static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){
-                return create( type, OPimGlobal::DEFAULT, appName );
-        }
+    static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){
+        return create( type, OPimGlobal::DEFAULT, appName );
+    }
     private:
-        OBackendPrivate* d;
+    OBackendPrivate* d;
 
 };
 
 }
 
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 5ffcb11..00d62ee 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -134,14 +134,14 @@ bool OPimContactAccessBackend_XML::save()
     }
     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 );
+        owarn << "problem renaming file " << strNewFile << " to " << m_journalName
+              << ", errno: " << errno << oendl;
         // remove the tmp file...
         QFile::remove( strNewFile );
     }
 
     /* The journalfile should be removed now... */
     removeJournal();
@@ -275,21 +275,19 @@ QArray<int> OPimContactAccessBackend_XML::queryByExample ( const OPimContact &qu
                                            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() );
+                            owarn << "Checking if " << checkDate->toString() << " is between " << current.toString()
+                                  << " and " << queryDate->toString() << " ! " << oendl;
                             if ( current.daysTo( *queryDate ) >= 0 ){
                                 if ( !( ( *checkDate >= current ) &&
                                     ( *checkDate <= *queryDate ) ) ){
                                     allcorrect = false;
-                                    qWarning (" Nope!..");
+                                    owarn << " Nope!.." << oendl;
                                 }
                             }
                         }
                     } else{
                         // checkDate is invalid. Therefore this entry is always rejected
                         allcorrect = false;
@@ -604,42 +602,42 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
         //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());
+                //owarn << "OPimContactDefBack::Searching for Tag \"Contacts\"! Found: "
+                //      << element->tagName() << oendl;
                 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());
+                //owarn << "OPimContactDefBack::Searching for Tag \"Contact\"! Found: "
+                //      << element->tagName() << oendl;
                 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() );
+            //owarn << "OPimContactDefBack::load element tagName() : "
+            //      << element->tagName() << oendl;
             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());
+                // owarn << "Read Attribute: " << it.key() << "=" << it.data() << oendl;
 
                 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());
@@ -659,13 +657,13 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
                       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);
+                    owarn << "ODefBack(journal)::ACTION found: " << action << oendl;
                     break;
                 case JOURNALROW:
                     journalKey = it.data().toInt();
                     break;
                 default: // no conversion needed add them to the map
                     contactMap.insert( *find, it.data() );
@@ -684,22 +682,20 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
                 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() );
+                        owarn << "ODefBack(journal)::Unable to remove uid: " << contact.uid() << oendl;
                     break;
                 case ACTION_REPLACE:
                     if ( !replace ( contact ) )
-                        qWarning ("ODefBack(journal)::Unable to replace uid: %d",
-                              contact.uid() );
+                        owarn << "ODefBack(journal)::Unable to replace uid: " << contact.uid() << oendl;
                     break;
                 default:
-                    qWarning ("Unknown action: ignored !");
+                    owarn << "Unknown action: ignored !" << oendl;
                     break;
                 }
             }else{
                 /* Add contact to list */
                 addContact_p (contact);
             }
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index a372267..7a3d7cb 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -33,127 +33,132 @@
  *
  */
 
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 
+/* OPIE */
+#include <opie2/ocontactaccessbackend_xml.h>
+#include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
+#include <opie2/odebug.h>
+
+//#include <qpe/qcopenvelope_qws.h>
+#include <qpe/global.h>
+
+/* QT */
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
-//#include <qpe/qcopenvelope_qws.h>
-#include <qpe/global.h>
-
+/* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <opie2/ocontactaccessbackend_xml.h>
-#include <opie2/opimresolver.h>
-#include <opie2/opimglobal.h>
 
 namespace Opie {
 
 OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
-                         OPimContactAccessBackend* end, bool autosync ):
-        OPimAccessTemplate<OPimContact>( end )
+             OPimContactAccessBackend* end, bool autosync ):
+    OPimAccessTemplate<OPimContact>( end )
 {
         /* take care of the backend. If there is no one defined, we
-         * will use the XML-Backend as default (until we have a cute SQL-Backend..).
-         */
+     * will use the XML-Backend as default (until we have a cute SQL-Backend..).
+     */
         if( end == 0 ) {
-                qWarning ("Using BackendFactory !");
-                end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
+        owarn << "Using BackendFactory !" << oendl;
+        end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
         }
-        // Set backend locally and in template
+    // Set backend locally and in template
         m_backEnd = end;
-        OPimAccessTemplate<OPimContact>::setBackEnd (end);
+    OPimAccessTemplate<OPimContact>::setBackEnd (end);
 
 
-        /* Connect signal of external db change to function */
-        QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+    /* Connect signal of external db change to function */
+    QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
+    connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
                this, SLOT(copMessage(const QCString&,const QByteArray&)) );
-        if ( autosync ){
-                QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
-                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
-        }
+    if ( autosync ){
+        QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
+        connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(copMessage(const QCString&,const QByteArray&)) );
+    }
 
 
 }
 OPimContactAccess::~OPimContactAccess ()
 {
-        /* The user may forget to save the changed database, therefore try to
-         * do it for him..
-         */
-        save();
-        // delete m_backEnd; is done by template..
+    /* The user may forget to save the changed database, therefore try to
+     * do it for him..
+     */
+    save();
+    // delete m_backEnd; is done by template..
 }
 
 
 bool OPimContactAccess::save ()
 {
-        /* If the database was changed externally, we could not save the
-         * Data. This will remove added items which is unacceptable !
-         * Therefore: Reload database and merge the data...
-         */
-        if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
-                reload();
+    /* If the database was changed externally, we could not save the
+     * Data. This will remove added items which is unacceptable !
+     * Therefore: Reload database and merge the data...
+     */
+    if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
+        reload();
 
-        bool status = OPimAccessTemplate<OPimContact>::save();
-        if ( !status ) return false;
+    bool status = OPimAccessTemplate<OPimContact>::save();
+    if ( !status ) return false;
 
-        /* Now tell everyone that new data is available.
-         */
-        QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
+    /* Now tell everyone that new data is available.
+     */
+    QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
 
-        return true;
+    return true;
 }
 
 const uint OPimContactAccess::querySettings()
 {
-        return ( m_backEnd->querySettings() );
+    return ( m_backEnd->querySettings() );
 }
 
 bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
-        return ( m_backEnd->hasQuerySettings ( querySettings ) );
+    return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
-        QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
-        return ( OPimRecordList<OPimContact>(matchingContacts, this) );
+    QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
+    return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
 
 
 bool OPimContactAccess::wasChangedExternally()const
 {
-        return ( m_backEnd->wasChangedExternally() );
+    return ( m_backEnd->wasChangedExternally() );
 }
 
 
 void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
-        if ( msg == "addressbookUpdated()" ){
-                qWarning ("OPimContactAccess: Received addressbokUpdated()");
-                emit signalChanged ( this );
-        } else if ( msg == "flush()" ) {
-                qWarning ("OPimContactAccess: Received flush()");
-                save ();
-        } else if ( msg == "reload()" ) {
-                qWarning ("OPimContactAccess: Received reload()");
-                reload ();
-                emit signalChanged ( this );
-        }
+    if ( msg == "addressbookUpdated()" ){
+        owarn << "OPimContactAccess: Received addressbokUpdated()" << oendl;
+        emit signalChanged ( this );
+    } else if ( msg == "flush()" ) {
+        owarn << "OPimContactAccess: Received flush()" << oendl;
+        save ();
+    } else if ( msg == "reload()" ) {
+        owarn << "OPimContactAccess: Received reload()" << oendl;
+        reload ();
+        emit signalChanged ( this );
+    }
 }
 
 int OPimContactAccess::rtti() const
 {
-        return OPimResolver::AddressBook;
+    return OPimResolver::AddressBook;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index e438980..55d600a 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -1,10 +1,10 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Holger Freyther <zecke@handhelds.org>
-                             Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
+                 Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
@@ -27,20 +27,23 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_PIM_ACCESS_TEMPLATE_H
 #define OPIE_PIM_ACCESS_TEMPLATE_H
 
-#include <qarray.h>
-
+/* OPIE */
 #include <opie2/opimrecord.h>
 #include <opie2/opimaccessbackend.h>
 #include <opie2/opimrecordlist.h>
 
 #include <opie2/opimcache.h>
 #include <opie2/opimtemplatebase.h>
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qarray.h>
 
 namespace Opie {
 
 class OPimAccessTemplatePrivate;
 /**
  * Thats the frontend to our OPIE PIM
@@ -202,24 +205,24 @@ OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
 {
     if (end )
         end->setFrontend( this );
 }
 template <class T>
 OPimAccessTemplate<T>::~OPimAccessTemplate() {
-    qWarning("~OPimAccessTemplate<T>");
+    owarn << "~OPimAccessTemplate<T>" << oendl;
     delete m_backEnd;
 }
 template <class T>
 bool OPimAccessTemplate<T>::load() {
     invalidateCache();
     return m_backEnd->load();
 }
 template <class T>
 bool OPimAccessTemplate<T>::reload() {
-        invalidateCache();  // zecke: I think this should be added (se)
-        return m_backEnd->reload();
+    invalidateCache();  // zecke: I think this should be added (se)
+    return m_backEnd->reload();
 }
 template <class T>
 bool OPimAccessTemplate<T>::save() {
     return m_backEnd->save();
 }
 template <class T>
@@ -257,13 +260,13 @@ T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar,
                                uint current, typename OTemplateBase<T>::CacheDirection dir )const {
     /*
      * better do T.isEmpty()
      * after a find this way we would
      * avoid two finds in QCache...
      */
-    // qWarning("find it now %d", uid );
+    // owarn << "find it now " << uid << oendl;
     if (m_cache.contains( uid ) ) {
         return m_cache.find( uid );
     }
 
     T t = m_backEnd->find( uid, ar, current, dir );
     cache( t );
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp
index 48a74d0..36e9a93 100644
--- a/libopie2/opiepim/core/opimcontact.cpp
+++ b/libopie2/opiepim/core/opimcontact.cpp
@@ -1170,13 +1170,13 @@ void OPimContact::setAnniversary( const QDate &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() );
+    // owarn << "Birthday " << str << oendl;
     if ( !str.isEmpty() )
         return OPimDateConversion::dateFromString ( str );
     else
         return QDate();
 }
 
@@ -1185,13 +1185,13 @@ QDate OPimContact::birthday() const
   Returns the anniversary of the contact.
 */
 QDate OPimContact::anniversary() const
 {
     QDate empty;
     QString str = find( Qtopia::Anniversary );
-    // qWarning ("Anniversary %s", str.latin1() );
+    // owarn << "Anniversary " << str << oendl;
     if ( !str.isEmpty() )
         return OPimDateConversion::dateFromString ( str );
     else
         return empty;
 }
 
diff --git a/libopie2/opiepim/core/opimnotifymanager.cpp b/libopie2/opiepim/core/opimnotifymanager.cpp
index 0f863aa..516dc79 100644
--- a/libopie2/opiepim/core/opimnotifymanager.cpp
+++ b/libopie2/opiepim/core/opimnotifymanager.cpp
@@ -224,14 +224,14 @@ 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
         owarn << "alarm: " << alarm.join( "___" ) << "" << oendl;
-        qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(),
-                  OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() );
+        owarn << "alarm[0]: " << alarm[ 0 ] << " "
+              << OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString() << oendl;
         OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::dateTimeFromString( alarm[ 0 ] ),
                       alarm[ 1 ].toInt() );
         add( al );
     }
 }
 
diff --git a/libopie2/opiepim/core/opimrecordlist.h b/libopie2/opiepim/core/opimrecordlist.h
index b23138d..1d5027f 100644
--- a/libopie2/opiepim/core/opimrecordlist.h
+++ b/libopie2/opiepim/core/opimrecordlist.h
@@ -30,12 +30,13 @@
 #ifndef ORECORDLIST_H
 #define ORECORDLIST_H
 
 /* OPIE */
 #include <opie2/opimtemplatebase.h>
 #include <opie2/opimrecord.h>
+//#include <opie2/odebug.h>
 
 /* QT */
 #include <qarray.h>
 
 namespace Opie
 {
@@ -186,13 +187,13 @@ OPimRecordListIterator<T>::~OPimRecordListIterator()
 }
 
 
 template <class T>
 OPimRecordListIterator<T>::OPimRecordListIterator( const OPimRecordListIterator<T>& it )
 {
-    //    qWarning("OPimRecordListIterator copy c'tor");
+    //owarn << "OPimRecordListIterator copy c'tor" << oendl;
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
     m_direction = it.m_direction;
@@ -212,13 +213,13 @@ OPimRecordListIterator<T> &OPimRecordListIterator<T>::operator=( const OPimRecor
 }
 
 
 template <class T>
 T OPimRecordListIterator<T>::operator*()
 {
-    //qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+    //owarn << "operator* " << m_current << " " << m_uids[m_current] << oendl;
     if ( !m_end )
         m_record = m_temp->find( m_uids[ m_current ], m_uids, m_current,
                                  m_direction ? Base::Forward :
                                  Base::Reverse );
     else
         m_record = T();