summaryrefslogtreecommitdiff
authorzecke <zecke>2004-05-06 19:47:25 (UTC)
committer zecke <zecke>2004-05-06 19:47:25 (UTC)
commit49588c7322679fe3dadf7aaad058d7df76e0d8d3 (patch) (unidiff)
tree9428d97efa1167552d17aebf30c3607b30b6b3d8
parentac015dbe0a2d7f52139d9efaba16d6e3069c5f2e (diff)
downloadopie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.zip
opie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.tar.gz
opie-49588c7322679fe3dadf7aaad058d7df76e0d8d3.tar.bz2
Error spotted by Clement with Opie::Core and namespaces
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/device.cc2
-rw-r--r--noncore/net/opietooth/lib/device.h2
-rw-r--r--noncore/net/opietooth/lib/manager.cc3
-rw-r--r--noncore/net/opietooth/lib/manager.h2
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
@@ -4,13 +4,13 @@
4#include <opie2/oprocess.h> 4#include <opie2/oprocess.h>
5 5
6#include "device.h" 6#include "device.h"
7 7
8using namespace OpieTooth; 8using namespace OpieTooth;
9 9
10using namespace Opie::Core; 10using Opie::Core::OProcess;
11namespace { 11namespace {
12 int parsePid( const QCString& par ){ 12 int parsePid( const QCString& par ){
13 int id=0; 13 int id=0;
14 QString string( par ); 14 QString string( par );
15 QStringList list = QStringList::split( '\n', string ); 15 QStringList list = QStringList::split( '\n', string );
16 for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ 16 for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
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
@@ -5,13 +5,13 @@
5#include <qobject.h> 5#include <qobject.h>
6#include <qstring.h> 6#include <qstring.h>
7#include <qvaluelist.h> 7#include <qvaluelist.h>
8 8
9#include <sys/types.h> 9#include <sys/types.h>
10 10
11namespace Opie {namespace Core {class Opie::Core::OProcess;}} 11namespace Opie {namespace Core {class OProcess;}}
12namespace OpieTooth { 12namespace OpieTooth {
13 /** 13 /**
14 * Device takes care of attaching serial 14 * Device takes care of attaching serial
15 * devices to the blueZ stack. 15 * devices to the blueZ stack.
16 * After attaching it hciconfig ups it 16 * After attaching it hciconfig ups it
17 */ 17 */
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
@@ -5,14 +5,13 @@
5#include "parser.h" 5#include "parser.h"
6#include "manager.h" 6#include "manager.h"
7 7
8 8
9using namespace OpieTooth; 9using namespace OpieTooth;
10 10
11using namespace Opie::Core; 11using Opie::Core::OProcess;
12using namespace Opie::Core;
13Manager::Manager( const QString& dev ) 12Manager::Manager( const QString& dev )
14 : QObject() 13 : QObject()
15{ 14{
16 qWarning("created"); 15 qWarning("created");
17 m_device = dev; 16 m_device = dev;
18 m_hcitool = 0; 17 m_hcitool = 0;
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
@@ -8,13 +8,13 @@
8#include <qvaluelist.h> 8#include <qvaluelist.h>
9 9
10#include "connection.h" 10#include "connection.h"
11#include "remotedevice.h" 11#include "remotedevice.h"
12#include "services.h" 12#include "services.h"
13 13
14namespace Opie {namespace Core {class Opie::Core::OProcess;}} 14namespace Opie {namespace Core {class OProcess;}}
15namespace OpieTooth { 15namespace OpieTooth {
16 class Device; 16 class Device;
17 /** Manager manages a blueZ device (hci0 for example) 17 /** Manager manages a blueZ device (hci0 for example)
18 * without Manager you can control the things you 18 * without Manager you can control the things you
19 * could do from command line in a OO and asynchronus 19 * could do from command line in a OO and asynchronus
20 * way. 20 * way.