Move around some #ifdefs to be able to be built with Qt2/X11

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
@@ -151,9 +151,8 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
   alertCount = 0;
   currentPriority = INT_MAX;
 }
 
-
 class QPEScreenSaver : public QWSScreenSaver
 {
 private:
   int LcdOn;
@@ -324,9 +323,8 @@ private:
   int m_backlight_bright;
   bool m_backlight_forcedoff;
 };
 
-
 void DesktopApplication::switchLCD ( bool on )
 {
   if ( qApp ) {
     DesktopApplication *dapp = (DesktopApplication *) qApp;
@@ -708,25 +706,29 @@ void Desktop::checkMemory()
 }
 
 static bool isVisibleWindow( int wid )
 {
+#ifdef QWS
   const QList<QWSWindow> &list = qwsServer->clientWindows();
   QWSWindow* w;
   for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
     if ( w->winId() == wid )
       return !w->isFullyObscured();
   }
+#endif
   return FALSE;
 }
 
 static bool hasVisibleWindow( const QString& clientname )
 {
+#ifdef QWS
   const QList<QWSWindow> &list = qwsServer->clientWindows();
   QWSWindow* w;
   for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
     if ( w->client() ->identity() == clientname && !w->isFullyObscured() )
       return TRUE;
   }
+#endif
   return FALSE;
 }
 
 void Desktop::raiseLauncher()
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
@@ -21,11 +21,9 @@
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 
-#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
-#endif
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.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
@@ -31,8 +31,9 @@
 
 #include <opie/odevice.h>
 
 #include <qfile.h>
+#include <qimage.h>
 #include <qwindowsystem_qws.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/alarmserver.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
@@ -20,11 +20,9 @@
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
-#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
-#endif
 #include <qpe/qpeapplication.h>
 #include <qpe/version.h>
 
 #include <qdir.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
@@ -43,10 +43,12 @@ RunningAppBar::RunningAppBar(QWidget* parent)
     setBackgroundMode( PaletteBackground );
 
     m_AppLnkSet = new AppLnkSet( QPEApplication::qpeDir() + "apps" );
 
+#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 );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(received(const QCString&, const QByteArray&)) );
 
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
@@ -55,11 +55,9 @@ extern "C" {
 #include <qpe/config.h>
 #include <qpe/contact.h>
 #include <qpe/quuid.h>
 #include <qpe/version.h>
-#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
-#endif
 
 #include "transferserver.h"
 #include "qprocess.h"