summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:42:53 (UTC)
committer zecke <zecke>2004-09-10 11:42:53 (UTC)
commit6adde94c6ee292de5bc87a0c651fef69e8847d7e (patch) (side-by-side diff)
tree56ae2a840932bd50e16b59232a185e62d17c0843
parent854e3af27ee7208bbb3620733a24f0214c0b118a (diff)
downloadopie-6adde94c6ee292de5bc87a0c651fef69e8847d7e.zip
opie-6adde94c6ee292de5bc87a0c651fef69e8847d7e.tar.gz
opie-6adde94c6ee292de5bc87a0c651fef69e8847d7e.tar.bz2
Remove unused code and mark parameter as Q_UNUSED
Diffstat (more/less context) (ignore 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
@@ -436,24 +436,26 @@ void LauncherItem::paintAnimatedIcon( QPainter *p )
p2.translate(-x1,-y1);
liv->drawBackground( &p2, QRect(x1,y1,w,h+4) );
int bounceY = 2;
#ifdef BOUNCE_BUSY_ICON
if ( busyType == BIT_Animated ) {
bounceY = 4 - ((iteration+2)%8);
bounceY = bounceY < 0 ? -bounceY : bounceY;
}
#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 );
}
void LauncherItem::animateIcon()
{
LauncherIconView* liv = (LauncherIconView*)iconView();
if ( liv->busyItem() != this || !app )
return;
// Highlight the icon
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
@@ -187,48 +187,24 @@ void Server::show()
Server::~Server()
{
serverGui->destroyGUI();
delete docList;
delete qcopBridge;
delete transferServer;
delete serverGui;
#if 0
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
OQCopMessage om;
if ( held ) {
om = button->heldAction();
} else {
om = button->pressedAction();
}
if ( om.channel() != "ignore" )
@@ -689,24 +665,26 @@ void Server::pokeTimeMonitors()
}
void Server::applicationLaunched(int, const QString &app)
{
serverGui->applicationStateChanged( app, ServerInterface::Launching );
}
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)
{
serverGui->applicationStateChanged( app, ServerInterface::Running );
}
void Server::storageChanged()
{
system( "opie-update-symlinks" );
serverGui->storageChanged( storage->fileSystems() );
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
@@ -348,26 +348,26 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) );
connect( this, SIGNAL(power() ),
SLOT(togglePower() ) );
rereadVolumes();
serverApp = this;
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 )
}
ServerApplication::~ServerApplication()
{
ungrabKeyboard();
delete pa;
delete m_ps;
delete m_ps_last;
}