Remove unused code and mark parameter as Q_UNUSED

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
@@ -444,8 +444,10 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
 #endif
     p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
+#else
+    Q_UNUSED( pic )
 #endif
     p->drawPixmap( x1, y1, dblBuf );
 }
 
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
@@ -195,32 +195,8 @@ Server::~Server()
     delete tsmMonitor;
 #endif
 }
 
-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;
-}
 
 void Server::activate(const ODeviceButton* button, bool held)
 {
     Global::terminateBuiltin("calibrate"); // No tr
@@ -697,8 +673,10 @@ void Server::applicationTerminated(int pid, const QString &app)
 {
     serverGui->applicationStateChanged( app, ServerInterface::Terminated );
 #if 0
     tsmMonitor->applicationTerminated( pid );
+#else
+    Q_UNUSED( pid )
 #endif
 }
 
 void Server::applicationConnected(const QString &app)
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
@@ -356,10 +356,10 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
 
     apmTimeout();
     grabKeyboard();
 
-    /* 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 )
 }