- convert qDebug to odebug

6 files changed, 25 insertions, 20 deletions

diff --git a/noncore/apps/opie-reader/CExpander.h b/noncore/apps/opie-reader/CExpander.h
index 9fae245..553069c 100644
--- a/noncore/apps/opie-reader/CExpander.h
+++ b/noncore/apps/opie-reader/CExpander.h
@@ -1,12 +1,6 @@
 #ifndef __CExpander_h
 #define __CExpander_h
 
-#ifndef _WINDOWS
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#include <time.h>
-#include <qmessagebox.h>
 #include "useqpe.h"
 #include "config.h"
 #include "StyleConsts.h"
@@ -14,6 +8,19 @@
 #include "names.h"
 #include "linktype.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qmessagebox.h>
+
+/* STD */
+#ifndef _WINDOWS
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <time.h>
+
 class QImage;
 class Bkmk;
 
@@ -143,7 +150,7 @@ class CExpander
     {
         if (srclen != 0)
         {
-        qDebug("Don't know what to do with non-zero save data");
+        odebug << "Don't know what to do with non-zero save data" << oendl;
         }
     }
     void setwidth(int w) { m_scrWidth = w; }
diff --git a/noncore/games/zlines/linesboard.h b/noncore/games/zlines/linesboard.h
index 97697cd..58478ee 100644
--- a/noncore/games/zlines/linesboard.h
+++ b/noncore/games/zlines/linesboard.h
@@ -27,14 +27,6 @@
 //#include "shotcounter.h"
 #include "ballpainter.h"
 
-#ifdef Q_WS_QWS
-        #define debug (void)
-#else
-        #define debug qDebug
-#endif
-#define fatal qFatal
-#define warning qWarning
-
 class LinesBoard : public Field
 {
   Q_OBJECT
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 203ff91..ba4e11a 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -38,7 +38,6 @@
 
 #include <assert.h>
 
-//#define MediaPlayerDebug(x) qDebug x
 #define MediaPlayerDebug(x)
 
 
diff --git a/noncore/net/mail/libmailwrapper/settings.h b/noncore/net/mail/libmailwrapper/settings.h
index 27e2823..bf27b97 100644
--- a/noncore/net/mail/libmailwrapper/settings.h
+++ b/noncore/net/mail/libmailwrapper/settings.h
@@ -3,6 +3,10 @@
 
 #include "maildefines.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qobject.h>
 #include <qlist.h>
 
@@ -41,8 +45,8 @@ public:
     bool getOffline()const{return offline;}
 
     virtual QString getFileName() { return accountName; }
-    virtual void read() { qDebug( "base reading..." ); }
-    virtual void save() { qDebug( "base saving..." ); }
+    virtual void read() { odebug << "base reading..." << oendl; }
+    virtual void save() { odebug << "base saving..." << oendl; }
     
 protected:
     QString accountName, server, port, user, password;
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index 3bc7d43..79f015b 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -56,7 +56,6 @@ using namespace Opie::Core;
 #include "auth.h"
 #include "modem.h"
 #include "pppdata.h"
-#define qError qDebug
 
 
 #define MY_ASSERT(x)  if (!(x)) { \
diff --git a/noncore/settings/tabmanager/tablistview.h b/noncore/settings/tabmanager/tablistview.h
index dfd88f7..54b87b6 100644
--- a/noncore/settings/tabmanager/tablistview.h
+++ b/noncore/settings/tabmanager/tablistview.h
@@ -1,6 +1,10 @@
 #ifndef TABLISTVIEW_H
 #define TABLISTVIEW_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qlistview.h>
 #include <qcursor.h>
 #include <qapplication.h>
@@ -46,7 +50,7 @@ private slots:
   void itemPressed(QListViewItem *item){
   if(item == NULL || !item->parent()){
     if(item == NULL)
-      qDebug("Item is NULL");
+      odebug << "Item is NULL" << oendl;
     return;
   }