author | mickeyl <mickeyl> | 2004-05-02 18:03:26 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-02 18:03:26 (UTC) |
commit | 1ddcf3566b3339bb649b07b64bd5802b735f37ba (patch) (unidiff) | |
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,5 +1,8 @@ | |||
1 | /* OPIE */ | ||
2 | #include <opie2/owait.h> | ||
3 | using namespace Opie::Ui; | ||
1 | 4 | ||
2 | #include <qstring.h> | ||
3 | #include <qtopia/qcom.h> | 5 | #include <qtopia/qcom.h> |
4 | #include <qtopia/qlibrary.h> | 6 | #include <qtopia/qlibrary.h> |
7 | #include <qtopia/qpeapplication.h> | ||
5 | #include <qtopia/applicationinterface.h> | 8 | #include <qtopia/applicationinterface.h> |
@@ -7,6 +10,6 @@ | |||
7 | 10 | ||
8 | #include <opie2/owait.h> | 11 | /* QT */ |
9 | |||
10 | #include <qmetaobject.h> | 12 | #include <qmetaobject.h> |
11 | #include <qmap.h> | 13 | #include <qmap.h> |
14 | #include <qstring.h> | ||
12 | 15 | ||
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 @@ | |||
20 | 20 | ||
21 | #define QTOPIA_INTERNAL_INITAPP | ||
21 | #include "dropins.h" | 22 | #include "dropins.h" |
@@ -24,2 +25,3 @@ | |||
24 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | using namespace Opie::Core; | ||
25 | 27 | ||
@@ -31,3 +33,2 @@ | |||
31 | #include <qcopchannel_qws.h> | 33 | #include <qcopchannel_qws.h> |
32 | #define QTOPIA_INTERNAL_INITAPP | ||
33 | 34 | ||
@@ -63,3 +64,2 @@ extern char **environ; | |||
63 | #include <stdarg.h> | 64 | #include <stdarg.h> |
64 | using namespace Opie::Ui; | ||
65 | void setproctitle (const char *fmt,...) { | 65 | void setproctitle (const char *fmt,...) { |
@@ -135,3 +135,3 @@ private slots: | |||
135 | stream >> argList; | 135 | stream >> argList; |
136 | odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl; | 136 | odebug << "QuickLauncher execute: " << argList.at(0) << oendl; |
137 | doQuickLaunch( argList ); | 137 | doQuickLaunch( argList ); |
@@ -143,3 +143,3 @@ private slots: | |||
143 | stream >> arg; | 143 | stream >> arg; |
144 | odebug << "QuickLauncher execute: " << arg << "" << oendl; | 144 | odebug << "QuickLauncher execute: " << arg << oendl; |
145 | QStrList argList; | 145 | QStrList argList; |
@@ -189,3 +189,3 @@ int main( int argc, char** argv ) | |||
189 | if ( arg0 != "quicklauncher" ) { | 189 | if ( arg0 != "quicklauncher" ) { |
190 | odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl; | 190 | odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; |
191 | QuickLauncher::exec( argc, argv ); | 191 | QuickLauncher::exec( argc, argv ); |