author | ar <ar> | 2004-05-31 15:26:50 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-31 15:26:50 (UTC) |
commit | 27dfc34d411dee76f09f5e516c60b0a64eb35948 (patch) (unidiff) | |
tree | b7f7259497630390e352a1257cac5dc59f5399a6 /noncore/net | |
parent | 27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062 (diff) | |
download | opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.zip opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.gz opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.bz2 |
- convert qWarning to owarn
-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 95 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 65 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 60 |
3 files changed, 116 insertions, 104 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index 04c50d9..f81066e 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -1,9 +1,14 @@ | |||
1 | 1 | ||
2 | #include <signal.h> | 2 | #include "device.h" |
3 | 3 | ||
4 | /* OPIE */ | ||
4 | #include <opie2/oprocess.h> | 5 | #include <opie2/oprocess.h> |
6 | #include <opie2/odebug.h> | ||
7 | using namespace Opie::Core; | ||
8 | |||
9 | /* STD */ | ||
10 | #include <signal.h> | ||
5 | 11 | ||
6 | #include "device.h" | ||
7 | 12 | ||
8 | using namespace OpieTooth; | 13 | using namespace OpieTooth; |
9 | 14 | ||
@@ -14,10 +19,10 @@ namespace { | |||
14 | QString string( par ); | 19 | QString string( par ); |
15 | QStringList list = QStringList::split( '\n', string ); | 20 | QStringList list = QStringList::split( '\n', string ); |
16 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ | 21 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ |
17 | qWarning("parsePID: %s", (*it).latin1() ); | 22 | owarn << "parsePID: " << (*it).latin1() << oendl; |
18 | if( !(*it).startsWith("CSR") ){ | 23 | if( !(*it).startsWith("CSR") ){ |
19 | id = (*it).toInt(); | 24 | id = (*it).toInt(); |
20 | break; | 25 | break; |
21 | } | 26 | } |
22 | } | 27 | } |
23 | return id; | 28 | return id; |
@@ -27,7 +32,7 @@ namespace { | |||
27 | Device::Device(const QString &device, const QString &mode, const QString &speed ) | 32 | Device::Device(const QString &device, const QString &mode, const QString &speed ) |
28 | : QObject(0, "device") { | 33 | : QObject(0, "device") { |
29 | 34 | ||
30 | qWarning("OpieTooth::Device create" ); | 35 | owarn << "OpieTooth::Device create" << oendl; |
31 | m_hci = 0; | 36 | m_hci = 0; |
32 | m_process = 0; | 37 | m_process = 0; |
33 | m_attached = false; | 38 | m_attached = false; |
@@ -40,10 +45,10 @@ Device::~Device(){ | |||
40 | detach(); | 45 | detach(); |
41 | } | 46 | } |
42 | void Device::attach(){ | 47 | void Device::attach(){ |
43 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); | 48 | owarn << "attaching " << m_device.latin1() << " " << m_mode.latin1() << " " << m_speed.latin1() << oendl; |
44 | if(m_process == 0 ){ | 49 | if(m_process == 0 ){ |
45 | m_output.resize(0); | 50 | m_output.resize(0); |
46 | qWarning("new process to create" ); | 51 | owarn << "new process to create" << oendl; |
47 | m_process = new OProcess(); | 52 | m_process = new OProcess(); |
48 | *m_process << "hciattach"; | 53 | *m_process << "hciattach"; |
49 | *m_process << "-p"; | 54 | *m_process << "-p"; |
@@ -55,7 +60,7 @@ void Device::attach(){ | |||
55 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), | 60 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), |
56 | this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) ); | 61 | this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) ); |
57 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ | 62 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
58 | qWarning("Could not start" ); | 63 | owarn << "Could not start" << oendl; |
59 | delete m_process; | 64 | delete m_process; |
60 | m_process = 0; | 65 | m_process = 0; |
61 | } | 66 | } |
@@ -67,10 +72,10 @@ void Device::detach(){ | |||
67 | // kill the pid we got | 72 | // kill the pid we got |
68 | if(m_attached ){ | 73 | if(m_attached ){ |
69 | //kill the pid | 74 | //kill the pid |
70 | qWarning( "killing" ); | 75 | warn << "killing" << oendl; |
71 | kill(pid, 9); | 76 | kill(pid, 9); |
72 | } | 77 | } |
73 | qWarning("detached" ); | 78 | owarn << "detached" << oendl; |
74 | } | 79 | } |
75 | bool Device::isLoaded()const{ | 80 | bool Device::isLoaded()const{ |
76 | return m_attached; | 81 | return m_attached; |
@@ -80,52 +85,52 @@ QString Device::devName()const { | |||
80 | }; | 85 | }; |
81 | void Device::slotExited( OProcess* proc) | 86 | void Device::slotExited( OProcess* proc) |
82 | { | 87 | { |
83 | qWarning("prcess exited" ); | 88 | owarn << "prcess exited" << oendl; |
84 | if(proc== m_process ){ | 89 | if(proc== m_process ){ |
85 | qWarning("proc == m_process" ); | 90 | owarn << "proc == m_process" << oendl; |
86 | if( m_process->normalExit() ){ // normal exit | 91 | if( m_process->normalExit() ){ // normal exit |
87 | qWarning("normalExit" ); | 92 | owarn << "normalExit" << oendl; |
88 | int ret = m_process->exitStatus(); | 93 | int ret = m_process->exitStatus(); |
89 | if( ret == 0 ){ // attached | 94 | if( ret == 0 ){ // attached |
90 | qWarning("attached" ); | 95 | owarn << "attached" << oendl; |
91 | qWarning("Output: %s", m_output.data() ); | 96 | owarn << "Output: " << m_output.data() << oendl; |
92 | pid = parsePid( m_output ); | 97 | pid = parsePid( m_output ); |
93 | qWarning("Pid = %d", pid ); | 98 | owarn << "Pid = " << pid << oendl; |
94 | // now hciconfig hci0 up ( determine hciX FIXME) | 99 | // now hciconfig hci0 up ( determine hciX FIXME) |
95 | // and call hciconfig hci0 up | 100 | // and call hciconfig hci0 up |
96 | // FIXME hardcoded to hci0 now :( | 101 | // FIXME hardcoded to hci0 now :( |
97 | m_hci = new OProcess( ); | 102 | m_hci = new OProcess( ); |
98 | *m_hci << "hciconfig"; | 103 | *m_hci << "hciconfig"; |
99 | *m_hci << "hci0 up"; | 104 | *m_hci << "hci0 up"; |
100 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), | 105 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), |
101 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); | 106 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
102 | if(!m_hci->start() ){ | 107 | if(!m_hci->start() ){ |
103 | qWarning("could not start" ); | 108 | owarn << "could not start" << oendl; |
104 | m_attached = false; | 109 | m_attached = false; |
105 | emit device("hci0", false ); | 110 | emit device("hci0", false ); |
106 | } | 111 | } |
107 | }else{ | 112 | }else{ |
108 | qWarning("crass" ); | 113 | owarn << "crass" << oendl; |
109 | m_attached = false; | 114 | m_attached = false; |
110 | emit device("hci0", false ); | 115 | emit device("hci0", false ); |
111 | 116 | ||
112 | } | 117 | } |
113 | } | 118 | } |
114 | delete m_process; | 119 | delete m_process; |
115 | m_process = 0; | 120 | m_process = 0; |
116 | }else if(proc== m_hci ){ | 121 | }else if(proc== m_hci ){ |
117 | qWarning("M HCI exited" ); | 122 | owarn << "M HCI exited" << oendl; |
118 | if( m_hci->normalExit() ){ | 123 | if( m_hci->normalExit() ){ |
119 | qWarning("normal exit" ); | 124 | owarn << "normal exit" << oendl; |
120 | int ret = m_hci->exitStatus(); | 125 | int ret = m_hci->exitStatus(); |
121 | if( ret == 0 ){ | 126 | if( ret == 0 ){ |
122 | qWarning("attached really really attached" ); | 127 | owarn << "attached really really attached" << oendl; |
123 | m_attached = true; | 128 | m_attached = true; |
124 | emit device("hci0", true ); | 129 | emit device("hci0", true ); |
125 | }else{ | 130 | }else{ |
126 | qWarning( "failed" ); | 131 | owarn << "failed" << oendl; |
127 | emit device("hci0", false ); | 132 | emit device("hci0", false ); |
128 | m_attached = false; | 133 | m_attached = false; |
129 | } | 134 | } |
130 | }// normal exit | 135 | }// normal exit |
131 | delete m_hci; | 136 | delete m_hci; |
@@ -134,19 +139,19 @@ void Device::slotExited( OProcess* proc) | |||
134 | } | 139 | } |
135 | void Device::slotStdOut(OProcess* proc, char* chars, int len) | 140 | void Device::slotStdOut(OProcess* proc, char* chars, int len) |
136 | { | 141 | { |
137 | qWarning("std out" ); | 142 | owarn << "std out" << oendl; |
138 | if( len <1 ){ | 143 | if( len <1 ){ |
139 | qWarning( "len < 1 " ); | 144 | owarn << "len < 1 " << oendl; |
140 | return; | 145 | return; |
141 | } | 146 | } |
142 | if(proc == m_process ){ | 147 | if(proc == m_process ){ |
143 | QCString string( chars, len+1 ); // \0 == +1 | 148 | QCString string( chars, len+1 ); // \0 == +1 |
144 | qWarning("output: %s", string.data() ); | 149 | owarn << "output: " << string.data() << oendl; |
145 | m_output.append( string.data() ); | 150 | m_output.append( string.data() ); |
146 | } | 151 | } |
147 | } | 152 | } |
148 | void Device::slotStdErr(OProcess* proc, char* chars, int len) | 153 | void Device::slotStdErr(OProcess* proc, char* chars, int len) |
149 | { | 154 | { |
150 | qWarning("std err" ); | 155 | owarn << "std err" << oendl; |
151 | slotStdOut( proc, chars, len ); | 156 | slotStdOut( proc, chars, len ); |
152 | } | 157 | } |
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 18e1df9..76d9127 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -1,10 +1,11 @@ | |||
1 | 1 | ||
2 | |||
3 | #include <opie2/oprocess.h> | ||
4 | |||
5 | #include "parser.h" | 2 | #include "parser.h" |
6 | #include "manager.h" | 3 | #include "manager.h" |
7 | 4 | ||
5 | #include <opie2/oprocess.h> | ||
6 | #include <opie2/odebug.h> | ||
7 | using namespace Opie::Core; | ||
8 | |||
8 | 9 | ||
9 | using namespace OpieTooth; | 10 | using namespace OpieTooth; |
10 | 11 | ||
@@ -12,7 +13,7 @@ using Opie::Core::OProcess; | |||
12 | Manager::Manager( const QString& dev ) | 13 | Manager::Manager( const QString& dev ) |
13 | : QObject() | 14 | : QObject() |
14 | { | 15 | { |
15 | qWarning("created"); | 16 | owarn << "created" << oendl; |
16 | m_device = dev; | 17 | m_device = dev; |
17 | m_hcitool = 0; | 18 | m_hcitool = 0; |
18 | m_sdp = 0; | 19 | m_sdp = 0; |
@@ -57,7 +58,7 @@ void Manager::isAvailable( Device* /*dev*/ ){ | |||
57 | 58 | ||
58 | } | 59 | } |
59 | void Manager::searchDevices( const QString& device ){ | 60 | void Manager::searchDevices( const QString& device ){ |
60 | qWarning("search devices"); | 61 | owarn << "search devices" << oendl; |
61 | OProcess* hcitool = new OProcess(); | 62 | OProcess* hcitool = new OProcess(); |
62 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
63 | *hcitool << "hcitool" << "scan"; | 64 | *hcitool << "hcitool" << "scan"; |
@@ -66,7 +67,7 @@ void Manager::searchDevices( const QString& device ){ | |||
66 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
67 | this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); | 68 | this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); |
68 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
69 | qWarning("could not start"); | 70 | owarn << "could not start" << oendl; |
70 | RemoteDevice::ValueList list; | 71 | RemoteDevice::ValueList list; |
71 | emit foundDevices( device, list ); | 72 | emit foundDevices( device, list ); |
72 | delete hcitool; | 73 | delete hcitool; |
@@ -107,13 +108,13 @@ void Manager::searchServices( const QString& remDevice ){ | |||
107 | OProcess *m_sdp =new OProcess(); | 108 | OProcess *m_sdp =new OProcess(); |
108 | *m_sdp << "sdptool" << "browse" << remDevice; | 109 | *m_sdp << "sdptool" << "browse" << remDevice; |
109 | m_sdp->setName( remDevice.latin1() ); | 110 | m_sdp->setName( remDevice.latin1() ); |
110 | qWarning("search Services for %s", remDevice.latin1() ); | 111 | owarn << "search Services for " << remDevice.latin1() << oendl; |
111 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), | 112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), |
112 | this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); | 113 | this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); |
113 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
114 | this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); | 115 | this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); |
115 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
116 | qWarning("could not start sdptool" ); | 117 | owarn << "could not start sdptool" << oendl; |
117 | delete m_sdp; | 118 | delete m_sdp; |
118 | Services::ValueList list; | 119 | Services::ValueList list; |
119 | emit foundServices( remDevice, list ); | 120 | emit foundServices( remDevice, list ); |
@@ -140,7 +141,7 @@ void Manager::slotProcessExited(OProcess* proc ) { | |||
140 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) | 141 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) |
141 | { | 142 | { |
142 | QCString str(ch, len+1 ); | 143 | QCString str(ch, len+1 ); |
143 | qWarning("SDP:%s", str.data() ); | 144 | owarn << "SDP:" << str.data() << oendl; |
144 | QMap<QString, QString>::Iterator it; | 145 | QMap<QString, QString>::Iterator it; |
145 | it = m_out.find(proc->name() ); | 146 | it = m_out.find(proc->name() ); |
146 | QString string; | 147 | QString string; |
@@ -153,12 +154,12 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len) | |||
153 | } | 154 | } |
154 | void Manager::slotSDPExited( OProcess* proc) | 155 | void Manager::slotSDPExited( OProcess* proc) |
155 | { | 156 | { |
156 | qWarning("proc name %s", proc->name() ); | 157 | owarn << "proc name " << proc->name() << oendl; |
157 | Services::ValueList list; | 158 | Services::ValueList list; |
158 | if (proc->normalExit() ) { | 159 | if (proc->normalExit() ) { |
159 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); | 160 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); |
160 | if ( it != m_out.end() ) { | 161 | if ( it != m_out.end() ) { |
161 | qWarning("found process" ); | 162 | owarn << "found process" << oendl; |
162 | list = parseSDPOutput( it.data() ); | 163 | list = parseSDPOutput( it.data() ); |
163 | m_out.remove( it ); | 164 | m_out.remove( it ); |
164 | } | 165 | } |
@@ -168,20 +169,20 @@ void Manager::slotSDPExited( OProcess* proc) | |||
168 | } | 169 | } |
169 | Services::ValueList Manager::parseSDPOutput( const QString& out ) { | 170 | Services::ValueList Manager::parseSDPOutput( const QString& out ) { |
170 | Services::ValueList list; | 171 | Services::ValueList list; |
171 | qWarning("parsing output" ); | 172 | owarn << "parsing output" << oendl; |
172 | Parser parser( out ); | 173 | Parser parser( out ); |
173 | list = parser.services(); | 174 | list = parser.services(); |
174 | return list; | 175 | return list; |
175 | } | 176 | } |
176 | 177 | ||
177 | void Manager::slotHCIExited(OProcess* proc ) { | 178 | void Manager::slotHCIExited(OProcess* proc ) { |
178 | qWarning("process exited"); | 179 | owarn << "process exited" << oendl; |
179 | RemoteDevice::ValueList list; | 180 | RemoteDevice::ValueList list; |
180 | if (proc->normalExit() ) { | 181 | if (proc->normalExit() ) { |
181 | qWarning("normalExit %s", proc->name() ); | 182 | owarn << "normalExit " << proc->name() << oendl; |
182 | QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); | 183 | QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); |
183 | if (it != m_devices.end() ) { | 184 | if (it != m_devices.end() ) { |
184 | qWarning("!= end ;)"); | 185 | owarn << "!= end ;)" << oendl; |
185 | list = parseHCIOutput( it.data() ); | 186 | list = parseHCIOutput( it.data() ); |
186 | m_devices.remove( it ); | 187 | m_devices.remove( it ); |
187 | } | 188 | } |
@@ -191,13 +192,13 @@ void Manager::slotHCIExited(OProcess* proc ) { | |||
191 | } | 192 | } |
192 | void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { | 193 | void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { |
193 | QCString str( ch, len+1 ); | 194 | QCString str( ch, len+1 ); |
194 | qWarning("hci: %s", str.data() ); | 195 | owarn << "hci: " << str.data() oendl; |
195 | QMap<QString, QString>::Iterator it; | 196 | QMap<QString, QString>::Iterator it; |
196 | it = m_devices.find( proc->name() ); | 197 | it = m_devices.find( proc->name() ); |
197 | qWarning("proc->name %s", proc->name() ); | 198 | owarn << "proc->name " << proc->name() << oendl; |
198 | QString string; | 199 | QString string; |
199 | if (it != m_devices.end() ) { | 200 | if (it != m_devices.end() ) { |
200 | qWarning("slotHCIOut "); | 201 | owarn << "slotHCIOut " << oendl; |
201 | string = it.data(); | 202 | string = it.data(); |
202 | } | 203 | } |
203 | string.append( str ); | 204 | string.append( str ); |
@@ -205,20 +206,20 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { | |||
205 | m_devices.replace( proc->name(), string ); | 206 | m_devices.replace( proc->name(), string ); |
206 | } | 207 | } |
207 | RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { | 208 | RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { |
208 | qWarning("parseHCI %s", output.latin1() ); | 209 | owarn << "parseHCI " << output.latin1() << oendl; |
209 | RemoteDevice::ValueList list; | 210 | RemoteDevice::ValueList list; |
210 | QStringList strList = QStringList::split('\n', output ); | 211 | QStringList strList = QStringList::split('\n', output ); |
211 | QStringList::Iterator it; | 212 | QStringList::Iterator it; |
212 | QString str; | 213 | QString str; |
213 | for ( it = strList.begin(); it != strList.end(); ++it ) { | 214 | for ( it = strList.begin(); it != strList.end(); ++it ) { |
214 | str = (*it).stripWhiteSpace(); | 215 | str = (*it).stripWhiteSpace(); |
215 | qWarning("OpieTooth %s", str.latin1() ); | 216 | owarn << "OpieTooth " << str.latin1() << oendl; |
216 | int pos = str.findRev(':' ); | 217 | int pos = str.findRev(':' ); |
217 | if ( pos > 0 ) { | 218 | if ( pos > 0 ) { |
218 | QString mac = str.left(17 ); | 219 | QString mac = str.left(17 ); |
219 | str.remove( 0, 17 ); | 220 | str.remove( 0, 17 ); |
220 | qWarning("mac %s", mac.latin1() ); | 221 | owarn << "mac " << mac.latin1() << oendl; |
221 | qWarning("rest:%s", str.latin1() ); | 222 | owarn << "rest: " << str.latin1() << oendl; |
222 | RemoteDevice rem( mac , str.stripWhiteSpace() ); | 223 | RemoteDevice rem( mac , str.stripWhiteSpace() ); |
223 | list.append( rem ); | 224 | list.append( rem ); |
224 | } | 225 | } |
@@ -243,7 +244,7 @@ void Manager::connectTo( const QString& mac) { | |||
243 | 244 | ||
244 | 245 | ||
245 | void Manager::searchConnections() { | 246 | void Manager::searchConnections() { |
246 | qWarning("searching connections?"); | 247 | owarn << "searching connections?" << oendl; |
247 | OProcess* proc = new OProcess(); | 248 | OProcess* proc = new OProcess(); |
248 | m_hcitoolCon = QString::null; | 249 | m_hcitoolCon = QString::null; |
249 | 250 | ||
@@ -281,15 +282,15 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | |||
281 | for (; it != list.end(); ++it ) { | 282 | for (; it != list.end(); ++it ) { |
282 | QString row = (*it).stripWhiteSpace(); | 283 | QString row = (*it).stripWhiteSpace(); |
283 | QStringList value = QStringList::split(' ', row ); | 284 | QStringList value = QStringList::split(' ', row ); |
284 | qWarning("0: %s", value[0].latin1() ); | 285 | owan << "0: %s" << value[0].latin1() << oendl; |
285 | qWarning("1: %s", value[1].latin1() ); | 286 | owan << "1: %s" << value[1].latin1() << oendl; |
286 | qWarning("2: %s", value[2].latin1() ); | 287 | owan << "2: %s" << value[2].latin1() << oendl; |
287 | qWarning("3: %s", value[3].latin1() ); | 288 | owan << "3: %s" << value[3].latin1() << oendl; |
288 | qWarning("4: %s", value[4].latin1() ); | 289 | owan << "4: %s" << value[4].latin1() << oendl; |
289 | qWarning("5: %s", value[5].latin1() ); | 290 | owan << "5: %s" << value[5].latin1() << oendl; |
290 | qWarning("6: %s", value[6].latin1() ); | 291 | owan << "6: %s" << value[6].latin1() << oendl; |
291 | qWarning("7: %s", value[7].latin1() ); | 292 | owan << "7: %s" << value[7].latin1() << oendl; |
292 | qWarning("8: %s", value[8].latin1() ); | 293 | owan << "8: %s" << value[8].latin1() << oendl; |
293 | ConnectionState con; | 294 | ConnectionState con; |
294 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); | 295 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); |
295 | con.setConnectionMode( value[1] ); | 296 | con.setConnectionMode( value[1] ); |
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 8baf284..7e95907 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc | |||
@@ -1,7 +1,13 @@ | |||
1 | 1 | ||
2 | #include "parser.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
2 | #include <qstringlist.h> | 9 | #include <qstringlist.h> |
3 | 10 | ||
4 | #include "parser.h" | ||
5 | 11 | ||
6 | using namespace OpieTooth; | 12 | using namespace OpieTooth; |
7 | 13 | ||
@@ -13,29 +19,29 @@ namespace { | |||
13 | // @eturn 13398 | 19 | // @eturn 13398 |
14 | // tactic find " ( | 20 | // tactic find " ( |
15 | int convert( const QString& line, QString& ret ) { | 21 | int convert( const QString& line, QString& ret ) { |
16 | // qWarning("called"); | 22 | // owarn << "called" << oendl; |
17 | ret = QString::null; | 23 | ret = QString::null; |
18 | int i = 0; | 24 | int i = 0; |
19 | int pos = line.findRev("\" ("); | 25 | int pos = line.findRev("\" ("); |
20 | if ( pos > 0 ) { // it shouldn't be at pos 0 | 26 | if ( pos > 0 ) { // it shouldn't be at pos 0 |
21 | ret = line.left(pos ).stripWhiteSpace(); | 27 | ret = line.left(pos ).stripWhiteSpace(); |
22 | // qWarning("ret: %s", ret.latin1() ); | 28 | // owarn << "ret: " << ret.latin1() << oendl; |
23 | ret = ret.replace(QRegExp("[\"]"), ""); | 29 | ret = ret.replace(QRegExp("[\"]"), ""); |
24 | //qWarning("ret: %s", ret.latin1() ); | 30 | //owarn << "ret: " << ret.latin1() << oendl; |
25 | QString dummy = line.mid(pos + 5 ); | 31 | QString dummy = line.mid(pos + 5 ); |
26 | //qWarning("dummy: %s", dummy.latin1() ); | 32 | //owarn << "dummy: " << dummy.latin1() << oendl; |
27 | dummy = dummy.replace(QRegExp("[)]"), ""); | 33 | dummy = dummy.replace(QRegExp("[)]"), ""); |
28 | //qWarning("dummy: %s", dummy.latin1() ); | 34 | //owarn << "dummy: " << dummy.latin1() << oendl; |
29 | // dummy = dummy.remove( dummy.length() -2, 1 ); // remove the ) | 35 | // dummy = dummy.remove( dummy.length() -2, 1 ); // remove the ) |
30 | bool ok; | 36 | bool ok; |
31 | i = dummy.toInt(&ok, 16 ); | 37 | i = dummy.toInt(&ok, 16 ); |
32 | //if (ok ) { | 38 | //if (ok ) { |
33 | // qWarning("converted %d", i); | 39 | // owarn << "converted " << i << oendl; |
34 | //}else qWarning("failed" ); | 40 | //}else owarn << "failed" << oendl; |
35 | //qWarning("exiting"); | 41 | //owarn << "exiting" << oendl; |
36 | return i; | 42 | return i; |
37 | } | 43 | } |
38 | //qWarning("output %d", i ); | 44 | //owarn << "output " << i << oendl; |
39 | return i; | 45 | return i; |
40 | } | 46 | } |
41 | 47 | ||
@@ -57,11 +63,11 @@ void Parser::parse( const QString& string) { | |||
57 | QStringList list = QStringList::split('\n', string,TRUE ); | 63 | QStringList list = QStringList::split('\n', string,TRUE ); |
58 | QStringList::Iterator it; | 64 | QStringList::Iterator it; |
59 | for (it = list.begin(); it != list.end(); ++it ) { | 65 | for (it = list.begin(); it != list.end(); ++it ) { |
60 | //qWarning("line:%s:line", (*it).latin1() ); | 66 | //owarn << "line:" << (*it).latin1() << oendl; |
61 | if ( (*it).startsWith("Browsing") ) continue; | 67 | if ( (*it).startsWith("Browsing") ) continue; |
62 | 68 | ||
63 | if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins | 69 | if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins |
64 | qWarning("could add"); | 70 | owarn << "could add" << oendl; |
65 | // now see if complete and add | 71 | // now see if complete and add |
66 | if (m_complete ) { | 72 | if (m_complete ) { |
67 | if (!m_item.serviceName().isEmpty() ) | 73 | if (!m_item.serviceName().isEmpty() ) |
@@ -80,22 +86,22 @@ void Parser::parse( const QString& string) { | |||
80 | } | 86 | } |
81 | // missed the last one | 87 | // missed the last one |
82 | if (m_complete) { | 88 | if (m_complete) { |
83 | // qWarning("adding"); | 89 | // owarn << "adding" << oendl; |
84 | if (!m_item.serviceName().isEmpty() ) | 90 | if (!m_item.serviceName().isEmpty() ) |
85 | m_list.append(m_item ); | 91 | m_list.append(m_item ); |
86 | } | 92 | } |
87 | QValueList<Services>::Iterator it2; | 93 | QValueList<Services>::Iterator it2; |
88 | 94 | ||
89 | if (m_list.isEmpty() ) | 95 | if (m_list.isEmpty() ) |
90 | qWarning("m_list is empty"); | 96 | owarn << "m_list is empty" << oendl; |
91 | for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { | 97 | for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { |
92 | qWarning("name %s", (*it2).serviceName().latin1() ); | 98 | owarn << "name " << (*it2).serviceName().latin1() << oendl; |
93 | } | 99 | } |
94 | } | 100 | } |
95 | bool Parser::parseName( const QString& str) { | 101 | bool Parser::parseName( const QString& str) { |
96 | if (str.startsWith("Service Name:") ) { | 102 | if (str.startsWith("Service Name:") ) { |
97 | m_item.setServiceName( str.mid(13).stripWhiteSpace() ); | 103 | m_item.setServiceName( str.mid(13).stripWhiteSpace() ); |
98 | qWarning(m_item.serviceName() ); | 104 | owarn << m_item.serviceName() << oendl; |
99 | return true; | 105 | return true; |
100 | } | 106 | } |
101 | return false; | 107 | return false; |
@@ -103,13 +109,13 @@ bool Parser::parseName( const QString& str) { | |||
103 | bool Parser::parseRecHandle( const QString& str) { | 109 | bool Parser::parseRecHandle( const QString& str) { |
104 | if (str.startsWith("Service RecHandle:" ) ) { | 110 | if (str.startsWith("Service RecHandle:" ) ) { |
105 | QString out = str.mid(18 ).stripWhiteSpace(); | 111 | QString out = str.mid(18 ).stripWhiteSpace(); |
106 | qWarning("out %s", out.latin1() ); | 112 | owarn << "out " << out.latin1() << oendl; |
107 | int value = out.mid(2).toInt(&m_ok, 16 ); | 113 | int value = out.mid(2).toInt(&m_ok, 16 ); |
108 | if (m_ok && (value != -1) ) | 114 | if (m_ok && (value != -1) ) |
109 | m_complete = true; | 115 | m_complete = true; |
110 | else | 116 | else |
111 | m_complete = false; | 117 | m_complete = false; |
112 | qWarning("rec handle %d", value); | 118 | owarn << "rec handle " << value << oendl; |
113 | m_item.setRecHandle( value ); | 119 | m_item.setRecHandle( value ); |
114 | return true; | 120 | return true; |
115 | 121 | ||
@@ -118,13 +124,13 @@ bool Parser::parseRecHandle( const QString& str) { | |||
118 | } | 124 | } |
119 | bool Parser::parseClassId( const QString& str) { | 125 | bool Parser::parseClassId( const QString& str) { |
120 | if (str.startsWith("Service Class ID List:") ) { | 126 | if (str.startsWith("Service Class ID List:") ) { |
121 | qWarning("found class id" ); | 127 | owarn << "found class id" << oendl; |
122 | qWarning("line:%s", str.latin1() ); | 128 | owarn << "line: " << str.latin1() << oendl; |
123 | m_classOver = true; | 129 | m_classOver = true; |
124 | return true; | 130 | return true; |
125 | }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place | 131 | }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place |
126 | qWarning("line with class id" ); | 132 | owarn << "line with class id" << oendl; |
127 | qWarning("%s",str.latin1() ); | 133 | owarn << str.latin1() << oendl; |
128 | 134 | ||
129 | // "Obex Object Push" (0x1105) | 135 | // "Obex Object Push" (0x1105) |
130 | // find backwards the " and the from 0 to pos and the mid pos+1 | 136 | // find backwards the " and the from 0 to pos and the mid pos+1 |
@@ -133,12 +139,12 @@ bool Parser::parseClassId( const QString& str) { | |||
133 | QString classes; | 139 | QString classes; |
134 | int ids; | 140 | int ids; |
135 | ids = convert( str, classes ); | 141 | ids = convert( str, classes ); |
136 | qWarning("ids %d", ids ); | 142 | owarn << "ids " << ids << oendl; |
137 | m_item.insertClassId( ids, classes ); | 143 | m_item.insertClassId( ids, classes ); |
138 | 144 | ||
139 | return true; | 145 | return true; |
140 | }else{ | 146 | }else{ |
141 | qWarning("Else %d", m_classOver ); | 147 | owarn << "Else " << m_classOver << oendl; |
142 | m_classOver = false; | 148 | m_classOver = false; |
143 | } | 149 | } |
144 | return false; | 150 | return false; |
@@ -150,7 +156,7 @@ bool Parser::parseProtocol( const QString& str) { | |||
150 | return true; | 156 | return true; |
151 | 157 | ||
152 | }else if (m_protocolOver && str.startsWith(" ") ) { // "L2CAP" (0x0100) | 158 | }else if (m_protocolOver && str.startsWith(" ") ) { // "L2CAP" (0x0100) |
153 | qWarning("double protocol filter"); | 159 | owarn << "double protocol filter" << oendl; |
154 | 160 | ||
155 | if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now | 161 | if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now |
156 | Services::ProtocolDescriptor desc( m_protName, m_protId ); | 162 | Services::ProtocolDescriptor desc( m_protName, m_protId ); |
@@ -162,7 +168,7 @@ bool Parser::parseProtocol( const QString& str) { | |||
162 | } | 168 | } |
163 | return true; | 169 | return true; |
164 | }else if (m_protocolOver && str.startsWith(" ") ) { | 170 | }else if (m_protocolOver && str.startsWith(" ") ) { |
165 | qWarning("tripple protocol filter"); | 171 | owarn << "tripple protocol filter" << oendl; |
166 | m_protocolAdded = true; | 172 | m_protocolAdded = true; |
167 | QString dummy = str.stripWhiteSpace(); | 173 | QString dummy = str.stripWhiteSpace(); |
168 | int pos = dummy.findRev(':'); | 174 | int pos = dummy.findRev(':'); |
@@ -187,7 +193,7 @@ bool Parser::parseProfile( const QString& str) { | |||
187 | int pos = str.findRev(':'); | 193 | int pos = str.findRev(':'); |
188 | if ( pos > 0 ) { | 194 | if ( pos > 0 ) { |
189 | int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt(); | 195 | int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt(); |
190 | qWarning("dummyInt:%d", dummy ); | 196 | owarn << "dummyInt: " << dummy << oendl; |
191 | Services::ProfileDescriptor desc( m_profName, m_profId, dummy ); | 197 | Services::ProfileDescriptor desc( m_profName, m_profId, dummy ); |
192 | m_item.insertProfileDescriptor(desc); | 198 | m_item.insertProfileDescriptor(desc); |
193 | } | 199 | } |