author | tille <tille> | 2003-06-16 16:56:06 (UTC) |
---|---|---|
committer | tille <tille> | 2003-06-16 16:56:06 (UTC) |
commit | ad64cf15ac6ac064619079592f7656464e88baac (patch) (unidiff) | |
tree | 54ed14a9cff9bdefcadb5ac5e04e5b3c104207ac | |
parent | c6e6ec7a25dd0acfd970d0b9e2f43a8ea500b98b (diff) | |
download | opie-ad64cf15ac6ac064619079592f7656464e88baac.zip opie-ad64cf15ac6ac064619079592f7656464e88baac.tar.gz opie-ad64cf15ac6ac064619079592f7656464e88baac.tar.bz2 |
add support for multiline qcop calls
and macaddrs
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 5029525..544498f 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -645,13 +645,6 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) | |||
645 | param = param.left( param.length() - 1 ); | 645 | param = param.left( param.length() - 1 ); |
646 | qDebug("dest >%s< param >"+param+"<",dest.latin1()); | 646 | qDebug("dest >%s< param >"+param+"<",dest.latin1()); |
647 | 647 | ||
648 | // if (param.contains("QString,QString,QString")) { | ||
649 | // QDataStream stream(arg,IO_ReadOnly); | ||
650 | // QString arg1, arg2, arg3; | ||
651 | // stream >> arg1 >> arg2 >> arg3 ; | ||
652 | // qDebug("args: >%s< >%s< >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1()); | ||
653 | // } | ||
654 | |||
655 | QMap<Module*, QLibrary*>::Iterator it; | 648 | QMap<Module*, QLibrary*>::Iterator it; |
656 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 649 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
657 | qDebug("plugin >%s<", it.key()->type().latin1() ); | 650 | qDebug("plugin >%s<", it.key()->type().latin1() ); |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index bc467bb..e34f0ce 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <qcheckbox.h> | 7 | #include <qcheckbox.h> |
8 | #include <qcombobox.h> | 8 | #include <qcombobox.h> |
9 | #include <qlabel.h> | 9 | #include <qlabel.h> |
10 | #include <qlineedit.h> | ||
10 | #include <qprogressbar.h> | 11 | #include <qprogressbar.h> |
11 | #include <qspinbox.h> | 12 | #include <qspinbox.h> |
12 | #include <qtabwidget.h> | 13 | #include <qtabwidget.h> |
@@ -131,7 +132,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
131 | QDataStream stream(arg,IO_ReadOnly); | 132 | QDataStream stream(arg,IO_ReadOnly); |
132 | QString interface; | 133 | QString interface; |
133 | QString action; | 134 | QString action; |
134 | 135 | while (! stream.atEnd() ){ | |
135 | stream >> interface; | 136 | stream >> interface; |
136 | stream >> action; | 137 | stream >> action; |
137 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); | 138 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); |
@@ -190,10 +191,13 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
190 | }else if (action.contains("Channel")){ | 191 | }else if (action.contains("Channel")){ |
191 | wlanconfigWiget->specifyChan->setChecked( true ); | 192 | wlanconfigWiget->specifyChan->setChecked( true ); |
192 | wlanconfigWiget->networkChannel->setValue( value.toInt() ); | 193 | wlanconfigWiget->networkChannel->setValue( value.toInt() ); |
194 | }else if (action.contains("MacAddr")){ | ||
195 | wlanconfigWiget->specifyAp->setChecked( true ); | ||
196 | wlanconfigWiget->macEdit->setText( value ); | ||
193 | }else | 197 | }else |
194 | qDebug("wlan plugin has no clue"); | 198 | qDebug("wlan plugin has no clue"); |
195 | } | 199 | } |
196 | 200 | }// while stream | |
197 | } | 201 | } |
198 | 202 | ||
199 | QWidget *WLANModule::getInfo( Interface *i) | 203 | QWidget *WLANModule::getInfo( Interface *i) |