From 543e54de7170c606b6883ac4152567e7faf13182 Mon Sep 17 00:00:00 2001 From: zecke Date: Wed, 16 Oct 2002 01:09:22 +0000 Subject: Remove #ifdef QWS HELL a Platform which is not supporting IPC compatible to QCopChannel/Envelope is not of much use nowadays.. so be sure your platform is supporting it --- diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp index 177a0cb..02bca3d 100644 --- a/library/alarmserver.cpp +++ b/library/alarmserver.cpp @@ -28,9 +28,7 @@ #include "global.h" #include "resource.h" -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) #include -#endif #include "alarmserver.h" #include diff --git a/library/applnk.cpp b/library/applnk.cpp index a56da5d..5763c62 100644 --- a/library/applnk.cpp +++ b/library/applnk.cpp @@ -27,9 +27,7 @@ #include #include #include -#ifdef QWS #include -#endif #include #include #include @@ -40,9 +38,7 @@ #include #include -#ifdef Q_WS_QWS #include -#endif #include diff --git a/library/fileselector.cpp b/library/fileselector.cpp index 052a29e..4039243 100644 --- a/library/fileselector.cpp +++ b/library/fileselector.cpp @@ -30,9 +30,7 @@ #include "applnk.h" #include "storage.h" #include "qpemenubar.h" -#ifdef QWS #include -#endif #include "lnkproperties.h" #include "applnk.h" #include diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index 2b5e0d2..147134c 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp @@ -24,9 +24,7 @@ #include -#ifdef QWS #include -#endif #include #include #include diff --git a/library/fontmanager.cpp b/library/fontmanager.cpp index 28a5212..c854133 100644 --- a/library/fontmanager.cpp +++ b/library/fontmanager.cpp @@ -18,7 +18,6 @@ ** **********************************************************************/ -#ifdef QWS #include "fontmanager.h" #include #include @@ -100,4 +99,3 @@ QFont FontManager::unicodeFont( Spacing sp ) } return QFont(fontName,size); } -#endif diff --git a/library/global.cpp b/library/global.cpp index 9b908bf..d02e711 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -25,9 +25,7 @@ #include #include #include -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) -#include "qpe/qcopenvelope_qws.h" -#endif +#include #include #include @@ -45,9 +43,7 @@ #include #include -#ifdef QWS #include // for qwsServer -#endif #include #include @@ -110,13 +106,11 @@ StartingAppList* StartingAppList::appl = 0; StartingAppList::StartingAppList( QObject *parent, const char* name ) :QObject( parent, name ) { -#ifdef QWS #if QT_VERSION >= 232 && !defined(QT_NO_COP) connect( qwsServer, SIGNAL( newChannel(const QString&)), this, SLOT( handleNewChannel(const QString&)) ); dict.setAutoDelete( TRUE ); #endif -#endif } void StartingAppList::add( const QString& name ) @@ -393,7 +387,7 @@ void Global::createDocDir() */ 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)" ); e << message; #endif @@ -404,7 +398,7 @@ void Global::statusMessage(const QString& message) */ void Global::applyStyle() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "applyStyle()" ); #else ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version @@ -416,7 +410,7 @@ void Global::applyStyle() */ QWidget *Global::shutdown( bool ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "shutdown()" ); #endif return 0; @@ -427,7 +421,7 @@ QWidget *Global::shutdown( bool ) */ QWidget *Global::restart( bool ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "restart()" ); #endif return 0; @@ -445,7 +439,7 @@ QWidget *Global::restart( bool ) */ void Global::showInputMethod() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); #endif } @@ -460,7 +454,7 @@ void Global::showInputMethod() */ void Global::hideInputMethod() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); #endif } @@ -559,7 +553,7 @@ void Global::invoke(const QString &c) // Convert the command line in to a list of arguments QStringList list = QStringList::split(QRegExp(" *"),c); -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QString ap=list[0]; // see if the application is already running // XXX should lock file /tmp/qcop-msg-ap @@ -595,7 +589,7 @@ void Global::invoke(const QString &c) args[j] = slist.at(j); args[j] = NULL; -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) // an attempt to show a wait... // more logic should be used, but this will be fine for the moment... QCopEnvelope ( "QPE/System", "busy()" ); @@ -636,7 +630,7 @@ void Global::execute( const QString &c, const QString& document ) { if ( qApp->type() != QApplication::GuiServer ) { // ask the server to do the work -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( document.isNull() ) { QCopEnvelope e( "QPE/System", "execute(QString)" ); e << c; @@ -676,7 +670,7 @@ void Global::execute( const QString &c, const QString& document ) // Convert the command line in to a list of arguments QStringList list = QStringList::split(QRegExp(" *"),c); -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QString ap=list[0]; qDebug("executing %s", ap.latin1() ); diff --git a/library/ir.cpp b/library/ir.cpp index a7cf7b1..b5b726d 100644 --- a/library/ir.cpp +++ b/library/ir.cpp @@ -21,10 +21,8 @@ #include "ir.h" #include -#ifdef QWS #include "qcopenvelope_qws.h" #include -#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 @@ -30,9 +30,7 @@ #include #include #include -#ifdef QWS #include -#endif #include #include #include diff --git a/library/network.cpp b/library/network.cpp index 185b147..3568809 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -25,9 +25,7 @@ #include "qpe/config.h" #include "qpe/resource.h" #include "qpe/qpeapplication.h" -#ifdef QWS #include -#endif #include #include diff --git a/library/networkinterface.cpp b/library/networkinterface.cpp index 2b5c77e..0ba773a 100644 --- a/library/networkinterface.cpp +++ b/library/networkinterface.cpp @@ -45,9 +45,7 @@ bool NetworkInterface::isActive( Config& cfg ) const { if ( devname == dev || devname == dev0 ) { 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 @@ -27,9 +27,7 @@ #include #include #include -#ifdef QWS #include -#endif #include 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 @@ -17,7 +17,6 @@ ** not clear to you. ** **********************************************************************/ -#ifdef QWS #define QTOPIA_INTERNAL_LANGLIST #include #include @@ -911,4 +910,3 @@ 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 @@ -28,9 +28,7 @@ #include #include -#ifdef Q_WS_QWS #include -#endif class TimeZoneSelectorPrivate { @@ -68,13 +66,11 @@ TZCombo::TZCombo( QWidget *p, const char* n ) // listen on QPE/System -#if defined(Q_WS_QWS) #if !defined(QT_NO_COP) QCopChannel *channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(handleSystemChannel(const QCString&, const QByteArray&)) ); #endif -#endif } -- cgit v0.9.0.2