summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp2
-rw-r--r--core/launcher/server.cpp26
-rw-r--r--core/launcher/serverapp.cpp4
3 files changed, 6 insertions, 26 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 0d0f2cb..cd9c14b 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -447,2 +447,4 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
+#else
+ Q_UNUSED( pic )
#endif
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 950032d..5ae517b 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -198,26 +198,2 @@ Server::~Server()
-static bool hasVisibleWindow(const QString& clientname, bool partial)
-{
-#ifdef QWS
- const QList<QWSWindow> &list = qwsServer->clientWindows();
- QWSWindow* w;
- for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
- if ( w->client()->identity() == clientname ) {
- if ( partial && !w->isFullyObscured() )
- return TRUE;
- if ( !partial && !w->isFullyObscured() && !w->isPartiallyObscured() ) {
-# if QT_VERSION < 0x030000
- QRect mwr = qt_screen->mapToDevice(qt_maxWindowRect,
- QSize(qt_screen->width(),qt_screen->height()) );
-# else
- QRect mwr = qt_maxWindowRect;
-# endif
- if ( mwr.contains(w->requested().boundingRect()) )
- return TRUE;
- }
- }
- }
-#endif
- return FALSE;
-}
@@ -700,2 +676,4 @@ void Server::applicationTerminated(int pid, const QString &app)
tsmMonitor->applicationTerminated( pid );
+#else
+ Q_UNUSED( pid )
#endif
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index a2302d8..66cc788 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -359,4 +359,4 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
- /* make sure the event filter is installed */
- const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 );
+ /* make sure the event filter is installed */ /* std::limits<short>::max() when you've stdc++ */
+ const ODeviceButton* but = ODevice::inst()->buttonForKeycode( SHRT_MAX );
Q_CONST_UNUSED( but )