1 files changed, 24 insertions, 19 deletions

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
@@ -33,10 +33,3 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <qarray.h>
-#include <qstringlist.h>
-
-#include <qpe/global.h>
-
+/* OPIE */
 #include <opie2/osqldriver.h>
@@ -47,2 +40,14 @@
 #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>
+
 
@@ -164,3 +169,3 @@ bool ODateBookAccessBackend_SQL::load()
 
-	qWarning( "command: %s", qu.latin1() );
+    owarn << "command: " << qu << "" << oendl;
 
@@ -223,3 +228,3 @@ void ODateBookAccessBackend_SQL::clear()
 OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
-	qDebug( "ODateBookAccessBackend_SQL::find( %d )", uid ); 
+    odebug << "ODateBookAccessBackend_SQL::find( " << uid << " )" << oendl;
 
@@ -228,3 +233,3 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
 
-	qDebug( "Query: %s", qu.latin1() );
+    odebug << "Query: " << qu << "" << oendl;
 
@@ -249,3 +254,3 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
 
-	qDebug( "ODateBookAccessBackend_SQL::find( %d ) end", uid ); 
+    odebug << "ODateBookAccessBackend_SQL::find( " << uid << " ) end" << oendl;
 	return retDate;
@@ -285,3 +290,3 @@ bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev )
 	}		
-	qWarning("add %s", qu.latin1() );
+    owarn << "add " << qu << "" << oendl;
 
@@ -392,3 +397,3 @@ QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 
-	qDebug( "query: %s", qu.latin1() );
+    odebug << "query: " << qu << "" << oendl;
 
@@ -407,3 +412,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-	qWarning("extractUids");
+    owarn << "extractUids" << oendl;
 	QTime t;
@@ -413,3 +418,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 	QArray<int> ints(list.count() );
-	qWarning(" count = %d", list.count() );
+    owarn << " count = " << list.count() << "" << oendl;
 
@@ -420,3 +425,3 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 	}
-	qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
+    owarn << "extractUids ready: count2 = " << i << " needs " << t.elapsed() << " ms" << oendl;
 
@@ -437,3 +442,3 @@ 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;
@@ -448,3 +453,3 @@ 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;