| author | zecke <zecke> | 2004-03-14 18:23:16 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 18:23:16 (UTC) |
| commit | 1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8 (patch) (side-by-side diff) | |
| tree | 85dbff8988614e3a6467febac1f409f094cc0158 | |
| parent | cbd0144d473cd22d565fbe6c07db85548f2d797d (diff) | |
| download | opie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.zip opie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.tar.gz opie-1c32fa9ffa9dda6b5726871bba948c0d2be3c7c8.tar.bz2 | |
QuickLauncher links now against opie2
| -rw-r--r-- | core/tools/quicklauncher/config.in | 2 | ||||
| -rw-r--r-- | core/tools/quicklauncher/dropins.h | 6 | ||||
| -rw-r--r-- | core/tools/quicklauncher/main.cpp | 3 | ||||
| -rw-r--r-- | core/tools/quicklauncher/quicklauncher.pro | 2 |
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 @@ -5,12 +5,12 @@ #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* ) { @@ -66,5 +66,3 @@ namespace Opie { } -/* 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 @@ -39,6 +39,8 @@ #include "dropins.h" +using QuickPrivate::PluginLoader; + static QPEApplication *app = 0; static PluginLoader *loader = 0; static ApplicationInterface *appIface = 0; @@ -52,6 +54,7 @@ extern char **environ; #define SPT_BUFSIZE 2048 #endif #include <stdarg.h> +using namespace Opie::Ui; void setproctitle (const char *fmt,...) { int i; char buf[SPT_BUFSIZE]; 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 @@ -7,7 +7,7 @@ SOURCES = main.cpp INTERFACES = INCLUDEPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 TARGET = quicklauncher |