2 files changed, 11 insertions, 8 deletions

diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index 7acace9..a9664f8 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -1,5 +1,8 @@
+/* OPIE */
+#include <opie2/owait.h>
+using namespace Opie::Ui;
 
-#include <qstring.h>
 #include <qtopia/qcom.h>
 #include <qtopia/qlibrary.h>
+#include <qtopia/qpeapplication.h>
 #include <qtopia/applicationinterface.h>
@@ -7,6 +10,6 @@
 
-#include <opie2/owait.h>
-
+/* QT */
 #include <qmetaobject.h>
 #include <qmap.h>
+#include <qstring.h>
 
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index c2467fb..b1befce 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -20,2 +20,3 @@
 
+#define QTOPIA_INTERNAL_INITAPP
 #include "dropins.h"
@@ -24,2 +25,3 @@
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
@@ -31,3 +33,2 @@
 #include <qcopchannel_qws.h>
-#define QTOPIA_INTERNAL_INITAPP
 
@@ -63,3 +64,2 @@ extern char **environ;
 #include <stdarg.h>
-using namespace Opie::Ui;
 void setproctitle (const char *fmt,...) {
@@ -135,3 +135,3 @@ private slots:
         stream >> argList;
-        odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl;
+        odebug << "QuickLauncher execute: " << argList.at(0) << oendl;
         doQuickLaunch( argList );
@@ -143,3 +143,3 @@ private slots:
         stream >> arg;
-        odebug << "QuickLauncher execute: " << arg << "" << oendl;
+        odebug << "QuickLauncher execute: " << arg << oendl;
         QStrList argList;
@@ -189,3 +189,3 @@ int main( int argc, char** argv )
     if ( arg0 != "quicklauncher" ) {
-    odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl;
+    odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
     QuickLauncher::exec( argc, argv );