summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/ppp
authorzecke <zecke>2004-09-10 11:16:54 (UTC)
committer zecke <zecke>2004-09-10 11:16:54 (UTC)
commit59dbb076579e0387f960525b415511946eb83b17 (patch) (unidiff)
treedc8caeebf7e5a1968a399838b53cb09a1537d9ec /noncore/settings/networksettings/ppp
parentb8baf551919868737c6f56a05e6efa1bad4d97ac (diff)
downloadopie-59dbb076579e0387f960525b415511946eb83b17.zip
opie-59dbb076579e0387f960525b415511946eb83b17.tar.gz
opie-59dbb076579e0387f960525b415511946eb83b17.tar.bz2
Fix the issues the compilers bothers
remove unused parameters, give return values on return
Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/connect.cpp13
-rw-r--r--noncore/settings/networksettings/ppp/devices.cpp6
-rw-r--r--noncore/settings/networksettings/ppp/edit.cpp2
-rw-r--r--noncore/settings/networksettings/ppp/interfaceinformationppp.cpp4
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp23
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.h2
6 files changed, 26 insertions, 24 deletions
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
@@ -213,7 +213,8 @@ void ConnectWidget::init() {
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 {
@@ -473,7 +474,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
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 }
@@ -839,7 +840,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
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());
@@ -849,7 +850,7 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
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())
@@ -1065,7 +1066,7 @@ void ConnectWidget::setExpect(const QString &n) {
1065void ConnectWidget::if_waiting_timed_out() { 1066void 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
@@ -1272,7 +1273,7 @@ bool ConnectWidget::execppp() {
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
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
@@ -74,11 +74,11 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam
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 }
@@ -87,7 +87,7 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam
87 87
88 88
89void DevicesWidget::slotListBoxSelect(int idx) { 89void 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));
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
@@ -1202,7 +1202,7 @@ QString PhoneNumberDialog::phoneNumber()
1202} 1202}
1203 1203
1204 1204
1205void PhoneNumberDialog::textChanged(const QString &s) 1205void PhoneNumberDialog::textChanged(const QString &)
1206{ 1206{
1207 // enableButtonOK(s.length() > 0); 1207 // enableButtonOK(s.length() > 0);
1208} 1208}
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
@@ -21,10 +21,10 @@ using namespace Opie::Core;
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 */
24InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) 24InterfaceInformationPPP::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) );
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
@@ -63,10 +63,10 @@ PPPModule::PPPModule() : Module()
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 );
@@ -74,7 +74,7 @@ PPPModule::PPPModule() : Module()
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 );
@@ -91,7 +91,7 @@ PPPModule::PPPModule() : Module()
91 */ 91 */
92PPPModule::~PPPModule() 92PPPModule::~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;
@@ -100,7 +100,7 @@ PPPModule::~PPPModule()
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 }
@@ -144,7 +144,7 @@ bool PPPModule::isOwner(Interface *i)
144 */ 144 */
145QWidget *PPPModule::configure(Interface *i) 145QWidget *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);
@@ -171,18 +171,19 @@ QWidget *PPPModule::information(Interface *i)
171QList<Interface> PPPModule::getInterfaces() 171QList<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 */
184Interface *PPPModule::addNewInterface(const QString &newInterface) 184Interface *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;
@@ -264,7 +265,7 @@ namespace
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 );
@@ -275,11 +276,11 @@ namespace
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
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
@@ -22,7 +22,7 @@ public:
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
27private: 27private:
28 QList<Interface> list; 28 QList<Interface> list;