author | schurig <schurig> | 2004-09-14 08:42:14 (UTC) |
---|---|---|
committer | schurig <schurig> | 2004-09-14 08:42:14 (UTC) |
commit | b425c1e7ae98835745f186f22c59db4377f4441c (patch) (unidiff) | |
tree | 7255f4d146ed5213f33532c8cf6ec175b2afe2ae | |
parent | 5b09662a6198033580493222fac6df5ea31479e3 (diff) | |
download | opie-b425c1e7ae98835745f186f22c59db4377f4441c.zip opie-b425c1e7ae98835745f186f22c59db4377f4441c.tar.gz opie-b425c1e7ae98835745f186f22c59db4377f4441c.tar.bz2 |
Fixed some horrible indentations
-rw-r--r-- | core/launcher/server.cpp | 127 |
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 | |||
@@ -234,3 +234,2 @@ void Server::activate(const ODeviceButton* button, bool held) | |||
234 | 234 | ||
235 | |||
236 | typedef struct KeyOverride { | 235 | typedef struct KeyOverride { |
@@ -283,3 +282,2 @@ bool Server::setKeyboardLayout( const QString &kb ) | |||
283 | } | 282 | } |
284 | |||
285 | #endif | 283 | #endif |
@@ -293,8 +291,10 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
293 | transferServer->authorizeConnections(); | 291 | transferServer->authorizeConnections(); |
292 | |||
294 | if ( qcopBridge ) | 293 | if ( qcopBridge ) |
295 | qcopBridge->authorizeConnections(); | 294 | qcopBridge->authorizeConnections(); |
296 | } | 295 | } else |
297 | /* ### FIXME support TempScreenSaverMode */ | 296 | |
298 | #if 0 | 297 | #if 0 |
299 | else if ( msg == "setTempScreenSaverMode(int,int)" ) { | 298 | /* ### FIXME support TempScreenSaverMode */ |
299 | if ( msg == "setTempScreenSaverMode(int,int)" ) { | ||
300 | int mode, pid; | 300 | int mode, pid; |
@@ -302,5 +302,6 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
302 | tsmMonitor->setTempMode(mode, pid); | 302 | tsmMonitor->setTempMode(mode, pid); |
303 | } | 303 | } else |
304 | #endif | 304 | #endif |
305 | else if ( msg == "linkChanged(QString)" ) { | 305 | |
306 | if ( msg == "linkChanged(QString)" ) { | ||
306 | QString link; | 307 | QString link; |
@@ -309,5 +310,9 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
309 | docList->linkChanged(link); | 310 | docList->linkChanged(link); |
310 | } else if ( msg == "serviceChanged(QString)" ) { | 311 | } else |
312 | |||
313 | if ( msg == "serviceChanged(QString)" ) { | ||
311 | MimeType::updateApplications(); | 314 | MimeType::updateApplications(); |
312 | } else if ( msg == "mkdir(QString)" ) { | 315 | } else |
316 | |||
317 | if ( msg == "mkdir(QString)" ) { | ||
313 | QString dir; | 318 | QString dir; |
@@ -316,3 +321,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
316 | mkdir( dir ); | 321 | mkdir( dir ); |
317 | } else if ( msg == "rdiffGenSig(QString,QString)" ) { | 322 | } else |
323 | |||
324 | if ( msg == "rdiffGenSig(QString,QString)" ) { | ||
318 | QString baseFile, sigFile; | 325 | QString baseFile, sigFile; |
@@ -320,3 +327,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
320 | QRsync::generateSignature( baseFile, sigFile ); | 327 | QRsync::generateSignature( baseFile, sigFile ); |
321 | } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) { | 328 | } else |
329 | |||
330 | if ( msg == "rdiffGenDiff(QString,QString,QString)" ) { | ||
322 | QString baseFile, sigFile, deltaFile; | 331 | QString baseFile, sigFile, deltaFile; |
@@ -324,3 +333,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
324 | QRsync::generateDiff( baseFile, sigFile, deltaFile ); | 333 | QRsync::generateDiff( baseFile, sigFile, deltaFile ); |
325 | } else if ( msg == "rdiffApplyPatch(QString,QString)" ) { | 334 | } else |
335 | |||
336 | if ( msg == "rdiffApplyPatch(QString,QString)" ) { | ||
326 | QString baseFile, deltaFile; | 337 | QString baseFile, deltaFile; |
@@ -337,3 +348,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
337 | #endif | 348 | #endif |
338 | } else if ( msg == "rdiffCleanup()" ) { | 349 | } else |
350 | |||
351 | if ( msg == "rdiffCleanup()" ) { | ||
339 | mkdir( "/tmp/rdiff" ); | 352 | mkdir( "/tmp/rdiff" ); |
@@ -344,3 +357,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
344 | dir.remove( *it ); | 357 | dir.remove( *it ); |
345 | } else if ( msg == "sendHandshakeInfo()" ) { | 358 | } else |
359 | |||
360 | if ( msg == "sendHandshakeInfo()" ) { | ||
346 | QString home = getenv( "HOME" ); | 361 | QString home = getenv( "HOME" ); |
@@ -352,4 +367,4 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
352 | #endif | 367 | #endif |
368 | } else | ||
353 | 369 | ||
354 | } | ||
355 | /* | 370 | /* |
@@ -360,3 +375,3 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
360 | */ | 375 | */ |
361 | else if ( msg == "sendVersionInfo()" ) { | 376 | if ( msg == "sendVersionInfo()" ) { |
362 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" ); | 377 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" ); |
@@ -364,3 +379,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
364 | e << QString::fromLatin1("1.7") << "Uncustomized Device"; | 379 | e << QString::fromLatin1("1.7") << "Uncustomized Device"; |
365 | } else if ( msg == "sendCardInfo()" ) { | 380 | } else |
381 | |||
382 | if ( msg == "sendCardInfo()" ) { | ||
366 | #ifndef QT_NO_COP | 383 | #ifndef QT_NO_COP |
@@ -391,3 +408,2 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
391 | s += homeFs; | 408 | s += homeFs; |
392 | |||
393 | #ifndef QT_NO_COP | 409 | #ifndef QT_NO_COP |
@@ -395,3 +411,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
395 | #endif | 411 | #endif |
396 | } else if ( msg == "sendSyncDate(QString)" ) { | 412 | } else |
413 | |||
414 | if ( msg == "sendSyncDate(QString)" ) { | ||
397 | QString app; | 415 | QString app; |
@@ -406,3 +424,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
406 | // << cfg.readEntry( app ).latin1() << oendl; | 424 | // << cfg.readEntry( app ).latin1() << oendl; |
407 | } else if ( msg == "setSyncDate(QString,QString)" ) { | 425 | } else |
426 | |||
427 | if ( msg == "setSyncDate(QString,QString)" ) { | ||
408 | QString app, date; | 428 | QString app, date; |
@@ -413,3 +433,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
413 | //odebug << "setSyncDate(QString,QString) " << app << " " << date << "" << oendl; | 433 | //odebug << "setSyncDate(QString,QString) " << app << " " << date << "" << oendl; |
414 | } else if ( msg == "startSync(QString)" ) { | 434 | } else |
435 | |||
436 | if ( msg == "startSync(QString)" ) { | ||
415 | QString what; | 437 | QString what; |
@@ -420,12 +442,19 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
420 | connect( syncDialog, SIGNAL(cancel()), SLOT(cancelSync()) ); | 442 | connect( syncDialog, SIGNAL(cancel()), SLOT(cancelSync()) ); |
421 | } else if ( msg == "stopSync()") { | 443 | } else |
444 | |||
445 | if ( msg == "stopSync()") { | ||
422 | delete syncDialog; | 446 | delete syncDialog; |
423 | syncDialog = 0; | 447 | syncDialog = 0; |
424 | } else if (msg == "restoreDone(QString)") { | 448 | } else |
449 | |||
450 | if (msg == "restoreDone(QString)") { | ||
425 | docList->restoreDone(); | 451 | docList->restoreDone(); |
426 | } else if ( msg == "getAllDocLinks()" ) { | 452 | } else |
453 | |||
454 | if ( msg == "getAllDocLinks()" ) { | ||
427 | docList->sendAllDocLinks(); | 455 | docList->sendAllDocLinks(); |
428 | } | 456 | } else |
457 | |||
429 | #ifdef Q_WS_QWS | 458 | #ifdef Q_WS_QWS |
430 | else if ( msg == "setMouseProto(QString)" ) { | 459 | if ( msg == "setMouseProto(QString)" ) { |
431 | QString mice; | 460 | QString mice; |
@@ -434,3 +463,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
434 | qwsServer->openMouse(); | 463 | qwsServer->openMouse(); |
435 | } else if ( msg == "setKeyboard(QString)" ) { | 464 | } else |
465 | |||
466 | if ( msg == "setKeyboard(QString)" ) { | ||
436 | QString kb; | 467 | QString kb; |
@@ -439,4 +470,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
439 | qwsServer->openKeyboard(); | 470 | qwsServer->openKeyboard(); |
471 | } else | ||
440 | 472 | ||
441 | } else if ( msg == "setKeyboardAutoRepeat(int,int)" ) { | 473 | if ( msg == "setKeyboardAutoRepeat(int,int)" ) { |
442 | int delay, period; | 474 | int delay, period; |
@@ -448,3 +480,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
448 | cfg.writeEntry( "RepeatPeriod", period ); | 480 | cfg.writeEntry( "RepeatPeriod", period ); |
449 | } else if ( msg == "setKeyboardLayout(QString)" ) { | 481 | } else |
482 | |||
483 | if ( msg == "setKeyboardLayout(QString)" ) { | ||
450 | QString kb; | 484 | QString kb; |
@@ -455,3 +489,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
455 | cfg.writeEntry( "Layout", kb ); | 489 | cfg.writeEntry( "Layout", kb ); |
456 | } else if ( msg == "autoStart(QString)" ) { | 490 | } else |
491 | |||
492 | if ( msg == "autoStart(QString)" ) { | ||
457 | QString appName; | 493 | QString appName; |
@@ -463,3 +499,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
463 | } | 499 | } |
464 | } else if ( msg == "autoStart(QString,QString)" ) { | 500 | } else |
501 | |||
502 | if ( msg == "autoStart(QString,QString)" ) { | ||
465 | QString modifier, appName; | 503 | QString modifier, appName; |
@@ -484,3 +522,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
484 | // case the autostart feature should be delayed | 522 | // case the autostart feature should be delayed |
485 | } else if ( msg == "autoStart(QString,QString,QString)") { | 523 | } else |
524 | |||
525 | if ( msg == "autoStart(QString,QString,QString)") { | ||
486 | QString modifier, appName, delay; | 526 | QString modifier, appName, delay; |
@@ -496,3 +536,2 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
496 | } | 536 | } |
497 | } else { | ||
498 | } | 537 | } |
@@ -508,6 +547,9 @@ void Server::receiveTaskBar(const QCString &msg, const QByteArray &data) | |||
508 | docList->reloadAppLnks(); | 547 | docList->reloadAppLnks(); |
509 | } else if ( msg == "soundAlarm()" ) { | 548 | } else |
549 | |||
550 | if ( msg == "soundAlarm()" ) { | ||
510 | ServerApplication::soundAlarm(); | 551 | ServerApplication::soundAlarm(); |
511 | } | 552 | } else |
512 | else if ( msg == "setLed(int,bool)" ) { | 553 | |
554 | if ( msg == "setLed(int,bool)" ) { | ||
513 | int led, status; | 555 | int led, status; |
@@ -556,5 +598,5 @@ bool Server::mkdir(const QString &localPath) | |||
556 | // no more seperators found, use the local path | 598 | // no more seperators found, use the local path |
557 | if (dirIndex == -1) | 599 | if (dirIndex == -1) { |
558 | checkedPath = localPath; | 600 | checkedPath = localPath; |
559 | else { | 601 | } else { |
560 | // the next directory to check | 602 | // the next directory to check |
@@ -598,2 +640,3 @@ void Server::startTransferServer() | |||
598 | } | 640 | } |
641 | |||
599 | if ( !transferServer ) { | 642 | if ( !transferServer ) { |
@@ -607,6 +650,7 @@ void Server::startTransferServer() | |||
607 | } | 650 | } |
608 | } | 651 | |
609 | if ( !transferServer || !qcopBridge ) | 652 | if ( !qcopBridge ) |
610 | tid_xfer = startTimer( 2000 ); | 653 | tid_xfer = startTimer( 2000 ); |
611 | } | 654 | } |
655 | } | ||
612 | 656 | ||
@@ -619,4 +663,4 @@ void Server::timerEvent( QTimerEvent *e ) | |||
619 | } | 663 | } |
620 | /* ### FIXME today startin */ | ||
621 | #if 0 | 664 | #if 0 |
665 | /* ### FIXME today startin */ | ||
622 | else if ( e->timerId() == tid_today ) { | 666 | else if ( e->timerId() == tid_today ) { |
@@ -706,2 +750 @@ void Server::preloadApps() | |||
706 | } | } | |
707 | |||