summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/ppp/pppmodule.cpp
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/pppmodule.cpp
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/pppmodule.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp23
1 files changed, 12 insertions, 11 deletions
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
@@ -60,24 +60,24 @@ PPPModule::PPPModule() : Module()
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 }
@@ -88,22 +88,22 @@ PPPModule::PPPModule() : Module()
88 88
89/** 89/**
90 * Delete any interfaces that we own. 90 * Delete any interfaces that we own.
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;
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 }
@@ -141,13 +141,13 @@ bool PPPModule::isOwner(Interface *i)
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 */
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);
151 return pppconfig; 151 return pppconfig;
152} 152}
153 153
@@ -168,24 +168,25 @@ QWidget *PPPModule::information(Interface *i)
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 */
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;
189 ifaceppp = new InterfacePPP(); 190 ifaceppp = new InterfacePPP();
190 PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); 191 PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
191 192
@@ -261,26 +262,26 @@ namespace
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}