23 files changed, 272 insertions, 208 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,6 +1,12 @@
+
+#include "osqlbackendmanager.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qdir.h>
 #include <qmap.h>
 
-#include "osqlbackendmanager.h"
 
 /**
@@ -39,5 +45,5 @@ namespace {
         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] );
@@ -93,5 +99,5 @@ OSQLBackEnd::ValueList OSQLBackEndManager::scanDir( const QString& dirName ) {
 OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) {
     OSQLBackEnd end;
-    qWarning("fileName: " + file  );
+    owarn << "fileName: " + file << oendl;
     Config cfg( file );
     if (cfg.load() ) {
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
@@ -125,5 +125,5 @@ 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,
@@ -133,5 +133,5 @@ bool OSQLiteDriver::open() {
     if (m_sqlite == 0l ) {
         // FIXME set the last error
-        qWarning("OSQLiteDriver::open: %s", error );
+        owarn << "OSQLiteDriver::open: " << error << "" << oendl; 
         free( error );
         return false;
@@ -175,5 +175,5 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     /* 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
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
@@ -83,5 +83,5 @@ void OSoundSystem::synchronize()
         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 );
@@ -238,6 +238,6 @@ void OMixerInterface::init()
     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; 
     }
 */
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
@@ -606,8 +606,11 @@ 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 )

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
@@ -63,8 +63,8 @@ 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
@@ -33,11 +33,5 @@
 #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>
@@ -47,4 +41,14 @@
 #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;
@@ -269,5 +273,5 @@ namespace {
                         }       
                 // qu  += "commit;";
-                qDebug("add %s", qu.latin1() );
+        odebug << "add " << qu << "" << oendl;
                 return qu;
         }
@@ -317,5 +321,5 @@ namespace {
                 qu += " from addressbook where uid = " + QString::number(m_uid);
 
-                // qWarning("find query: %s", qu.latin1() );
+        // owarn << "find query: " << qu << "" << oendl;
                 return qu;
         }
@@ -351,5 +355,5 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a
         OPimContactAccessBackend(), m_changed(false), m_driver( NULL )
 {
-        qDebug("C'tor OPimContactAccessBackend_SQL starts");
+    odebug << "C'tor OPimContactAccessBackend_SQL starts" << oendl;
         QTime t;
         t.start();
@@ -368,5 +372,5 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a
         load();
 
-        qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
+    odebug << "C'tor OPimContactAccessBackend_SQL ends: " << t.elapsed() << " ms" << oendl;
 }
 
@@ -431,5 +435,5 @@ QArray<int> OPimContactAccessBackend_SQL::allRecords() const
 bool OPimContactAccessBackend_SQL::add ( const OPimContact &newcontact )
 {
-        qDebug("add in contact SQL-Backend");
+    odebug << "add in contact SQL-Backend" << oendl;
         InsertQuery ins( newcontact );
         OSQLResult res = m_driver->query( &ins );
@@ -470,5 +474,5 @@ bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact )
 OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
-        qDebug("OPimContactAccessBackend_SQL::find()");
+    odebug << "OPimContactAccessBackend_SQL::find()" << oendl;
         QTime t;
         t.start();
@@ -477,5 +481,5 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
         retContact.setExtraMap( requestCustom( uid ) );
 
-        qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
+    odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl;
         return retContact;
 }
@@ -586,5 +590,5 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
         qu += searchQuery;
 
-        qDebug( "queryByExample query: %s", qu.latin1() );
+    odebug << "queryByExample query: " << qu << "" << oendl;
 
         // Execute query and return the received uid's
@@ -621,5 +625,5 @@ QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
         qu = qu + searchlist + ")";
 
-        qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -702,5 +706,5 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
                 query += "DESC";
 
-        // qDebug("sorted query is: %s", query.latin1() ); 
+    // odebug << "sorted query is: " << query << "" << oendl;
 
         OSQLRawQuery raw( query );
@@ -713,5 +717,5 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
         QArray<int> list = extractUids( res );
 
-        qDebug("sorted needed %d ms!", t.elapsed() );
+    odebug << "sorted needed " << t.elapsed() << " ms!" << oendl;
         return list;
 }
@@ -720,5 +724,5 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
 void OPimContactAccessBackend_SQL::update()
 {
-        qDebug("Update starts");
+    odebug << "Update starts" << oendl;
         QTime t;
         t.start();
@@ -736,10 +740,10 @@ void OPimContactAccessBackend_SQL::update()
         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");
+    odebug << "extractUids" << oendl;
         QTime t;
         t.start();
@@ -747,5 +751,5 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
         OSQLResultItem::ValueList::Iterator it;
         QArray<int> ints(list.count() );
-        qDebug(" count = %d", list.count() );
+    odebug << " count = " << list.count() << "" << oendl;
 
         int i = 0;
@@ -754,5 +758,5 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
                 i++;
         }
-        qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
+    odebug << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl;
 
         return ints;
@@ -789,5 +793,5 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
                 QString value = resItem.data( (*it) );
                 
-                // qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() );
+        // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl;
 
                 switch( id ){
@@ -807,5 +811,5 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
                         break;
                 case Qtopia::AddressCategory:
-                        qDebug("Category is: %s", value.latin1() );
+            odebug << "Category is: " << value << "" << oendl;
                 default:
                         nonCustomMap.insert( id, value );
@@ -817,7 +821,7 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
         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  );
+    // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl;
+    odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed
+           << " ms, mapping: " << t3needed << " ms" << oendl;
 
         return nonCustomMap;
@@ -835,5 +839,5 @@ QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) c
 
         if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
                 QMap<QString, QString> empty;
                 return empty;
@@ -846,5 +850,5 @@ QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) c
         }
 
-        qDebug("RequestCustom needed: %d ms", t.elapsed() );
+    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
@@ -36,4 +36,6 @@
 /* OPIE */
 #include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/odebug.h>
+
 #include <qpe/timeconversion.h>
 
@@ -65,5 +67,5 @@ bool OPimContactAccessBackend_VCard::load ()
                         return false;
         }else{
-                qWarning("File \"%s\" not found !", m_file.latin1() );
+        owarn << "File \"" << m_file << "\" not found !" << oendl;
                 return false;
         }
@@ -78,5 +80,5 @@ bool OPimContactAccessBackend_VCard::load ()
                 if ( con.uid() == 0 ){
                         con.setUid( 1 );
-                        qWarning("assigned new uid %d",con.uid() );
+            owarn << "assigned new uid " << con.uid() << "" << oendl;
                 }
 
@@ -317,5 +319,5 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
                                         type |= VOICE;
 
-                                qWarning("value %s %d", value.data(), type );
+                                owarn << "value " << value.data() << " " << type << "" << oendl;
                                 if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) )
                                         c.setHomePhone( value );
@@ -511,5 +513,5 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
         // Exporting Birthday regarding RFC 2425 (5.8.4)
         if ( c.birthday().isValid() ){
-                qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() );
+        owarn << "Exporting birthday as: " << convDateToVCardDate( c.birthday() ) << "" << oendl;
                 safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
         }
@@ -530,5 +532,5 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
         safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
         if ( c.anniversary().isValid() ){
-                qWarning("Exporting anniversary as: %s", convDateToVCardDate( c.anniversary() ).latin1() );
+        owarn << "Exporting anniversary as: " << convDateToVCardDate( c.anniversary() ) << "" << oendl;
                 safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
         }
@@ -559,5 +561,5 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest
         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 );
+        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 ){
@@ -565,5 +567,5 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest
                         dayPos     = 6;
                         sep_ignore = 0;
-                        qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
+            odebug << "Try with follwing positions str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
                 } else {
                         return QDate();
@@ -573,5 +575,5 @@ QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datest
         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);
+    odebug << "TimeConversion::fromString ymd = " << datestr << " => " << y << " " << m << " " << d << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
         QDate date ( y,m,d );
         return date;
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
@@ -31,6 +31,15 @@
  */
 
+
+/* 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>
@@ -40,10 +49,5 @@
 #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>
@@ -105,5 +109,5 @@ bool OPimContactAccessBackend_XML::save()
         QListIterator<OPimContact> it( m_contactList );
         for ( ; it.current(); ++it ) {
-                // qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
+        // owarn << " Uid " << (*it)->uid() << " at Offset: " << idx_offset << "" << oendl;
                 out += "<Contact ";
                 (*it)->save( out );
@@ -460,5 +464,5 @@ QArray<int> OPimContactAccessBackend_XML::sorted( bool asc,  int , int ,  int )
 bool OPimContactAccessBackend_XML::add ( const OPimContact &newcontact )
 {
-        //qWarning("odefaultbackend: ACTION::ADD");
+    //owarn << "odefaultbackend: ACTION::ADD" << oendl;
         updateJournal (newcontact, ACTION_ADD);
         addContact_p( newcontact );
@@ -484,5 +488,5 @@ bool OPimContactAccessBackend_XML::replace ( const OPimContact &contact )
                 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;
@@ -590,5 +594,5 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
         dict.insert( "actionrow", new int(JOURNALROW) );
 
-        //qWarning( "OPimContactDefaultBackEnd::loading %s", filename.latin1() );
+    //owarn << "OPimContactDefaultBackEnd::loading " << filename << "" << oendl;
 
         XMLElement *root = XMLElement::load( filename );
@@ -598,5 +602,5 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
                  */
                 XMLElement *element = root->firstChild();
-                //qWarning("OPimContactAccess::load tagName(): %s", root->tagName().latin1() );
+        //owarn << "OPimContactAccess::load tagName(): " << root->tagName() << "" << oendl;
                 element = element->firstChild();
 
@@ -638,5 +642,5 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
                                 /* Unknown attributes will be stored as "Custom" elements */
                                 if ( !find ) {
-                                        // qWarning("Attribute %s not known.", it.key().latin1());
+                    // owarn << "Attribute " << it.key() << " not known." << oendl;
                                         //contact.setCustomField(it.key(), it.data());
                                         customMap.insert( it.key(),  it.data() );
@@ -705,8 +709,8 @@ bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal
                 }
         }else {
-                qWarning("ODefBack::could not load");
+        owarn << "ODefBack::could not load" << oendl;
         }
         delete root;
-        qWarning("returning from loading" );
+    owarn << "returning from loading" << oendl;
         return true;
 }
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
@@ -32,12 +32,5 @@
  */
 
-#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>
@@ -46,4 +39,16 @@
 #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;
@@ -163,5 +168,5 @@ bool ODateBookAccessBackend_SQL::load()
         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() );
+    owarn << "command: " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -222,10 +227,10 @@ void ODateBookAccessBackend_SQL::clear()
 
 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);
 
-        qDebug( "Query: %s", qu.latin1() );
+    odebug << "Query: " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -248,5 +253,5 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
         retDate.setExtraMap( requestCustom( uid ) );
 
-        qDebug( "ODateBookAccessBackend_SQL::find( %d ) end", uid ); 
+    odebug << "ODateBookAccessBackend_SQL::find( " << uid << " ) end" << oendl;
         return retDate;
 }
@@ -284,5 +289,5 @@ bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev )
                         + "');";
                 }       
-        qWarning("add %s", qu.latin1() );
+    owarn << "add " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -391,5 +396,5 @@ QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
         qu += " )";
 
-        qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -406,5 +411,5 @@ QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-        qWarning("extractUids");
+    owarn << "extractUids" << oendl;
         QTime t;
         t.start();
@@ -412,5 +417,5 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
         OSQLResultItem::ValueList::Iterator it;
         QArray<int> ints(list.count() );
-        qWarning(" count = %d", list.count() );
+    owarn << " count = " << list.count() << "" << oendl;
 
         int i = 0;
@@ -419,5 +424,5 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
                 i++;
         }
-        qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
+    owarn << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl;
 
         return ints;
@@ -436,5 +441,5 @@ QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) cons
 
         if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
                 QMap<QString, QString> empty;
                 return empty;
@@ -447,5 +452,5 @@ QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) cons
         }
 
-        qDebug("RequestCustom needed: %d ms", t.elapsed() );
+    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
@@ -27,4 +27,21 @@
                              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>
@@ -39,15 +56,4 @@
 #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;
@@ -117,5 +123,5 @@ namespace {
     // 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() )
@@ -491,8 +497,8 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) {
     }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() ) );
 
@@ -515,8 +521,8 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& ev ) {
     }
     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 );
@@ -526,5 +532,5 @@ void ODateBookAccessBackend_XML::finalizeRecord( OPimEvent& 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:
@@ -611,5 +617,5 @@ void ODateBookAccessBackend_XML::setField( OPimEvent& e, int id, const QString&
         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 );
         }
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
@@ -29,10 +29,5 @@
 */
 
-#include <qdatetime.h>
-#include <qmap.h>
-#include <qstring.h>
-
-#include <qpe/global.h>
-
+/* OPIE */
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
@@ -44,4 +39,13 @@
 #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;
@@ -292,5 +296,5 @@ namespace {
 
 
-        qDebug("add %s", qu.latin1() );
+        odebug << "add " << qu << "" << oendl;
         return qu;
     }
@@ -457,5 +461,5 @@ 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;
@@ -467,5 +471,5 @@ OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
     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++;
@@ -542,5 +546,5 @@ QArray<int> OPimTodoAccessBackendSQL::effectiveToDos( const QDate& s,
 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 ";
@@ -601,9 +605,9 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
 
     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) );
@@ -630,5 +634,5 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
-    qDebug("todo1");
+    odebug << "todo1" << oendl;
     OPimTodo to = todo( (*it) );
     cache( to );
@@ -636,5 +640,5 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
 
     for ( ; it != list.end(); ++it ) {
-        qDebug("caching");
+        odebug << "caching" << oendl;
         cache( todo( (*it) ) );
     }
@@ -642,5 +646,5 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
 }
 OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
-    qDebug("todo(ResultItem)");
+    odebug << "todo(ResultItem)" << oendl;
 
     // Request information from addressbook table and create the OPimTodo-object.
@@ -650,5 +654,5 @@ OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     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(),
@@ -751,5 +755,5 @@ QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
-    qDebug(" count = %d", list.count() );
+    odebug << " count = " << list.count() << "" << oendl;
 
     int i = 0;
@@ -777,5 +781,5 @@ QArray<int> OPimTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
         qu += ")";
 
-        qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
         OSQLRawQuery raw( qu );
@@ -817,5 +821,5 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){
         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 )
@@ -843,10 +847,10 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){
         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() );
+        owarn << "OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: " << qu << "" << oendl;
         }
 }
@@ -861,5 +865,5 @@ QMap<QString, QString>  OPimTodoAccessBackendSQL::requestCustom( int uid ) const
 
         if ( res_custom.state() == OSQLResult::Failure ) {
-                qWarning("OSQLResult::Failure in find query !!");
+        owarn << "OSQLResult::Failure in find query !!" << oendl;
                 QMap<QString, QString> empty;
                 return empty;
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
@@ -28,9 +28,13 @@
 */
 
-/* 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
@@ -89,5 +93,5 @@ namespace {
         if((ob = isAPropertyOf( obj, VCCategoriesProp )) != 0 ){
             name = vObjectStringZValue( ob );
-            qWarning("Categories:%s", name.data() );
+            owarn << "Categories:" << name.data() << "" << oendl;
         }
 
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
@@ -27,4 +27,23 @@
                              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>
@@ -37,18 +56,4 @@
 
 
-#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;
 
@@ -178,5 +183,5 @@ bool OPimTodoAccessXML::load() {
         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;
@@ -234,5 +239,5 @@ bool OPimTodoAccessXML::load() {
          * 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 );
@@ -257,5 +262,5 @@ bool OPimTodoAccessXML::load() {
     munmap(map_addr, attribut.st_size );
 
-    qWarning("counts %d records loaded!", m_events.count() );
+    owarn << "counts " << m_events.count() << " records loaded!" << oendl;
     return true;
 }
@@ -265,7 +270,7 @@ bool OPimTodoAccessXML::reload() {
 }
 bool OPimTodoAccessXML::save() {
-//    qWarning("saving");
+//    owarn << "saving" << oendl;
     if (!m_opened || !m_changed ) {
-//        qWarning("not saving");
+//        owarn << "not saving" << oendl;
         return true;
     }
@@ -308,5 +313,5 @@ bool OPimTodoAccessXML::save() {
 
     if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
-//        qWarning("error renaming");
+//        owarn << "error renaming" << oendl;
         QFile::remove( strNewFile );
     }
@@ -346,5 +351,5 @@ void OPimTodoAccessXML::clear() {
 }
 bool OPimTodoAccessXML::add( const OPimTodo& todo ) {
-//    qWarning("add");
+//    owarn << "add" << oendl;
     m_changed = true;
     m_events.insert( todo.uid(), todo );
@@ -405,5 +410,5 @@ QArray<int> OPimTodoAccessXML::overDue() {
 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;
@@ -411,5 +416,5 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
     find = (*dict)[ attr.data() ];
     if (!find ) {
-//            qWarning("Unknown option" + it.key() );
+//            owarn << "Unknown option" + it.key() << oendl;
         ev.setCustomField( attr, val );
         return;
@@ -464,6 +469,6 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev,
         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 );
@@ -538,9 +543,9 @@ 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.");
+//  owarn << ".ITEM." << oendl;
         buf += cit.key();
         buf += "=\"";
@@ -571,5 +576,5 @@ QString OPimTodoAccessXML::toString( const OPimTodo& ev )const {
         str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
     }
-//    qWarning( "Uid %d",  ev.uid() );
+//    owarn << "Uid " << ev.uid() << "" << oendl;
     str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 
@@ -618,5 +623,5 @@ QString OPimTodoAccessXML::toString( const OPimTodo& ev )const {
             }
             // now write the list
-            qWarning("als: %s", als.join("____________").latin1() );
+            owarn << "als: " << als.join("____________") << "" << oendl;
             str += "Alarms=\""+als.join(";") +"\" ";
         }
@@ -839,5 +844,5 @@ QArray<int> OPimTodoAccessXML::sorted( bool asc,  int sortOrder,
         /* 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;
         }
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
@@ -35,4 +35,6 @@
 #include <opie2/opimresolver.h>
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
+
 #include <qpe/stringutil.h>
 #include <qpe/timestring.h>
@@ -80,5 +82,5 @@ OPimContact::OPimContact( const QMap<int, QString> &fromMap ):OPimRecord(), mMap
     if ( uidStr.isEmpty() || ( uidStr.toInt() == 0 ) )
     {
-        qWarning( "Invalid UID found. Generate new one.." );
+        owarn << "Invalid UID found. Generate new one.." << oendl;
         setUid( uidGen().generate() );
     }
@@ -932,5 +934,5 @@ QStringList OPimContact::emailList() const
     if ( !emailStr.isEmpty() )
     {
-        qDebug( " emailstr " );
+        odebug << " emailstr " << oendl;
         QStringList l = QStringList::split( emailSeparator(), emailStr );
         for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
@@ -1137,5 +1139,5 @@ void OPimContact::setBirthday( const QDate &v )
     if ( v.isNull() )
     {
-        qWarning( "Remove Birthday" );
+        owarn << "Remove Birthday" << oendl;
         replace( Qtopia::Birthday, QString::null );
         return ;
@@ -1156,5 +1158,5 @@ void OPimContact::setAnniversary( const QDate &v )
     if ( v.isNull() )
     {
-        qWarning( "Remove Anniversary" );
+        owarn << "Remove Anniversary" << oendl;
         replace( Qtopia::Anniversary, QString::null );
         return ;
@@ -1197,5 +1199,5 @@ QDate OPimContact::anniversary() const
 void OPimContact::insertEmail( const QString &v )
 {
-    //qDebug("insertEmail %s", v.latin1());
+    //odebug << "insertEmail " << v << "" << oendl;
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
@@ -1231,5 +1233,5 @@ void OPimContact::insertEmail( const QString &v )
 
     // remove it
-    //qDebug(" removing email from list %s", e.latin1());
+    //odebug << " removing email from list " << e << "" << oendl;
     emails.remove( e );
     // reset the string
@@ -1240,5 +1242,5 @@ void OPimContact::insertEmail( const QString &v )
     if ( def == e )
     {
-        //qDebug("removeEmail is default; setting new default");
+        //odebug << "removeEmail is default; setting new default" << oendl;
         if ( !emails.count() )
             clearEmails();
@@ -1260,5 +1262,5 @@ 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 );
 
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
@@ -32,4 +32,6 @@
 /* OPIE */
 #include <opie2/opimcontact.h>
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
 
@@ -443,5 +445,5 @@ void OPimContactFields::saveToRecord( OPimContact &cnt )
 {
 
-    qDebug( "ocontactfields saveToRecord: >%s<", fieldOrder.latin1() );
+    odebug << "ocontactfields saveToRecord: >" << fieldOrder << "<" << oendl;
 
     // Store fieldorder into this contact.
@@ -455,6 +457,6 @@ void OPimContactFields::saveToRecord( OPimContact &cnt )
 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,
@@ -463,5 +465,5 @@ void OPimContactFields::loadFromRecord( const OPimContact &cnt )
     fieldOrder = cnt.customField( CONTACT_FIELD_ORDER_NAME );
 
-    qDebug( "fieldOrder from contact>%s<", fieldOrder.latin1() );
+    odebug << "fieldOrder from contact>" << fieldOrder << "<" << oendl;
 
     if ( fieldOrder.isEmpty() )
@@ -471,10 +473,10 @@ void OPimContactFields::loadFromRecord( const OPimContact &cnt )
 
 
-    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 ];
@@ -485,11 +487,11 @@ void OPimContactFields::setFieldOrder( int num, int index )
     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..
@@ -508,5 +510,5 @@ int OPimContactFields::getFieldOrder( int num, int defIndex )
     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
@@ -29,4 +29,6 @@ _;:,     .>    :=|.         This program is free software; you can
 /* OPIE */

 #include <opie2/opimdateconversion.h>

+#include <opie2/odebug.h>

+

 #include <qpe/timeconversion.h>

 

@@ -47,5 +49,5 @@ QString OPimDateConversion::dateToString( const QDate &d )
 

     QString str = year + month + day;

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

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

 

     return str;

@@ -75,15 +77,15 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     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;

     }

@@ -92,5 +94,5 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     if ( !date.isValid() )

     {

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

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

         return date;

     }

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
@@ -34,4 +34,6 @@
 #include <opie2/opimresolver.h>
 #include <opie2/opimnotifymanager.h>
+#include <opie2/odebug.h>
+
 #include <qpe/categories.h>
 #include <qpe/stringutil.h>
@@ -642,8 +644,8 @@ void OPimEvent::fromMap( const QMap<int, QString>& map )
     {
         /* 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() ) );
 
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
@@ -32,4 +32,5 @@
 /* OPIE */
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
 
 /* QT */
@@ -164,5 +165,5 @@ 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;
@@ -192,5 +193,5 @@ QString OPimNotifyManager::alarmsToString() const
         }
         // now write the list
-        qWarning( "als: %s", als.join( "____________" ).latin1() );
+        owarn << "als: " << als.join( "____________" ) << "" << oendl;
         str = als.join( ";" );
     }
@@ -226,5 +227,5 @@ void OPimNotifyManager::alarmsFromString( const QString& str )
     {
         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() );
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
@@ -122,5 +122,5 @@ bool OPimRecord::isEmpty() const
     }
     str = str.remove( str.length()-1, 1); // strip the ;
-    //qWarning("IDS " + str );
+    //owarn << "IDS " + str << oendl; 
 
     return str;
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
@@ -30,4 +30,7 @@
 #include "opimtimezone.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 /* STD */
 #include <stdio.h>
@@ -150,5 +153,5 @@ QDateTime OPimTimeZone::toDateTime( const QDateTime& dt, const OPimTimeZone& zon
 {
     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 );
 }
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
@@ -36,4 +36,6 @@
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimresolver.h>
+#include <opie2/odebug.h>
+
 #include <qpe/palmtopuidgen.h>
 #include <qpe/palmtoprecord.h>
@@ -86,5 +88,5 @@ OPimTodo::OPimTodo( const OPimTodo &event )
 {
     data->ref();
-    //    qWarning("ref up");
+    //    owarn << "ref up" << oendl;
 }
 
@@ -93,8 +95,8 @@ OPimTodo::~OPimTodo()
 {
 
-    //    qWarning("~OPimTodo "  );
+    //    owarn << "~OPimTodo " << oendl;
     if ( data->deref() )
     {
-        //        qWarning("OPimTodo::dereffing");
+        //        owarn << "OPimTodo::dereffing" << oendl;
         delete data;
         data = 0l;
@@ -111,5 +113,5 @@ OPimTodo::OPimTodo( bool completed, int priority,
         : OPimRecord( uid )
 {
-    //    qWarning("OPimTodoData " + summary);
+    //    owarn << "OPimTodoData " + summary << oendl;
     setCategories( category );
 
@@ -134,5 +136,5 @@ OPimTodo::OPimTodo( bool completed, int priority,
         : OPimRecord( uid )
 {
-    //    qWarning("OPimTodoData" + summary);
+    //    owarn << "OPimTodoData" + summary << oendl;
     setCategories( idsFromString( category.join( ";" ) ) );
 
@@ -307,5 +309,5 @@ void OPimTodo::setHasDueDate( bool hasDate )
 void OPimTodo::setDescription( const QString &desc )
 {
-    //    qWarning( "desc " + desc );
+    //    owarn << "desc " + desc << oendl;
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace( desc );
@@ -592,8 +594,8 @@ void OPimTodo::deref()
 {
 
-    //    qWarning("deref in ToDoEvent");
+    //    owarn << "deref in ToDoEvent" << oendl;
     if ( data->deref() )
     {
-        //        qWarning("deleting");
+        //        owarn << "deleting" << oendl;
         delete data;
         data = 0;
@@ -607,5 +609,5 @@ OPimTodo &OPimTodo::operator=( const OPimTodo &item )
 
     OPimRecord::operator=( item );
-    //qWarning("operator= ref ");
+    //owarn << "operator= ref " << oendl;
     item.data->ref();
     deref();
@@ -650,5 +652,5 @@ void OPimTodo::changeOrModify()
     if ( data->count != 1 )
     {
-        qWarning( "changeOrModify" );
+        owarn << "changeOrModify" << oendl;
         data->deref();
         OPimTodoData* d2 = new OPimTodoData();
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
@@ -51,5 +51,5 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
 }
 OPimTodoAccess::~OPimTodoAccess() {
-//    qWarning("~OPimTodoAccess");
+//    owarn << "~OPimTodoAccess" << oendl; 
 }
 void OPimTodoAccess::mergeWith( const QValueList<OPimTodo>& list ) {
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
@@ -27,7 +27,10 @@
                              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>
@@ -35,6 +38,10 @@
 #include <qpe/qpeapplication.h>
 
-#include <opie2/opimresolver.h>
-#include "opimmainwindow.h"
+/* QT */
+#include <qapplication.h>
+#include <qdatetime.h>
+#include <qcopchannel_qws.h>
+
+
 
 namespace Opie {
@@ -117,5 +124,5 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         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() )