1 files changed, 13 insertions, 6 deletions

diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index d467d6e..c2467fb 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -17,8 +17,14 @@
 ** not clear to you.
 **
 **********************************************************************/
 
+#include "dropins.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
 #include <qguardedptr.h>
@@ -30,15 +36,16 @@
 #endif
 #define private public
 #include <qtopia/qpeapplication.h>
 #undef private
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "dropins.h"
 
 using QuickPrivate::PluginLoader;
 
 static QPEApplication *app = 0;
@@ -110,9 +117,9 @@ public:
             } else {
                 app->showMainWidget( mainWindow );
             }
         } else {
-            qWarning( "Could not create application main window" );
+        owarn << "Could not create application main window" << oendl;
             exit(-1);
         }
     }
 
@@ -125,17 +132,17 @@ private slots:
             delete qlChannel;
             QDataStream stream( data, IO_ReadOnly );
             QStrList argList;
             stream >> argList;
-            qDebug( "QuickLauncher execute: %s", argList.at(0) );
+        odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl;
             doQuickLaunch( argList );
             delete this;
         } else if ( msg == "execute(QString)" ) {
             delete qlChannel;
             QDataStream stream( data, IO_ReadOnly );
             QString arg;
             stream >> arg;
-            qDebug( "QuickLauncher execute: %s", arg.latin1() );
+        odebug << "QuickLauncher execute: " << arg << "" << oendl;
             QStrList argList;
             argList.append( arg.utf8() );
             doQuickLaunch( argList );
             delete this;
@@ -179,9 +186,9 @@ int main( int argc, char** argv )
     int sep = arg0.findRev( '/' );
     if ( sep > 0 )
         arg0 = arg0.mid( sep+1 );
     if ( arg0 != "quicklauncher" ) {
-        qDebug( "QuickLauncher invoked as: %s", arg0.data() );
+    odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl;
         QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
         // Setup to change proc title
@@ -205,9 +212,9 @@ int main( int argc, char** argv )
         else
             argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
 #endif
         (void)new QuickLauncher();
-        qDebug( "QuickLauncher running" );
+    odebug << "QuickLauncher running" << oendl;
         // Pre-load default fonts
         QFontMetrics fm( QApplication::font() );
         fm.ascent(); // causes font load.
         QFont f( QApplication::font() );