-rw-r--r-- | core/launcher/server.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp index 9a86a80..b9fa1e5 100644 --- a/core/launcher/server.cpp +++ b/core/launcher/server.cpp | |||
@@ -36,6 +36,10 @@ | |||
36 | #endif | 36 | #endif |
37 | #include "documentlist.h" | 37 | #include "documentlist.h" |
38 | 38 | ||
39 | /* OPIE */ | ||
40 | #include <opie2/odebug.h> | ||
41 | #include <opie2/odevicebutton.h> | ||
42 | #include <opie2/odevice.h> | ||
39 | #include <qtopia/applnk.h> | 43 | #include <qtopia/applnk.h> |
40 | #include <qtopia/private/categories.h> | 44 | #include <qtopia/private/categories.h> |
41 | #include <qtopia/mimetype.h> | 45 | #include <qtopia/mimetype.h> |
@@ -43,28 +47,24 @@ | |||
43 | #include <qtopia/resource.h> | 47 | #include <qtopia/resource.h> |
44 | #include <qtopia/version.h> | 48 | #include <qtopia/version.h> |
45 | #include <qtopia/storage.h> | 49 | #include <qtopia/storage.h> |
46 | |||
47 | #include <qtopia/qcopenvelope_qws.h> | 50 | #include <qtopia/qcopenvelope_qws.h> |
48 | #include <qwindowsystem_qws.h> | ||
49 | #include <qgfx_qws.h> | ||
50 | #include <qtopia/global.h> | 51 | #include <qtopia/global.h> |
51 | //#include <qtopia/custom.h> | 52 | using namespace Opie::Core; |
52 | |||
53 | #include <opie2/odevicebutton.h> | ||
54 | #include <opie2/odevice.h> | ||
55 | 53 | ||
56 | #include <unistd.h> | 54 | /* QT */ |
57 | #include <qmainwindow.h> | 55 | #include <qmainwindow.h> |
58 | #include <qmessagebox.h> | 56 | #include <qmessagebox.h> |
59 | #include <qtimer.h> | 57 | #include <qtimer.h> |
60 | #include <qtextstream.h> | 58 | #include <qtextstream.h> |
59 | #include <qwindowsystem_qws.h> | ||
60 | #include <qgfx_qws.h> | ||
61 | 61 | ||
62 | /* STD */ | ||
63 | #include <unistd.h> | ||
62 | #include <stdlib.h> | 64 | #include <stdlib.h> |
63 | 65 | ||
64 | extern QRect qt_maxWindowRect; | 66 | extern QRect qt_maxWindowRect; |
65 | 67 | ||
66 | |||
67 | using namespace Opie::Core; | ||
68 | static QWidget *calibrate(bool) | 68 | static QWidget *calibrate(bool) |
69 | { | 69 | { |
70 | #ifdef Q_WS_QWS | 70 | #ifdef Q_WS_QWS |
@@ -329,7 +329,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
329 | else if ( msg == "linkChanged(QString)" ) { | 329 | else if ( msg == "linkChanged(QString)" ) { |
330 | QString link; | 330 | QString link; |
331 | stream >> link; | 331 | stream >> link; |
332 | qDebug( "desktop.cpp systemMsg -> linkchanged( %s )", link.latin1() ); | 332 | odebug << "desktop.cpp systemMsg -> linkchanged( " << link << " )" << oendl; |
333 | docList->linkChanged(link); | 333 | docList->linkChanged(link); |
334 | } else if ( msg == "serviceChanged(QString)" ) { | 334 | } else if ( msg == "serviceChanged(QString)" ) { |
335 | MimeType::updateApplications(); | 335 | MimeType::updateApplications(); |
@@ -434,7 +434,7 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
434 | Config cfg( "qpe" ); | 434 | Config cfg( "qpe" ); |
435 | cfg.setGroup("SyncDate"); | 435 | cfg.setGroup("SyncDate"); |
436 | cfg.writeEntry( app, date ); | 436 | cfg.writeEntry( app, date ); |
437 | //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1()); | 437 | //odebug << "setSyncDate(QString,QString) " << app << " " << date << "" << oendl; |
438 | } else if ( msg == "startSync(QString)" ) { | 438 | } else if ( msg == "startSync(QString)" ) { |
439 | QString what; | 439 | QString what; |
440 | stream >> what; | 440 | stream >> what; |
@@ -572,7 +572,7 @@ bool Server::mkdir(const QString &localPath) | |||
572 | 572 | ||
573 | // didn't find any seps; weird, use the cur dir instead | 573 | // didn't find any seps; weird, use the cur dir instead |
574 | if (dirIndex == -1) { | 574 | if (dirIndex == -1) { |
575 | //qDebug("No seperators found in path %s", localPath.latin1()); | 575 | //odebug << "No seperators found in path " << localPath << "" << oendl; |
576 | checkedPath = QDir::currentDirPath(); | 576 | checkedPath = QDir::currentDirPath(); |
577 | } | 577 | } |
578 | 578 | ||
@@ -589,10 +589,10 @@ bool Server::mkdir(const QString &localPath) | |||
589 | 589 | ||
590 | QDir checkDir(checkedPath); | 590 | QDir checkDir(checkedPath); |
591 | if (!checkDir.exists()) { | 591 | if (!checkDir.exists()) { |
592 | //qDebug("mkdir making dir %s", checkedPath.latin1()); | 592 | //odebug << "mkdir making dir " << checkedPath << "" << oendl; |
593 | 593 | ||
594 | if (!checkDir.mkdir(checkedPath)) { | 594 | if (!checkDir.mkdir(checkedPath)) { |
595 | qDebug("Unable to make directory %s", checkedPath.latin1()); | 595 | odebug << "Unable to make directory " << checkedPath << "" << oendl; |
596 | return FALSE; | 596 | return FALSE; |
597 | } | 597 | } |
598 | } | 598 | } |
@@ -670,7 +670,7 @@ void Server::terminateServers() | |||
670 | 670 | ||
671 | void Server::syncConnectionClosed( const QHostAddress & ) | 671 | void Server::syncConnectionClosed( const QHostAddress & ) |
672 | { | 672 | { |
673 | qDebug( "Lost sync connection" ); | 673 | odebug << "Lost sync connection" << oendl; |
674 | delete syncDialog; | 674 | delete syncDialog; |
675 | syncDialog = 0; | 675 | syncDialog = 0; |
676 | } | 676 | } |