QuickLauncher links now against opie2

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 @@
   config QUICKLAUNCHER
     boolean "The Quick Launcher Loader"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    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
@@ -1,21 +1,21 @@
 
 #include <qstring.h>
 #include <qtopia/qcom.h>
 #include <qtopia/qlibrary.h>
 #include <qtopia/applicationinterface.h>
 #include <qtopia/resource.h>
 
-#include <opie/owait.h>
+#include <opie2/owait.h>
 
 #include <qmetaobject.h>
 #include <qmap.h>
 
-namespace Opie {
+namespace QuickPrivate {
 
     struct PluginLoader {
         PluginLoader( const char* ) {
         }
 
         QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** );
         void releaseInterface( QUnknownInterface* );
         QMap<QUnknownInterface*, QLibrary*> libs;
@@ -61,10 +61,8 @@ namespace Opie {
             iface->release();
             delete libs[iface];
             libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is
         }
     }
 
 }
 
-/* small hack ;) */
-using 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
@@ -34,29 +34,32 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "dropins.h"
 
+using QuickPrivate::PluginLoader;
+
 static QPEApplication *app = 0;
 static PluginLoader *loader = 0;
 static ApplicationInterface *appIface = 0;
 static QGuardedPtr<QWidget> mainWindow;
 
 #ifdef _OS_LINUX_
 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)
 	return;
 
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
@@ -2,14 +2,14 @@ TEMPLATE	= app
 CONFIG		+= qtopia warn_on release
 DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS		= dropins.h
 SOURCES		= main.cpp
 INTERFACES	= 
 
 INCLUDEPATH	+= $(OPIEDIR)/include
-LIBS       	+= -lqpe -lopie
+LIBS       	+= -lqpe -lopiecore2 -lopieui2
 
 TARGET		= quicklauncher
 
 
 include ( $(OPIEDIR)/include.pro )
\ No newline at end of file