-rw-r--r-- | noncore/apps/opie-reader/CExpander.h | 21 | ||||
-rw-r--r-- | noncore/games/zlines/linesboard.h | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/settings.h | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/modem.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tablistview.h | 6 |
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,22 +1,29 @@ | |||
1 | #ifndef __CExpander_h | 1 | #ifndef __CExpander_h |
2 | #define __CExpander_h | 2 | #define __CExpander_h |
3 | 3 | ||
4 | #ifndef _WINDOWS | ||
5 | #include <unistd.h> | ||
6 | #endif | ||
7 | #include <stdio.h> | ||
8 | #include <time.h> | ||
9 | #include <qmessagebox.h> | ||
10 | #include "useqpe.h" | 4 | #include "useqpe.h" |
11 | #include "config.h" | 5 | #include "config.h" |
12 | #include "StyleConsts.h" | 6 | #include "StyleConsts.h" |
13 | #include "Markups.h" | 7 | #include "Markups.h" |
14 | #include "names.h" | 8 | #include "names.h" |
15 | #include "linktype.h" | 9 | #include "linktype.h" |
16 | 10 | ||
11 | /* OPIE */ | ||
12 | #include <opie2/odebug.h> | ||
13 | |||
14 | /* QT */ | ||
15 | #include <qmessagebox.h> | ||
16 | |||
17 | /* STD */ | ||
18 | #ifndef _WINDOWS | ||
19 | #include <unistd.h> | ||
20 | #endif | ||
21 | #include <stdio.h> | ||
22 | #include <time.h> | ||
23 | |||
17 | class QImage; | 24 | class QImage; |
18 | class Bkmk; | 25 | class Bkmk; |
19 | 26 | ||
20 | template<class T> | 27 | template<class T> |
21 | class CList; | 28 | class CList; |
22 | 29 | ||
@@ -140,12 +147,12 @@ class CExpander | |||
140 | memcpy(data, src, len); | 147 | memcpy(data, src, len); |
141 | } | 148 | } |
142 | virtual void putSaveData(unsigned char*& src, unsigned short& srclen) | 149 | virtual void putSaveData(unsigned char*& src, unsigned short& srclen) |
143 | { | 150 | { |
144 | if (srclen != 0) | 151 | if (srclen != 0) |
145 | { | 152 | { |
146 | qDebug("Don't know what to do with non-zero save data"); | 153 | odebug << "Don't know what to do with non-zero save data" << oendl; |
147 | } | 154 | } |
148 | } | 155 | } |
149 | void setwidth(int w) { m_scrWidth = w; } | 156 | void setwidth(int w) { m_scrWidth = w; } |
150 | }; | 157 | }; |
151 | #endif | 158 | #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 | |||
@@ -24,20 +24,12 @@ | |||
24 | #include <qtimer.h> | 24 | #include <qtimer.h> |
25 | 25 | ||
26 | #include "field.h" | 26 | #include "field.h" |
27 | //#include "shotcounter.h" | 27 | //#include "shotcounter.h" |
28 | #include "ballpainter.h" | 28 | #include "ballpainter.h" |
29 | 29 | ||
30 | #ifdef Q_WS_QWS | ||
31 | #define debug (void) | ||
32 | #else | ||
33 | #define debug qDebug | ||
34 | #endif | ||
35 | #define fatal qFatal | ||
36 | #define warning qWarning | ||
37 | |||
38 | class LinesBoard : public Field | 30 | class LinesBoard : public Field |
39 | { | 31 | { |
40 | Q_OBJECT | 32 | Q_OBJECT |
41 | public: | 33 | public: |
42 | LinesBoard( BallPainter * abPainter, QWidget* parent=0, const char* name=0 ); | 34 | LinesBoard( BallPainter * abPainter, QWidget* parent=0, const char* name=0 ); |
43 | ~LinesBoard(); | 35 | ~LinesBoard(); |
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 | |||
@@ -35,13 +35,12 @@ | |||
35 | 35 | ||
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | #include "mediaplayerstate.h" | 37 | #include "mediaplayerstate.h" |
38 | 38 | ||
39 | #include <assert.h> | 39 | #include <assert.h> |
40 | 40 | ||
41 | //#define MediaPlayerDebug(x) qDebug x | ||
42 | #define MediaPlayerDebug(x) | 41 | #define MediaPlayerDebug(x) |
43 | 42 | ||
44 | 43 | ||
45 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 44 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
46 | : QObject( parent, name ) { | 45 | : QObject( parent, name ) { |
47 | Config cfg( "OpiePlayer" ); | 46 | Config cfg( "OpiePlayer" ); |
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,11 +1,15 @@ | |||
1 | #ifndef SETTINGS_H | 1 | #ifndef SETTINGS_H |
2 | #define SETTINGS_H | 2 | #define SETTINGS_H |
3 | 3 | ||
4 | #include "maildefines.h" | 4 | #include "maildefines.h" |
5 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | |||
9 | /* QT */ | ||
6 | #include <qobject.h> | 10 | #include <qobject.h> |
7 | #include <qlist.h> | 11 | #include <qlist.h> |
8 | 12 | ||
9 | class Account | 13 | class Account |
10 | { | 14 | { |
11 | 15 | ||
@@ -38,14 +42,14 @@ public: | |||
38 | 42 | ||
39 | 43 | ||
40 | void setOffline(bool b) {offline = b;} | 44 | void setOffline(bool b) {offline = b;} |
41 | bool getOffline()const{return offline;} | 45 | bool getOffline()const{return offline;} |
42 | 46 | ||
43 | virtual QString getFileName() { return accountName; } | 47 | virtual QString getFileName() { return accountName; } |
44 | virtual void read() { qDebug( "base reading..." ); } | 48 | virtual void read() { odebug << "base reading..." << oendl; } |
45 | virtual void save() { qDebug( "base saving..." ); } | 49 | virtual void save() { odebug << "base saving..." << oendl; } |
46 | 50 | ||
47 | protected: | 51 | protected: |
48 | QString accountName, server, port, user, password; | 52 | QString accountName, server, port, user, password; |
49 | bool ssl; | 53 | bool ssl; |
50 | int connectionType; | 54 | int connectionType; |
51 | bool offline; | 55 | bool offline; |
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 | |||
@@ -53,13 +53,12 @@ using namespace Opie::Core; | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #define strlcpy strcpy | 55 | #define strlcpy strcpy |
56 | #include "auth.h" | 56 | #include "auth.h" |
57 | #include "modem.h" | 57 | #include "modem.h" |
58 | #include "pppdata.h" | 58 | #include "pppdata.h" |
59 | #define qError qDebug | ||
60 | 59 | ||
61 | 60 | ||
62 | #define MY_ASSERT(x) if (!(x)) { \ | 61 | #define MY_ASSERT(x) if (!(x)) { \ |
63 | ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ | 62 | ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ |
64 | exit(1); } | 63 | exit(1); } |
65 | 64 | ||
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,9 +1,13 @@ | |||
1 | #ifndef TABLISTVIEW_H | 1 | #ifndef TABLISTVIEW_H |
2 | #define TABLISTVIEW_H | 2 | #define TABLISTVIEW_H |
3 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | |||
7 | /* QT */ | ||
4 | #include <qlistview.h> | 8 | #include <qlistview.h> |
5 | #include <qcursor.h> | 9 | #include <qcursor.h> |
6 | #include <qapplication.h> | 10 | #include <qapplication.h> |
7 | 11 | ||
8 | class TabListView : public QListView { | 12 | class TabListView : public QListView { |
9 | Q_OBJECT | 13 | Q_OBJECT |
@@ -43,13 +47,13 @@ protected: | |||
43 | }; | 47 | }; |
44 | 48 | ||
45 | private slots: | 49 | private slots: |
46 | void itemPressed(QListViewItem *item){ | 50 | void itemPressed(QListViewItem *item){ |
47 | if(item == NULL || !item->parent()){ | 51 | if(item == NULL || !item->parent()){ |
48 | if(item == NULL) | 52 | if(item == NULL) |
49 | qDebug("Item is NULL"); | 53 | odebug << "Item is NULL" << oendl; |
50 | return; | 54 | return; |
51 | } | 55 | } |
52 | 56 | ||
53 | currentSelectedItem = item; | 57 | currentSelectedItem = item; |
54 | internalCursor.setShape(13); | 58 | internalCursor.setShape(13); |
55 | qApp->setOverrideCursor(internalCursor); | 59 | qApp->setOverrideCursor(internalCursor); |