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/net | |
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 | |||
@@ -38,25 +38,25 @@ | |||
38 | 38 | ||
39 | #include <qpoint.h> | 39 | #include <qpoint.h> |
40 | #include <qpainter.h> | 40 | #include <qpainter.h> |
41 | #include <qlayout.h> | 41 | #include <qlayout.h> |
42 | #include <qframe.h> | 42 | #include <qframe.h> |
43 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
44 | #include <qstring.h> | 44 | #include <qstring.h> |
45 | #include <qtimer.h> | 45 | #include <qtimer.h> |
46 | #include <qpopupmenu.h> | 46 | #include <qpopupmenu.h> |
47 | 47 | ||
48 | #include <device.h> | 48 | #include <device.h> |
49 | 49 | ||
50 | using namespace Opie; | 50 | using namespace Opie::Core; |
51 | 51 | ||
52 | namespace OpieTooth { | 52 | namespace OpieTooth { |
53 | 53 | ||
54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
55 | setFixedHeight( 18 ); | 55 | setFixedHeight( 18 ); |
56 | setFixedWidth( 14 ); | 56 | setFixedWidth( 14 ); |
57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
60 | startTimer(4000); | 60 | startTimer(4000); |
61 | btDevice = 0; | 61 | btDevice = 0; |
62 | bluezactive = false; | 62 | bluezactive = false; |
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 @@ | |||
1 | config OPIETOOTH-APPLET | 1 | config OPIETOOTH-APPLET |
2 | boolean | 2 | boolean |
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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config BLUE-PIN | 1 | config BLUE-PIN |
2 | boolean "opie-bluepin (Bluetooth pin application)" | 2 | boolean "opie-bluepin (Bluetooth pin application)" |
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 | |||
@@ -1,7 +1,7 @@ | |||
1 | config OPIETOOTH | 1 | config OPIETOOTH |
2 | bool "Bluetooth support" | 2 | bool "Bluetooth support" |
3 | depends (LIBQPE || LIBQPE-X11) && LIBOPIE | 3 | depends (LIBQPE || LIBQPE-X11) && LIBOPIECORE2 |
4 | 4 | ||
5 | if OPIETOOTH | 5 | if OPIETOOTH |
6 | @sources@ | 6 | @sources@ |
7 | endif | 7 | 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 @@ | |||
1 | config LIBOPIETOOTH | 1 | config LIBOPIETOOTH |
2 | boolean "libopietooth1 (Opie Bluetooth library)" | 2 | boolean "libopietooth1 (Opie Bluetooth library)" |
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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIETOOTH-MANAGER | 1 | config OPIETOOTH-MANAGER |
2 | boolean "opie-bluetoothmanager (Bluetooth manager)" | 2 | boolean "opie-bluetoothmanager (Bluetooth manager)" |
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 | |||
@@ -14,14 +14,16 @@ using namespace Opie::Core; | |||
14 | * * | 14 | * * |
15 | * This program is free software; you can redistribute it and/or modify * | 15 | * This program is free software; you can redistribute it and/or modify * |
16 | * it under the terms of the GNU General Public License as published by * | 16 | * it under the terms of the GNU General Public License as published by * |
17 | * the Free Software Foundation; either version 2 of the License, or * | 17 | * the Free Software Foundation; either version 2 of the License, or * |
18 | * (at your option) any later version. * | 18 | * (at your option) any later version. * |
19 | * * | 19 | * * |
20 | ***************************************************************************/ | 20 | ***************************************************************************/ |
21 | 21 | ||
22 | #include "bluebase.h" | 22 | #include "bluebase.h" |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
27 | |||
26 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) | 28 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) |
27 | 29 | ||
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 | |||
@@ -13,18 +13,18 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | |||
13 | btserviceitem.cpp stdpopups.cpp \ | 13 | btserviceitem.cpp stdpopups.cpp \ |
14 | popuphelper.cpp main.cpp \ | 14 | popuphelper.cpp main.cpp \ |
15 | bluebase.cpp scandialog.cpp \ | 15 | bluebase.cpp scandialog.cpp \ |
16 | btlistitem.cpp hciconfwrapper.cpp \ | 16 | btlistitem.cpp hciconfwrapper.cpp \ |
17 | bticonloader.cpp pppdialog.cpp \ | 17 | bticonloader.cpp pppdialog.cpp \ |
18 | rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \ | 18 | rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \ |
19 | obexdialog.cpp devicehandler.cpp \ | 19 | obexdialog.cpp devicehandler.cpp \ |
20 | rfcpopup.cpp obexpopup.cpp \ | 20 | rfcpopup.cpp obexpopup.cpp \ |
21 | rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp | 21 | rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp |
22 | INCLUDEPATH += $(OPIEDIR)/include | 22 | INCLUDEPATH += $(OPIEDIR)/include |
23 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 23 | 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 |
27 | 27 | ||
28 | TARGET = bluetooth-manager | 28 | TARGET = bluetooth-manager |
29 | 29 | ||
30 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(OPIEDIR)/include.pro ) |