| -rw-r--r-- | noncore/apps/opie-reader/CExpander.h | 21 | ||||
| -rw-r--r-- | noncore/games/zlines/linesboard.h | 12 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 1 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/settings.h | 42 | ||||
| -rw-r--r-- | noncore/settings/networksettings/ppp/modem.cpp | 1 | ||||
| -rw-r--r-- | noncore/settings/tabmanager/tablistview.h | 24 |
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 @@ -3,8 +3,2 @@ -#ifndef _WINDOWS -#include <unistd.h> -#endif -#include <stdio.h> -#include <time.h> -#include <qmessagebox.h> #include "useqpe.h" @@ -16,2 +10,15 @@ +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ +#include <qmessagebox.h> + +/* STD */ +#ifndef _WINDOWS +#include <unistd.h> +#endif +#include <stdio.h> +#include <time.h> + class QImage; @@ -145,3 +152,3 @@ class CExpander { - 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 @@ -29,10 +29,2 @@ -#ifdef Q_WS_QWS -# define debug (void) -#else -# define debug qDebug -#endif -#define fatal qFatal -#define warning qWarning - class LinesBoard : public Field @@ -50,3 +42,3 @@ public: void placeBalls(int nextBalls[BALLSDROP]); - void undo(); + void undo(); @@ -63,3 +55,3 @@ private: } *way; - int nextBalls[BALLSDROP]; + int nextBalls[BALLSDROP]; 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 @@ -40,3 +40,2 @@ -//#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 @@ -5,2 +5,6 @@ +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qobject.h> @@ -8,5 +12,5 @@ -class Account +class Account { - + public: @@ -19,21 +23,21 @@ public: 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; } - + @@ -43,5 +47,5 @@ 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: @@ -56,3 +60,3 @@ class IMAPaccount : public Account { - + public: @@ -77,3 +81,3 @@ class POP3account : public Account { - + public: @@ -90,3 +94,3 @@ private: QString file; - + }; @@ -95,3 +99,3 @@ class SMTPaccount : public Account { - + public: @@ -117,3 +121,3 @@ class NNTPaccount : public Account { - + public: @@ -132,3 +136,3 @@ public: void setGroups( QStringList list ) { subscribedGroups = list; } - QStringList getGroups() { return subscribedGroups; } + QStringList getGroups() { return subscribedGroups; } @@ -157,3 +161,3 @@ private: 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 @@ -58,3 +58,2 @@ using namespace Opie::Core; #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 @@ -3,2 +3,6 @@ +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qlistview.h> @@ -7,5 +11,5 @@ -class TabListView : public QListView { +class TabListView : public QListView { Q_OBJECT - + signals: @@ -21,3 +25,3 @@ protected: void contentsMouseReleaseEvent(QMouseEvent* ){ - QListViewItem *newGroup = this->currentItem(); + QListViewItem *newGroup = this->currentItem(); // Make sure they are both real. @@ -28,3 +32,3 @@ protected: return; - + // Ok we have two valid items. @@ -32,3 +36,3 @@ protected: newGroup = newGroup->parent(); - + // Just in case the parent was null @@ -36,4 +40,4 @@ protected: 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()) @@ -48,6 +52,6 @@ private slots: if(item == NULL) - qDebug("Item is NULL"); + odebug << "Item is NULL" << oendl; return; } - + currentSelectedItem = item; @@ -64,2 +68,2 @@ private: #endif - + |