| -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 @@ -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 @@ -48,7 +40,7 @@ public: int hHint(); // void doAfterBalls(); void placeBalls(int nextBalls[BALLSDROP]); - void undo(); + void undo(); signals: void endTurn(); @@ -61,7 +53,7 @@ private: struct Waypoints { 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 @@ -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,12 +3,16 @@ #include "maildefines.h" +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qobject.h> #include <qlist.h> -class Account +class Account { - + public: Account(); virtual ~Account() {} @@ -17,33 +21,33 @@ public: void setAccountName( QString name ) { accountName = name; } 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;} 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; @@ -54,7 +58,7 @@ protected: class IMAPaccount : public Account { - + public: IMAPaccount(); IMAPaccount( QString filename ); @@ -75,7 +79,7 @@ private: class POP3account : public Account { - + public: POP3account(); POP3account( QString filename ); @@ -88,12 +92,12 @@ public: private: QString file; - + }; class SMTPaccount : public Account { - + public: SMTPaccount(); SMTPaccount( QString filename ); @@ -115,7 +119,7 @@ private: class NNTPaccount : public Account { - + public: NNTPaccount(); NNTPaccount( QString filename ); @@ -130,7 +134,7 @@ public: bool getLogin() { return login; } void setGroups( QStringList list ) { subscribedGroups = list; } - QStringList getGroups() { return subscribedGroups; } + QStringList getGroups() { return subscribedGroups; } private: QString file; @@ -155,7 +159,7 @@ public: private: void updateAccounts(); QList<Account> accounts; - + }; #endif 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,13 +1,17 @@ #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 { +class TabListView : public QListView { Q_OBJECT - + signals: void moveItem(QListViewItem *item, QListViewItem *newFolder); @@ -19,23 +23,23 @@ public: protected: void contentsMouseReleaseEvent(QMouseEvent* ){ - QListViewItem *newGroup = this->currentItem(); + QListViewItem *newGroup = this->currentItem(); // Make sure they are both real. if (currentSelectedItem == NULL || newGroup == NULL) return; // Make sure they are not the same 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); currentSelectedItem = NULL; @@ -46,10 +50,10 @@ 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); @@ -62,4 +66,4 @@ private: }; #endif - + |