summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-11-22 20:57:18 (UTC)
committer benmeyer <benmeyer>2002-11-22 20:57:18 (UTC)
commit575f126fe474ba1d1603de73088c342c2a3eaa8f (patch) (side-by-side diff)
tree382d804a7c29d664fa6f864663201b736270feaa
parent6632eb593cc9ac17a4b01efb7a5145c4e7efaaa4 (diff)
downloadopie-575f126fe474ba1d1603de73088c342c2a3eaa8f.zip
opie-575f126fe474ba1d1603de73088c342c2a3eaa8f.tar.gz
opie-575f126fe474ba1d1603de73088c342c2a3eaa8f.tar.bz2
Remove return
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp6
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 44c721a..6a56358 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -170,22 +170,22 @@ void WLANImp::changeAndSaveSettingFile(){
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
if(authOpen->isChecked())
stream << " open";
else
stream << " restricted";
- stream << "\n\"";
+ stream << "\"\n";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
- if(output)
+ if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
}
/**
@@ -205,14 +205,12 @@ void WLANImp::accept(){
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
- QDialog::accept();
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
initpath = "/etc/rc.d/init.d";
else if( QDir("/etc/init.d").exists() )
initpath = "/etc/init.d";
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 44c721a..6a56358 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -170,22 +170,22 @@ void WLANImp::changeAndSaveSettingFile(){
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
if(authOpen->isChecked())
stream << " open";
else
stream << " restricted";
- stream << "\n\"";
+ stream << "\"\n";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
if(line.contains("esac"))
stream << line << "\n";
}
if(line.contains(";;"))
output = true;
- if(output)
+ if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
}
/**
@@ -205,14 +205,12 @@ void WLANImp::accept(){
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
- QDialog::accept();
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
initpath = "/etc/rc.d/init.d";
else if( QDir("/etc/init.d").exists() )
initpath = "/etc/init.d";