author | benmeyer <benmeyer> | 2002-11-08 17:16:58 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-08 17:16:58 (UTC) |
commit | 56a6d067a51d741eb9be1912b69325bdd424dd84 (patch) (side-by-side diff) | |
tree | e8db80af083fc44d31042e342726ecfcbbcce4d5 /noncore/net/networksetup/interfaces/interfaces.cpp | |
parent | e0db2259cc26cab12c6f1131b82dd867c454a3ff (diff) | |
download | opie-56a6d067a51d741eb9be1912b69325bdd424dd84.zip opie-56a6d067a51d741eb9be1912b69325bdd424dd84.tar.gz opie-56a6d067a51d741eb9be1912b69325bdd424dd84.tar.bz2 |
More optimizations, 1 memory leak fixed
Diffstat (limited to 'noncore/net/networksetup/interfaces/interfaces.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/networksetup/interfaces/interfaces.cpp | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/noncore/net/networksetup/interfaces/interfaces.cpp b/noncore/net/networksetup/interfaces/interfaces.cpp index 708f399..e49998e 100644 --- a/noncore/net/networksetup/interfaces/interfaces.cpp +++ b/noncore/net/networksetup/interfaces/interfaces.cpp @@ -5,4 +5,5 @@ #include <qregexp.h> +// The three stanza's #define AUTO "auto" #define IFACE "iface" @@ -103,11 +104,10 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){ break; } + // else see if we need to remove from this one else{ if((*it).contains(interface)){ (*it) = (*it).replace(QRegExp(interface), ""); - // clean up - QString line = (*it).simplifyWhiteSpace(); - line = line.replace(QRegExp(" "),""); - if(line == AUTO) + // if AUTO is the only thing left clear the line + if(((*it).simplifyWhiteSpace()).replace(QRegExp(" "),"") == AUTO) (*it) = ""; changed = true; @@ -117,11 +117,7 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){ } } - if(changed == false){ - if(setAuto == true) + // In the case where there is no AUTO field add one. + if(!changed && setAuto) interfaces.append(QString(AUTO" %1").arg(interface)); - else{ - qDebug(QString("Interfaces: Can't set interface %1 auto to false sense it is already false.").arg(interface).latin1()); - } - } return true; } @@ -158,5 +154,5 @@ bool Interfaces::isInterfaceSet(){ */ bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ - if(acceptedFamily.contains(family)==0) + if(0 == acceptedFamily.contains(family)) return false; QString newInterface = interface.simplifyWhiteSpace(); @@ -173,15 +169,21 @@ bool Interfaces::addInterface(const QString &interface, const QString &family, c */ bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ - if(!setInterface(interface)) return false; + if(!setInterface(interface)) + return false; + // Store the old interface and bump past the stanza line. QStringList::Iterator it = currentIface; it++; + // Add the new interface bool error; addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); - if(!setInterface(newInterface)) return false; + if(!setInterface(newInterface)) + return false; + QStringList::Iterator newIface = currentIface; newIface++; + // Copy all of the lines for ( ; it != interfaces.end(); ++it ){ if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) @@ -198,8 +200,5 @@ bool Interfaces::copyInterface(const QString &interface, const QString &newInter */ bool Interfaces::removeInterface(){ - if(currentIface == interfaces.end()) - return false; - (*currentIface) = ""; - return removeAllInterfaceOptions(); + return removeStanza(currentIface); } @@ -233,8 +232,6 @@ QString Interfaces::getInterfaceName(bool &error){ QString Interfaces::getInterfaceFamily(bool &error){ QString name = getInterfaceName(error); - if(error){ - error = true; + if(error) return QString(); - } QString line = (*currentIface); line = line.mid(QString(IFACE).length() +1, line.length()); @@ -258,13 +255,9 @@ QString Interfaces::getInterfaceFamily(bool &error){ QString Interfaces::getInterfaceMethod(bool &error){ QString name = getInterfaceName(error); - if(error){ - error = true; + if(error) return QString(); - } QString family = getInterfaceFamily(error); - if(error){ - error = true; + if(error) return QString(); - } QString line = (*currentIface); line = line.mid(QString(IFACE).length()+1, line.length()); @@ -392,8 +385,5 @@ void Interfaces::addMapping(const QString &option){ */ bool Interfaces::removeMapping(){ - if(currentMapping == interfaces.end()) - return false; - (*currentMapping) = ""; - return removeAllOptions(currentMapping); + return removeStanza(currentMapping); } @@ -521,4 +511,17 @@ bool Interfaces::setOption(const QStringList::Iterator &start, const QString &op return found; } + +/** + * Removes a stanza and all of its options + * @param stanza the stanza to remove + * @return bool true if successfull. + */ +bool Interfaces::removeStanza(QStringList::Iterator &stanza){ + if(stanza == interfaces.end()) + return false; + (*stanza) = ""; + return removeAllOptions(stanza); +} + /** * Removes a option in a stanza @@ -592,12 +595,12 @@ QString Interfaces::getOption(const QStringList::Iterator &start, const QString if((*it).contains(option) && (*it).at(0) != '#'){ if(found) - qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); + qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); found = true; QString line = (*it).simplifyWhiteSpace(); int space = line.find(" ", option.length()); - if(space != -1) + if(space != -1){ value = line.mid(space+1, line.length()); - else - qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1()); + break; + } } } |