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

6 files changed, 12 insertions, 13 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 )
@@ -644,3 +642,3 @@ Desktop::Desktop() :
   qApp->installEventFilter( this );
-  
+
   qApp-> setMainWidget ( launcher );
@@ -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;
@@ -747,3 +749,3 @@ void Desktop::raiseLauncher()
 void Desktop::home ( )
-{ 
+{
     if ( isVisibleWindow( launcher->winId() ) )
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>
@@ -55,3 +56,3 @@ void initEnvironment()
 
-  // if not timezone set, pick New York 
+  // if not timezone set, pick New York
   if (tz.isNull())
@@ -131,3 +132,3 @@ void create_pidfile ( )
 	FILE *f;
-	
+
 	if (( f = ::fopen ( pidfile_path, "w" ))) {
@@ -158,3 +159,3 @@ int main( int argc, char ** argv )
 	::setpgid ( 0, 0 );
-	
+
 	::atexit ( remove_pidfile );
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