From 0655456f68849bfad9019a7760dec961792d7519 Mon Sep 17 00:00:00 2001 From: zecke Date: Thu, 17 Oct 2002 16:45:38 +0000 Subject: Move around some #ifdefs to be able to be built with Qt2/X11 --- (limited to 'core/launcher/desktop.cpp') 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 @@ -152,7 +152,6 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e ) currentPriority = INT_MAX; } - class QPEScreenSaver : public QWSScreenSaver { private: @@ -325,7 +324,6 @@ private: bool m_backlight_forcedoff; }; - void DesktopApplication::switchLCD ( bool on ) { if ( qApp ) { @@ -642,7 +640,7 @@ Desktop::Desktop() : connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) ); qApp->installEventFilter( this ); - + qApp-> setMainWidget ( launcher ); } @@ -709,23 +707,27 @@ void Desktop::checkMemory() static bool isVisibleWindow( int wid ) { +#ifdef QWS const QList &list = qwsServer->clientWindows(); QWSWindow* w; for ( QListIterator 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 &list = qwsServer->clientWindows(); QWSWindow* w; for ( QListIterator it( list ); ( w = it.current() ); ++it ) { if ( w->client() ->identity() == clientname && !w->isFullyObscured() ) return TRUE; } +#endif return FALSE; } @@ -745,7 +747,7 @@ void Desktop::raiseLauncher() } void Desktop::home ( ) -{ +{ if ( isVisibleWindow( launcher->winId() ) ) launcher->nextView(); else -- cgit v0.9.0.2