-FlowControl and LineTermination are saved and activated by numerical

 value now. This makes it work across different translations
-Switch code to use new PPPData::enter() and PPPData::flowcontrol()

1 files changed, 6 insertions, 6 deletions

diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index eb03ef4..1491ea2 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -384,18 +384,18 @@ bool PPPData::setModemDevice(const QString &n) {
     odebug << "Setting modem dev to >" << n.latin1() << "<" << oendl; 
     writeConfig(modemGroup(), MODEMDEV_KEY, n);
     return true; //FIXME
 }
 
 
-const QString PPPData::flowcontrol() {
-  return readConfig(modemGroup(), FLOWCONTROL_KEY, "CRTSCTS");
+enum PPPData::FlowControl PPPData::flowcontrol() {
+  return static_cast<FlowControl>(readNumConfig(modemGroup(), FLOWCONTROL_KEY, FlowHardware));
 }
 
 
-void PPPData::setFlowcontrol(const QString &n) {
+void PPPData::setFlowcontrol(enum FlowControl n) {
   writeConfig(modemGroup(), FLOWCONTROL_KEY, n);
 }
 
 
 const QString PPPData::speed() {
   QString s = readConfig(modemGroup(), SPEED_KEY, "57600");
@@ -717,18 +717,18 @@ const QString PPPData::modemAnswerResp() {
 
 void PPPData::setModemAnswerResp(const QString &n) {
   writeConfig(modemGroup(), ANSWERRESP_KEY, n);
 }
 
 
-const QString PPPData::enter() {
-  return readConfig(modemGroup(), ENTER_KEY, "CR");
+enum PPPData::LineTermination PPPData::enter(){
+    return static_cast<PPPData::LineTermination>(readNumConfig(modemGroup(), ENTER_KEY, EndCR));
 }
 
 
-void PPPData::setEnter(const QString &n) {
+void PPPData::setEnter(enum PPPData::LineTermination n) {
   writeConfig(modemGroup(), ENTER_KEY, n);
 }
 
 
 //
 // functions to set/return account information