author | ar <ar> | 2004-03-15 19:34:39 (UTC) |
---|---|---|
committer | ar <ar> | 2004-03-15 19:34:39 (UTC) |
commit | ab41047d6404c63b34e18c400cccae1580d6805e (patch) (unidiff) | |
tree | 0360d534614068e6103956bcb45819adeeaa2622 /noncore | |
parent | 0de0c28bda1190c1e1df92dfa591c9c555f80fcd (diff) | |
download | opie-ab41047d6404c63b34e18c400cccae1580d6805e.zip opie-ab41047d6404c63b34e18c400cccae1580d6805e.tar.gz opie-ab41047d6404c63b34e18c400cccae1580d6805e.tar.bz2 |
- make opietooth compilable
- correct LIBOPIECORE2 dependencies and namespace's
-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 | |||
@@ -49,3 +49,3 @@ | |||
49 | 49 | ||
50 | using namespace Opie; | 50 | using namespace Opie::Core; |
51 | 51 | ||
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 | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH | 4 | 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 | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH | 4 | 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 | |||
@@ -2,3 +2,3 @@ config OPIETOOTH | |||
2 | bool "Bluetooth support" | 2 | bool "Bluetooth support" |
3 | depends (LIBQPE || LIBQPE-X11) && LIBOPIE | 3 | depends (LIBQPE || LIBQPE-X11) && LIBOPIECORE2 |
4 | 4 | ||
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 | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH | 4 | 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 | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH | 4 | 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 | |||
@@ -25,2 +25,4 @@ using namespace Opie::Core; | |||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
27 | |||
26 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) | 28 | 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 | |||
@@ -24,3 +24,3 @@ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | |||
24 | DEPENDPATH += $(OPIEDIR)/include | 24 | DEPENDPATH += $(OPIEDIR)/include |
25 | LIBS += -lqpe -lopietooth -lopie | 25 | LIBS += -lqpe -lopietooth -lopiecore2 |
26 | INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui | 26 | INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui |