summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/dropins.h9
-rw-r--r--core/tools/quicklauncher/main.cpp10
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,14 +1,17 @@
1/* OPIE */
2#include <opie2/owait.h>
3using 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>
6#include <qtopia/resource.h> 9#include <qtopia/resource.h>
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
13namespace QuickPrivate { 16namespace QuickPrivate {
14 17
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
@@ -18,10 +18,12 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#define QTOPIA_INTERNAL_INITAPP
21#include "dropins.h" 22#include "dropins.h"
22 23
23/* OPIE */ 24/* OPIE */
24#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26using namespace Opie::Core;
25 27
26/* QT */ 28/* QT */
27#include <qpainter.h> 29#include <qpainter.h>
@@ -29,7 +31,6 @@
29#include <qtimer.h> 31#include <qtimer.h>
30#include <qguardedptr.h> 32#include <qguardedptr.h>
31#include <qcopchannel_qws.h> 33#include <qcopchannel_qws.h>
32#define QTOPIA_INTERNAL_INITAPP
33 34
34#ifdef private 35#ifdef private
35# undef private 36# undef private
@@ -61,7 +62,6 @@ extern char **environ;
61#define SPT_BUFSIZE 2048 62#define SPT_BUFSIZE 2048
62#endif 63#endif
63#include <stdarg.h> 64#include <stdarg.h>
64using namespace Opie::Ui;
65void setproctitle (const char *fmt,...) { 65void setproctitle (const char *fmt,...) {
66 int i; 66 int i;
67 char buf[SPT_BUFSIZE]; 67 char buf[SPT_BUFSIZE];
@@ -133,7 +133,7 @@ private slots:
133 QDataStream stream( data, IO_ReadOnly ); 133 QDataStream stream( data, IO_ReadOnly );
134 QStrList argList; 134 QStrList argList;
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 );
138 delete this; 138 delete this;
139 } else if ( msg == "execute(QString)" ) { 139 } else if ( msg == "execute(QString)" ) {
@@ -141,7 +141,7 @@ private slots:
141 QDataStream stream( data, IO_ReadOnly ); 141 QDataStream stream( data, IO_ReadOnly );
142 QString arg; 142 QString arg;
143 stream >> arg; 143 stream >> arg;
144 odebug << "QuickLauncher execute: " << arg << "" << oendl; 144 odebug << "QuickLauncher execute: " << arg << oendl;
145 QStrList argList; 145 QStrList argList;
146 argList.append( arg.utf8() ); 146 argList.append( arg.utf8() );
147 doQuickLaunch( argList ); 147 doQuickLaunch( argList );
@@ -187,7 +187,7 @@ int main( int argc, char** argv )
187 if ( sep > 0 ) 187 if ( sep > 0 )
188 arg0 = arg0.mid( sep+1 ); 188 arg0 = arg0.mid( sep+1 );
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 );
192 } else { 192 } else {
193#ifdef _OS_LINUX_ 193#ifdef _OS_LINUX_