summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-10-18 18:12:53 (UTC)
committer benmeyer <benmeyer>2002-10-18 18:12:53 (UTC)
commita63b3b36cf4d665b67733e069bfaad8f96388276 (patch) (side-by-side diff)
tree0089ca8d5bacd31982d8bec367d091b4f58cace1
parent5ec0d959ca9d3ade0c7271885028fd4309cf2b4c (diff)
downloadopie-a63b3b36cf4d665b67733e069bfaad8f96388276.zip
opie-a63b3b36cf4d665b67733e069bfaad8f96388276.tar.gz
opie-a63b3b36cf4d665b67733e069bfaad8f96388276.tar.bz2
interfaces now watches for # in most cases
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaceinformation.ui12
-rw-r--r--noncore/net/networksetup/interfaces.cpp10
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp4
-rw-r--r--noncore/net/networksetup/module.h8
-rw-r--r--noncore/settings/networksettings/interfaceinformation.ui12
-rw-r--r--noncore/settings/networksettings/interfaces.cpp10
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp4
-rw-r--r--noncore/settings/networksettings/module.h8
8 files changed, 34 insertions, 34 deletions
diff --git a/noncore/net/networksetup/interfaceinformation.ui b/noncore/net/networksetup/interfaceinformation.ui
index fc99fce..2838d19 100644
--- a/noncore/net/networksetup/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaceinformation.ui
@@ -52,5 +52,5 @@
<property stdset="1">
<name>text</name>
- <string>Refresh</string>
+ <string>&amp;Refresh</string>
</property>
</widget>
@@ -63,5 +63,5 @@
<property stdset="1">
<name>text</name>
- <string>Stop</string>
+ <string>S&amp;top</string>
</property>
</widget>
@@ -74,5 +74,5 @@
<property stdset="1">
<name>text</name>
- <string>Restart</string>
+ <string>R&amp;estart</string>
</property>
</widget>
@@ -85,5 +85,5 @@
<property stdset="1">
<name>text</name>
- <string>Start</string>
+ <string>&amp;Start</string>
</property>
</widget>
@@ -294,5 +294,5 @@
<property stdset="1">
<name>text</name>
- <string>View Advanced Information</string>
+ <string>View &amp;Advanced Information</string>
</property>
</widget>
@@ -334,6 +334,4 @@
</image>
</images>
-<connections>
-</connections>
<tabstops>
<tabstop>startButton</tabstop>
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp
index 9155890..377a6db 100644
--- a/noncore/net/networksetup/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces.cpp
@@ -52,5 +52,5 @@ QStringList Interfaces::getInterfaceList(){
for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
- if(line.contains(IFACE)){
+ if(line.contains(IFACE) && line.at(0) != '#'){
line = line.mid(QString(IFACE).length() +1, line.length());
line = line.simplifyWhiteSpace();
@@ -458,5 +458,5 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
- if(line.contains(stanza) && line.contains(option)){
+ if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){
uint point = line.find(option);
bool valid = true;
@@ -504,5 +504,5 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
break;
}
- if((*it).contains(option) && it != start){
+ if((*it).contains(option) && it != start && (*it).at(0) != '#'){
// Found it in stanza so replace it.
if(found)
@@ -535,5 +535,5 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
break;
}
- if((*it).contains(option) && (*it).contains(value) &&it != start){
+ if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){
// Found it in stanza so replace it.
if(found)
@@ -588,5 +588,5 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool
break;
}
- if((*it).contains(option)){
+ 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());
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 01063c2..8e4e898 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -233,5 +233,5 @@ void MainWindowImp::configureClicked(){
i->getModuleOwner()->setProfile(currentProfile);
QTabWidget *tabWidget = NULL;
- QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
+ QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
if(moduleConfigure != NULL){
if(tabWidget != NULL){
@@ -279,5 +279,5 @@ void MainWindowImp::informationClicked(){
if(i->getModuleOwner()){
QTabWidget *tabWidget = NULL;
- QWidget *moduleInformation = i->getModuleOwner()->information(&tabWidget);
+ QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget);
if(moduleInformation != NULL){
if(tabWidget != NULL){
diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index a30f492..96db5b3 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -30,5 +30,5 @@ public:
* @return QString the icon name (minus .png, .gif etc)
*/
- virtual QString getPixmapName(Interface* i) = 0;
+ virtual QString getPixmapName(Interface *) = 0;
/**
@@ -41,15 +41,17 @@ public:
/**
* Create, set tabWiget and return the WLANConfigure Module
+ * @param Interface *i the interface to configure.
* @param tabWidget a pointer to the tab widget that this configure has.
* @return QWidget* pointer to the tab widget in this modules configure.
*/
- virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+ virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
/**
* Create, set tabWiget and return the Information Module
+ * @param Interface *i the interface to get info on.
* @param tabWidget a pointer to the tab widget that this information has.
* @return QWidget* pointer to the tab widget in this modules info.
*/
- virtual QWidget *information(QTabWidget **){ return NULL; };
+ virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };
/**
diff --git a/noncore/settings/networksettings/interfaceinformation.ui b/noncore/settings/networksettings/interfaceinformation.ui
index fc99fce..2838d19 100644
--- a/noncore/settings/networksettings/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaceinformation.ui
@@ -52,5 +52,5 @@
<property stdset="1">
<name>text</name>
- <string>Refresh</string>
+ <string>&amp;Refresh</string>
</property>
</widget>
@@ -63,5 +63,5 @@
<property stdset="1">
<name>text</name>
- <string>Stop</string>
+ <string>S&amp;top</string>
</property>
</widget>
@@ -74,5 +74,5 @@
<property stdset="1">
<name>text</name>
- <string>Restart</string>
+ <string>R&amp;estart</string>
</property>
</widget>
@@ -85,5 +85,5 @@
<property stdset="1">
<name>text</name>
- <string>Start</string>
+ <string>&amp;Start</string>
</property>
</widget>
@@ -294,5 +294,5 @@
<property stdset="1">
<name>text</name>
- <string>View Advanced Information</string>
+ <string>View &amp;Advanced Information</string>
</property>
</widget>
@@ -334,6 +334,4 @@
</image>
</images>
-<connections>
-</connections>
<tabstops>
<tabstop>startButton</tabstop>
diff --git a/noncore/settings/networksettings/interfaces.cpp b/noncore/settings/networksettings/interfaces.cpp
index 9155890..377a6db 100644
--- a/noncore/settings/networksettings/interfaces.cpp
+++ b/noncore/settings/networksettings/interfaces.cpp
@@ -52,5 +52,5 @@ QStringList Interfaces::getInterfaceList(){
for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
- if(line.contains(IFACE)){
+ if(line.contains(IFACE) && line.at(0) != '#'){
line = line.mid(QString(IFACE).length() +1, line.length());
line = line.simplifyWhiteSpace();
@@ -458,5 +458,5 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) {
QString line = (*it).simplifyWhiteSpace();
- if(line.contains(stanza) && line.contains(option)){
+ if(line.contains(stanza) && line.contains(option) && line.at(0) != '#'){
uint point = line.find(option);
bool valid = true;
@@ -504,5 +504,5 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
break;
}
- if((*it).contains(option) && it != start){
+ if((*it).contains(option) && it != start && (*it).at(0) != '#'){
// Found it in stanza so replace it.
if(found)
@@ -535,5 +535,5 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri
break;
}
- if((*it).contains(option) && (*it).contains(value) &&it != start){
+ if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){
// Found it in stanza so replace it.
if(found)
@@ -588,5 +588,5 @@ QString Interfaces::getOption(QStringList::Iterator start, QString option, bool
break;
}
- if((*it).contains(option)){
+ 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());
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 01063c2..8e4e898 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -233,5 +233,5 @@ void MainWindowImp::configureClicked(){
i->getModuleOwner()->setProfile(currentProfile);
QTabWidget *tabWidget = NULL;
- QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget);
+ QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
if(moduleConfigure != NULL){
if(tabWidget != NULL){
@@ -279,5 +279,5 @@ void MainWindowImp::informationClicked(){
if(i->getModuleOwner()){
QTabWidget *tabWidget = NULL;
- QWidget *moduleInformation = i->getModuleOwner()->information(&tabWidget);
+ QWidget *moduleInformation = i->getModuleOwner()->information(i, &tabWidget);
if(moduleInformation != NULL){
if(tabWidget != NULL){
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index a30f492..96db5b3 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -30,5 +30,5 @@ public:
* @return QString the icon name (minus .png, .gif etc)
*/
- virtual QString getPixmapName(Interface* i) = 0;
+ virtual QString getPixmapName(Interface *) = 0;
/**
@@ -41,15 +41,17 @@ public:
/**
* Create, set tabWiget and return the WLANConfigure Module
+ * @param Interface *i the interface to configure.
* @param tabWidget a pointer to the tab widget that this configure has.
* @return QWidget* pointer to the tab widget in this modules configure.
*/
- virtual QWidget *configure(QTabWidget **){ return NULL; } ;
+ virtual QWidget *configure(Interface *, QTabWidget **){ return NULL; } ;
/**
* Create, set tabWiget and return the Information Module
+ * @param Interface *i the interface to get info on.
* @param tabWidget a pointer to the tab widget that this information has.
* @return QWidget* pointer to the tab widget in this modules info.
*/
- virtual QWidget *information(QTabWidget **){ return NULL; };
+ virtual QWidget *information(Interface *, QTabWidget **){ return NULL; };
/**