Diffstat (limited to 'noncore/settings/networksettings/wlan/wlanmodule.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 74d7f8e..886af10 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -121,55 +121,55 @@ bool WLANModule::remove(Interface*){ | |||
121 | } | 121 | } |
122 | 122 | ||
123 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | 123 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) |
124 | { | 124 | { |
125 | qDebug("WLANModule::receive "+param); | 125 | odebug << "WLANModule::receive "+param << oendl; |
126 | QStringList params = QStringList::split(",",param); | 126 | QStringList params = QStringList::split(",",param); |
127 | int count = params.count(); | 127 | int count = params.count(); |
128 | qDebug("WLANModule got %i params", count ); | 128 | odebug << "WLANModule got " << count << " params" << oendl; |
129 | if (count < 2){ | 129 | if (count < 2){ |
130 | qDebug("Erorr less than 2 parameter"); | 130 | odebug << "Erorr less than 2 parameter" << oendl; |
131 | qDebug("RETURNING"); | 131 | odebug << "RETURNING" << oendl; |
132 | return; | 132 | return; |
133 | } | 133 | } |
134 | 134 | ||
135 | QDataStream stream(arg,IO_ReadOnly); | 135 | QDataStream stream(arg,IO_ReadOnly); |
136 | QString interface; | 136 | QString interface; |
137 | QString action; | 137 | QString action; |
138 | int countMsgs = 0; | 138 | int countMsgs = 0; |
139 | stream >> interface; | 139 | stream >> interface; |
140 | qDebug("got count? >%s<",interface.latin1()); | 140 | odebug << "got count? >" << interface.latin1() << "<" << oendl; |
141 | if (interface == "count"){ | 141 | if (interface == "count"){ |
142 | qDebug("got count"); | 142 | odebug << "got count" << oendl; |
143 | stream >> action; | 143 | stream >> action; |
144 | qDebug("Got count num >%s<", action.latin1()); | 144 | odebug << "Got count num >" << action.latin1() << "<" << oendl; |
145 | countMsgs = action.toInt(); | 145 | countMsgs = action.toInt(); |
146 | } | 146 | } |
147 | 147 | ||
148 | QDialog *toShow; | 148 | QDialog *toShow; |
149 | //while (! stream.atEnd() ){ | 149 | //while (! stream.atEnd() ){ |
150 | for (int i = 0; i < countMsgs; i++){ | 150 | for (int i = 0; i < countMsgs; i++){ |
151 | qDebug("start stream %d/%d",i,countMsgs); | 151 | odebug << "start stream " << i << "/" << countMsgs << "" << oendl; |
152 | if (stream.atEnd()){ | 152 | if (stream.atEnd()){ |
153 | qDebug("end of stream"); | 153 | odebug << "end of stream" << oendl; |
154 | return; | 154 | return; |
155 | } | 155 | } |
156 | stream >> interface; | 156 | stream >> interface; |
157 | qDebug("got iface"); | 157 | odebug << "got iface" << oendl; |
158 | stream >> action; | 158 | stream >> action; |
159 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); | 159 | odebug << "WLANModule got interface " << interface.latin1() << " and acion " << action.latin1() << "" << oendl; |
160 | // find interfaces | 160 | // find interfaces |
161 | Interface *ifa=0; | 161 | Interface *ifa=0; |
162 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ | 162 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ |
163 | if (i->getInterfaceName() == interface){ | 163 | if (i->getInterfaceName() == interface){ |
164 | qDebug("WLANModule found interface %s",interface.latin1()); | 164 | odebug << "WLANModule found interface " << interface.latin1() << "" << oendl; |
165 | ifa = i; | 165 | ifa = i; |
166 | } | 166 | } |
167 | } | 167 | } |
168 | 168 | ||
169 | if (ifa == 0){ | 169 | if (ifa == 0){ |
170 | qDebug("WLANModule Did not find %s",interface.latin1()); | 170 | odebug << "WLANModule Did not find " << interface.latin1() << "" << oendl; |
171 | qDebug("skipping"); | 171 | odebug << "skipping" << oendl; |
172 | count = 0; | 172 | count = 0; |
173 | } | 173 | } |
174 | 174 | ||
175 | if (count == 2){ | 175 | if (count == 2){ |
@@ -194,11 +194,11 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
194 | toShow = (QDialog*) wlanconfigWiget; | 194 | toShow = (QDialog*) wlanconfigWiget; |
195 | } | 195 | } |
196 | QPEApplication::showWidget( wlanconfigWiget ); | 196 | QPEApplication::showWidget( wlanconfigWiget ); |
197 | stream >> value; | 197 | stream >> value; |
198 | qDebug("WLANModule (build 4) is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); | 198 | odebug << "WLANModule (build 4) is setting " << action.latin1() << " of " << interface.latin1() << " to " << value.latin1() << "" << oendl; |
199 | if (value.isEmpty()){ | 199 | if (value.isEmpty()){ |
200 | qDebug("value is empty!!!\nreturning"); | 200 | odebug << "value is empty!!!\nreturning" << oendl; |
201 | return; | 201 | return; |
202 | } | 202 | } |
203 | if ( action.contains("ESSID") ){ | 203 | if ( action.contains("ESSID") ){ |
204 | QComboBox *combo = wlanconfigWiget->essid; | 204 | QComboBox *combo = wlanconfigWiget->essid; |
@@ -217,39 +217,39 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
217 | } | 217 | } |
218 | 218 | ||
219 | }else if (action.contains("Channel")){ | 219 | }else if (action.contains("Channel")){ |
220 | bool ok; | 220 | bool ok; |
221 | qDebug("converting channel"); | 221 | odebug << "converting channel" << oendl; |
222 | int chan = value.toInt( &ok ); | 222 | int chan = value.toInt( &ok ); |
223 | if (ok){ | 223 | if (ok){ |
224 | qDebug("ok setting channel"); | 224 | odebug << "ok setting channel" << oendl; |
225 | wlanconfigWiget->specifyChan->setChecked( true ); | 225 | wlanconfigWiget->specifyChan->setChecked( true ); |
226 | wlanconfigWiget->networkChannel->setValue( chan ); | 226 | wlanconfigWiget->networkChannel->setValue( chan ); |
227 | } | 227 | } |
228 | }else if (action.contains("MacAddr")){ | 228 | }else if (action.contains("MacAddr")){ |
229 | wlanconfigWiget->specifyAp->setChecked( true ); | 229 | wlanconfigWiget->specifyAp->setChecked( true ); |
230 | wlanconfigWiget->macEdit->setText( value ); | 230 | wlanconfigWiget->macEdit->setText( value ); |
231 | }else | 231 | }else |
232 | qDebug("wlan plugin has no clue"); | 232 | odebug << "wlan plugin has no clue" << oendl; |
233 | } | 233 | } |
234 | qDebug("next stream"); | 234 | odebug << "next stream" << oendl; |
235 | }// while stream | 235 | }// while stream |
236 | qDebug("end of stream"); | 236 | odebug << "end of stream" << oendl; |
237 | if (toShow) toShow->exec(); | 237 | if (toShow) toShow->exec(); |
238 | qDebug("returning"); | 238 | odebug << "returning" << oendl; |
239 | } | 239 | } |
240 | 240 | ||
241 | QWidget *WLANModule::getInfo( Interface *i) | 241 | QWidget *WLANModule::getInfo( Interface *i) |
242 | { | 242 | { |
243 | qDebug("WLANModule::getInfo start"); | 243 | odebug << "WLANModule::getInfo start" << oendl; |
244 | WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); | 244 | WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); |
245 | InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); | 245 | InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); |
246 | info->tabWidget->insertTab(information, "TCP/IP", 0); | 246 | info->tabWidget->insertTab(information, "TCP/IP", 0); |
247 | info->tabWidget->setCurrentPage( 0 ); | 247 | info->tabWidget->setCurrentPage( 0 ); |
248 | info->tabWidget->showPage( information ); | 248 | info->tabWidget->showPage( information ); |
249 | if (info->tabWidget->currentPage() == information ) qDebug("infotab OK"); | 249 | if (info->tabWidget->currentPage() == information ) odebug << "infotab OK" << oendl; |
250 | else qDebug("infotab NOT OK"); | 250 | else odebug << "infotab NOT OK" << oendl; |
251 | qDebug("current idx %d", info->tabWidget->currentPageIndex()); | 251 | odebug << "current idx " << info->tabWidget->currentPageIndex() << "" << oendl; |
252 | qDebug("WLANModule::getInfo return"); | 252 | odebug << "WLANModule::getInfo return" << oendl; |
253 | return info; | 253 | return info; |
254 | } | 254 | } |
255 | 255 | ||