#define QTOPIA_INTERNAL_INITAPP must happen before #include "dropins.h" or

this won't compile

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,17 +1,20 @@
+/* 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>
 #include <qtopia/resource.h>
 
-#include <opie2/owait.h>
-
+/* QT */
 #include <qmetaobject.h>
 #include <qmap.h>
+#include <qstring.h>
 
 namespace QuickPrivate {
 
     struct PluginLoader {
         PluginLoader( const char* ) {
         }
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
@@ -15,24 +15,25 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_INITAPP
 #include "dropins.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
 #include <qguardedptr.h>
 #include <qcopchannel_qws.h>
-#define QTOPIA_INTERNAL_INITAPP
 
 #ifdef private
 #       undef  private
 #endif
 #define private public
 #include <qtopia/qpeapplication.h>
@@ -58,13 +59,12 @@ static char **argv0 = 0;
 static int argv_lth;
 extern char **environ;
 #ifndef SPT_BUFSIZE
 #define SPT_BUFSIZE     2048
 #endif
 #include <stdarg.h>
-using namespace Opie::Ui;
 void setproctitle (const char *fmt,...) {
     int        i;
     char       buf[SPT_BUFSIZE];
     va_list    ap;
 
     if (!argv0)
@@ -130,21 +130,21 @@ private slots:
 
     if ( msg == "execute(QStrList)" ) {
         delete qlChannel;
         QDataStream stream( data, IO_ReadOnly );
         QStrList argList;
         stream >> argList;
-        odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl;
+        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;
-        odebug << "QuickLauncher execute: " << arg << "" << oendl;
+        odebug << "QuickLauncher execute: " << arg << oendl;
         QStrList argList;
         argList.append( arg.utf8() );
         doQuickLaunch( argList );
         delete this;
     }
     }
@@ -184,13 +184,13 @@ int main( int argc, char** argv )
 
     QCString arg0 = argv[0];
     int sep = arg0.findRev( '/' );
     if ( sep > 0 )
     arg0 = arg0.mid( sep+1 );
     if ( arg0 != "quicklauncher" ) {
-    odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl;
+    odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
     QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
     // Setup to change proc title
     int i;
     char **envp = environ;