3 files changed, 35 insertions, 24 deletions

diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/engine.cpp
index e843e29..74cd701 100644
--- a/noncore/tools/calc2/engine.cpp
+++ b/noncore/tools/calc2/engine.cpp
@@ -19,10 +19,17 @@
 **********************************************************************/
 
 #include "engine.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qstring.h>
-#include <math.h>
 #include <qlcdnumber.h>
 
+/* STD */
+#include <math.h>
+
 Data Engine::evalStack (Data num, bool inbrace = FALSE)
 {
   if (state != sError) {
@@ -42,7 +49,7 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE)
 
 // Error-check ( change this to work for all types )
       if (isnan (num.dbl) || isinf (num.dbl)) {
-        qDebug ("bad result from operation");
+    odebug << "bad result from operation" << oendl;
         state = sError;
         clearData(&num);
         return num;
@@ -113,7 +120,7 @@ void Engine::pushValue (char v)
     state = sAppend;
     pushValue (v);
   } else if (state == sError) {
-    qDebug ("in error state");
+    odebug << "in error state" << oendl;
     return;
   }
 }
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 9d5fc49..049af8d 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -213,7 +213,7 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
         QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
 //        QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
         if(!str.isEmpty() ) {
-            qDebug(str);
+            odebug << str << oendl; 
             config.writeEntry("mp3Alarm",1);
             config.writeEntry("mp3File",str);
         }
diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index 2bd47a4..7d34b24 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -1,17 +1,21 @@
 #include "converter.h"
 
-#include <qdatetime.h>
-#include <qprogressbar.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-
+/* OPIE */
 #include <qpe/qpeapplication.h>
 
+#include <opie2/odebug.h>
 #include <opie2/opimglobal.h>
 // Include SQL related header files
 #define __USE_SQL
 #include <opie2/opimaccessfactory.h>
 
+/* QT */
+#include <qdatetime.h>
+#include <qprogressbar.h>
+#include <qcombobox.h>
+#include <qcheckbox.h>
+
+
 using namespace Opie;
 using namespace Pim;
 
@@ -49,7 +53,7 @@ void Converter::start_conversion(){
 
         switch( m_selectedSourceFormat ){
         case XML:
-                qDebug("XMLSourceDB = %d", m_selectedDatabase);
+        odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl;
                 switch( m_selectedDatabase ){
                 case ADDRESSBOOK:{
                         sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
@@ -63,12 +67,12 @@ void Converter::start_conversion(){
                         }
                         break;
                 default:
-                        qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+            owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
                         return;
                 }
                 break;
         case SQL:
-                qDebug("SQLSourceDB = %d", m_selectedDatabase);
+        odebug << "SQLSourceDB = " << m_selectedDatabase << "" << oendl;
                 switch( m_selectedDatabase ){
                 case ADDRESSBOOK:{
                         sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" );
@@ -82,18 +86,18 @@ void Converter::start_conversion(){
                         }
                         break;
                 default:
-                        qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+            owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
                         return;
                 }
                 break;
         default:
-                qWarning( "Unknown source format selected (%d) !!", m_selectedSourceFormat );
+        owarn << "Unknown source format selected (" << m_selectedSourceFormat << ") !!" << oendl;
                 return;
         }
 
         switch ( m_selectedDestFormat ){
         case XML:
-                qDebug("XMLDestDB = %d", m_selectedDatabase);
+        odebug << "XMLDestDB = " << m_selectedDatabase << "" << oendl;
                 switch( m_selectedDatabase ){
                 case ADDRESSBOOK:{
                         destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
@@ -107,12 +111,12 @@ void Converter::start_conversion(){
                         }
                         break;
                 default:
-                        qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+            owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
                         return;
                 }
                 break;
         case SQL:
-                qDebug("SQLDestDB = %d", m_selectedDatabase);
+        odebug << "SQLDestDB = " << m_selectedDatabase << "" << oendl;
                 switch( m_selectedDatabase ){
                 case ADDRESSBOOK:{
                         destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" );
@@ -126,12 +130,12 @@ void Converter::start_conversion(){
                         }
                         break;
                 default:
-                        qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+            owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
                         return;
                 }
                 break;
         default:
-                qWarning( "Unknown destination format selected (%d)!!", m_selectedDestFormat );
+        owarn << "Unknown destination format selected (" << m_selectedDestFormat << ")!!" << oendl;
                 return;
         }
 
@@ -146,17 +150,17 @@ void Converter::start_conversion(){
 
         // Clean the dest-database if requested (isChecked) 
         if ( m_eraseDB -> isChecked() ){
-                qDebug( "Clearing destination database!" );
+        odebug << "Clearing destination database!" << oendl;
                 destDB -> clear();
         }
 
         // Now transmit every pim-item from the source database to the destination -database
         QArray<int> uidList = sourceDB->records();
-        qDebug( "Try to move data for addressbook.. (%d items) ", uidList.count() );
+    odebug << "Try to move data for addressbook.. (" << uidList.count() << " items) " << oendl;
         m_progressBar->setTotalSteps( uidList.count() );
         int count = 0;
         for ( uint i = 0; i < uidList.count(); ++i ){
-                qDebug( "Adding uid: %d", uidList[i] );
+        odebug << "Adding uid: " << uidList[i] << "" << oendl;
                 OPimRecord* rec = sourceDB -> record( uidList[i] );
                 destDB -> add( rec );
                 m_progressBar->setProgress( ++count );
@@ -181,12 +185,12 @@ void Converter::start_conversion(){
                         delete static_cast<ODateBookAccess*> (destDB);  
                 break;
         default:
-                qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+        owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
                 return;
         }
         
 
-        qWarning("Conversion is finished and needed %d ms !", t.elapsed());
+    owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl;
 }
 
 int main( int argc, char** argv ) {