author | zecke <zecke> | 2004-05-06 19:47:25 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-05-06 19:47:25 (UTC) |
commit | 49588c7322679fe3dadf7aaad058d7df76e0d8d3 (patch) (side-by-side diff) | |
tree | 9428d97efa1167552d17aebf30c3607b30b6b3d8 /noncore | |
parent | ac015dbe0a2d7f52139d9efaba16d6e3069c5f2e (diff) | |
download | opie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.zip opie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.tar.gz opie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.tar.bz2 |
Error spotted by Clement with Opie::Core and namespaces
-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/device.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index 18d26e4..04c50d9 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc @@ -1,34 +1,34 @@ #include <signal.h> #include <opie2/oprocess.h> #include "device.h" using namespace OpieTooth; -using namespace Opie::Core; +using Opie::Core::OProcess; namespace { int parsePid( const QCString& par ){ int id=0; QString string( par ); QStringList list = QStringList::split( '\n', string ); for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ qWarning("parsePID: %s", (*it).latin1() ); if( !(*it).startsWith("CSR") ){ id = (*it).toInt(); break; } } return id; } } Device::Device(const QString &device, const QString &mode, const QString &speed ) : QObject(0, "device") { qWarning("OpieTooth::Device create" ); m_hci = 0; m_process = 0; m_attached = false; m_device = device; diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h index f3339fc..3631c97 100644 --- a/noncore/net/opietooth/lib/device.h +++ b/noncore/net/opietooth/lib/device.h @@ -1,35 +1,35 @@ #ifndef OpieToothDevice_H #define OpieToothDevice_H #include <qobject.h> #include <qstring.h> #include <qvaluelist.h> #include <sys/types.h> -namespace Opie {namespace Core {class Opie::Core::OProcess;}} +namespace Opie {namespace Core {class OProcess;}} namespace OpieTooth { /** * Device takes care of attaching serial * devices to the blueZ stack. * After attaching it hciconfig ups it */ class Device : public QObject { Q_OBJECT public: /** * Brings up an device. * Usage example: new Device(/dev/ttySB0, csr) * * @param &device QString the device name * @param &mode QString the mode * @param &speed QString the speed of the device, can be left blank */ Device(const QString &device, const QString& mode, const QString& speed); /** * unloads the device diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 7c9ea5b..18e1df9 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -1,36 +1,35 @@ #include <opie2/oprocess.h> #include "parser.h" #include "manager.h" using namespace OpieTooth; -using namespace Opie::Core; -using namespace Opie::Core; +using Opie::Core::OProcess; Manager::Manager( const QString& dev ) : QObject() { qWarning("created"); m_device = dev; m_hcitool = 0; m_sdp = 0; } Manager::Manager( Device* /*dev*/ ) : QObject() { m_hcitool = 0; m_sdp = 0; } Manager::Manager() : QObject() { m_hcitool = 0; m_sdp = 0; } Manager::~Manager(){ delete m_hcitool; delete m_sdp; } diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index 9b1c714..930eb56 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h @@ -1,38 +1,38 @@ #ifndef OpieToothManager_H #define OpieToothManager_H #include <qobject.h> #include <qstring.h> #include <qmap.h> #include <qvaluelist.h> #include "connection.h" #include "remotedevice.h" #include "services.h" -namespace Opie {namespace Core {class Opie::Core::OProcess;}} +namespace Opie {namespace Core {class OProcess;}} namespace OpieTooth { class Device; /** Manager manages a blueZ device (hci0 for example) * without Manager you can control the things you * could do from command line in a OO and asynchronus * way. */ class Manager : public QObject { Q_OBJECT public: /** c'tor whichs create a new Manager * @param device is the device to use. Either a mac or blueZ device name * */ Manager( const QString &device ); /** c'tor * @param dev The Device to be managed * We don't care of Device so you need to delete it */ Manager( Device* dev ); /** * c'tor |