summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-14 23:27:22 (UTC)
committer kergoth <kergoth>2003-04-14 23:27:22 (UTC)
commit68c558ca78e5416145b64ca87fd01361f033ef34 (patch) (side-by-side diff)
tree53287d7a641fc37d4f52e0e13dfb576149e41f8e
parent9c0ba9922e12081ba87cce6583fe413ab5794cf6 (diff)
downloadopie-68c558ca78e5416145b64ca87fd01361f033ef34.zip
opie-68c558ca78e5416145b64ca87fd01361f033ef34.tar.gz
opie-68c558ca78e5416145b64ca87fd01361f033ef34.tar.bz2
Add remove methods which do not require that you pass the current value of the option, to avoid having to retain that information unnecessarily
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfaces.cpp37
-rw-r--r--noncore/settings/networksettings/interfaces/interfaces.h2
2 files changed, 39 insertions, 0 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp
index 8f685fe..8d3e151 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaces.cpp
@@ -338,12 +338,22 @@ bool Interfaces::setInterfaceOption(const QString &option, const QString &value)
return setOption(currentIface, option, value);
}
/**
* Removes a value for an option in the currently selected interface.
* @param option the options to set the value.
+ * @param error set to true if any error occurs, false otherwise.
+ * @return QString the options value. QString::null if error == true
+ */
+bool Interfaces::removeInterfaceOption(const QString &option){
+ return removeOption(currentIface, option);
+}
+
+/**
+ * Removes a value for an option in the currently selected interface.
+ * @param option the options to set the value.
* @param value the value that option should be set to.
* @param error set to true if any error occurs, false otherwise.
* @return QString the options value. QString::null if error == true
*/
bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){
return removeOption(currentIface, option, value);
@@ -523,12 +533,39 @@ bool Interfaces::removeStanza(QStringList::Iterator &stanza){
return removeAllOptions(stanza);
}
/**
* Removes a option in a stanza
* @param start the start of the stanza
+ * @param option the option to remove
+ * @return bool true if successfull, false otherwise.
+ */
+bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option){
+ if(start == interfaces.end())
+ return false;
+
+ bool found = false;
+ for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) {
+ if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)) && it != start){
+ // got to the end without finding it
+ break;
+ }
+ if((*it).contains(option) && it != start && (*it).at(0) != '#'){
+ // Found it in stanza so replace it.
+ if(found)
+ qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1());
+ found = true;
+ (*it) = "";
+ }
+ }
+ return found;
+}
+
+/**
+ * Removes a option in a stanza
+ * @param start the start of the stanza
* @param option the option to use when setting value.
* @return bool true if successfull, false otherwise.
*/
bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option, const QString &value){
if(start == interfaces.end())
return false;
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h
index bac2a7e..bc9eaaa 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.h
+++ b/noncore/settings/networksettings/interfaces/interfaces.h
@@ -38,12 +38,13 @@ public:
QString getInterfaceFamily(bool &error);
bool setInterfaceFamily(const QString &newName);
QString getInterfaceMethod(bool &error);
bool setInterfaceMethod(const QString &newName);
QString getInterfaceOption(const QString &option, bool &error);
bool setInterfaceOption(const QString &option, const QString &value);
+ bool removeInterfaceOption(const QString &option);
bool removeInterfaceOption(const QString &option, const QString &value);
bool removeAllInterfaceOptions();
bool setMapping(const QString &interface);
bool removeMapping();
void addMapping(const QString &options);
@@ -57,12 +58,13 @@ public:
private:
bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator);
bool removeStanza(QStringList::Iterator &stanza);
bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value);
bool removeAllOptions(const QStringList::Iterator &start);
+ bool removeOption(const QStringList::Iterator &start, const QString &option);
bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value);
QString getOption(const QStringList::Iterator &start, const QString &option, bool &error);
QString interfacesFile;
QStringList interfaces;
QStringList::Iterator currentIface;