summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 18:23:16 (UTC)
committer zecke <zecke>2004-03-14 18:23:16 (UTC)
commit1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8 (patch) (unidiff)
tree85dbff8988614e3a6467febac1f409f094cc0158
parentcbd0144d473cd22d565fbe6c07db85548f2d797d (diff)
downloadopie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.zip
opie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.tar.gz
opie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.tar.bz2
QuickLauncher links now against opie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/config.in2
-rw-r--r--core/tools/quicklauncher/dropins.h6
-rw-r--r--core/tools/quicklauncher/main.cpp3
-rw-r--r--core/tools/quicklauncher/quicklauncher.pro2
4 files changed, 7 insertions, 6 deletions
diff --git a/core/tools/quicklauncher/config.in b/core/tools/quicklauncher/config.in
index c105e94..eacbcf6 100644
--- a/core/tools/quicklauncher/config.in
+++ b/core/tools/quicklauncher/config.in
@@ -1,4 +1,4 @@
1 config QUICKLAUNCHER 1 config QUICKLAUNCHER
2 boolean "The Quick Launcher Loader" 2 boolean "The Quick Launcher Loader"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index 3e2b5fd..7acace9 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -4,14 +4,14 @@
4#include <qtopia/qlibrary.h> 4#include <qtopia/qlibrary.h>
5#include <qtopia/applicationinterface.h> 5#include <qtopia/applicationinterface.h>
6#include <qtopia/resource.h> 6#include <qtopia/resource.h>
7 7
8#include <opie/owait.h> 8#include <opie2/owait.h>
9 9
10#include <qmetaobject.h> 10#include <qmetaobject.h>
11#include <qmap.h> 11#include <qmap.h>
12 12
13namespace Opie { 13namespace QuickPrivate {
14 14
15 struct PluginLoader { 15 struct PluginLoader {
16 PluginLoader( const char* ) { 16 PluginLoader( const char* ) {
17 } 17 }
@@ -65,6 +65,4 @@ namespace Opie {
65 } 65 }
66 66
67} 67}
68 68
69/* small hack ;) */
70using namespace Opie;
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 1d6774c..f3055cc 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -38,8 +38,10 @@
38#include <unistd.h> 38#include <unistd.h>
39 39
40#include "dropins.h" 40#include "dropins.h"
41 41
42using QuickPrivate::PluginLoader;
43
42static QPEApplication *app = 0; 44static QPEApplication *app = 0;
43static PluginLoader *loader = 0; 45static PluginLoader *loader = 0;
44static ApplicationInterface *appIface = 0; 46static ApplicationInterface *appIface = 0;
45static QGuardedPtr<QWidget> mainWindow; 47static QGuardedPtr<QWidget> mainWindow;
@@ -51,8 +53,9 @@ extern char **environ;
51#ifndef SPT_BUFSIZE 53#ifndef SPT_BUFSIZE
52#define SPT_BUFSIZE 2048 54#define SPT_BUFSIZE 2048
53#endif 55#endif
54#include <stdarg.h> 56#include <stdarg.h>
57using namespace Opie::Ui;
55void setproctitle (const char *fmt,...) { 58void setproctitle (const char *fmt,...) {
56 int i; 59 int i;
57 char buf[SPT_BUFSIZE]; 60 char buf[SPT_BUFSIZE];
58 va_list ap; 61 va_list ap;
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 6ab5fc8..ae390e5 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -6,9 +6,9 @@ HEADERS = dropins.h
6 SOURCES = main.cpp 6 SOURCES = main.cpp
7 INTERFACES= 7 INTERFACES=
8 8
9 INCLUDEPATH+= $(OPIEDIR)/include 9 INCLUDEPATH+= $(OPIEDIR)/include
10 LIBS += -lqpe -lopie 10 LIBS += -lqpe -lopiecore2 -lopieui2
11 11
12 TARGET = quicklauncher 12 TARGET = quicklauncher
13 13
14 14