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 | |||
@@ -24,9 +24,9 @@ | |||
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 | } |
@@ -46,9 +46,9 @@ InterfaceSetupImp::~InterfaceSetupImp(){ | |||
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(); |
@@ -72,9 +72,9 @@ bool InterfaceSetupImp::saveChanges(){ | |||
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; |
@@ -157,9 +157,9 @@ void InterfaceSetupImp::setProfile(const QString &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); |
@@ -167,9 +167,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
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 | } |
@@ -185,9 +185,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
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); |
@@ -199,10 +199,10 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
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 |
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 | |||
@@ -9,17 +9,17 @@ | |||
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)]); |
@@ -27,14 +27,14 @@ void AddConnectionImp::changed(){ | |||
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 |
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 | |||
@@ -212,9 +212,10 @@ void ConnectWidget::init() { | |||
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(); |
@@ -472,9 +473,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
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 | ||
@@ -838,9 +839,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
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 | ||
@@ -848,9 +849,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
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 ); |
@@ -1064,9 +1065,9 @@ void ConnectWidget::setExpect(const QString &n) { | |||
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 |
@@ -1271,9 +1272,9 @@ bool ConnectWidget::execppp() { | |||
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); |
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 | |||
@@ -73,22 +73,22 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam | |||
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 | } |
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 | |||
@@ -1201,9 +1201,9 @@ QString PhoneNumberDialog::phoneNumber() | |||
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 | ||
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 | |||
@@ -20,12 +20,12 @@ using namespace Opie::Core; | |||
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 | ||
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 | |||
@@ -62,20 +62,20 @@ PPPModule::PPPModule() : Module() | |||
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 ); |
@@ -90,18 +90,18 @@ PPPModule::PPPModule() : Module() | |||
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() ); |
@@ -143,9 +143,9 @@ bool PPPModule::isOwner(Interface *i) | |||
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; |
@@ -170,20 +170,21 @@ QWidget *PPPModule::information(Interface *i) | |||
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(); |
@@ -263,9 +264,9 @@ namespace | |||
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 | } |
@@ -274,13 +275,13 @@ namespace | |||
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 | |||
@@ -21,9 +21,9 @@ public: | |||
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; |
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 | |||
@@ -10,13 +10,13 @@ KeyEdit::KeyEdit(QWidget* parent, const char* name) : | |||
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 | |||
@@ -115,9 +115,8 @@ void WLANImp::parseOpts() { | |||
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 |