-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/config.in.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/main.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 2 |
8 files changed, 9 insertions, 7 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 93b2c67..8a7f0bc 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -44,13 +44,13 @@ #include <qstring.h> #include <qtimer.h> #include <qpopupmenu.h> #include <device.h> -using namespace Opie; +using namespace Opie::Core; namespace OpieTooth { BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( 18 ); setFixedWidth( 14 ); diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in index 59fdeb4..ee37ed6 100644 --- a/noncore/net/opietooth/applet/config.in +++ b/noncore/net/opietooth/applet/config.in @@ -1,4 +1,4 @@ config OPIETOOTH-APPLET boolean default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH && LIBOPIETOOTH diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in index 4b9f3ca..93bc70c 100644 --- a/noncore/net/opietooth/blue-pin/config.in +++ b/noncore/net/opietooth/blue-pin/config.in @@ -1,4 +1,4 @@ config BLUE-PIN boolean "opie-bluepin (Bluetooth pin application)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH diff --git a/noncore/net/opietooth/config.in.in b/noncore/net/opietooth/config.in.in index 4f1b974..afb0891 100644 --- a/noncore/net/opietooth/config.in.in +++ b/noncore/net/opietooth/config.in.in @@ -1,7 +1,7 @@ config OPIETOOTH bool "Bluetooth support" - depends (LIBQPE || LIBQPE-X11) && LIBOPIE + depends (LIBQPE || LIBQPE-X11) && LIBOPIECORE2 if OPIETOOTH @sources@ endif diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in index b966dce..7be2575 100644 --- a/noncore/net/opietooth/lib/config.in +++ b/noncore/net/opietooth/lib/config.in @@ -1,4 +1,4 @@ config LIBOPIETOOTH boolean "libopietooth1 (Opie Bluetooth library)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in index de9aa2e..2f06e37 100644 --- a/noncore/net/opietooth/manager/config.in +++ b/noncore/net/opietooth/manager/config.in @@ -1,4 +1,4 @@ config OPIETOOTH-MANAGER boolean "opie-bluetoothmanager (Bluetooth manager)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH && LIBOPIETOOTH diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp index a96f128..c7b59a2 100644 --- a/noncore/net/opietooth/manager/main.cpp +++ b/noncore/net/opietooth/manager/main.cpp @@ -20,8 +20,10 @@ using namespace Opie::Core; ***************************************************************************/ #include "bluebase.h" #include <qpe/qpeapplication.h> #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; + OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 005a2d7..e352398 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -19,12 +19,12 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ obexdialog.cpp devicehandler.cpp \ rfcpopup.cpp obexpopup.cpp \ rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopietooth -lopie +LIBS += -lqpe -lopietooth -lopiecore2 INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui TARGET = bluetooth-manager include ( $(OPIEDIR)/include.pro ) |