Diffstat (limited to 'noncore/net/networksetup/interfaces/interfaces.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/interfaces/interfaces.cpp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/noncore/net/networksetup/interfaces/interfaces.cpp b/noncore/net/networksetup/interfaces/interfaces.cpp index f1b8067..708f399 100644 --- a/noncore/net/networksetup/interfaces/interfaces.cpp +++ b/noncore/net/networksetup/interfaces/interfaces.cpp | |||
@@ -72,3 +72,3 @@ QStringList Interfaces::getInterfaceList(){ | |||
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)); |
@@ -88,3 +88,3 @@ bool Interfaces::isAuto(QString interface){ | |||
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. |
@@ -158,9 +158,9 @@ bool Interfaces::isInterfaceSet(){ | |||
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; |
@@ -173,3 +173,3 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) | |||
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; |
@@ -282,9 +282,9 @@ QString Interfaces::getInterfaceMethod(bool &error){ | |||
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; |
@@ -298,3 +298,3 @@ bool Interfaces::setInterfaceName(QString newName){ | |||
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()) |
@@ -313,3 +313,3 @@ bool Interfaces::setInterfaceFamily(QString newName){ | |||
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()) |
@@ -331,3 +331,3 @@ bool Interfaces::setInterfaceMethod(QString newName){ | |||
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); |
@@ -343,3 +343,3 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){ | |||
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); |
@@ -354,3 +354,3 @@ bool Interfaces::setInterfaceOption(QString option, QString value){ | |||
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); |
@@ -373,6 +373,6 @@ bool Interfaces::removeAllInterfaceOptions(){ | |||
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 | } |
@@ -383,3 +383,3 @@ bool Interfaces::setMapping(QString interface){ | |||
383 | */ | 383 | */ |
384 | void Interfaces::addMapping(QString option){ | 384 | void Interfaces::addMapping(const QString &option){ |
385 | interfaces.append(""); | 385 | interfaces.append(""); |
@@ -405,3 +405,3 @@ bool Interfaces::removeMapping(){ | |||
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); |
@@ -415,3 +415,3 @@ bool Interfaces::setMap(QString map, QString value){ | |||
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); |
@@ -425,3 +425,3 @@ bool Interfaces::removeMap(QString map, QString value){ | |||
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); |
@@ -434,3 +434,3 @@ QString Interfaces::getMap(QString map, bool &error){ | |||
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); |
@@ -446,2 +446,4 @@ QString Interfaces::getScript(bool &error){ | |||
446 | 446 | ||
447 | |||
448 | |||
447 | /** | 449 | /** |
@@ -454,3 +456,3 @@ QString Interfaces::getScript(bool &error){ | |||
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; |
@@ -491,3 +493,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
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()) |
@@ -526,3 +528,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
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()) |
@@ -552,3 +554,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
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()) |
@@ -577,3 +579,3 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){ | |||
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()){ |