-rw-r--r-- | library/alarmserver.cpp | 2 | ||||
-rw-r--r-- | library/applnk.cpp | 4 | ||||
-rw-r--r-- | library/fileselector.cpp | 2 | ||||
-rw-r--r-- | library/fontdatabase.cpp | 2 | ||||
-rw-r--r-- | library/fontmanager.cpp | 2 | ||||
-rw-r--r-- | library/global.cpp | 28 | ||||
-rw-r--r-- | library/ir.cpp | 2 | ||||
-rw-r--r-- | library/lnkproperties.cpp | 2 | ||||
-rw-r--r-- | library/network.cpp | 2 | ||||
-rw-r--r-- | library/networkinterface.cpp | 2 | ||||
-rw-r--r-- | library/password.cpp | 2 | ||||
-rw-r--r-- | library/qpedecoration_qws.cpp | 2 | ||||
-rw-r--r-- | library/tzselect.cpp | 4 |
13 files changed, 11 insertions, 45 deletions
diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp index 177a0cb..02bca3d 100644 --- a/library/alarmserver.cpp +++ b/library/alarmserver.cpp @@ -30,5 +30,3 @@ -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) #include <qpe/qcopenvelope_qws.h> -#endif #include "alarmserver.h" diff --git a/library/applnk.cpp b/library/applnk.cpp index a56da5d..5763c62 100644 --- a/library/applnk.cpp +++ b/library/applnk.cpp @@ -29,5 +29,3 @@ #include <qpe/categoryselect.h> -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/global.h> @@ -42,5 +40,3 @@ -#ifdef Q_WS_QWS #include <qgfx_qws.h> -#endif diff --git a/library/fileselector.cpp b/library/fileselector.cpp index 052a29e..4039243 100644 --- a/library/fileselector.cpp +++ b/library/fileselector.cpp @@ -32,5 +32,3 @@ #include "qpemenubar.h" -#ifdef QWS #include <qcopchannel_qws.h> -#endif #include "lnkproperties.h" diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index 2b5e0d2..147134c 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp @@ -26,5 +26,3 @@ -#ifdef QWS #include <qfontmanager_qws.h> -#endif #include <qdir.h> diff --git a/library/fontmanager.cpp b/library/fontmanager.cpp index 28a5212..c854133 100644 --- a/library/fontmanager.cpp +++ b/library/fontmanager.cpp @@ -20,3 +20,2 @@ -#ifdef QWS #include "fontmanager.h" @@ -102,2 +101 @@ QFont FontManager::unicodeFont( Spacing sp ) } -#endif diff --git a/library/global.cpp b/library/global.cpp index 9b908bf..d02e711 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -27,5 +27,3 @@ #include <qpe/applnk.h> -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) -#include "qpe/qcopenvelope_qws.h" -#endif +#include <qpe/qcopenvelope_qws.h> @@ -47,5 +45,3 @@ -#ifdef QWS #include <qwindowsystem_qws.h> // for qwsServer -#endif #include <qdatetime.h> @@ -112,3 +108,2 @@ StartingAppList::StartingAppList( QObject *parent, const char* name ) { -#ifdef QWS #if QT_VERSION >= 232 && !defined(QT_NO_COP) @@ -118,3 +113,2 @@ StartingAppList::StartingAppList( QObject *parent, const char* name ) #endif -#endif } @@ -395,3 +389,3 @@ void Global::statusMessage(const QString& message) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if!defined(QT_NO_COP) QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); @@ -406,3 +400,3 @@ void Global::applyStyle() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "applyStyle()" ); @@ -418,3 +412,3 @@ QWidget *Global::shutdown( bool ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "shutdown()" ); @@ -429,3 +423,3 @@ QWidget *Global::restart( bool ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "restart()" ); @@ -447,3 +441,3 @@ void Global::showInputMethod() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); @@ -462,3 +456,3 @@ void Global::hideInputMethod() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); @@ -561,3 +555,3 @@ void Global::invoke(const QString &c) -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QString ap=list[0]; @@ -597,3 +591,3 @@ void Global::invoke(const QString &c) -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) // an attempt to show a wait... @@ -638,3 +632,3 @@ void Global::execute( const QString &c, const QString& document ) // ask the server to do the work -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( document.isNull() ) { @@ -678,3 +672,3 @@ void Global::execute( const QString &c, const QString& document ) -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QString ap=list[0]; diff --git a/library/ir.cpp b/library/ir.cpp index a7cf7b1..b5b726d 100644 --- a/library/ir.cpp +++ b/library/ir.cpp @@ -23,6 +23,4 @@ #include <qstring.h> -#ifdef QWS #include "qcopenvelope_qws.h" #include <qcopchannel_qws.h> -#endif #include "applnk.h" diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp index 0b50bae..50cf5af 100644 --- a/library/lnkproperties.cpp +++ b/library/lnkproperties.cpp @@ -32,5 +32,3 @@ #include <qpe/categorywidget.h> -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/filemanager.h> diff --git a/library/network.cpp b/library/network.cpp index 185b147..3568809 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -27,5 +27,3 @@ #include "qpe/qpeapplication.h" -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/qlibrary.h> diff --git a/library/networkinterface.cpp b/library/networkinterface.cpp index 2b5c77e..0ba773a 100644 --- a/library/networkinterface.cpp +++ b/library/networkinterface.cpp @@ -47,5 +47,3 @@ bool NetworkInterface::isActive( Config& cfg ) const fclose(f); -#ifdef QWS Network::writeProxySettings( cfg ); -#endif return TRUE; diff --git a/library/password.cpp b/library/password.cpp index 41b3358..4b22b65 100644 --- a/library/password.cpp +++ b/library/password.cpp @@ -29,5 +29,3 @@ #include <qfile.h> -#ifdef QWS #include <qwindowsystem_qws.h> -#endif diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index 214c721..9cbe92b 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp @@ -19,3 +19,2 @@ **********************************************************************/ -#ifdef QWS #define QTOPIA_INTERNAL_LANGLIST @@ -913,2 +912 @@ QPopupMenu *QPEDecoration::menu(QWSManager*, const QWidget*, const QPoint&) #endif // QT_NO_QWS_QPE_WM_STYLE -#endif diff --git a/library/tzselect.cpp b/library/tzselect.cpp index 9436867..2e5a433 100644 --- a/library/tzselect.cpp +++ b/library/tzselect.cpp @@ -30,5 +30,3 @@ -#ifdef Q_WS_QWS #include <qcopchannel_qws.h> -#endif @@ -70,3 +68,2 @@ TZCombo::TZCombo( QWidget *p, const char* n ) // listen on QPE/System -#if defined(Q_WS_QWS) #if !defined(QT_NO_COP) @@ -76,3 +73,2 @@ TZCombo::TZCombo( QWidget *p, const char* n ) #endif -#endif |