summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -1,22 +1,29 @@
#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"
#include "Markups.h"
#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;
template<class T>
class CList;
@@ -140,12 +147,12 @@ class CExpander
memcpy(data, src, len);
}
virtual void putSaveData(unsigned char*& src, unsigned short& srclen)
{
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; }
};
#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 @@
#include <qtimer.h>
#include "field.h"
//#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
public:
LinesBoard( BallPainter * abPainter, QWidget* parent=0, const char* name=0 );
~LinesBoard();
@@ -45,26 +37,26 @@ public:
int width();
int height();
int wHint();
int hHint();
// void doAfterBalls();
void placeBalls(int nextBalls[BALLSDROP]);
- void undo();
+ void undo();
signals:
void endTurn();
void endGame();
void eraseLine(int nb);
private:
int anim;
struct Waypoints {
int x,y;
} *way;
- int nextBalls[BALLSDROP];
+ int nextBalls[BALLSDROP];
int animmax;
//used for running and animation phase
int painting;
int animstep;
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 @@
#include <qpe/config.h>
#include "mediaplayerstate.h"
#include <assert.h>
-//#define MediaPlayerDebug(x) qDebug x
#define MediaPlayerDebug(x)
MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
: QObject( parent, name ) {
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,63 +1,67 @@
#ifndef SETTINGS_H
#define SETTINGS_H
#include "maildefines.h"
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
#include <qobject.h>
#include <qlist.h>
-class Account
+class Account
{
-
+
public:
Account();
virtual ~Account() {}
void remove();
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;
int connectionType;
bool offline;
MAILLIB::ATYPE type;
};
class IMAPaccount : public Account
{
-
+
public:
IMAPaccount();
IMAPaccount( QString filename );
static QString getUniqueFileName();
@@ -72,31 +76,31 @@ private:
QString file,prefix;
};
class POP3account : public Account
{
-
+
public:
POP3account();
POP3account( QString filename );
static QString getUniqueFileName();
virtual void read();
virtual void save();
virtual QString getFileName();
private:
QString file;
-
+
};
class SMTPaccount : public Account
{
-
+
public:
SMTPaccount();
SMTPaccount( QString filename );
static QString getUniqueFileName();
@@ -112,13 +116,13 @@ private:
bool useCC, useBCC, useReply, login;
};
class NNTPaccount : public Account
{
-
+
public:
NNTPaccount();
NNTPaccount( QString filename );
static QString getUniqueFileName();
@@ -127,13 +131,13 @@ public:
virtual QString getFileName();
void setLogin( bool b ) { login = b; }
bool getLogin() { return login; }
void setGroups( QStringList list ) { subscribedGroups = list; }
- QStringList getGroups() { return subscribedGroups; }
+ QStringList getGroups() { return subscribedGroups; }
private:
QString file;
bool login;
QStringList subscribedGroups;
@@ -152,10 +156,10 @@ public:
void readAccounts();
static void checkDirectory();
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
@@ -53,13 +53,12 @@ using namespace Opie::Core;
#endif
#define strlcpy strcpy
#include "auth.h"
#include "modem.h"
#include "pppdata.h"
-#define qError qDebug
#define MY_ASSERT(x) if (!(x)) { \
ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \
exit(1); }
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,65 +1,69 @@
#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);
public:
TabListView( QWidget* parent = 0, const char* name = 0) : QListView(parent, name){ currentSelectedItem = NULL;
connect(this, SIGNAL(pressed ( QListViewItem *)), this, SLOT(itemPressed(QListViewItem *)));
internalCursor.setShape(0);
};
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;
qApp->restoreOverrideCursor();
};
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);
};
private:
QListViewItem *currentSelectedItem;
QCursor internalCursor;
};
#endif
-
+