Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
10 files changed, 40 insertions, 39 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 8498759..62b1b7a 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -4,97 +4,97 @@ | |||
4 | #include <qcheckbox.h> | 4 | #include <qcheckbox.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qspinbox.h> | 6 | #include <qspinbox.h> |
7 | #include <qgroupbox.h> | 7 | #include <qgroupbox.h> |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | 9 | ||
10 | #include <qmessagebox.h> | 10 | #include <qmessagebox.h> |
11 | 11 | ||
12 | #include <opie2/oprocess.h> | 12 | #include <opie2/oprocess.h> |
13 | 13 | ||
14 | #ifdef QWS | 14 | #ifdef QWS |
15 | #include <opie2/owait.h> | 15 | #include <opie2/owait.h> |
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <qpe/global.h> | 17 | #include <qpe/global.h> |
18 | #include <qapplication.h> | 18 | #include <qapplication.h> |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #define DNSSCRIPT "changedns" | 21 | #define DNSSCRIPT "changedns" |
22 | 22 | ||
23 | /** | 23 | /** |
24 | * Constuctor. Set up the connection. A profile must be set. | 24 | * Constuctor. Set up the connection. A profile must be set. |
25 | */ | 25 | */ |
26 | using namespace Opie::Ui; | 26 | using namespace Opie::Ui; |
27 | using namespace Opie::Core; | 27 | using namespace Opie::Core; |
28 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ | 28 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interfaces(j), interface(i), delInterfaces(false){ |
29 | if (j == 0) { | 29 | if (j == 0) { |
30 | delInterfaces = true; | 30 | delInterfaces = true; |
31 | interfaces = new Interfaces; | 31 | interfaces = new Interfaces; |
32 | } | 32 | } |
33 | } | 33 | } |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * Destructor | 36 | * Destructor |
37 | */ | 37 | */ |
38 | InterfaceSetupImp::~InterfaceSetupImp(){ | 38 | InterfaceSetupImp::~InterfaceSetupImp(){ |
39 | if(delInterfaces) { | 39 | if(delInterfaces) { |
40 | delete interfaces; | 40 | delete interfaces; |
41 | } | 41 | } |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Save the current settings, then write out the interfaces file and close. | 45 | * Save the current settings, then write out the interfaces file and close. |
46 | */ | 46 | */ |
47 | bool InterfaceSetupImp::saveChanges(){ | 47 | bool InterfaceSetupImp::saveChanges(){ |
48 | bool error; | 48 | bool error; |
49 | QString iface = interfaces->getInterfaceName(error); | 49 | QString iface = interfaces->getInterfaceName(error); |
50 | odebug << "InterfaceSetupImp::saveChanges saves interface " << iface.latin1() << "" << oendl; | 50 | odebug << "InterfaceSetupImp::saveChanges saves interface " << iface.latin1() << "" << oendl; |
51 | if(!saveSettings()) | 51 | if(!saveSettings()) |
52 | return false; | 52 | return false; |
53 | 53 | ||
54 | interfaces->write(); | 54 | interfaces->write(); |
55 | 55 | ||
56 | if (interface->getStatus()) { | 56 | if (interface->getStatus()) { |
57 | QString ifup; | 57 | QString ifup; |
58 | ifup += "ifdown "; | 58 | ifup += "ifdown "; |
59 | ifup += iface; | 59 | ifup += iface; |
60 | ifup += "; ifup "; | 60 | ifup += "; ifup "; |
61 | ifup += iface; | 61 | ifup += iface; |
62 | ifup += ";"; | 62 | ifup += ";"; |
63 | 63 | ||
64 | OProcess restart; | 64 | OProcess restart; |
65 | restart << "sh"; | 65 | restart << "sh"; |
66 | restart << "-c"; | 66 | restart << "-c"; |
67 | restart << ifup; | 67 | restart << ifup; |
68 | 68 | ||
69 | OWait *owait = new OWait(); | 69 | OWait *owait = new OWait(); |
70 | Global::statusMessage( tr( "Restarting interface" ) ); | 70 | Global::statusMessage( tr( "Restarting interface" ) ); |
71 | 71 | ||
72 | owait->show(); | 72 | owait->show(); |
73 | qApp->processEvents(); | 73 | qApp->processEvents(); |
74 | 74 | ||
75 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { | 75 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { |
76 | owarn << "unstable to spawn ifdown/ifup" << oendl; | 76 | owarn << "unstable to spawn ifdown/ifup" << oendl; |
77 | } | 77 | } |
78 | 78 | ||
79 | owait->hide(); | 79 | owait->hide(); |
80 | delete owait; | 80 | delete owait; |
81 | 81 | ||
82 | interface->refresh(); | 82 | interface->refresh(); |
83 | } | 83 | } |
84 | return true; | 84 | return true; |
85 | } | 85 | } |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * Save the settings for the current Interface. | 88 | * Save the settings for the current Interface. |
89 | * @return bool true if successful, false otherwise | 89 | * @return bool true if successful, false otherwise |
90 | */ | 90 | */ |
91 | bool InterfaceSetupImp::saveSettings(){ | 91 | bool InterfaceSetupImp::saveSettings(){ |
92 | // eh can't really do anything about it other then return. :-D | 92 | // eh can't really do anything about it other then return. :-D |
93 | if(!interfaces->isInterfaceSet()) | 93 | if(!interfaces->isInterfaceSet()) |
94 | return true; | 94 | return true; |
95 | 95 | ||
96 | bool error = false; | 96 | bool error = false; |
97 | // Loopback case | 97 | // Loopback case |
98 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | 98 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ |
99 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 99 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
100 | return true; | 100 | return true; |
@@ -137,73 +137,73 @@ bool InterfaceSetupImp::saveSettings(){ | |||
137 | * @param QString profile the new profile. | 137 | * @param QString profile the new profile. |
138 | */ | 138 | */ |
139 | void InterfaceSetupImp::setProfile(const QString &profile){ | 139 | void InterfaceSetupImp::setProfile(const QString &profile){ |
140 | /* | 140 | /* |
141 | bool error = false; | 141 | bool error = false; |
142 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | 142 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ |
143 | staticGroupBox->hide(); | 143 | staticGroupBox->hide(); |
144 | dhcpCheckBox->hide(); | 144 | dhcpCheckBox->hide(); |
145 | leaseTime->hide(); | 145 | leaseTime->hide(); |
146 | leaseHoursLabel->hide(); | 146 | leaseHoursLabel->hide(); |
147 | } | 147 | } |
148 | */ | 148 | */ |
149 | 149 | ||
150 | QString newInterfaceName = interface->getInterfaceName(); | 150 | QString newInterfaceName = interface->getInterfaceName(); |
151 | if(profile.length() > 0) | 151 | if(profile.length() > 0) |
152 | newInterfaceName += "_" + profile; | 152 | newInterfaceName += "_" + profile; |
153 | // See if we have to make a interface. | 153 | // See if we have to make a interface. |
154 | if(!interfaces->setInterface(newInterfaceName)){ | 154 | if(!interfaces->setInterface(newInterfaceName)){ |
155 | // Add making for this new interface if need too | 155 | // Add making for this new interface if need too |
156 | if(profile != ""){ | 156 | if(profile != ""){ |
157 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 157 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); |
158 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 158 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
159 | interfaces->addMapping(interface->getInterfaceName()); | 159 | interfaces->addMapping(interface->getInterfaceName()); |
160 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 160 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
161 | odebug << "InterfaceSetupImp: Added Mapping, but still can't setInterface." << oendl; | 161 | odebug << "InterfaceSetupImp: Added Mapping, but still can't setInterface." << oendl; |
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | } | 164 | } |
165 | interfaces->setMap("map", newInterfaceName); | 165 | interfaces->setMap("map", newInterfaceName); |
166 | interfaces->setScript("getprofile.sh"); | 166 | interfaces->setScript("getprofile.sh"); |
167 | } | 167 | } |
168 | else{ | 168 | else{ |
169 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | 169 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); |
170 | if(!interfaces->setInterface(newInterfaceName)){ | 170 | if(!interfaces->setInterface(newInterfaceName)){ |
171 | odebug << "InterfaceSetupImp: Added interface, but still can't setInterface." << oendl; | 171 | odebug << "InterfaceSetupImp: Added interface, but still can't setInterface." << oendl; |
172 | return; | 172 | return; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | } | 175 | } |
176 | 176 | ||
177 | // We must have a valid interface to get this far so read some settings. | 177 | // We must have a valid interface to get this far so read some settings. |
178 | 178 | ||
179 | // DHCP | 179 | // DHCP |
180 | bool error = false; | 180 | bool error = false; |
181 | if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP) | 181 | if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP) |
182 | dhcpCheckBox->setChecked(true); | 182 | dhcpCheckBox->setChecked(true); |
183 | else | 183 | else |
184 | dhcpCheckBox->setChecked(false); | 184 | dhcpCheckBox->setChecked(false); |
185 | 185 | ||
186 | // IP Information | 186 | // IP Information |
187 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); | 187 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); |
188 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); | 188 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); |
189 | odebug << "dns >" << dns.latin1() << "<" << oendl; | 189 | odebug << "dns >" << dns.latin1() << "<" << oendl; |
190 | if(dns.contains(" ")){ | 190 | if(dns.contains(" ")){ |
191 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); | 191 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); |
192 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); | 192 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); |
193 | }else firstDNSLineEdit->setText(dns); | 193 | }else firstDNSLineEdit->setText(dns); |
194 | 194 | ||
195 | ipAddressEdit->setText(interfaces->getInterfaceOption("address", error)); | 195 | ipAddressEdit->setText(interfaces->getInterfaceOption("address", error)); |
196 | subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); | 196 | subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); |
197 | if (subnetMaskEdit->text().isEmpty()) | 197 | if (subnetMaskEdit->text().isEmpty()) |
198 | subnetMaskEdit->setText( "255.255.255.0" ); | 198 | subnetMaskEdit->setText( "255.255.255.0" ); |
199 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); | 199 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); |
200 | 200 | ||
201 | 201 | ||
202 | 202 | ||
203 | owarn << "InterfaceSetupImp::setProfile(" << profile.latin1() << ")\n" << oendl; | 203 | owarn << "InterfaceSetupImp::setProfile(" << profile.latin1() << ")\n" << oendl; |
204 | owarn << "InterfaceSetupImp::setProfile: iface is " << interfaces->getInterfaceName(error).latin1() << "\n" << oendl; | 204 | owarn << "InterfaceSetupImp::setProfile: iface is " << interfaces->getInterfaceName(error).latin1() << "\n" << oendl; |
205 | 205 | ||
206 | } | 206 | } |
207 | 207 | ||
208 | // interfacesetup.cpp | 208 | // interfacesetup.cpp |
209 | 209 | ||
diff --git a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp index f18d8d1..84f1cf6 100644 --- a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp +++ b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp | |||
@@ -1,41 +1,41 @@ | |||
1 | #include "addconnectionimp.h" | 1 | #include "addconnectionimp.h" |
2 | #include <qlistview.h> | 2 | #include <qlistview.h> |
3 | #if QT_VERSION < 300 | 3 | #if QT_VERSION < 300 |
4 | #include <qlist.h> | 4 | #include <qlist.h> |
5 | #else | 5 | #else |
6 | #include <qptrlist.h> | 6 | #include <qptrlist.h> |
7 | #endif | 7 | #endif |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | #include <qheader.h> | 9 | #include <qheader.h> |
10 | 10 | ||
11 | /** | 11 | /** |
12 | * Constructor | 12 | * Constructor |
13 | */ | 13 | */ |
14 | AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f):AddConnection(parent, name, f){ | 14 | AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f):AddConnection(parent, name, f){ |
15 | connect(registeredServicesList, SIGNAL(selectionChanged()), this, SLOT(changed())); | 15 | connect(registeredServicesList, SIGNAL(selectionChanged()), this, SLOT(changed())); |
16 | registeredServicesList->header()->hide(); | 16 | registeredServicesList->header()->hide(); |
17 | }; | 17 | }; |
18 | 18 | ||
19 | /** | 19 | /** |
20 | * The current item changed, update the discription. | 20 | * The current item changed, update the discription. |
21 | */ | 21 | */ |
22 | void AddConnectionImp::changed(){ | 22 | void AddConnectionImp::changed(){ |
23 | QListViewItem *item = registeredServicesList->currentItem(); | 23 | QListViewItem *item = registeredServicesList->currentItem(); |
24 | if(item) | 24 | if(item) |
25 | help->setText(list[item->text(0)]); | 25 | help->setText(list[item->text(0)]); |
26 | } | 26 | } |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * Save a copy of newList for the discriptions and append them all to the view | 29 | * Save a copy of newList for the discriptions and append them all to the view |
30 | * @param newList the new list of possible interfaces | 30 | * @param newList the new list of possible interfaces |
31 | */ | 31 | */ |
32 | void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){ | 32 | void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){ |
33 | list = newList; | 33 | list = newList; |
34 | QMap<QString, QString>::Iterator it; | 34 | QMap<QString, QString>::Iterator it; |
35 | for( it = list.begin(); it != list.end(); ++it ) | 35 | for( it = list.begin(); it != list.end(); ++it ) |
36 | QListViewItem *item = new QListViewItem(registeredServicesList, it.key()); | 36 | (void)new QListViewItem(registeredServicesList, it.key()); |
37 | registeredServicesList->setCurrentItem(registeredServicesList->firstChild()); | 37 | registeredServicesList->setCurrentItem(registeredServicesList->firstChild()); |
38 | } | 38 | } |
39 | 39 | ||
40 | // addserviceimp.cpp | 40 | // addserviceimp.cpp |
41 | 41 | ||
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index 24d33f4..128877a 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp | |||
@@ -192,49 +192,50 @@ void ConnectWidget::init() { | |||
192 | firstrunID = true; | 192 | firstrunID = true; |
193 | firstrunPW = true; | 193 | firstrunPW = true; |
194 | // stats->totalbytes = 0; | 194 | // stats->totalbytes = 0; |
195 | dialnumber = 0; | 195 | dialnumber = 0; |
196 | 196 | ||
197 | // p_kppp->con_speed = ""; | 197 | // p_kppp->con_speed = ""; |
198 | 198 | ||
199 | // p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || _ifaceppp->data()->quit_on_disconnect()); | 199 | // p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || _ifaceppp->data()->quit_on_disconnect()); |
200 | 200 | ||
201 | comlist = &_ifaceppp->data()->scriptType(); | 201 | comlist = &_ifaceppp->data()->scriptType(); |
202 | arglist = &_ifaceppp->data()->script(); | 202 | arglist = &_ifaceppp->data()->script(); |
203 | 203 | ||
204 | QString tit = QObject::tr("Connecting to: %1").arg(_ifaceppp->data()->accname()); | 204 | QString tit = QObject::tr("Connecting to: %1").arg(_ifaceppp->data()->accname()); |
205 | setCaption(tit); | 205 | setCaption(tit); |
206 | 206 | ||
207 | qApp->processEvents(); | 207 | qApp->processEvents(); |
208 | 208 | ||
209 | // run the "before-connect" command | 209 | // run the "before-connect" command |
210 | if (!_ifaceppp->data()->command_before_connect().isEmpty()) { | 210 | if (!_ifaceppp->data()->command_before_connect().isEmpty()) { |
211 | messg->setText(QObject::tr("Running pre-startup command...")); | 211 | messg->setText(QObject::tr("Running pre-startup command...")); |
212 | emit debugMessage(QObject::tr("Running pre-startup command...")); | 212 | emit debugMessage(QObject::tr("Running pre-startup command...")); |
213 | 213 | ||
214 | qApp->processEvents(); | 214 | qApp->processEvents(); |
215 | QApplication::flushX(); | 215 | QApplication::flushX(); |
216 | pid_t id = execute_command(_ifaceppp->data()->command_before_connect()); | 216 | (void)execute_command(_ifaceppp->data()->command_before_connect()); |
217 | |||
217 | // int i, status; | 218 | // int i, status; |
218 | 219 | ||
219 | // do { | 220 | // do { |
220 | // qApp->processEvents(); | 221 | // qApp->processEvents(); |
221 | // i = waitpid(id, &status, WNOHANG); | 222 | // i = waitpid(id, &status, WNOHANG); |
222 | // usleep(100000); | 223 | // usleep(100000); |
223 | // } while (i == 0 && errno == 0); | 224 | // } while (i == 0 && errno == 0); |
224 | } | 225 | } |
225 | 226 | ||
226 | int lock = _ifaceppp->modem()->lockdevice(); | 227 | int lock = _ifaceppp->modem()->lockdevice(); |
227 | 228 | ||
228 | if (lock == 1) { | 229 | if (lock == 1) { |
229 | messg->setText(QObject::tr("Modem device is locked.")); | 230 | messg->setText(QObject::tr("Modem device is locked.")); |
230 | vmain = 20; // wait until cancel is pressed | 231 | vmain = 20; // wait until cancel is pressed |
231 | return; | 232 | return; |
232 | } | 233 | } |
233 | 234 | ||
234 | if (lock == -1) { | 235 | if (lock == -1) { |
235 | messg->setText(QObject::tr("Unable to create modem lock file.")); | 236 | messg->setText(QObject::tr("Unable to create modem lock file.")); |
236 | vmain = 20; // wait until cancel is pressed | 237 | vmain = 20; // wait until cancel is pressed |
237 | return; | 238 | return; |
238 | } | 239 | } |
239 | 240 | ||
240 | if(_ifaceppp->modem()->opentty()) { | 241 | if(_ifaceppp->modem()->opentty()) { |
@@ -452,49 +453,49 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
452 | if(vmain == 101) { | 453 | if(vmain == 101) { |
453 | if(!expecting) { | 454 | if(!expecting) { |
454 | _ifaceppp->modem()->setDataMode(true); // modem will no longer respond to AT commands | 455 | _ifaceppp->modem()->setDataMode(true); // modem will no longer respond to AT commands |
455 | 456 | ||
456 | emit startAccounting(); | 457 | emit startAccounting(); |
457 | // p_kppp->con_win->startClock(); | 458 | // p_kppp->con_win->startClock(); |
458 | 459 | ||
459 | vmain = 2; | 460 | vmain = 2; |
460 | scriptTimeout=_ifaceppp->data()->modemTimeout()*1000; | 461 | scriptTimeout=_ifaceppp->data()->modemTimeout()*1000; |
461 | return; | 462 | return; |
462 | } | 463 | } |
463 | } | 464 | } |
464 | 465 | ||
465 | // execute the script | 466 | // execute the script |
466 | if(vmain == 2) { | 467 | if(vmain == 2) { |
467 | if(!expecting && !pausing && !scanning) { | 468 | if(!expecting && !pausing && !scanning) { |
468 | 469 | ||
469 | timeout_timer->stop(); | 470 | timeout_timer->stop(); |
470 | timeout_timer->start(scriptTimeout); | 471 | timeout_timer->start(scriptTimeout); |
471 | 472 | ||
472 | if((unsigned) scriptindex < comlist->count()) { | 473 | if((unsigned) scriptindex < comlist->count()) { |
473 | scriptCommand = *(comlist->at(scriptindex)); | 474 | scriptCommand = *(comlist->at(scriptindex)); |
474 | scriptArgument = *(arglist->at(scriptindex)); | 475 | scriptArgument = *(arglist->at(scriptindex)); |
475 | } else { | 476 | } else { |
476 | odebug << "End of script" << oendl; | 477 | odebug << "End of script" << oendl; |
477 | vmain = 10; | 478 | vmain = 10; |
478 | return; | 479 | return; |
479 | } | 480 | } |
480 | 481 | ||
481 | if (scriptCommand == "Scan") { | 482 | if (scriptCommand == "Scan") { |
482 | QString bm = QObject::tr("Scanning %1").arg(scriptArgument); | 483 | QString bm = QObject::tr("Scanning %1").arg(scriptArgument); |
483 | messg->setText(bm); | 484 | messg->setText(bm); |
484 | emit debugMessage(bm); | 485 | emit debugMessage(bm); |
485 | 486 | ||
486 | setScan(scriptArgument); | 487 | setScan(scriptArgument); |
487 | scriptindex++; | 488 | scriptindex++; |
488 | return; | 489 | return; |
489 | } | 490 | } |
490 | 491 | ||
491 | if (scriptCommand == "Save") { | 492 | if (scriptCommand == "Save") { |
492 | QString bm = QObject::tr("Saving %1").arg(scriptArgument); | 493 | QString bm = QObject::tr("Saving %1").arg(scriptArgument); |
493 | messg->setText(bm); | 494 | messg->setText(bm); |
494 | emit debugMessage(bm); | 495 | emit debugMessage(bm); |
495 | 496 | ||
496 | if (scriptArgument.lower() == "password") { | 497 | if (scriptArgument.lower() == "password") { |
497 | _ifaceppp->data()->setPassword(scanvar); | 498 | _ifaceppp->data()->setPassword(scanvar); |
498 | // p_kppp->setPW_Edit(scanvar); | 499 | // p_kppp->setPW_Edit(scanvar); |
499 | if(_ifaceppp->data()->storePassword()) | 500 | if(_ifaceppp->data()->storePassword()) |
500 | _ifaceppp->data()->setStoredPassword(scanvar); | 501 | _ifaceppp->data()->setStoredPassword(scanvar); |
@@ -818,59 +819,59 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
818 | // if (termwindow) { | 819 | // if (termwindow) { |
819 | // delete termwindow; | 820 | // delete termwindow; |
820 | // termwindow = 0L; | 821 | // termwindow = 0L; |
821 | // this->show(); | 822 | // this->show(); |
822 | // } else { | 823 | // } else { |
823 | // termwindow = new LoginTerm(0L, 0L); | 824 | // termwindow = new LoginTerm(0L, 0L); |
824 | // hide(); | 825 | // hide(); |
825 | // termwindow->show(); | 826 | // termwindow->show(); |
826 | // vmain = 30; | 827 | // vmain = 30; |
827 | // return; | 828 | // return; |
828 | // } | 829 | // } |
829 | } | 830 | } |
830 | 831 | ||
831 | // Close the tty. This prevents the QTimer::singleShot() in | 832 | // Close the tty. This prevents the QTimer::singleShot() in |
832 | // Modem::readtty() from re-enabling the socket notifier. | 833 | // Modem::readtty() from re-enabling the socket notifier. |
833 | // The port is still held open by the helper process. | 834 | // The port is still held open by the helper process. |
834 | 835 | ||
835 | /* Er, there _is_ not QTimer::singleShot() in Modem::readtty(), | 836 | /* Er, there _is_ not QTimer::singleShot() in Modem::readtty(), |
836 | and closing the thing prevents pppd from using it later. */ | 837 | and closing the thing prevents pppd from using it later. */ |
837 | //_ifaceppp->modem()->closetty(); | 838 | //_ifaceppp->modem()->closetty(); |
838 | 839 | ||
839 | killTimer( main_timer_ID ); | 840 | killTimer( main_timer_ID ); |
840 | 841 | ||
841 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); | 842 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); |
842 | odebug << "started if timeout timer with " << _ifaceppp->data()->pppdTimeout()*1000 << "" << oendl; | 843 | odebug << "started if timeout timer with " << _ifaceppp->data()->pppdTimeout()*1000 << "" << oendl; |
843 | 844 | ||
844 | // find out PPP interface and notify the stats module | 845 | // find out PPP interface and notify the stats module |
845 | // stats->setUnit(pppInterfaceNumber()); | 846 | // stats->setUnit(pppInterfaceNumber()); |
846 | 847 | ||
847 | qApp->flushX(); | 848 | qApp->flushX(); |
848 | semaphore = true; | 849 | semaphore = true; |
849 | result = execppp(); | 850 | result = execppp(); |
850 | 851 | ||
851 | emit debugMessage(QObject::tr("Starting pppd...")); | 852 | emit debugMessage(QObject::tr("Starting pppd...")); |
852 | odebug << "execppp() returned with return-code " << result << "" << oendl; | 853 | odebug << "execppp() returned with return-code " << result << "" << oendl; |
853 | 854 | ||
854 | if(result) { | 855 | if(result) { |
855 | if(!_ifaceppp->data()->autoDNS()) | 856 | if(!_ifaceppp->data()->autoDNS()) |
856 | adddns( _ifaceppp ); | 857 | adddns( _ifaceppp ); |
857 | 858 | ||
858 | // O.K we are done here, let's change over to the if_waiting loop | 859 | // O.K we are done here, let's change over to the if_waiting loop |
859 | // where we wait for the ppp if (interface) to come up. | 860 | // where we wait for the ppp if (interface) to come up. |
860 | 861 | ||
861 | emit if_waiting_signal(); | 862 | emit if_waiting_signal(); |
862 | } else { | 863 | } else { |
863 | 864 | ||
864 | // starting pppd wasn't successful. Error messages were | 865 | // starting pppd wasn't successful. Error messages were |
865 | // handled by execppp(); | 866 | // handled by execppp(); |
866 | if_timeout_timer->stop(); | 867 | if_timeout_timer->stop(); |
867 | this->hide(); | 868 | this->hide(); |
868 | messg->setText(""); | 869 | messg->setText(""); |
869 | //p_kppp->quit_b->setFocus(); | 870 | //p_kppp->quit_b->setFocus(); |
870 | //p_kppp->show(); | 871 | //p_kppp->show(); |
871 | qApp->processEvents(); | 872 | qApp->processEvents(); |
872 | _ifaceppp->modem()->hangup(); | 873 | _ifaceppp->modem()->hangup(); |
873 | emit stopAccounting(); | 874 | emit stopAccounting(); |
874 | //p_kppp->con_win->stopClock(); | 875 | //p_kppp->con_win->stopClock(); |
875 | _ifaceppp->modem()->closetty(); | 876 | _ifaceppp->modem()->closetty(); |
876 | _ifaceppp->modem()->unlockdevice(); | 877 | _ifaceppp->modem()->unlockdevice(); |
@@ -1044,49 +1045,49 @@ void ConnectWidget::setScan(const QString &n) { | |||
1044 | scanstr = n; | 1045 | scanstr = n; |
1045 | scanbuffer = ""; | 1046 | scanbuffer = ""; |
1046 | 1047 | ||
1047 | QString ts = QObject::tr("Scanning: %1").arg(n); | 1048 | QString ts = QObject::tr("Scanning: %1").arg(n); |
1048 | emit debugMessage(ts); | 1049 | emit debugMessage(ts); |
1049 | } | 1050 | } |
1050 | 1051 | ||
1051 | 1052 | ||
1052 | void ConnectWidget::setExpect(const QString &n) { | 1053 | void ConnectWidget::setExpect(const QString &n) { |
1053 | expecting = true; | 1054 | expecting = true; |
1054 | expectstr = n; | 1055 | expectstr = n; |
1055 | 1056 | ||
1056 | QString ts = QObject::tr("Expecting: %1").arg(n); | 1057 | QString ts = QObject::tr("Expecting: %1").arg(n); |
1057 | ts.replace(QRegExp("\n"), "<LF>"); | 1058 | ts.replace(QRegExp("\n"), "<LF>"); |
1058 | emit debugMessage(ts); | 1059 | emit debugMessage(ts); |
1059 | 1060 | ||
1060 | // check if the expected string is in the read buffer already. | 1061 | // check if the expected string is in the read buffer already. |
1061 | checkBuffers(); | 1062 | checkBuffers(); |
1062 | } | 1063 | } |
1063 | 1064 | ||
1064 | 1065 | ||
1065 | void ConnectWidget::if_waiting_timed_out() { | 1066 | void ConnectWidget::if_waiting_timed_out() { |
1066 | if_timer->stop(); | 1067 | if_timer->stop(); |
1067 | if_timeout_timer->stop(); | 1068 | if_timeout_timer->stop(); |
1068 | odebug << "if_waiting_timed_out()" << oendl; | 1069 | odebug << "if_waiting_timed_out()" << oendl; |
1069 | 1070 | ||
1070 | _ifaceppp->data()->setpppdError(E_IF_TIMEOUT); | 1071 | _ifaceppp->data()->setpppdError(E_IF_TIMEOUT); |
1071 | 1072 | ||
1072 | // let's kill the stuck pppd | 1073 | // let's kill the stuck pppd |
1073 | _ifaceppp->modem()->killPPPDaemon(); | 1074 | _ifaceppp->modem()->killPPPDaemon(); |
1074 | 1075 | ||
1075 | emit stopAccounting(); | 1076 | emit stopAccounting(); |
1076 | // p_kppp->con_win->stopClock(); | 1077 | // p_kppp->con_win->stopClock(); |
1077 | 1078 | ||
1078 | 1079 | ||
1079 | // killing ppp will generate a SIGCHLD which will be caught in pppdie() | 1080 | // killing ppp will generate a SIGCHLD which will be caught in pppdie() |
1080 | // in main.cpp what happens next will depend on the boolean | 1081 | // in main.cpp what happens next will depend on the boolean |
1081 | // reconnect_on_disconnect which is set in ConnectWidget::init(); | 1082 | // reconnect_on_disconnect which is set in ConnectWidget::init(); |
1082 | } | 1083 | } |
1083 | 1084 | ||
1084 | void ConnectWidget::pppdDied() | 1085 | void ConnectWidget::pppdDied() |
1085 | { | 1086 | { |
1086 | if_timer->stop(); | 1087 | if_timer->stop(); |
1087 | if_timeout_timer->stop(); | 1088 | if_timeout_timer->stop(); |
1088 | } | 1089 | } |
1089 | 1090 | ||
1090 | void ConnectWidget::if_waiting_slot() { | 1091 | void ConnectWidget::if_waiting_slot() { |
1091 | messg->setText(QObject::tr("Logging on to network...")); | 1092 | messg->setText(QObject::tr("Logging on to network...")); |
1092 | 1093 | ||
@@ -1251,49 +1252,49 @@ bool ConnectWidget::execppp() { | |||
1251 | 1252 | ||
1252 | // check for debug | 1253 | // check for debug |
1253 | if(_ifaceppp->data()->getPPPDebug()) | 1254 | if(_ifaceppp->data()->getPPPDebug()) |
1254 | command += " debug"; | 1255 | command += " debug"; |
1255 | 1256 | ||
1256 | QStringList &arglist = _ifaceppp->data()->pppdArgument(); | 1257 | QStringList &arglist = _ifaceppp->data()->pppdArgument(); |
1257 | for ( QStringList::Iterator it = arglist.begin(); | 1258 | for ( QStringList::Iterator it = arglist.begin(); |
1258 | it != arglist.end(); | 1259 | it != arglist.end(); |
1259 | ++it ) | 1260 | ++it ) |
1260 | { | 1261 | { |
1261 | command += " " + *it; | 1262 | command += " " + *it; |
1262 | } | 1263 | } |
1263 | 1264 | ||
1264 | command += " call opie-kppp logfd 11"; | 1265 | command += " call opie-kppp logfd 11"; |
1265 | 1266 | ||
1266 | if (command.length() > MAX_CMDLEN) { | 1267 | if (command.length() > MAX_CMDLEN) { |
1267 | QMessageBox::critical(this, "error", QObject::tr( | 1268 | QMessageBox::critical(this, "error", QObject::tr( |
1268 | "pppd command + command-line arguments exceed " | 1269 | "pppd command + command-line arguments exceed " |
1269 | "2024 characters in length." | 1270 | "2024 characters in length." |
1270 | )); | 1271 | )); |
1271 | 1272 | ||
1272 | return false; // nonsensically long command which would bust my buffer buf. | 1273 | return false; // nonsensically long command which would bust my buffer buf. |
1273 | } | 1274 | } |
1274 | 1275 | ||
1275 | owarn << "Command IS: " << command.latin1() << "" << oendl; | 1276 | owarn << "Command IS: " << command.latin1() << "" << oendl; |
1276 | 1277 | ||
1277 | qApp->flushX(); | 1278 | qApp->flushX(); |
1278 | 1279 | ||
1279 | return _ifaceppp->modem()->execPPPDaemon(command); | 1280 | return _ifaceppp->modem()->execPPPDaemon(command); |
1280 | } | 1281 | } |
1281 | 1282 | ||
1282 | 1283 | ||
1283 | void ConnectWidget::closeEvent( QCloseEvent *e ) { | 1284 | void ConnectWidget::closeEvent( QCloseEvent *e ) { |
1284 | e->ignore(); | 1285 | e->ignore(); |
1285 | emit cancelbutton(); | 1286 | emit cancelbutton(); |
1286 | } | 1287 | } |
1287 | 1288 | ||
1288 | 1289 | ||
1289 | void ConnectWidget::setMsg(const QString &msg) { | 1290 | void ConnectWidget::setMsg(const QString &msg) { |
1290 | messg->setText(msg); | 1291 | messg->setText(msg); |
1291 | } | 1292 | } |
1292 | 1293 | ||
1293 | void ConnectWidget::writeline(const QString &s) { | 1294 | void ConnectWidget::writeline(const QString &s) { |
1294 | _ifaceppp->modem()->writeLine(s.local8Bit()); | 1295 | _ifaceppp->modem()->writeLine(s.local8Bit()); |
1295 | } | 1296 | } |
1296 | 1297 | ||
1297 | // Set the hostname and domain from DNS Server | 1298 | // Set the hostname and domain from DNS Server |
1298 | void auto_hostname(InterfacePPP *_ifaceppp) { | 1299 | void auto_hostname(InterfacePPP *_ifaceppp) { |
1299 | struct in_addr local_ip; | 1300 | struct in_addr local_ip; |
diff --git a/noncore/settings/networksettings/ppp/devices.cpp b/noncore/settings/networksettings/ppp/devices.cpp index 42de44c..e2c67d8 100644 --- a/noncore/settings/networksettings/ppp/devices.cpp +++ b/noncore/settings/networksettings/ppp/devices.cpp | |||
@@ -53,62 +53,62 @@ using namespace Opie::Core; | |||
53 | 53 | ||
54 | 54 | ||
55 | void parseargs(char* buf, char** args); | 55 | void parseargs(char* buf, char** args); |
56 | 56 | ||
57 | DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *name, WFlags f ) | 57 | DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *name, WFlags f ) |
58 | : ChooserWidget(ip->data(), parent, name, f) | 58 | : ChooserWidget(ip->data(), parent, name, f) |
59 | { | 59 | { |
60 | _ifaceppp = ip; | 60 | _ifaceppp = ip; |
61 | QWhatsThis::add(edit_b, tr("Allows you to modify the selected device")); | 61 | QWhatsThis::add(edit_b, tr("Allows you to modify the selected device")); |
62 | QWhatsThis::add(new_b, tr("Create a new device") ); | 62 | QWhatsThis::add(new_b, tr("Create a new device") ); |
63 | 63 | ||
64 | QWhatsThis::add(copy_b, | 64 | QWhatsThis::add(copy_b, |
65 | tr("Makes a copy of the selected device. All\n" | 65 | tr("Makes a copy of the selected device. All\n" |
66 | "settings of the selected device are copied\n" | 66 | "settings of the selected device are copied\n" |
67 | "to a new device, that you can modify to fit your\n" | 67 | "to a new device, that you can modify to fit your\n" |
68 | "needs")); | 68 | "needs")); |
69 | QWhatsThis::add(delete_b, | 69 | QWhatsThis::add(delete_b, |
70 | tr("<p>Deletes the selected device\n\n" | 70 | tr("<p>Deletes the selected device\n\n" |
71 | "<font color=\"red\"><b>Use with care!</b></font>")); | 71 | "<font color=\"red\"><b>Use with care!</b></font>")); |
72 | 72 | ||
73 | copy_b->setEnabled( false ); //FIXME | 73 | copy_b->setEnabled( false ); //FIXME |
74 | // delete_b->setEnabled( false ); //FIXME | 74 | // delete_b->setEnabled( false ); //FIXME |
75 | 75 | ||
76 | QStringList tmp = _pppdata->getDevicesNamesList(); | 76 | QStringList tmp = _pppdata->getDevicesNamesList(); |
77 | odebug << "DevicesWidget::DevicesWidget got devices " << tmp.join("--").latin1() << "" << oendl; | 77 | odebug << "DevicesWidget::DevicesWidget got devices " << tmp.join("--").latin1() << "" << oendl; |
78 | listListbox->insertStringList(tmp); | 78 | listListbox->insertStringList(tmp); |
79 | 79 | ||
80 | for (uint i = 0; i < listListbox->count(); i++){ | 80 | for (uint i = 0; i < listListbox->count(); i++){ |
81 | odebug << "listListbox->text(i) " << listListbox->text(i).latin1() << " == _pppdata->devname() " << _pppdata->devname().latin1() << "" << oendl; | 81 | odebug << "listListbox->text(i) " << listListbox->text(i).latin1() << " == _pppdata->devname() " << _pppdata->devname().latin1() << "" << oendl; |
82 | if ( listListbox->text(i) == _pppdata->devname() ) | 82 | if ( listListbox->text(i) == _pppdata->devname() ) |
83 | listListbox->setCurrentItem( i ); | 83 | listListbox->setCurrentItem( i ); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
88 | 88 | ||
89 | void DevicesWidget::slotListBoxSelect(int idx) { | 89 | void DevicesWidget::slotListBoxSelect(int idx) { |
90 | bool ok = _pppdata->setDevice( listListbox->text(idx) ); | 90 | _pppdata->setDevice( listListbox->text(idx) ); |
91 | delete_b->setEnabled((bool)(idx != -1)); | 91 | delete_b->setEnabled((bool)(idx != -1)); |
92 | edit_b->setEnabled((bool)(idx != -1)); | 92 | edit_b->setEnabled((bool)(idx != -1)); |
93 | //FIXME copy_b->setEnabled((bool)(idx != -1)); | 93 | //FIXME copy_b->setEnabled((bool)(idx != -1)); |
94 | } | 94 | } |
95 | 95 | ||
96 | void DevicesWidget::edit() { | 96 | void DevicesWidget::edit() { |
97 | _pppdata->setDevice(listListbox->text(listListbox->currentItem())); | 97 | _pppdata->setDevice(listListbox->text(listListbox->currentItem())); |
98 | 98 | ||
99 | int result = doTab(); | 99 | int result = doTab(); |
100 | 100 | ||
101 | if(result == QDialog::Accepted) { | 101 | if(result == QDialog::Accepted) { |
102 | listListbox->changeItem(_pppdata->devname(),listListbox->currentItem()); | 102 | listListbox->changeItem(_pppdata->devname(),listListbox->currentItem()); |
103 | _pppdata->save(); | 103 | _pppdata->save(); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
108 | void DevicesWidget::create() { | 108 | void DevicesWidget::create() { |
109 | 109 | ||
110 | // if(listListbox->count() == MAX_ACCOUNTS) { | 110 | // if(listListbox->count() == MAX_ACCOUNTS) { |
111 | // QMessageBox::information(this, "sorry", | 111 | // QMessageBox::information(this, "sorry", |
112 | // tr("Maximum number of accounts reached.")); | 112 | // tr("Maximum number of accounts reached.")); |
113 | // return; | 113 | // return; |
114 | // } | 114 | // } |
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 3b2393c..6c9735c 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp | |||
@@ -1181,31 +1181,31 @@ PhoneNumberDialog::PhoneNumberDialog(QWidget *parent) | |||
1181 | QLabel *label = new QLabel(this, tr("Enter a phone number:")); | 1181 | QLabel *label = new QLabel(this, tr("Enter a phone number:")); |
1182 | layout->addWidget( label ); | 1182 | layout->addWidget( label ); |
1183 | 1183 | ||
1184 | le = new QLineEdit(this, "lineEdit"); | 1184 | le = new QLineEdit(this, "lineEdit"); |
1185 | layout->addWidget( le ); | 1185 | layout->addWidget( le ); |
1186 | 1186 | ||
1187 | connect(le, SIGNAL(textChanged(const QString&)), | 1187 | connect(le, SIGNAL(textChanged(const QString&)), |
1188 | this, SLOT(textChanged(const QString&))); | 1188 | this, SLOT(textChanged(const QString&))); |
1189 | 1189 | ||
1190 | le->setFocus(); | 1190 | le->setFocus(); |
1191 | textChanged(""); | 1191 | textChanged(""); |
1192 | 1192 | ||
1193 | 1193 | ||
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | 1196 | ||
1197 | QString PhoneNumberDialog::phoneNumber() | 1197 | QString PhoneNumberDialog::phoneNumber() |
1198 | { | 1198 | { |
1199 | QString s = le->text(); | 1199 | QString s = le->text(); |
1200 | 1200 | ||
1201 | return s; | 1201 | return s; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | 1204 | ||
1205 | void PhoneNumberDialog::textChanged(const QString &s) | 1205 | void PhoneNumberDialog::textChanged(const QString &) |
1206 | { | 1206 | { |
1207 | // enableButtonOK(s.length() > 0); | 1207 | // enableButtonOK(s.length() > 0); |
1208 | } | 1208 | } |
1209 | 1209 | ||
1210 | 1210 | ||
1211 | //#include "edit.moc" | 1211 | //#include "edit.moc" |
diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp index 4755aed..56e1c1f 100644 --- a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp | |||
@@ -1,45 +1,45 @@ | |||
1 | #include "interfaceinformationppp.h" | 1 | #include "interfaceinformationppp.h" |
2 | #include "connect.h" | 2 | #include "connect.h" |
3 | #include "conwindow.h" | 3 | #include "conwindow.h" |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <opie2/odebug.h> | 6 | #include <opie2/odebug.h> |
7 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
8 | 8 | ||
9 | /* QT */ | 9 | /* QT */ |
10 | #include <qpushbutton.h> | 10 | #include <qpushbutton.h> |
11 | #include <qlabel.h> | 11 | #include <qlabel.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
13 | #include <qabstractlayout.h> | 13 | #include <qabstractlayout.h> |
14 | 14 | ||
15 | #ifdef QWS | 15 | #ifdef QWS |
16 | #else | 16 | #else |
17 | #define showMaximized show | 17 | #define showMaximized show |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | /** | 20 | /** |
21 | * Constructor for the InterfaceInformationImp class. This class pretty much | 21 | * Constructor for the InterfaceInformationImp class. This class pretty much |
22 | * just display's information about the interface that is passed to it. | 22 | * just display's information about the interface that is passed to it. |
23 | */ | 23 | */ |
24 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) | 24 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags ) |
25 | :InterfaceInformationImp(parent, name, i, Qt::WStyle_ContextHelp) | 25 | :InterfaceInformationImp(parent, name, i, Qt::WStyle_ContextHelp) |
26 | { | 26 | { |
27 | odebug << "InterfaceInformationPPP::InterfaceInformationPPP " << name << "" << oendl; | 27 | odebug << "InterfaceInformationPPP::InterfaceInformationPPP " << name << "" << oendl; |
28 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); | 28 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); |
29 | con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, | 29 | con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, |
30 | QSizePolicy::Fixed) ); | 30 | QSizePolicy::Fixed) ); |
31 | 31 | ||
32 | macAddressLabel->hide(); | 32 | macAddressLabel->hide(); |
33 | subnetMaskLabel->hide(); | 33 | subnetMaskLabel->hide(); |
34 | broadcastLabel->hide(); | 34 | broadcastLabel->hide(); |
35 | TextLabel23->hide(); | 35 | TextLabel23->hide(); |
36 | TextLabel21->hide(); | 36 | TextLabel21->hide(); |
37 | TextLabel24->hide(); | 37 | TextLabel24->hide(); |
38 | 38 | ||
39 | InterfaceInformationLayout->addWidget( con, 1, 0 ); | 39 | InterfaceInformationLayout->addWidget( con, 1, 0 ); |
40 | connect(i, SIGNAL(begin_connect()),con, SLOT(preinit())); | 40 | connect(i, SIGNAL(begin_connect()),con, SLOT(preinit())); |
41 | connect(i, SIGNAL(hangup_now() ), con, SLOT(cancelbutton() ) ); | 41 | connect(i, SIGNAL(hangup_now() ), con, SLOT(cancelbutton() ) ); |
42 | } | 42 | } |
43 | 43 | ||
44 | 44 | ||
45 | 45 | ||
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index fb279ee..dec0177 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp | |||
@@ -42,168 +42,169 @@ namespace | |||
42 | void addInterface( pid_t, const QString& pppDev, const QString& name ); | 42 | void addInterface( pid_t, const QString& pppDev, const QString& name ); |
43 | QMap<QString, Connection> interfaces()const; // will check if still available | 43 | QMap<QString, Connection> interfaces()const; // will check if still available |
44 | private: | 44 | private: |
45 | bool isAvailable( pid_t )const; | 45 | bool isAvailable( pid_t )const; |
46 | QMap<QString, Connection> m_interfaces; | 46 | QMap<QString, Connection> m_interfaces; |
47 | }; | 47 | }; |
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Constructor, find all of the possible interfaces | 52 | * Constructor, find all of the possible interfaces |
53 | * We also need to restore the state.. it could be that | 53 | * We also need to restore the state.. it could be that |
54 | * an interface was up while closing the application | 54 | * an interface was up while closing the application |
55 | * we need to be able to shut it down... | 55 | * we need to be able to shut it down... |
56 | */ | 56 | */ |
57 | PPPModule::PPPModule() : Module() | 57 | PPPModule::PPPModule() : Module() |
58 | { | 58 | { |
59 | InterfaceKeeper inFace; | 59 | InterfaceKeeper inFace; |
60 | QMap<QString,Connection> running = inFace.interfaces(); | 60 | QMap<QString,Connection> running = inFace.interfaces(); |
61 | QStringList handledInterfaceNames; | 61 | QStringList handledInterfaceNames; |
62 | 62 | ||
63 | QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); | 63 | QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); |
64 | QMap<QString,QString>::Iterator it; | 64 | QMap<QString,QString>::Iterator it; |
65 | InterfacePPP *iface; | 65 | InterfacePPP *iface; |
66 | odebug << "getting interfaces" << oendl; | 66 | odebug << "getting interfaces" << oendl; |
67 | for( it = ifaces.begin(); it != ifaces.end(); ++it ) | 67 | for( it = ifaces.begin(); it != ifaces.end(); ++it ) |
68 | { | 68 | { |
69 | odebug << "ifaces " << it.key().latin1() << " " << it.data().latin1() << "" << oendl; | 69 | odebug << "ifaces " << it.key().latin1() << " " << it.data().latin1() << "" << oendl; |
70 | iface = new InterfacePPP( 0, it.key() ); | 70 | iface = new InterfacePPP( 0, it.key() ); |
71 | iface->setHardwareName( it.data() ); | 71 | iface->setHardwareName( it.data() ); |
72 | list.append( (Interface*)iface ); | 72 | list.append( (Interface*)iface ); |
73 | 73 | ||
74 | // check if (*it) is one of the running ifaces | 74 | // check if (*it) is one of the running ifaces |
75 | if ( running.contains( it.data() ) ) | 75 | if ( running.contains( it.data() ) ) |
76 | { | 76 | { |
77 | odebug << "iface is running " << it.key().latin1() << "" << oendl; | 77 | odebug << "iface is running " << it.key().latin1() << "" << oendl; |
78 | handledInterfaceNames << running[it.data()].device; | 78 | handledInterfaceNames << running[it.data()].device; |
79 | iface->setStatus( true ); | 79 | iface->setStatus( true ); |
80 | iface->setPPPDpid( running[it.data()].pid ); | 80 | iface->setPPPDpid( running[it.data()].pid ); |
81 | iface->modem()->setPPPDevice( running[it.data()].device ); | 81 | iface->modem()->setPPPDevice( running[it.data()].device ); |
82 | iface->refresh(); | 82 | iface->refresh(); |
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | setHandledInterfaceNames( handledInterfaceNames ); | 86 | setHandledInterfaceNames( handledInterfaceNames ); |
87 | } | 87 | } |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * Delete any interfaces that we own. | 90 | * Delete any interfaces that we own. |
91 | */ | 91 | */ |
92 | PPPModule::~PPPModule() | 92 | PPPModule::~PPPModule() |
93 | { | 93 | { |
94 | odebug << "PPPModule::~PPPModule() " << oendl; | 94 | odebug << "PPPModule::~PPPModule() " << oendl; |
95 | QMap<QString,QString> ifaces; | 95 | QMap<QString,QString> ifaces; |
96 | InterfaceKeeper keeper; | 96 | InterfaceKeeper keeper; |
97 | Interface *i; | 97 | Interface *i; |
98 | for ( i=list.first(); i != 0; i=list.next() ) | 98 | for ( i=list.first(); i != 0; i=list.next() ) |
99 | { | 99 | { |
100 | /* if online save the state */ | 100 | /* if online save the state */ |
101 | if ( i->getStatus() ) | 101 | if ( i->getStatus() ) |
102 | { | 102 | { |
103 | odebug << "Iface " << i->getHardwareName().latin1() << " is still up" << oendl; | 103 | odebug << "Iface " << i->getHardwareName().latin1() << " is still up" << oendl; |
104 | InterfacePPP* ppp = static_cast<InterfacePPP*>(i); | 104 | InterfacePPP* ppp = static_cast<InterfacePPP*>(i); |
105 | keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() ); | 105 | keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() ); |
106 | } | 106 | } |
107 | ifaces.insert( i->getInterfaceName(), i->getHardwareName() ); | 107 | ifaces.insert( i->getInterfaceName(), i->getHardwareName() ); |
108 | delete i; | 108 | delete i; |
109 | } | 109 | } |
110 | PPPData::setConfiguredInterfaces( ifaces ); | 110 | PPPData::setConfiguredInterfaces( ifaces ); |
111 | } | 111 | } |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * Change the current profile | 114 | * Change the current profile |
115 | */ | 115 | */ |
116 | void PPPModule::setProfile(const QString &newProfile) | 116 | void PPPModule::setProfile(const QString &newProfile) |
117 | { | 117 | { |
118 | profile = newProfile; | 118 | profile = newProfile; |
119 | } | 119 | } |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * get the icon name for this device. | 122 | * get the icon name for this device. |
123 | * @param Interface* can be used in determining the icon. | 123 | * @param Interface* can be used in determining the icon. |
124 | * @return QString the icon name (minus .png, .gif etc) | 124 | * @return QString the icon name (minus .png, .gif etc) |
125 | */ | 125 | */ |
126 | QString PPPModule::getPixmapName(Interface* ) | 126 | QString PPPModule::getPixmapName(Interface* ) |
127 | { | 127 | { |
128 | return "ppp"; | 128 | return "ppp"; |
129 | } | 129 | } |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * Check to see if the interface i is owned by this module. | 132 | * Check to see if the interface i is owned by this module. |
133 | * @param Interface* interface to check against | 133 | * @param Interface* interface to check against |
134 | * @return bool true if i is owned by this module, false otherwise. | 134 | * @return bool true if i is owned by this module, false otherwise. |
135 | */ | 135 | */ |
136 | bool PPPModule::isOwner(Interface *i) | 136 | bool PPPModule::isOwner(Interface *i) |
137 | { | 137 | { |
138 | return list.find( i ) != -1; | 138 | return list.find( i ) != -1; |
139 | } | 139 | } |
140 | 140 | ||
141 | /** | 141 | /** |
142 | * Create, and return the WLANConfigure Module | 142 | * Create, and return the WLANConfigure Module |
143 | * @return QWidget* pointer to this modules configure. | 143 | * @return QWidget* pointer to this modules configure. |
144 | */ | 144 | */ |
145 | QWidget *PPPModule::configure(Interface *i) | 145 | QWidget *PPPModule::configure(Interface *i) |
146 | { | 146 | { |
147 | odebug << "return ModemWidget" << oendl; | 147 | odebug << "return ModemWidget" << oendl; |
148 | PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, | 148 | PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, |
149 | 0, "PPPConfig", false, | 149 | 0, "PPPConfig", false, |
150 | ::Qt::WDestructiveClose | ::Qt::WStyle_ContextHelp); | 150 | ::Qt::WDestructiveClose | ::Qt::WStyle_ContextHelp); |
151 | return pppconfig; | 151 | return pppconfig; |
152 | } | 152 | } |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * Create, and return the Information Module | 155 | * Create, and return the Information Module |
156 | * @return QWidget* pointer to this modules info. | 156 | * @return QWidget* pointer to this modules info. |
157 | */ | 157 | */ |
158 | QWidget *PPPModule::information(Interface *i) | 158 | QWidget *PPPModule::information(Interface *i) |
159 | { | 159 | { |
160 | // We don't have any advanced pppd information widget yet :-D | 160 | // We don't have any advanced pppd information widget yet :-D |
161 | // TODO ^ | 161 | // TODO ^ |
162 | 162 | ||
163 | return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); | 163 | return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); |
164 | } | 164 | } |
165 | 165 | ||
166 | /** | 166 | /** |
167 | * Get all active (up or down) interfaces | 167 | * Get all active (up or down) interfaces |
168 | * @return QList<Interface> A list of interfaces that exsist that havn't | 168 | * @return QList<Interface> A list of interfaces that exsist that havn't |
169 | * been called by isOwner() | 169 | * been called by isOwner() |
170 | */ | 170 | */ |
171 | QList<Interface> PPPModule::getInterfaces() | 171 | QList<Interface> PPPModule::getInterfaces() |
172 | { | 172 | { |
173 | // List all of the files in the peer directory | 173 | // List all of the files in the peer directory |
174 | odebug << "PPPModule::getInterfaces" << oendl; | 174 | odebug << "PPPModule::getInterfaces" << oendl; |
175 | return list; | 175 | return list; |
176 | } | 176 | } |
177 | 177 | ||
178 | /** | 178 | /** |
179 | * Attempt to add a new interface as defined by name | 179 | * Attempt to add a new interface as defined by name |
180 | * @param name the name of the type of interface that should be created given | 180 | * @param newInterface the name of the type of interface that should be created given |
181 | * by possibleNewInterfaces(); | 181 | * by possibleNewInterfaces(); |
182 | * @return Interface* NULL if it was unable to be created. | 182 | * @return Interface* NULL if it was unable to be created. |
183 | */ | 183 | */ |
184 | Interface *PPPModule::addNewInterface(const QString &newInterface) | 184 | Interface *PPPModule::addNewInterface(const QString &newInterface) |
185 | { | 185 | { |
186 | Q_CONST_UNUSED( newInterface ) | ||
186 | 187 | ||
187 | InterfacePPP *ifaceppp; | 188 | InterfacePPP *ifaceppp; |
188 | Interface *iface; | 189 | Interface *iface; |
189 | ifaceppp = new InterfacePPP(); | 190 | ifaceppp = new InterfacePPP(); |
190 | PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); | 191 | PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); |
191 | 192 | ||
192 | if( QPEApplication::execDialog( &imp ) == QDialog::Accepted ) | 193 | if( QPEApplication::execDialog( &imp ) == QDialog::Accepted ) |
193 | { | 194 | { |
194 | iface = (InterfacePPP*) ifaceppp; | 195 | iface = (InterfacePPP*) ifaceppp; |
195 | iface->setModuleOwner( this ); | 196 | iface->setModuleOwner( this ); |
196 | list.append( iface ); | 197 | list.append( iface ); |
197 | return iface; | 198 | return iface; |
198 | } | 199 | } |
199 | else | 200 | else |
200 | { | 201 | { |
201 | delete ifaceppp; | 202 | delete ifaceppp; |
202 | iface = NULL; | 203 | iface = NULL; |
203 | } | 204 | } |
204 | return iface; | 205 | return iface; |
205 | } | 206 | } |
206 | 207 | ||
207 | /** | 208 | /** |
208 | * Attempts to remove the interface, doesn't delete i | 209 | * Attempts to remove the interface, doesn't delete i |
209 | * @return bool true if successful, false otherwise. | 210 | * @return bool true if successful, false otherwise. |
@@ -243,44 +244,44 @@ namespace | |||
243 | cfg.writeEntry( "pid", con.pid ); | 244 | cfg.writeEntry( "pid", con.pid ); |
244 | cfg.writeEntry( "device", con.device ); | 245 | cfg.writeEntry( "device", con.device ); |
245 | } | 246 | } |
246 | } | 247 | } |
247 | void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) | 248 | void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) |
248 | { | 249 | { |
249 | Connection con; | 250 | Connection con; |
250 | con.pid = pid; | 251 | con.pid = pid; |
251 | con.device = dev; | 252 | con.device = dev; |
252 | con.name = name; | 253 | con.name = name; |
253 | m_interfaces.insert( name, con ); | 254 | m_interfaces.insert( name, con ); |
254 | } | 255 | } |
255 | QMap<QString, Connection> InterfaceKeeper::interfaces()const | 256 | QMap<QString, Connection> InterfaceKeeper::interfaces()const |
256 | { | 257 | { |
257 | Config cfg("ppp_plugin_keeper"); | 258 | Config cfg("ppp_plugin_keeper"); |
258 | QMap<QString, Connection> ifaces; | 259 | QMap<QString, Connection> ifaces; |
259 | QStringList lst = cfg.groupList(); | 260 | QStringList lst = cfg.groupList(); |
260 | for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) | 261 | for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) |
261 | { | 262 | { |
262 | Connection con; | 263 | Connection con; |
263 | cfg.setGroup( (*it) ); | 264 | cfg.setGroup( (*it) ); |
264 | con.name = (*it); | 265 | con.name = (*it); |
265 | con.pid = cfg.readNumEntry("pid"); | 266 | con.pid = cfg.readNumEntry("pid"); |
266 | con.device = cfg.readEntry("device"); | 267 | con.device = cfg.readEntry("device"); |
267 | odebug << " " << con.name.latin1() << " " << con.device.latin1() << " " << con.pid << "" << oendl; | 268 | odebug << " " << con.name.latin1() << " " << con.device.latin1() << " " << con.pid << "" << oendl; |
268 | 269 | ||
269 | if ( con.pid != -1 && isAvailable( con.pid ) ) | 270 | if ( con.pid != -1 && isAvailable( con.pid ) ) |
270 | ifaces.insert( con.name, con ); | 271 | ifaces.insert( con.name, con ); |
271 | } | 272 | } |
272 | return ifaces; | 273 | return ifaces; |
273 | } | 274 | } |
274 | bool InterfaceKeeper::isAvailable( pid_t p)const | 275 | bool InterfaceKeeper::isAvailable( pid_t p)const |
275 | { | 276 | { |
276 | if (::kill(p, 0 ) == 0 || errno != ESRCH ) | 277 | if (::kill(p, 0 ) == 0 || errno != ESRCH ) |
277 | { | 278 | { |
278 | odebug << "isAvailable " << p << "" << oendl; | 279 | odebug << "isAvailable " << p << "" << oendl; |
279 | return true; | 280 | return true; |
280 | } | 281 | } |
281 | 282 | ||
282 | odebug << "notAvailable " << p << "" << oendl; | 283 | odebug << "notAvailable " << p << "" << oendl; |
283 | return false; | 284 | return false; |
284 | } | 285 | } |
285 | 286 | ||
286 | } | 287 | } |
diff --git a/noncore/settings/networksettings/ppp/pppmodule.h b/noncore/settings/networksettings/ppp/pppmodule.h index de649e4..1ecbf7a 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.h +++ b/noncore/settings/networksettings/ppp/pppmodule.h | |||
@@ -1,43 +1,43 @@ | |||
1 | #ifndef PPP_MODULE_H | 1 | #ifndef PPP_MODULE_H |
2 | #define PPP_MODULE_H | 2 | #define PPP_MODULE_H |
3 | 3 | ||
4 | #include "module.h" | 4 | #include "module.h" |
5 | 5 | ||
6 | class PPPModule : Module { | 6 | class PPPModule : Module { |
7 | 7 | ||
8 | signals: | 8 | signals: |
9 | void updateInterface(Interface *i); | 9 | void updateInterface(Interface *i); |
10 | 10 | ||
11 | public: | 11 | public: |
12 | PPPModule(); | 12 | PPPModule(); |
13 | ~PPPModule(); | 13 | ~PPPModule(); |
14 | 14 | ||
15 | virtual const QString type() {return "ppp";}; | 15 | virtual const QString type() {return "ppp";}; |
16 | virtual void setProfile(const QString &newProfile); | 16 | virtual void setProfile(const QString &newProfile); |
17 | virtual bool isOwner(Interface *); | 17 | virtual bool isOwner(Interface *); |
18 | virtual QWidget *configure(Interface *i); | 18 | virtual QWidget *configure(Interface *i); |
19 | virtual QWidget *information(Interface *i); | 19 | virtual QWidget *information(Interface *i); |
20 | virtual QList<Interface> getInterfaces(); | 20 | virtual QList<Interface> getInterfaces(); |
21 | virtual void possibleNewInterfaces(QMap<QString, QString> &); | 21 | virtual void possibleNewInterfaces(QMap<QString, QString> &); |
22 | virtual Interface *addNewInterface(const QString &name); | 22 | virtual Interface *addNewInterface(const QString &name); |
23 | virtual bool remove(Interface* i); | 23 | virtual bool remove(Interface* i); |
24 | virtual QString getPixmapName(Interface* i); | 24 | virtual QString getPixmapName(Interface* i); |
25 | virtual void receive(const QCString &msg, const QByteArray &arg) {}; | 25 | virtual void receive(const QCString &, const QByteArray &) {}; |
26 | 26 | ||
27 | private: | 27 | private: |
28 | QList<Interface> list; | 28 | QList<Interface> list; |
29 | QString profile; | 29 | QString profile; |
30 | 30 | ||
31 | }; | 31 | }; |
32 | 32 | ||
33 | extern "C" | 33 | extern "C" |
34 | { | 34 | { |
35 | void* create_plugin() { | 35 | void* create_plugin() { |
36 | return new PPPModule(); | 36 | return new PPPModule(); |
37 | } | 37 | } |
38 | }; | 38 | }; |
39 | 39 | ||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | // pppmodule.h | 42 | // pppmodule.h |
43 | 43 | ||
diff --git a/noncore/settings/networksettings/wlan/keyedit.cpp b/noncore/settings/networksettings/wlan/keyedit.cpp index 13a1c3b..62f8960 100644 --- a/noncore/settings/networksettings/wlan/keyedit.cpp +++ b/noncore/settings/networksettings/wlan/keyedit.cpp | |||
@@ -1,22 +1,22 @@ | |||
1 | #include "keyedit.h" | 1 | #include "keyedit.h" |
2 | #include <qlineedit.h> | 2 | #include <qlineedit.h> |
3 | 3 | ||
4 | KeyEdit::KeyEdit(QWidget* parent, const char* name) : | 4 | KeyEdit::KeyEdit(QWidget* parent, const char* name) : |
5 | QLineEdit(parent, name) | 5 | QLineEdit(parent, name) |
6 | { | 6 | { |
7 | setEchoMode(Password); | 7 | setEchoMode(Password); |
8 | } | 8 | } |
9 | 9 | ||
10 | KeyEdit::~KeyEdit() | 10 | KeyEdit::~KeyEdit() |
11 | { | 11 | { |
12 | } | 12 | } |
13 | 13 | ||
14 | void KeyEdit::focusInEvent(QFocusEvent *event) | 14 | void KeyEdit::focusInEvent(QFocusEvent *) |
15 | { | 15 | { |
16 | setEchoMode(Normal); | 16 | setEchoMode(Normal); |
17 | } | 17 | } |
18 | 18 | ||
19 | void KeyEdit::focusOutEvent(QFocusEvent *event) | 19 | void KeyEdit::focusOutEvent(QFocusEvent *) |
20 | { | 20 | { |
21 | setEchoMode(Password); | 21 | setEchoMode(Password); |
22 | } | 22 | } |
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index d36a702..5cb78cf 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp | |||
@@ -95,49 +95,48 @@ void WLANImp::parseOpts() { | |||
95 | opt = interfaces->getInterfaceOption("wireless_mode", error).simplifyWhiteSpace(); | 95 | opt = interfaces->getInterfaceOption("wireless_mode", error).simplifyWhiteSpace(); |
96 | 96 | ||
97 | for ( int i = 0; i < mode->count(); i++) | 97 | for ( int i = 0; i < mode->count(); i++) |
98 | if ( mode->text( i ) == opt ) mode->setCurrentItem( i ); | 98 | if ( mode->text( i ) == opt ) mode->setCurrentItem( i ); |
99 | 99 | ||
100 | opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace(); | 100 | opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace(); |
101 | if (! opt.isNull()) { | 101 | if (! opt.isNull()) { |
102 | specifyAp->setChecked(true); | 102 | specifyAp->setChecked(true); |
103 | macEdit->setText(opt); | 103 | macEdit->setText(opt); |
104 | } | 104 | } |
105 | 105 | ||
106 | opt = interfaces->getInterfaceOption("wireless_channel", error).simplifyWhiteSpace(); | 106 | opt = interfaces->getInterfaceOption("wireless_channel", error).simplifyWhiteSpace(); |
107 | if (! opt.isNull()) { | 107 | if (! opt.isNull()) { |
108 | specifyChan->setChecked(true); | 108 | specifyChan->setChecked(true); |
109 | networkChannel->setValue(opt.toInt()); | 109 | networkChannel->setValue(opt.toInt()); |
110 | } | 110 | } |
111 | 111 | ||
112 | opt = interfaces->getInterfaceOption("wireless_key", error).simplifyWhiteSpace(); | 112 | opt = interfaces->getInterfaceOption("wireless_key", error).simplifyWhiteSpace(); |
113 | if (opt.isNull()) | 113 | if (opt.isNull()) |
114 | opt = interfaces->getInterfaceOption("wireless_enc", error).simplifyWhiteSpace(); | 114 | opt = interfaces->getInterfaceOption("wireless_enc", error).simplifyWhiteSpace(); |
115 | parseKeyStr(opt); | 115 | parseKeyStr(opt); |
116 | } | 116 | } |
117 | 117 | ||
118 | void WLANImp::parseKeyStr(QString keystr) { | 118 | void WLANImp::parseKeyStr(QString keystr) { |
119 | int loc = 0; | ||
120 | int index = 1; | 119 | int index = 1; |
121 | QString key; | 120 | QString key; |
122 | QStringList keys = QStringList::split(QRegExp("\\s+"), keystr); | 121 | QStringList keys = QStringList::split(QRegExp("\\s+"), keystr); |
123 | int enc = -1; // encryption state | 122 | int enc = -1; // encryption state |
124 | 123 | ||
125 | for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { | 124 | for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { |
126 | if ((*it).left(3) == "off") { | 125 | if ((*it).left(3) == "off") { |
127 | // encryption disabled | 126 | // encryption disabled |
128 | enc = 0; | 127 | enc = 0; |
129 | } else if ((*it).left(2) == "on") { | 128 | } else if ((*it).left(2) == "on") { |
130 | // encryption enabled | 129 | // encryption enabled |
131 | enc = 1; | 130 | enc = 1; |
132 | } else if ((*it).left(4) == "open") { | 131 | } else if ((*it).left(4) == "open") { |
133 | // open mode, accept non encrypted packets | 132 | // open mode, accept non encrypted packets |
134 | acceptNonEnc->setChecked(true); | 133 | acceptNonEnc->setChecked(true); |
135 | } else if ((*it).left(10) == "restricted") { | 134 | } else if ((*it).left(10) == "restricted") { |
136 | // restricted mode, only accept encrypted packets | 135 | // restricted mode, only accept encrypted packets |
137 | rejectNonEnc->setChecked(true); | 136 | rejectNonEnc->setChecked(true); |
138 | } else if ((*it).left(3) == "key") { | 137 | } else if ((*it).left(3) == "key") { |
139 | // new set of options | 138 | // new set of options |
140 | } else if ((*it).left(1) == "[") { | 139 | } else if ((*it).left(1) == "[") { |
141 | index = (*it).mid(1, 1).toInt(); | 140 | index = (*it).mid(1, 1).toInt(); |
142 | // switch current key to index | 141 | // switch current key to index |
143 | switch (index) { | 142 | switch (index) { |