| -rw-r--r-- | core/launcher/desktop.cpp | 10 | ||||
| -rw-r--r-- | core/launcher/launcher.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/main.cpp | 7 | ||||
| -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, 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 @@ -153,5 +153,4 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e ) } - class QPEScreenSaver : public QWSScreenSaver { @@ -326,5 +325,4 @@ private: }; - void DesktopApplication::switchLCD ( bool on ) { @@ -643,5 +641,5 @@ Desktop::Desktop() : qApp->installEventFilter( this ); - + qApp-> setMainWidget ( launcher ); } @@ -710,4 +708,5 @@ void Desktop::checkMemory() static bool isVisibleWindow( int wid ) { +#ifdef QWS const QList<QWSWindow> &list = qwsServer->clientWindows(); QWSWindow* w; @@ -716,4 +715,5 @@ static bool isVisibleWindow( int wid ) return !w->isFullyObscured(); } +#endif return FALSE; } @@ -721,4 +721,5 @@ static bool isVisibleWindow( int wid ) static bool hasVisibleWindow( const QString& clientname ) { +#ifdef QWS const QList<QWSWindow> &list = qwsServer->clientWindows(); QWSWindow* w; @@ -727,4 +728,5 @@ static bool hasVisibleWindow( const QString& clientname ) return TRUE; } +#endif return FALSE; } @@ -746,5 +748,5 @@ void Desktop::raiseLauncher() void Desktop::home ( ) -{ +{ if ( isVisibleWindow( launcher->winId() ) ) launcher->nextView(); 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 @@ -23,7 +23,5 @@ #define QTOPIA_INTERNAL_FSLP -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/resource.h> #include <qpe/applnk.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 @@ -33,4 +33,5 @@ #include <qfile.h> +#include <qimage.h> #include <qwindowsystem_qws.h> #include <qpe/qcopenvelope_qws.h> @@ -54,5 +55,5 @@ void initEnvironment() QString tz = config.readEntry( "Timezone", getenv("TZ") ); - // if not timezone set, pick New York + // if not timezone set, pick New York if (tz.isNull()) tz = "America/New_York"; @@ -130,5 +131,5 @@ void create_pidfile ( ) { FILE *f; - + if (( f = ::fopen ( pidfile_path, "w" ))) { ::fprintf ( f, "%d", getpid ( )); @@ -157,5 +158,5 @@ int main( int argc, char ** argv ) ::setsid ( ); ::setpgid ( 0, 0 ); - + ::atexit ( remove_pidfile ); create_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 @@ -22,7 +22,5 @@ #include "transferserver.h" -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include <qpe/qpeapplication.h> #include <qpe/version.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 @@ -45,6 +45,8 @@ RunningAppBar::RunningAppBar(QWidget* parent) 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&)), 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 @@ -57,7 +57,5 @@ extern "C" { #include <qpe/quuid.h> #include <qpe/version.h> -#ifdef QWS #include <qpe/qcopenvelope_qws.h> -#endif #include "transferserver.h" |