summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/CExpander.h21
-rw-r--r--noncore/games/zlines/linesboard.h12
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp1
-rw-r--r--noncore/net/mail/libmailwrapper/settings.h42
-rw-r--r--noncore/settings/networksettings/ppp/modem.cpp1
-rw-r--r--noncore/settings/tabmanager/tablistview.h24
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 @@
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"
@@ -15,4 +9,17 @@
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
17class QImage; 24class QImage;
18class Bkmk; 25class Bkmk;
@@ -144,5 +151,5 @@ class CExpander
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 }
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 @@
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
38class LinesBoard : public Field 30class LinesBoard : public Field
39{ 31{
@@ -49,5 +41,5 @@ public:
49// void doAfterBalls(); 41// void doAfterBalls();
50 void placeBalls(int nextBalls[BALLSDROP]); 42 void placeBalls(int nextBalls[BALLSDROP]);
51 void undo(); 43 void undo();
52 44
53signals: 45signals:
@@ -62,5 +54,5 @@ private:
62 int x,y; 54 int x,y;
63 } *way; 55 } *way;
64 int nextBalls[BALLSDROP]; 56 int nextBalls[BALLSDROP];
65 57
66 int animmax; 58 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 @@
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
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 @@
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
9class Account 13class Account
10{ 14{
11 15
12public: 16public:
13 Account(); 17 Account();
@@ -18,23 +22,23 @@ public:
18 const QString&getAccountName()const{ return accountName; } 22 const QString&getAccountName()const{ return accountName; }
19 MAILLIB::ATYPE getType()const{ return type; } 23 MAILLIB::ATYPE getType()const{ return type; }
20 24
21 void setServer(const QString&str){ server = str; } 25 void setServer(const QString&str){ server = str; }
22 const QString&getServer()const{ return server; } 26 const QString&getServer()const{ return server; }
23 27
24 void setPort(const QString&str) { port = str; } 28 void setPort(const QString&str) { port = str; }
25 const QString&getPort()const{ return port; } 29 const QString&getPort()const{ return port; }
26 30
27 void setUser(const QString&str){ user = str; } 31 void setUser(const QString&str){ user = str; }
28 const QString&getUser()const{ return user; } 32 const QString&getUser()const{ return user; }
29 33
30 void setPassword(const QString&str) { password = str; } 34 void setPassword(const QString&str) { password = str; }
31 const QString&getPassword()const { return password; } 35 const QString&getPassword()const { return password; }
32 36
33 void setSSL( bool b ) { ssl = b; } 37 void setSSL( bool b ) { ssl = b; }
34 bool getSSL() { return ssl; } 38 bool getSSL() { return ssl; }
35 39
36 void setConnectionType( int x ) { connectionType = x; } 40 void setConnectionType( int x ) { connectionType = x; }
37 int ConnectionType() { return connectionType; } 41 int ConnectionType() { return connectionType; }
38 42
39 43
40 void setOffline(bool b) {offline = b;} 44 void setOffline(bool b) {offline = b;}
@@ -42,7 +46,7 @@ public:
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
47protected: 51protected:
48 QString accountName, server, port, user, password; 52 QString accountName, server, port, user, password;
@@ -55,5 +59,5 @@ protected:
55class IMAPaccount : public Account 59class IMAPaccount : public Account
56{ 60{
57 61
58public: 62public:
59 IMAPaccount(); 63 IMAPaccount();
@@ -76,5 +80,5 @@ private:
76class POP3account : public Account 80class POP3account : public Account
77{ 81{
78 82
79public: 83public:
80 POP3account(); 84 POP3account();
@@ -89,10 +93,10 @@ public:
89private: 93private:
90 QString file; 94 QString file;
91 95
92}; 96};
93 97
94class SMTPaccount : public Account 98class SMTPaccount : public Account
95{ 99{
96 100
97public: 101public:
98 SMTPaccount(); 102 SMTPaccount();
@@ -116,5 +120,5 @@ private:
116class NNTPaccount : public Account 120class NNTPaccount : public Account
117{ 121{
118 122
119public: 123public:
120 NNTPaccount(); 124 NNTPaccount();
@@ -131,5 +135,5 @@ public:
131 135
132 void setGroups( QStringList list ) { subscribedGroups = list; } 136 void setGroups( QStringList list ) { subscribedGroups = list; }
133 QStringList getGroups() { return subscribedGroups; } 137 QStringList getGroups() { return subscribedGroups; }
134 138
135private: 139private:
@@ -156,5 +160,5 @@ private:
156 void updateAccounts(); 160 void updateAccounts();
157 QList<Account> accounts; 161 QList<Account> accounts;
158 162
159}; 163};
160 164
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;
57#include "modem.h" 57#include "modem.h"
58#include "pppdata.h" 58#include "pppdata.h"
59#define qError qDebug
60 59
61 60
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 @@
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
8class TabListView : public QListView { 12class TabListView : public QListView {
9 Q_OBJECT 13 Q_OBJECT
10 14
11signals: 15signals:
12 void moveItem(QListViewItem *item, QListViewItem *newFolder); 16 void moveItem(QListViewItem *item, QListViewItem *newFolder);
@@ -20,5 +24,5 @@ public:
20protected: 24protected:
21 void contentsMouseReleaseEvent(QMouseEvent* ){ 25 void contentsMouseReleaseEvent(QMouseEvent* ){
22 QListViewItem *newGroup = this->currentItem(); 26 QListViewItem *newGroup = this->currentItem();
23 // Make sure they are both real. 27 // Make sure they are both real.
24 if (currentSelectedItem == NULL || newGroup == NULL) 28 if (currentSelectedItem == NULL || newGroup == NULL)
@@ -27,14 +31,14 @@ protected:
27 if(this->isSelected(currentSelectedItem) == true) 31 if(this->isSelected(currentSelectedItem) == true)
28 return; 32 return;
29 33
30 // Ok we have two valid items. 34 // Ok we have two valid items.
31 if(newGroup->parent()) 35 if(newGroup->parent())
32 newGroup = newGroup->parent(); 36 newGroup = newGroup->parent();
33 37
34 // Just in case the parent was null 38 // Just in case the parent was null
35 if(newGroup == NULL) 39 if(newGroup == NULL)
36 return; 40 return;
37 41
38 // If the new folder and buddies current parent are the same don't do anything. 42 // If the new folder and buddies current parent are the same don't do anything.
39 if (newGroup != currentSelectedItem->parent()) 43 if (newGroup != currentSelectedItem->parent())
40 moveItem(currentSelectedItem, newGroup); 44 moveItem(currentSelectedItem, newGroup);
@@ -47,8 +51,8 @@ private slots:
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);
@@ -63,3 +67,3 @@ private:
63 67
64#endif 68#endif
65 69