-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index c454588..fcd21f6 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -26,37 +26,37 @@ Manager::Manager() | |||
26 | m_sdp = 0; | 26 | m_sdp = 0; |
27 | } | 27 | } |
28 | Manager::~Manager(){ | 28 | Manager::~Manager(){ |
29 | delete m_hcitool; | 29 | delete m_hcitool; |
30 | delete m_sdp; | 30 | delete m_sdp; |
31 | } | 31 | } |
32 | void Manager::setDevice( const QString& dev ){ | 32 | void Manager::setDevice( const QString& dev ){ |
33 | m_device = dev; | 33 | m_device = dev; |
34 | } | 34 | } |
35 | void Manager::setDevice( Device* dev ){ | 35 | void Manager::setDevice( Device* dev ){ |
36 | 36 | ||
37 | } | 37 | } |
38 | void Manager::isConnected( const QString& device ){ | 38 | void Manager::isAvailable( const QString& device ){ |
39 | OProcess* l2ping = new OProcess(); | 39 | OProcess* l2ping = new OProcess(); |
40 | l2ping->setName( device.latin1() ); | 40 | l2ping->setName( device.latin1() ); |
41 | *l2ping << "l2ping" << "-c1" << device; | 41 | *l2ping << "l2ping" << "-c1" << device; |
42 | connect(l2ping, SIGNAL(processExited(OProcess* ) ), | 42 | connect(l2ping, SIGNAL(processExited(OProcess* ) ), |
43 | this, SLOT(slotProcessExited(OProcess*) ) ); | 43 | this, SLOT(slotProcessExited(OProcess*) ) ); |
44 | if (!l2ping->start() ) { | 44 | if (!l2ping->start() ) { |
45 | emit connected( device, false ); | 45 | emit available( device, false ); |
46 | delete l2ping; | 46 | delete l2ping; |
47 | } | 47 | } |
48 | 48 | ||
49 | } | 49 | } |
50 | void Manager::isConnected( Device* dev ){ | 50 | void Manager::isAvailable( Device* dev ){ |
51 | 51 | ||
52 | 52 | ||
53 | } | 53 | } |
54 | void Manager::searchDevices( const QString& device ){ | 54 | void Manager::searchDevices( const QString& device ){ |
55 | qWarning("search devices"); | 55 | qWarning("search devices"); |
56 | OProcess* hcitool = new OProcess(); | 56 | OProcess* hcitool = new OProcess(); |
57 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 57 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
58 | *hcitool << "hcitool" << "scan"; | 58 | *hcitool << "hcitool" << "scan"; |
59 | connect( hcitool, SIGNAL(processExited(OProcess*) ) , | 59 | connect( hcitool, SIGNAL(processExited(OProcess*) ) , |
60 | this, SLOT(slotHCIExited(OProcess* ) ) ); | 60 | this, SLOT(slotHCIExited(OProcess* ) ) ); |
61 | connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 61 | connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), |
62 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); | 62 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); |
@@ -118,25 +118,25 @@ void Manager::searchServices( const RemoteDevice& dev){ | |||
118 | QString Manager::toDevice( const QString& mac ){ | 118 | QString Manager::toDevice( const QString& mac ){ |
119 | 119 | ||
120 | } | 120 | } |
121 | QString Manager::toMac( const QString &device ){ | 121 | QString Manager::toMac( const QString &device ){ |
122 | 122 | ||
123 | } | 123 | } |
124 | void Manager::slotProcessExited(OProcess* proc ) { | 124 | void Manager::slotProcessExited(OProcess* proc ) { |
125 | bool conn= false; | 125 | bool conn= false; |
126 | if (proc->normalExit() && proc->exitStatus() == 0 ) | 126 | if (proc->normalExit() && proc->exitStatus() == 0 ) |
127 | conn = true; | 127 | conn = true; |
128 | 128 | ||
129 | QString name = QString::fromLatin1(proc->name() ); | 129 | QString name = QString::fromLatin1(proc->name() ); |
130 | emit connected( name, conn ); | 130 | emit available( name, conn ); |
131 | delete proc; | 131 | delete proc; |
132 | } | 132 | } |
133 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) | 133 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) |
134 | { | 134 | { |
135 | QCString str(ch, len+1 ); | 135 | QCString str(ch, len+1 ); |
136 | QMap<QString, QString>::Iterator it; | 136 | QMap<QString, QString>::Iterator it; |
137 | it = m_out.find(proc->name() ); | 137 | it = m_out.find(proc->name() ); |
138 | if ( it != m_out.end() ) { | 138 | if ( it != m_out.end() ) { |
139 | QString string = it.data(); | 139 | QString string = it.data(); |
140 | string.append( str ); | 140 | string.append( str ); |
141 | m_out.replace( proc->name(), string ); | 141 | m_out.replace( proc->name(), string ); |
142 | } | 142 | } |
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index aba70f7..415ec72 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h | |||
@@ -44,29 +44,29 @@ Q_OBJECT | |||
44 | /** | 44 | /** |
45 | * Convience functions for setting a new device | 45 | * Convience functions for setting a new device |
46 | */ | 46 | */ |
47 | void setDevice( Device *dev ); | 47 | void setDevice( Device *dev ); |
48 | /** | 48 | /** |
49 | * Wether or not a device is connected. The function | 49 | * Wether or not a device is connected. The function |
50 | * is asynchron | 50 | * is asynchron |
51 | * If device is empty it will take the currently managed | 51 | * If device is empty it will take the currently managed |
52 | * device and see if it's up | 52 | * device and see if it's up |
53 | * for Remote devices it will ping and see. | 53 | * for Remote devices it will ping and see. |
54 | * @param either mac or hciX | 54 | * @param either mac or hciX |
55 | */ | 55 | */ |
56 | void isConnected(const QString& device= QString::null ); | 56 | void isAvailable(const QString& device= QString::null ); |
57 | /** | 57 | /** |
58 | * same as above | 58 | * same as above |
59 | */ | 59 | */ |
60 | void isConnected(Device *dev ); | 60 | void isAvailable(Device *dev ); |
61 | 61 | ||
62 | /** this searchs for devices reachable from the | 62 | /** this searchs for devices reachable from the |
63 | * currently managed device | 63 | * currently managed device |
64 | * or from device if @param device is not empty | 64 | * or from device if @param device is not empty |
65 | */ | 65 | */ |
66 | void searchDevices(const QString& device= QString::null ); | 66 | void searchDevices(const QString& device= QString::null ); |
67 | /** same as above | 67 | /** same as above |
68 | * | 68 | * |
69 | */ | 69 | */ |
70 | void searchDevices(Device *d ); | 70 | void searchDevices(Device *d ); |
71 | 71 | ||
72 | /** | 72 | /** |
@@ -96,25 +96,25 @@ Q_OBJECT | |||
96 | */ | 96 | */ |
97 | void searchServices( const QString& remDevice ); | 97 | void searchServices( const QString& remDevice ); |
98 | /** | 98 | /** |
99 | * search for services on a remote device | 99 | * search for services on a remote device |
100 | */ | 100 | */ |
101 | void searchServices( const RemoteDevice& ); | 101 | void searchServices( const RemoteDevice& ); |
102 | /*static*/ QString toDevice( const QString& mac ); | 102 | /*static*/ QString toDevice( const QString& mac ); |
103 | /*static*/ QString toMac( const QString &device ); | 103 | /*static*/ QString toMac( const QString &device ); |
104 | 104 | ||
105 | signals: | 105 | signals: |
106 | // device either mac or dev name | 106 | // device either mac or dev name |
107 | // the first device is the device which you access | 107 | // the first device is the device which you access |
108 | void connected( const QString& device, bool connected ); | 108 | void available( const QString& device, bool connected ); |
109 | void addedService( const QString& service, bool added ); | 109 | void addedService( const QString& service, bool added ); |
110 | void removedService( const QString& service, bool removed ); | 110 | void removedService( const QString& service, bool removed ); |
111 | void foundServices( const QString& device, Services::ValueList ); | 111 | void foundServices( const QString& device, Services::ValueList ); |
112 | void foundDevices( const QString& device, RemoteDevice::ValueList ); | 112 | void foundDevices( const QString& device, RemoteDevice::ValueList ); |
113 | 113 | ||
114 | private slots: | 114 | private slots: |
115 | void slotProcessExited(OProcess* ); | 115 | void slotProcessExited(OProcess* ); |
116 | void slotSDPExited(OProcess*); | 116 | void slotSDPExited(OProcess*); |
117 | void slotSDPOut(OProcess*, char*, int); | 117 | void slotSDPOut(OProcess*, char*, int); |
118 | void slotHCIExited(OProcess* ); | 118 | void slotHCIExited(OProcess* ); |
119 | void slotHCIOut(OProcess*, char*, int ); | 119 | void slotHCIOut(OProcess*, char*, int ); |
120 | private: | 120 | private: |