| author | zecke <zecke> | 2002-10-17 16:45:38 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-10-17 16:45:38 (UTC) |
| commit | 0655456f68849bfad9019a7760dec961792d7519 (patch) (side-by-side diff) | |
| tree | 4651cad54a144385442a26e78f4a83b57501830f /core | |
| parent | 8511273d7122d50ffea27f78ba13ab72af60326d (diff) | |
| download | opie-0655456f68849bfad9019a7760dec961792d7519.zip opie-0655456f68849bfad9019a7760dec961792d7519.tar.gz opie-0655456f68849bfad9019a7760dec961792d7519.tar.bz2 | |
Move around some #ifdefs to be able to be built with Qt2/X11
| -rw-r--r-- | core/launcher/desktop.cpp | 6 | ||||
| -rw-r--r-- | core/launcher/launcher.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/main.cpp | 1 | ||||
| -rw-r--r-- | core/launcher/qcopbridge.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/runningappbar.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/transferserver.cpp | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index d74b745..1fd3f6a 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -154,3 +154,2 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e ) - class QPEScreenSaver : public QWSScreenSaver @@ -327,3 +326,2 @@ private: - void DesktopApplication::switchLCD ( bool on ) @@ -711,2 +709,3 @@ static bool isVisibleWindow( int wid ) { +#ifdef QWS const QList<QWSWindow> &list = qwsServer->clientWindows(); @@ -717,2 +716,3 @@ static bool isVisibleWindow( int wid ) } +#endif return FALSE; @@ -722,2 +722,3 @@ static bool hasVisibleWindow( const QString& clientname ) { +#ifdef QWS const QList<QWSWindow> &list = qwsServer->clientWindows(); @@ -728,2 +729,3 @@ static bool hasVisibleWindow( const QString& clientname ) } +#endif return FALSE; diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 66cc3e6..a5955a4 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp @@ -24,5 +24,3 @@ -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/resource.h> diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 073e19a..762a596 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -34,2 +34,3 @@ #include <qfile.h> +#include <qimage.h> #include <qwindowsystem_qws.h> diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp index 85993ee..6177a7c 100644 --- a/core/launcher/qcopbridge.cpp +++ b/core/launcher/qcopbridge.cpp @@ -23,5 +23,3 @@ -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/qpeapplication.h> diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp index b830d1b..c8f45d5 100644 --- a/core/launcher/runningappbar.cpp +++ b/core/launcher/runningappbar.cpp @@ -46,4 +46,6 @@ RunningAppBar::RunningAppBar(QWidget* parent) +#ifdef QWS connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&))); connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&))); +#endif QCopChannel* channel = new QCopChannel( "QPE/System", this ); diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index d2f5501..dea140d 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -58,5 +58,3 @@ extern "C" { #include <qpe/version.h> -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif |