9 files changed, 65 insertions, 51 deletions

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
@@ -36,2 +36,4 @@
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
+
 #include <qpe/stringutil.h>
@@ -81,3 +83,3 @@ OPimContact::OPimContact( const QMap<int, QString> &fromMap ):OPimRecord(), mMap
     {
-        qWarning( "Invalid UID found. Generate new one.." );
+        owarn << "Invalid UID found. Generate new one.." << oendl;
         setUid( uidGen().generate() );
@@ -88,3 +90,3 @@ OPimContact::OPimContact( const QMap<int, QString> &fromMap ):OPimRecord(), mMap
     //     if ( !uidStr.isEmpty() )
-            // setUid( uidStr.toInt() );
+    //  setUid( uidStr.toInt() );
 }
@@ -933,3 +935,3 @@ QStringList OPimContact::emailList() const
     {
-        qDebug( " emailstr " );
+        odebug << " emailstr " << oendl;
         QStringList l = QStringList::split( emailSeparator(), emailStr );
@@ -1138,3 +1140,3 @@ void OPimContact::setBirthday( const QDate &v )
     {
-        qWarning( "Remove Birthday" );
+        owarn << "Remove Birthday" << oendl;
         replace( Qtopia::Birthday, QString::null );
@@ -1157,3 +1159,3 @@ void OPimContact::setAnniversary( const QDate &v )
     {
-        qWarning( "Remove Anniversary" );
+        owarn << "Remove Anniversary" << oendl;
         replace( Qtopia::Anniversary, QString::null );
@@ -1198,3 +1200,3 @@ void OPimContact::insertEmail( const QString &v )
 {
-    //qDebug("insertEmail %s", v.latin1());
+    //odebug << "insertEmail " << v << "" << oendl;
     QString e = v.simplifyWhiteSpace();
@@ -1232,3 +1234,3 @@ 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 );
@@ -1241,3 +1243,3 @@ void OPimContact::insertEmail( const QString &v )
     {
-        //qDebug("removeEmail is default; setting new default");
+        //odebug << "removeEmail is default; setting new default" << oendl;
         if ( !emails.count() )
@@ -1261,3 +1263,3 @@ void OPimContact::setDefaultEmail( const QString &v )
 
-    //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
@@ -33,2 +33,4 @@
 #include <opie2/opimcontact.h>
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
@@ -444,3 +446,3 @@ void OPimContactFields::saveToRecord( OPimContact &cnt )
 
-    qDebug( "ocontactfields saveToRecord: >%s<", fieldOrder.latin1() );
+    odebug << "ocontactfields saveToRecord: >" << fieldOrder << "<" << oendl;
 
@@ -456,4 +458,4 @@ void OPimContactFields::loadFromRecord( const OPimContact &cnt )
 {
-    qDebug( "ocontactfields loadFromRecord" );
-    qDebug( "loading >%s<", cnt.fullName().latin1() );
+    odebug << "ocontactfields loadFromRecord" << oendl;
+    odebug << "loading >" << cnt.fullName() << "<" << oendl;
 
@@ -464,3 +466,3 @@ void OPimContactFields::loadFromRecord( const OPimContact &cnt )
 
-    qDebug( "fieldOrder from contact>%s<", fieldOrder.latin1() );
+    odebug << "fieldOrder from contact>" << fieldOrder << "<" << oendl;
 
@@ -472,3 +474,3 @@ void OPimContactFields::loadFromRecord( const OPimContact &cnt )
 
-    qDebug( "effective fieldOrder in loadFromRecord >%s<", fieldOrder.latin1() );
+    odebug << "effective fieldOrder in loadFromRecord >" << fieldOrder << "<" << oendl;
 }
@@ -477,3 +479,3 @@ void OPimContactFields::setFieldOrder( int num, int index )
 {
-    qDebug( "qcontactfields setfieldorder pos %i -> %i", num, index );
+    odebug << "qcontactfields setfieldorder pos " << num << " -> " << index << "" << oendl;
 
@@ -486,3 +488,3 @@ void OPimContactFields::setFieldOrder( int num, int index )
 
-    qDebug( "fieldOrder >%s<", fieldOrder.latin1() );
+    odebug << "fieldOrder >" << fieldOrder << "<" << oendl;
 }
@@ -491,4 +493,4 @@ int OPimContactFields::getFieldOrder( int num, int defIndex )
 {
-    qDebug( "ocontactfields getFieldOrder" );
-    qDebug( "fieldOrder >%s<", fieldOrder.latin1() );
+    odebug << "ocontactfields getFieldOrder" << oendl;
+    odebug << "fieldOrder >" << fieldOrder << "<" << oendl;
 
@@ -509,3 +511,3 @@ int OPimContactFields::getFieldOrder( int num, int defIndex )
 
-    qDebug( "returning >%i<", ret );
+    odebug << "returning >" << ret << "<" << oendl;
 
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
@@ -30,2 +30,4 @@ _;:,     .>    :=|.         This program is free software; you can
 #include <opie2/opimdateconversion.h>

+#include <opie2/odebug.h>

+

 #include <qpe/timeconversion.h>

@@ -48,3 +50,3 @@ QString OPimDateConversion::dateToString( const QDate &d )
     QString str = year + month + day;

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

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

 

@@ -76,3 +78,3 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     {

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

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

         return date;

@@ -81,3 +83,3 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     {

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

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

         return date;

@@ -86,3 +88,3 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     {

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

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

         return date;

@@ -93,3 +95,3 @@ QDate OPimDateConversion::dateFromString( const QString& s )
     {

-        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
@@ -35,2 +35,4 @@
 #include <opie2/opimnotifymanager.h>
+#include <opie2/odebug.h>
+
 #include <qpe/categories.h>
@@ -557,7 +559,7 @@ QMap<int, QString> OPimEvent::toMap() const
     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" );
     }
@@ -643,6 +645,6 @@ 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() ) );
@@ -660,5 +662,5 @@ void OPimEvent::fromMap( const QMap<int, QString>& map )
     {
-            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 );
     }
@@ -667,3 +669,3 @@ void OPimEvent::fromMap( const QMap<int, QString>& map )
     if ( !map[ OPimEvent::FNote ].isEmpty() )
-            setNote( map[ OPimEvent::FNote ] );
+        setNote( map[ OPimEvent::FNote ] );
 
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
@@ -33,2 +33,3 @@
 #include <opie2/opimdateconversion.h>
+#include <opie2/odebug.h>
 
@@ -165,3 +166,3 @@ 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;
@@ -193,3 +194,3 @@ QString OPimNotifyManager::alarmsToString() const
         // now write the list
-        qWarning( "als: %s", als.join( "____________" ).latin1() );
+        owarn << "als: " << als.join( "____________" ) << "" << oendl;
         str = als.join( ";" );
@@ -227,3 +228,3 @@ 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(),
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
@@ -123,3 +123,3 @@ bool OPimRecord::isEmpty() const
     str = str.remove( str.length()-1, 1); // strip the ;
-    //qWarning("IDS " + str );
+    //owarn << "IDS " + str << oendl; 
 
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
@@ -31,2 +31,5 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 /* STD */
@@ -151,3 +154,3 @@ 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
@@ -37,2 +37,4 @@
 #include <opie2/opimresolver.h>
+#include <opie2/odebug.h>
+
 #include <qpe/palmtopuidgen.h>
@@ -87,3 +89,3 @@ OPimTodo::OPimTodo( const OPimTodo &event )
     data->ref();
-    //    qWarning("ref up");
+    //    owarn << "ref up" << oendl;
 }
@@ -94,6 +96,6 @@ OPimTodo::~OPimTodo()
 
-    //    qWarning("~OPimTodo "  );
+    //    owarn << "~OPimTodo " << oendl;
     if ( data->deref() )
     {
-        //        qWarning("OPimTodo::dereffing");
+        //        owarn << "OPimTodo::dereffing" << oendl;
         delete data;
@@ -112,3 +114,3 @@ OPimTodo::OPimTodo( bool completed, int priority,
 {
-    //    qWarning("OPimTodoData " + summary);
+    //    owarn << "OPimTodoData " + summary << oendl;
     setCategories( category );
@@ -135,3 +137,3 @@ OPimTodo::OPimTodo( bool completed, int priority,
 {
-    //    qWarning("OPimTodoData" + summary);
+    //    owarn << "OPimTodoData" + summary << oendl;
     setCategories( idsFromString( category.join( ";" ) ) );
@@ -308,3 +310,3 @@ void OPimTodo::setDescription( const QString &desc )
 {
-    //    qWarning( "desc " + desc );
+    //    owarn << "desc " + desc << oendl;
     changeOrModify();
@@ -593,6 +595,6 @@ void OPimTodo::deref()
 
-    //    qWarning("deref in ToDoEvent");
+    //    owarn << "deref in ToDoEvent" << oendl;
     if ( data->deref() )
     {
-        //        qWarning("deleting");
+        //        owarn << "deleting" << oendl;
         delete data;
@@ -608,3 +610,3 @@ OPimTodo &OPimTodo::operator=( const OPimTodo &item )
     OPimRecord::operator=( item );
-    //qWarning("operator= ref ");
+    //owarn << "operator= ref " << oendl;
     item.data->ref();
@@ -651,3 +653,3 @@ void OPimTodo::changeOrModify()
     {
-        qWarning( "changeOrModify" );
+        owarn << "changeOrModify" << oendl;
         data->deref();
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
@@ -52,3 +52,3 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
 OPimTodoAccess::~OPimTodoAccess() {
-//    qWarning("~OPimTodoAccess");
+//    owarn << "~OPimTodoAccess" << oendl; 
 }