author | mickeyl <mickeyl> | 2004-05-02 18:03:26 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-02 18:03:26 (UTC) |
commit | 1ddcf3566b3339bb649b07b64bd5802b735f37ba (patch) (side-by-side diff) | |
tree | 87495c1882069521c8fd7a70174c1dcf6e8e25b4 /core/tools/quicklauncher | |
parent | 43bd7d72643e2ee3bc4d830c6927def392bc9c7f (diff) | |
download | opie-1ddcf3566b3339bb649b07b64bd5802b735f37ba.zip opie-1ddcf3566b3339bb649b07b64bd5802b735f37ba.tar.gz opie-1ddcf3566b3339bb649b07b64bd5802b735f37ba.tar.bz2 |
#define QTOPIA_INTERNAL_INITAPP must happen before #include "dropins.h" or
this won't compile
-rw-r--r-- | core/tools/quicklauncher/dropins.h | 9 | ||||
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 10 |
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,13 +1,16 @@ +/* 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 { 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 @@ -19,8 +19,10 @@ **********************************************************************/ +#define QTOPIA_INTERNAL_INITAPP #include "dropins.h" /* OPIE */ #include <opie2/odebug.h> +using namespace Opie::Core; /* QT */ @@ -30,5 +32,4 @@ #include <qguardedptr.h> #include <qcopchannel_qws.h> -#define QTOPIA_INTERNAL_INITAPP #ifdef private @@ -62,5 +63,4 @@ extern char **environ; #endif #include <stdarg.h> -using namespace Opie::Ui; void setproctitle (const char *fmt,...) { int i; @@ -134,5 +134,5 @@ private slots: QStrList argList; stream >> argList; - odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl; + odebug << "QuickLauncher execute: " << argList.at(0) << oendl; doQuickLaunch( argList ); delete this; @@ -142,5 +142,5 @@ private slots: QString arg; stream >> arg; - odebug << "QuickLauncher execute: " << arg << "" << oendl; + odebug << "QuickLauncher execute: " << arg << oendl; QStrList argList; argList.append( arg.utf8() ); @@ -188,5 +188,5 @@ int main( int argc, char** argv ) 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 { |