author | wimpie <wimpie> | 2004-04-07 01:06:27 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-07 01:06:27 (UTC) |
commit | 453109d9dafc25fdaf82197ef8a3f4e34c9272af (patch) (side-by-side diff) | |
tree | bc8fe8e54f52425e6b478be69b979f0a8ab910f5 /noncore | |
parent | 88b862c2356a7e75136282524b6856f1fcd10066 (diff) | |
download | opie-453109d9dafc25fdaf82197ef8a3f4e34c9272af.zip opie-453109d9dafc25fdaf82197ef8a3f4e34c9272af.tar.gz opie-453109d9dafc25fdaf82197ef8a3f4e34c9272af.tar.bz2 |
Added some odebug includes and namespaces refs
opiepim links with opiedb2 -> needs depend in config.in
qlibrary_unix -> print dlopen errors ALWAYS not only indebug
BTmanager.pro needs opieui2
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startdunconnection.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/devicehandler.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/dunpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/panpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommconfhandler.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 3 |
17 files changed, 31 insertions, 3 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 1d93f5c..66e8f01 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -30,16 +30,17 @@ #include "bluezapplet.h" #include <qapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/config.h> #include <qpe/resource.h> #include <opie2/odevice.h> +#include <opie2/odebug.h> #include <qpoint.h> #include <qpainter.h> #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> #include <qstring.h> #include <qtimer.h> diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 37f2ae7..2d23b3a 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp @@ -1,8 +1,9 @@ +#include <opie2/odebug.h> #include "startdunconnection.h" using namespace OpieTooth; using namespace Opie::Core; StartDunConnection::StartDunConnection() { diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index 50afc9f..29b95e9 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp @@ -1,9 +1,9 @@ - +#include <opie2/odebug.h> #include "startpanconnection.h" using namespace OpieTooth; using namespace Opie::Core; using namespace Opie::Core; StartPanConnection::StartPanConnection() { diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index b1cddd2..ee01b61 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -21,16 +21,18 @@ #include "devicehandler.h" #include "btconnectionitem.h" #include "rfcommassigndialogimpl.h" /* OPIE */ #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> +#include <opie2/odebug.h> +using namespace Opie::Core; /* QT */ #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.h> #include <qimage.h> diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in index ecebb9b..56d8b78 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 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH && LIBOPIE2UI diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp index bd34351..320ad44 100644 --- a/noncore/net/opietooth/manager/devicehandler.cpp +++ b/noncore/net/opietooth/manager/devicehandler.cpp @@ -1,13 +1,15 @@ #include <stdlib.h> #include <qdir.h> #include <qpe/config.h> +#include <opie2/odebug.h> +using namespace Opie::Core; #include "devicehandler.h" using namespace OpieTooth; DeviceHandler::DeviceHandler() { }; diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp index 5b01d2f..10505a9 100644 --- a/noncore/net/opietooth/manager/dunpopup.cpp +++ b/noncore/net/opietooth/manager/dunpopup.cpp @@ -1,11 +1,13 @@ #include <qpe/qcopenvelope_qws.h> #include <qtimer.h> +#include <opie2/odebug.h> +using namespace Opie::Core; #include "dunpopup.h" using namespace OpieTooth; /* * c'tor init the QAction */ diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 71c935c..ca2e7bd 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp @@ -1,14 +1,17 @@ #include "hciconfwrapper.h" #include <qfile.h> #include <qtextstream.h> #include <qregexp.h> +#include <opie2/odebug.h> +using namespace Opie::Core; + namespace OpieTooth { HciConfWrapper::HciConfWrapper( const QString &fileName) { m_fileName = fileName; } HciConfWrapper::~HciConfWrapper() { diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 238acb3..5c05b4d 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -17,14 +17,14 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ bticonloader.cpp pppdialog.cpp \ rfcommassigndialogimpl.cpp rfcommassigndialogitem.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 -lopiecore2 +LIBS += -lqpe -lopietooth -lopiecore2 -lopieui2 INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui TARGET = bluetooth-manager include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 3a3dbb0..951d87a 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp @@ -6,16 +6,18 @@ #include <qlayout.h> #include <qlabel.h> #include <qfileinfo.h> #include <qpe/resource.h> #include <opie2/oprocess.h> #include <opie2/ofiledialog.h> +#include <opie2/odebug.h> +using namespace Opie::Core; using namespace OpieTooth; using namespace Opie::Core; using namespace Opie::Ui; using namespace Opie::Core; ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) : QDialog( parent, name, modal, fl ) { diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp index 9a50199..010f7de 100644 --- a/noncore/net/opietooth/manager/obexpopup.cpp +++ b/noncore/net/opietooth/manager/obexpopup.cpp @@ -1,14 +1,16 @@ #include "obexdialog.h" #include "obexpopup.h" /* OPIE */ #include <qpe/qpeapplication.h> +#include <opie2/odebug.h> +using namespace Opie::Core; /* QT */ #include <qtimer.h> using namespace OpieTooth; /* * c'tor init the QAction diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 43c2777..f02a58c 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp @@ -1,9 +1,11 @@ #include <qpe/qcopenvelope_qws.h> +#include <opie2/odebug.h> +using namespace Opie::Core; #include <qtimer.h> #include "panpopup.h" using namespace OpieTooth; /* diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 989bf45..ef007f5 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp @@ -1,16 +1,18 @@ #include "pppdialog.h" #include <qpushbutton.h> #include <qmultilineedit.h> #include <qlineedit.h> #include <qlayout.h> #include <qlabel.h> #include <opie2/oprocess.h> +#include <opie2/odebug.h> +using namespace Opie::Core; using namespace OpieTooth; using namespace Opie::Core; PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) : QDialog( parent, name, modal, fl ) { if ( !name ) diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index 4469129..3fe2ea6 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp @@ -1,16 +1,18 @@ #include "rfcommassigndialogimpl.h" #include "rfcommassigndialogitem.h" #include "rfcommconfhandler.h" /* OPIE */ #include <qpe/config.h> #include <qpe/qpeapplication.h> +#include <opie2/odebug.h> +using namespace Opie::Core; /* QT */ #include <qlayout.h> using namespace OpieTooth; // TODO: write only the file in bluebase? // muss rfcommd dann neu gestartet werden diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index 2ef95ff..1f7ba65 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp @@ -1,10 +1,12 @@ #include <qtextstream.h> +#include <opie2/odebug.h> +using namespace Opie::Core; #include "rfcommconfhandler.h" using namespace OpieTooth; // move to lib diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 01ad616..54f1eb7 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp @@ -1,15 +1,17 @@ #include "pppdialog.h" #include "rfcpopup.h" #include "rfcommassigndialogimpl.h" /* OPIE */ #include <qpe/qpeapplication.h> +#include <opie2/odebug.h> +using namespace Opie::Core; /* QT */ #include <qtimer.h> using namespace OpieTooth; /* * c'tor init the QAction diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 3b005c4..bccc6c2 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -26,16 +26,19 @@ #include <qtooltip.h> #include <qwhatsthis.h> #include <qprogressbar.h> #include <qlist.h> #include <manager.h> #include <device.h> +#include <opie2/odebug.h> +using namespace Opie::Core; + namespace OpieTooth { #include <remotedevice.h> /** */ ScanDialog::ScanDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |