- 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,28 +1,35 @@
 #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"
 #include "Markups.h"
 #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;
 
 template<class T>
 class CList;
 
 class CCharacterSource
 {
  public:
     virtual void getch(tchar&, CStyle&) = 0;
     virtual linkType hyperlink(unsigned int n, QString&) = 0;
 };
@@ -134,18 +141,18 @@ class CExpander
       }
 #endif
     virtual void setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
     {
         len = srclen;
         data = new unsigned char[len];
         memcpy(data, src, len);
     }
     virtual void putSaveData(unsigned char*& src, unsigned short& srclen)
     {
         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; }
 };
 #endif
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
@@ -18,32 +18,24 @@
  ***************************************************************************/
 #ifndef __linesboard_h
 #define __linesboard_h
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 
 #include "field.h"
 //#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
 public:
   LinesBoard( BallPainter * abPainter, QWidget* parent=0, const char* name=0 );
   ~LinesBoard();
 
   int width();
   int height();
   int wHint();
   int hHint();
 //  void doAfterBalls();
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
@@ -29,25 +29,24 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 // this file is based on work by trolltech
 
 #include <qpe/config.h>
 #include "mediaplayerstate.h"
 
 #include <assert.h>
 
-//#define MediaPlayerDebug(x) qDebug x
 #define MediaPlayerDebug(x)
 
 
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
         : QObject( parent, name ) {
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
     streaming = false;
     seekable = true;
 }
 
 
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
@@ -1,17 +1,21 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
 #include "maildefines.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qobject.h>
 #include <qlist.h>
 
 class Account 
 {
     
 public:
     Account();
     virtual ~Account() {}
 
     void remove();
     void setAccountName( QString name ) { accountName = name; }
@@ -32,26 +36,26 @@ public:
     
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
     
     void setConnectionType( int x ) { connectionType = x; }
     int ConnectionType() { return connectionType; }
     
 
     void setOffline(bool b) {offline = b;}
     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;
     bool ssl;
     int connectionType;
     bool offline;
     MAILLIB::ATYPE type;
 };
 
 class IMAPaccount : public Account
 {
         
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
@@ -47,25 +47,24 @@ using namespace Opie::Core;
 #  include <arpa/nameser.h>
 #  include <resolv.h>
 #endif
 
 #ifndef _PATH_RESCONF
 #define _PATH_RESCONF "/etc/resolv.conf"
 #endif
 
 #define strlcpy strcpy
 #include "auth.h"
 #include "modem.h"
 #include "pppdata.h"
-#define qError qDebug
 
 
 #define MY_ASSERT(x)  if (!(x)) { \
         ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl;  \
         exit(1); }
 
 
 static sigjmp_buf jmp_buffer;
 
 //Modem *Modem::modem = 0;
 
 
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,15 +1,19 @@
 #ifndef TABLISTVIEW_H
 #define TABLISTVIEW_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qlistview.h>
 #include <qcursor.h>
 #include <qapplication.h>
 
 class TabListView : public QListView { 
   Q_OBJECT
 	  
 signals:
   void moveItem(QListViewItem *item, QListViewItem *newFolder);
 
 public:
   TabListView( QWidget* parent = 0, const char* name = 0) : QListView(parent, name){ currentSelectedItem = NULL;
@@ -37,25 +41,25 @@ protected:
   
   // If the new folder and buddies current parent are the same don't do anything.	
   if (newGroup != currentSelectedItem->parent())
     moveItem(currentSelectedItem, newGroup);
   currentSelectedItem = NULL;
   qApp->restoreOverrideCursor();
 };
 
 private slots:
   void itemPressed(QListViewItem *item){
   if(item == NULL || !item->parent()){
     if(item == NULL)
-      qDebug("Item is NULL");
+      odebug << "Item is NULL" << oendl;
     return;
   }
   
   currentSelectedItem = item;
   internalCursor.setShape(13);
   qApp->setOverrideCursor(internalCursor);
 };
 
 
 private:
   QListViewItem *currentSelectedItem;
   QCursor internalCursor;