1 files changed, 85 insertions, 42 deletions

diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 5ae517b..3bef36e 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -233,5 +233,4 @@ void Server::activate(const ODeviceButton* button, bool held)
 #ifdef Q_WS_QWS
 
-
 typedef struct KeyOverride {
     ushort scan_code;
@@ -282,5 +281,4 @@ bool Server::setKeyboardLayout( const QString &kb )
     return TRUE;
 }
-
 #endif
 
@@ -292,36 +290,49 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     if ( transferServer )
        transferServer->authorizeConnections();
+
     if ( qcopBridge )
         qcopBridge->authorizeConnections();
-    }
-    /* ### FIXME support TempScreenSaverMode */
+    } else
+
 #if 0
-    else if ( msg == "setTempScreenSaverMode(int,int)" ) {
+    /* ### FIXME support TempScreenSaverMode */
+    if ( msg == "setTempScreenSaverMode(int,int)" ) {
     int mode, pid;
     stream >> mode >> pid;
     tsmMonitor->setTempMode(mode, pid);
-    }
+    } else
 #endif
-    else if ( msg == "linkChanged(QString)" ) {
+
+    if ( msg == "linkChanged(QString)" ) {
     QString link;
     stream >> link;
     odebug << "desktop.cpp systemMsg -> linkchanged( " << link << " )" << oendl;
     docList->linkChanged(link);
-    } else if ( msg == "serviceChanged(QString)" ) {
+    } else
+
+    if ( msg == "serviceChanged(QString)" ) {
     MimeType::updateApplications();
-    } else if ( msg == "mkdir(QString)" ) {
+    } else
+
+    if ( msg == "mkdir(QString)" ) {
     QString dir;
     stream >> dir;
     if ( !dir.isEmpty() )
         mkdir( dir );
-    } else if ( msg == "rdiffGenSig(QString,QString)" ) {
+    } else
+
+    if ( msg == "rdiffGenSig(QString,QString)" ) {
     QString baseFile, sigFile;
     stream >> baseFile >> sigFile;
     QRsync::generateSignature( baseFile, sigFile );
-    } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
+    } else
+
+    if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
     QString baseFile, sigFile, deltaFile;
     stream >> baseFile >> sigFile >> deltaFile;
     QRsync::generateDiff( baseFile, sigFile, deltaFile );
-    } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
+    } else
+
+    if ( msg == "rdiffApplyPatch(QString,QString)" ) {
     QString baseFile, deltaFile;
     stream >> baseFile >> deltaFile;
@@ -336,5 +347,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     e << baseFile;
 #endif
-    } else if ( msg == "rdiffCleanup()" ) {
+    } else
+
+    if ( msg == "rdiffCleanup()" ) {
     mkdir( "/tmp/rdiff" );
     QDir dir;
@@ -343,5 +356,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
         dir.remove( *it );
-    } else if ( msg == "sendHandshakeInfo()" ) {
+    } else
+
+    if ( msg == "sendHandshakeInfo()" ) {
     QString home = getenv( "HOME" );
 #ifndef QT_NO_COP
@@ -351,6 +366,6 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     e << locked;
 #endif
+    } else
 
-    }
     /*
      * QtopiaDesktop relies on the major number
@@ -359,9 +374,11 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
      * to sync with QtopiaDesktop1.6
      */
-    else if ( msg == "sendVersionInfo()" ) {
+    if ( msg == "sendVersionInfo()" ) {
     QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" );
         /* ### FIXME Architecture ### */
     e << QString::fromLatin1("1.7") << "Uncustomized Device";
-    } else if ( msg == "sendCardInfo()" ) {
+    } else
+
+    if ( msg == "sendCardInfo()" ) {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
@@ -390,9 +407,10 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     if ( !homeFs.isEmpty() )
         s += homeFs;
-
 #ifndef QT_NO_COP
     e << s;
 #endif
-    } else if ( msg == "sendSyncDate(QString)" ) {
+    } else
+
+    if ( msg == "sendSyncDate(QString)" ) {
     QString app;
     stream >> app;
@@ -405,5 +423,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     //odebug << "QPE/System sendSyncDate for " << app.latin1() << ": response "
     //       << cfg.readEntry( app ).latin1() << oendl;
-    } else if ( msg == "setSyncDate(QString,QString)" ) {
+    } else
+
+    if ( msg == "setSyncDate(QString,QString)" ) {
     QString app, date;
     stream >> app >> date;
@@ -412,5 +432,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     cfg.writeEntry( app, date );
     //odebug << "setSyncDate(QString,QString) " << app << " " << date << "" << oendl;
-    } else if ( msg == "startSync(QString)" ) {
+    } else
+
+    if ( msg == "startSync(QString)" ) {
     QString what;
     stream >> what;
@@ -419,25 +441,35 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     syncDialog->show();
     connect( syncDialog, SIGNAL(cancel()), SLOT(cancelSync()) );
-    } else if ( msg == "stopSync()") {
+    } else
+
+    if ( msg == "stopSync()") {
     delete syncDialog;
     syncDialog = 0;
-    } else if (msg == "restoreDone(QString)") {
+    } else
+
+    if (msg == "restoreDone(QString)") {
     docList->restoreDone();
-    } else if ( msg == "getAllDocLinks()" ) {
+    } else
+
+    if ( msg == "getAllDocLinks()" ) {
     docList->sendAllDocLinks();
-    }
+    } else
+
 #ifdef Q_WS_QWS
-    else if ( msg == "setMouseProto(QString)" ) {
+    if ( msg == "setMouseProto(QString)" ) {
     QString mice;
     stream >> mice;
     setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
     qwsServer->openMouse();
-    } else if ( msg == "setKeyboard(QString)" ) {
+    } else
+
+    if ( msg == "setKeyboard(QString)" ) {
     QString kb;
     stream >> kb;
     setenv("QWS_KEYBOARD",kb.latin1(),1);
     qwsServer->openKeyboard();
+    } else
 
-    } else if ( msg == "setKeyboardAutoRepeat(int,int)" ) {
+    if ( msg == "setKeyboardAutoRepeat(int,int)" ) {
     int delay, period;
     stream >> delay >> period;
@@ -447,5 +479,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     cfg.writeEntry( "RepeatDelay", delay );
     cfg.writeEntry( "RepeatPeriod", period );
-    } else if ( msg == "setKeyboardLayout(QString)" ) {
+    } else
+
+    if ( msg == "setKeyboardLayout(QString)" ) {
     QString kb;
     stream >> kb;
@@ -454,5 +488,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
     cfg.setGroup("Keyboard");
     cfg.writeEntry( "Layout", kb );
-    } else if ( msg == "autoStart(QString)" ) {
+    } else
+
+    if ( msg == "autoStart(QString)" ) {
         QString appName;
         stream >> appName;
@@ -462,5 +498,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
             cfg.writeEntry("Apps", "");
         }
-    } else if ( msg == "autoStart(QString,QString)" ) {
+    } else
+
+    if ( msg == "autoStart(QString,QString)" ) {
         QString modifier, appName;
         stream >> modifier >> appName;
@@ -483,5 +521,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
         }
         // case the autostart feature should be delayed
-    } else if ( msg == "autoStart(QString,QString,QString)") {
+    } else
+
+    if ( msg == "autoStart(QString,QString,QString)") {
          QString modifier, appName, delay;
          stream >> modifier >> appName >> delay;
@@ -495,5 +535,4 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
                 cfg.writeEntry("Delay", delay);
             }
-        } else {
         }
     }
@@ -507,8 +546,11 @@ void Server::receiveTaskBar(const QCString &msg, const QByteArray &data)
     if ( msg == "reloadApps()" ) {
     docList->reloadAppLnks();
-    } else if ( msg == "soundAlarm()" ) {
+    } else
+
+    if ( msg == "soundAlarm()" ) {
     ServerApplication::soundAlarm();
-    }
-    else if ( msg == "setLed(int,bool)" ) {
+    } else
+
+    if ( msg == "setLed(int,bool)" ) {
     int led, status;
     stream >> led >> status;
@@ -555,7 +597,7 @@ bool Server::mkdir(const QString &localPath)
     while (checkedPath != localPath) {
     // no more seperators found, use the local path
-    if (dirIndex == -1)
+    if (dirIndex == -1) {
         checkedPath = localPath;
-    else {
+    } else {
         // the next directory to check
         checkedPath = localPath.left(dirIndex) + "/";
@@ -597,4 +639,5 @@ void Server::startTransferServer()
     }
     }
+
     if ( !transferServer ) {
     // start transfer server
@@ -606,8 +649,9 @@ void Server::startTransferServer()
         transferServer = 0;
     }
-    }
-    if ( !transferServer || !qcopBridge )
+
+        if ( !qcopBridge )
     tid_xfer = startTimer( 2000 );
 }
+}
 
 void Server::timerEvent( QTimerEvent *e )
@@ -618,6 +662,6 @@ void Server::timerEvent( QTimerEvent *e )
     startTransferServer();
     }
-    /* ### FIXME today startin */
 #if 0
+    /* ### FIXME today startin */
     else if ( e->timerId() == tid_today ) {
     QDate today = QDate::currentDate();
@@ -705,3 +749,2 @@ void Server::preloadApps()
     }
 }
-