6 files changed, 53 insertions, 48 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
@@ -2,10 +2,4 @@
 #define __CExpander_h
 
-#ifndef _WINDOWS
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#include <time.h>
-#include <qmessagebox.h>
 #include "useqpe.h"
 #include "config.h"
@@ -15,4 +9,17 @@
 #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;
@@ -144,5 +151,5 @@ 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;
         }
     }
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
@@ -28,12 +28,4 @@
 #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
 {
@@ -49,5 +41,5 @@ public:
 //  void doAfterBalls();
   void placeBalls(int nextBalls[BALLSDROP]);
-        void undo();
+    void undo();
 
 signals:
@@ -62,5 +54,5 @@ private:
         int x,y;
   } *way;
-        int nextBalls[BALLSDROP];
+    int nextBalls[BALLSDROP];
 
   int animmax;
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
@@ -39,5 +39,4 @@
 #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
@@ -4,10 +4,14 @@
 #include "maildefines.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qobject.h>
 #include <qlist.h>
 
-class Account 
+class Account
 {
-    
+
 public:
     Account();
@@ -18,23 +22,23 @@ public:
     const QString&getAccountName()const{ return accountName; }
     MAILLIB::ATYPE getType()const{ return type; }
-    
+
     void setServer(const QString&str){ server = str; }
     const QString&getServer()const{ return server; }
-    
+
     void setPort(const QString&str) { port = str; }
     const QString&getPort()const{ return port; }
-    
+
     void setUser(const QString&str){ user = str; }
     const QString&getUser()const{ return user; }
-    
+
     void setPassword(const QString&str) { password = str; }
     const QString&getPassword()const { return password; }
-    
+
     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;}
@@ -42,7 +46,7 @@ public:
 
     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;
@@ -55,5 +59,5 @@ protected:
 class IMAPaccount : public Account
 {
-        
+
 public:
     IMAPaccount();
@@ -76,5 +80,5 @@ private:
 class POP3account : public Account
 {
-        
+
 public:
     POP3account();
@@ -89,10 +93,10 @@ public:
 private:
     QString file;
-    
+
 };
 
 class SMTPaccount : public Account
 {
-    
+
 public:
     SMTPaccount();
@@ -116,5 +120,5 @@ private:
 class NNTPaccount : public Account
 {
-        
+
 public:
     NNTPaccount();
@@ -131,5 +135,5 @@ public:
 
     void setGroups( QStringList list )  { subscribedGroups = list; }
-    QStringList getGroups()  { return subscribedGroups; } 
+    QStringList getGroups()  { return subscribedGroups; }
 
 private:
@@ -156,5 +160,5 @@ private:
     void updateAccounts();
     QList<Account> accounts;
-        
+
 };
 
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
@@ -57,5 +57,4 @@ using namespace Opie::Core;
 #include "modem.h"
 #include "pppdata.h"
-#define qError qDebug
 
 
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
@@ -2,11 +2,15 @@
 #define TABLISTVIEW_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qlistview.h>
 #include <qcursor.h>
 #include <qapplication.h>
 
-class TabListView : public QListView { 
+class TabListView : public QListView {
   Q_OBJECT
-          
+
 signals:
   void moveItem(QListViewItem *item, QListViewItem *newFolder);
@@ -20,5 +24,5 @@ public:
 protected:
   void contentsMouseReleaseEvent(QMouseEvent* ){
-        QListViewItem *newGroup = this->currentItem();
+    QListViewItem *newGroup = this->currentItem();
   // Make sure they are both real.
   if (currentSelectedItem == NULL  || newGroup == NULL)
@@ -27,14 +31,14 @@ protected:
   if(this->isSelected(currentSelectedItem) == true)
     return;
-  
+
   // Ok we have two valid items.
   if(newGroup->parent())
     newGroup = newGroup->parent();
-  
+
   // Just in case the parent was null
   if(newGroup == NULL)
     return;
-  
-          // If the new folder and buddies current parent are the same don't do anything.
+
+  // If the new folder and buddies current parent are the same don't do anything.
   if (newGroup != currentSelectedItem->parent())
     moveItem(currentSelectedItem, newGroup);
@@ -47,8 +51,8 @@ private slots:
   if(item == NULL || !item->parent()){
     if(item == NULL)
-      qDebug("Item is NULL");
+      odebug << "Item is NULL" << oendl;
     return;
   }
-  
+
   currentSelectedItem = item;
   internalCursor.setShape(13);
@@ -63,3 +67,3 @@ private:
 
 #endif
- 
+