author | benmeyer <benmeyer> | 2002-11-08 16:16:11 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-08 16:16:11 (UTC) |
commit | e0db2259cc26cab12c6f1131b82dd867c454a3ff (patch) (unidiff) | |
tree | e251396e5e96839aed5bf6a930dff37fefe5acc0 /noncore/settings/networksettings/interfaces/interfaces.cpp | |
parent | d8ac5b68b504536136347547816992b1cf605cd4 (diff) | |
download | opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.zip opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.tar.gz opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.tar.bz2 |
Code Optimizations
Diffstat (limited to 'noncore/settings/networksettings/interfaces/interfaces.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfaces.cpp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index f1b8067..708f399 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -70,7 +70,7 @@ QStringList Interfaces::getInterfaceList(){ | |||
70 | * @param interface interface to check to see if it is on or not. | 70 | * @param interface interface to check to see if it is on or not. |
71 | * @return true is interface is in auto | 71 | * @return true is interface is in auto |
72 | */ | 72 | */ |
73 | bool Interfaces::isAuto(QString interface){ | 73 | bool Interfaces::isAuto(const QString &interface){ |
74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
75 | QStringList awi = autoLines.grep(QRegExp(interface)); | 75 | QStringList awi = autoLines.grep(QRegExp(interface)); |
76 | if(awi.count() > 1) | 76 | if(awi.count() > 1) |
@@ -86,7 +86,7 @@ bool Interfaces::isAuto(QString interface){ | |||
86 | * @param setAuto the value to set interface to. | 86 | * @param setAuto the value to set interface to. |
87 | * @return false if already set to setAuto. | 87 | * @return false if already set to setAuto. |
88 | * */ | 88 | * */ |
89 | bool Interfaces::setAuto(QString interface, bool setAuto){ | 89 | bool Interfaces::setAuto(const QString &interface, bool setAuto){ |
90 | // Don't need to set it if it is already set. | 90 | // Don't need to set it if it is already set. |
91 | if(isAuto(interface) == setAuto) | 91 | if(isAuto(interface) == setAuto) |
92 | return false; | 92 | return false; |
@@ -156,13 +156,13 @@ bool Interfaces::isInterfaceSet(){ | |||
156 | * @param method for the family. see interfaces man page for family methods. | 156 | * @param method for the family. see interfaces man page for family methods. |
157 | * @return true if successfull. | 157 | * @return true if successfull. |
158 | */ | 158 | */ |
159 | bool Interfaces::addInterface(QString interface, QString family, QString method){ | 159 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ |
160 | if(acceptedFamily.contains(family)==0) | 160 | if(acceptedFamily.contains(family)==0) |
161 | return false; | 161 | return false; |
162 | interface = interface.simplifyWhiteSpace(); | 162 | QString newInterface = interface.simplifyWhiteSpace(); |
163 | interface = interface.replace(QRegExp(" "), ""); | 163 | newInterface = newInterface.replace(QRegExp(" "), ""); |
164 | interfaces.append(""); | 164 | interfaces.append(""); |
165 | interfaces.append(QString(IFACE " %1 %2 %3").arg(interface).arg(family).arg(method)); | 165 | interfaces.append(QString(IFACE " %1 %2 %3").arg(newInterface).arg(family).arg(method)); |
166 | return true; | 166 | return true; |
167 | } | 167 | } |
168 | 168 | ||
@@ -171,7 +171,7 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) | |||
171 | * @param newInterface name of the new interface. | 171 | * @param newInterface name of the new interface. |
172 | * @return bool true if successfull | 172 | * @return bool true if successfull |
173 | */ | 173 | */ |
174 | bool Interfaces::copyInterface(QString interface, QString newInterface){ | 174 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ |
175 | if(!setInterface(interface)) return false; | 175 | if(!setInterface(interface)) return false; |
176 | 176 | ||
177 | QStringList::Iterator it = currentIface; | 177 | QStringList::Iterator it = currentIface; |
@@ -280,13 +280,13 @@ QString Interfaces::getInterfaceMethod(bool &error){ | |||
280 | * @param newName the new name of the interface. All whitespace is removed. | 280 | * @param newName the new name of the interface. All whitespace is removed. |
281 | * @return bool true if successfull. | 281 | * @return bool true if successfull. |
282 | */ | 282 | */ |
283 | bool Interfaces::setInterfaceName(QString newName){ | 283 | bool Interfaces::setInterfaceName(const QString &newName){ |
284 | if(currentIface == interfaces.end()) | 284 | if(currentIface == interfaces.end()) |
285 | return false; | 285 | return false; |
286 | newName = newName.simplifyWhiteSpace(); | 286 | QString name = newName.simplifyWhiteSpace(); |
287 | newName = newName.replace(QRegExp(" "), ""); | 287 | name = name.replace(QRegExp(" "), ""); |
288 | bool returnValue = false; | 288 | bool returnValue = false; |
289 | (*currentIface) = QString("iface %1 %2 %3").arg(newName).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); | 289 | (*currentIface) = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); |
290 | return !returnValue; | 290 | return !returnValue; |
291 | } | 291 | } |
292 | 292 | ||
@@ -296,7 +296,7 @@ bool Interfaces::setInterfaceName(QString newName){ | |||
296 | * defined in the interfaces.h file. | 296 | * defined in the interfaces.h file. |
297 | * @return bool true if successfull. | 297 | * @return bool true if successfull. |
298 | */ | 298 | */ |
299 | bool Interfaces::setInterfaceFamily(QString newName){ | 299 | bool Interfaces::setInterfaceFamily(const QString &newName){ |
300 | if(currentIface == interfaces.end()) | 300 | if(currentIface == interfaces.end()) |
301 | return false; | 301 | return false; |
302 | if(acceptedFamily.contains(newName)==0) | 302 | if(acceptedFamily.contains(newName)==0) |
@@ -311,7 +311,7 @@ bool Interfaces::setInterfaceFamily(QString newName){ | |||
311 | * @param newName the new name of the interface | 311 | * @param newName the new name of the interface |
312 | * @return bool true if successfull. | 312 | * @return bool true if successfull. |
313 | */ | 313 | */ |
314 | bool Interfaces::setInterfaceMethod(QString newName){ | 314 | bool Interfaces::setInterfaceMethod(const QString &newName){ |
315 | if(currentIface == interfaces.end()) | 315 | if(currentIface == interfaces.end()) |
316 | return false; | 316 | return false; |
317 | bool returnValue = false; | 317 | bool returnValue = false; |
@@ -329,7 +329,7 @@ bool Interfaces::setInterfaceMethod(QString newName){ | |||
329 | * @param error set to true if any error occurs, false otherwise. | 329 | * @param error set to true if any error occurs, false otherwise. |
330 | * @return QString the options value. QString::null if error == true | 330 | * @return QString the options value. QString::null if error == true |
331 | */ | 331 | */ |
332 | QString Interfaces::getInterfaceOption(QString option, bool &error){ | 332 | QString Interfaces::getInterfaceOption(const QString &option, bool &error){ |
333 | return getOption(currentIface, option, error); | 333 | return getOption(currentIface, option, error); |
334 | } | 334 | } |
335 | 335 | ||
@@ -341,7 +341,7 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){ | |||
341 | * @param error set to true if any error occurs, false otherwise. | 341 | * @param error set to true if any error occurs, false otherwise. |
342 | * @return QString the options value. QString::null if error == true | 342 | * @return QString the options value. QString::null if error == true |
343 | */ | 343 | */ |
344 | bool Interfaces::setInterfaceOption(QString option, QString value){ | 344 | bool Interfaces::setInterfaceOption(const QString &option, const QString &value){ |
345 | return setOption(currentIface, option, value); | 345 | return setOption(currentIface, option, value); |
346 | } | 346 | } |
347 | 347 | ||
@@ -352,7 +352,7 @@ bool Interfaces::setInterfaceOption(QString option, QString value){ | |||
352 | * @param error set to true if any error occurs, false otherwise. | 352 | * @param error set to true if any error occurs, false otherwise. |
353 | * @return QString the options value. QString::null if error == true | 353 | * @return QString the options value. QString::null if error == true |
354 | */ | 354 | */ |
355 | bool Interfaces::removeInterfaceOption(QString option, QString value){ | 355 | bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){ |
356 | return removeOption(currentIface, option, value); | 356 | return removeOption(currentIface, option, value); |
357 | } | 357 | } |
358 | 358 | ||
@@ -371,17 +371,17 @@ bool Interfaces::removeAllInterfaceOptions(){ | |||
371 | * removed from the interface name. | 371 | * removed from the interface name. |
372 | * @return bool true if it is successfull. | 372 | * @return bool true if it is successfull. |
373 | */ | 373 | */ |
374 | bool Interfaces::setMapping(QString interface){ | 374 | bool Interfaces::setMapping(const QString &interface){ |
375 | interface = interface.simplifyWhiteSpace(); | 375 | QString interfaceName = interface.simplifyWhiteSpace(); |
376 | interface = interface.replace(QRegExp(" "), ""); | 376 | interfaceName = interfaceName.replace(QRegExp(" "), ""); |
377 | return setStanza(MAPPING, interface, currentMapping); | 377 | return setStanza(MAPPING, interfaceName, currentMapping); |
378 | } | 378 | } |
379 | 379 | ||
380 | /** | 380 | /** |
381 | * Adds a new Mapping to the interfaces file with interfaces. | 381 | * Adds a new Mapping to the interfaces file with interfaces. |
382 | * @param interface the name(s) of the interfaces to set to this mapping | 382 | * @param interface the name(s) of the interfaces to set to this mapping |
383 | */ | 383 | */ |
384 | void Interfaces::addMapping(QString option){ | 384 | void Interfaces::addMapping(const QString &option){ |
385 | interfaces.append(""); | 385 | interfaces.append(""); |
386 | interfaces.append(QString(MAPPING " %1").arg(option)); | 386 | interfaces.append(QString(MAPPING " %1").arg(option)); |
387 | } | 387 | } |
@@ -403,7 +403,7 @@ bool Interfaces::removeMapping(){ | |||
403 | * @param value value to go with map | 403 | * @param value value to go with map |
404 | * @return bool true if it is successfull. | 404 | * @return bool true if it is successfull. |
405 | */ | 405 | */ |
406 | bool Interfaces::setMap(QString map, QString value){ | 406 | bool Interfaces::setMap(const QString &map, const QString &value){ |
407 | return setOption(currentMapping, map, value); | 407 | return setOption(currentMapping, map, value); |
408 | } | 408 | } |
409 | 409 | ||
@@ -413,7 +413,7 @@ bool Interfaces::setMap(QString map, QString value){ | |||
413 | * @param value value to go with map | 413 | * @param value value to go with map |
414 | * @return bool true if it is successfull. | 414 | * @return bool true if it is successfull. |
415 | */ | 415 | */ |
416 | bool Interfaces::removeMap(QString map, QString value){ | 416 | bool Interfaces::removeMap(const QString &map, const QString &value){ |
417 | return removeOption(currentMapping, map, value); | 417 | return removeOption(currentMapping, map, value); |
418 | } | 418 | } |
419 | 419 | ||
@@ -423,7 +423,7 @@ bool Interfaces::removeMap(QString map, QString value){ | |||
423 | * @param bool true if it is successfull. | 423 | * @param bool true if it is successfull. |
424 | * @return value that goes to the map | 424 | * @return value that goes to the map |
425 | */ | 425 | */ |
426 | QString Interfaces::getMap(QString map, bool &error){ | 426 | QString Interfaces::getMap(const QString &map, bool &error){ |
427 | return getOption(currentMapping, map, error); | 427 | return getOption(currentMapping, map, error); |
428 | } | 428 | } |
429 | 429 | ||
@@ -432,7 +432,7 @@ QString Interfaces::getMap(QString map, bool &error){ | |||
432 | * @param argument the script name. | 432 | * @param argument the script name. |
433 | * @return true if successfull. | 433 | * @return true if successfull. |
434 | */ | 434 | */ |
435 | bool Interfaces::setScript(QString argument){ | 435 | bool Interfaces::setScript(const QString &argument){ |
436 | return setOption(currentMapping, "script", argument); | 436 | return setOption(currentMapping, "script", argument); |
437 | } | 437 | } |
438 | 438 | ||
@@ -444,6 +444,8 @@ QString Interfaces::getScript(bool &error){ | |||
444 | return getOption(currentMapping, "script", error); | 444 | return getOption(currentMapping, "script", error); |
445 | } | 445 | } |
446 | 446 | ||
447 | |||
448 | |||
447 | /** | 449 | /** |
448 | * Helper function used to parse through the QStringList and put pointers in | 450 | * Helper function used to parse through the QStringList and put pointers in |
449 | * the correct place. | 451 | * the correct place. |
@@ -452,7 +454,7 @@ QString Interfaces::getScript(bool &error){ | |||
452 | * @param interator interator to place at location of stanza if successfull. | 454 | * @param interator interator to place at location of stanza if successfull. |
453 | * @return bool true if the stanza is found. | 455 | * @return bool true if the stanza is found. |
454 | */ | 456 | */ |
455 | bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){ | 457 | bool Interfaces::setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator){ |
456 | bool found = false; | 458 | bool found = false; |
457 | iterator = interfaces.end(); | 459 | iterator = interfaces.end(); |
458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 460 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
@@ -489,7 +491,7 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
489 | * @param option the option to use when setting value. | 491 | * @param option the option to use when setting value. |
490 | * @return bool true if successfull, false otherwise. | 492 | * @return bool true if successfull, false otherwise. |
491 | */ | 493 | */ |
492 | bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){ | 494 | bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){ |
493 | if(start == interfaces.end()) | 495 | if(start == interfaces.end()) |
494 | return false; | 496 | return false; |
495 | 497 | ||
@@ -524,7 +526,7 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
524 | * @param option the option to use when setting value. | 526 | * @param option the option to use when setting value. |
525 | * @return bool true if successfull, false otherwise. | 527 | * @return bool true if successfull, false otherwise. |
526 | */ | 528 | */ |
527 | bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){ | 529 | bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option, const QString &value){ |
528 | if(start == interfaces.end()) | 530 | if(start == interfaces.end()) |
529 | return false; | 531 | return false; |
530 | 532 | ||
@@ -550,7 +552,7 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
550 | * @param start the start of the stanza | 552 | * @param start the start of the stanza |
551 | * @return bool true if successfull, false otherwise. | 553 | * @return bool true if successfull, false otherwise. |
552 | */ | 554 | */ |
553 | bool Interfaces::removeAllOptions(QStringList::Iterator start){ | 555 | bool Interfaces::removeAllOptions(const QStringList::Iterator &start){ |
554 | if(start == interfaces.end()) | 556 | if(start == interfaces.end()) |
555 | return false; | 557 | return false; |
556 | 558 | ||
@@ -575,7 +577,7 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){ | |||
575 | * @param bool true if errors false otherwise. | 577 | * @param bool true if errors false otherwise. |
576 | * @return QString the value of option QString::null() if error == true. | 578 | * @return QString the value of option QString::null() if error == true. |
577 | */ | 579 | */ |
578 | QString Interfaces::getOption(QStringList::Iterator start, QString option, bool &error){ | 580 | QString Interfaces::getOption(const QStringList::Iterator &start, const QString &option, bool &error){ |
579 | if(start == interfaces.end()){ | 581 | if(start == interfaces.end()){ |
580 | error = false; | 582 | error = false; |
581 | return QString(); | 583 | return QString(); |