1 files changed, 31 insertions, 28 deletions

diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index 98e035b..f735e49 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -36,25 +36,25 @@
 #include <qspinbox.h>
 #include <qwhatsthis.h>
 
 // #include <qgroupbox.h>
 
 #include "general.h"
-//#include "version.h"
+#include "interfaceppp.h"
 //#include "miniterm.h"
 #include "modeminfo.h"
 #include "modemcmds.h"
 #include "devices.h"
 #include "pppdata.h"
 //#include <klocale.h>
 #define i18n QObject::tr
 
 
 
-ModemWidget::ModemWidget( QWidget *parent, const char *name)
-  : QWidget(parent, name)
+ModemWidget::ModemWidget( InterfacePPP *ifppp, QWidget *parent, const char *name )
+    : QWidget(parent, name), _ifaceppp(ifppp)
 {
   int k;
 
   QGridLayout *tl = new QGridLayout(this, 8, 2, 0 );//, KDialog::spacingHint());
 
   QLabel *label1;
@@ -169,22 +169,22 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
              "that your serial port supports higher speeds).");
 
   QWhatsThis::add(baud_label,tmp);
   QWhatsThis::add(baud_c,tmp);
 
   for(int i=0; i <= enter->count()-1; i++) {
-    if(PPPData::data()->enter() == enter->text(i))
+    if(_ifaceppp->data()->enter() == enter->text(i))
       enter->setCurrentItem(i);
   }
 
   tl->addRowSpacing(4, 10);
 
   //Modem Lock File
   modemlockfile = new QCheckBox(i18n("&Use lock file"), this);
 
-  modemlockfile->setChecked(PPPData::data()->modemLockFile());
+  modemlockfile->setChecked(_ifaceppp->data()->modemLockFile());
   connect(modemlockfile, SIGNAL(toggled(bool)),
           SLOT(modemlockfilechanged(bool)));
   tl->addMultiCellWidget(modemlockfile, 5, 5, 0, 1);
   //  l12->addStretch(1);
   QWhatsThis::add(modemlockfile,
                   i18n("<p>To prevent other programs from accessing the\n"
@@ -198,16 +198,17 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
                        "<b>Default</b>: On"));
 
   // Modem Timeout Line Edit Box
   QHBoxLayout *timeoutLayout = new QHBoxLayout( this );
   QLabel *timeoutlabel = new QLabel( tr("Modem timeout:") ,this, "timeout" );
   modemtimeout = new QSpinBox( 1, 120, 1, this, "modemTimeout" );
-//   modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
+//   modemtimeout = new KIntNumInput(_pppdata->modemTimeout(), this);
 //   modemtimeout->setLabel(i18n("Modem &timeout:"));
 //  modemtimeout->setRange(1, 120, 1);
   modemtimeout->setSuffix(i18n(" sec"));
+  modemtimeout->setValue( _ifaceppp->data()->modemTimeout() );
   connect(modemtimeout, SIGNAL(valueChanged(int)),
           SLOT(modemtimeoutchanged(int)));
   timeoutLayout->addWidget(timeoutlabel);
   timeoutLayout->addWidget(modemtimeout);
   tl->addMultiCellLayout(timeoutLayout, 6, 6, 0, 1);
 
@@ -215,73 +216,74 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
                   i18n("This specifies how long <i>kppp</i> waits for a\n"
                        "<i>CONNECT</i> response from your modem. The\n"
                        "recommended value is 30 seconds."));
 
   //set stuff from gpppdata
   for(int i=0; i <= enter->count()-1; i++) {
-    if(PPPData::data()->enter() == enter->text(i))
+    if(_ifaceppp->data()->enter() == enter->text(i))
       enter->setCurrentItem(i);
   }
 
   for(int i=0; i <= modemdevice->count()-1; i++) {
-    if(PPPData::data()->modemDevice() == modemdevice->text(i))
+    if(_ifaceppp->data()->modemDevice() == modemdevice->text(i))
       modemdevice->setCurrentItem(i);
   }
 
   for(int i=0; i <= flowcontrol->count()-1; i++) {
-    if(PPPData::data()->flowcontrol() == flowcontrol->text(i))
+    if(_ifaceppp->data()->flowcontrol() == flowcontrol->text(i))
       flowcontrol->setCurrentItem(i);
   }
 
   //set the modem speed
   for(int i=0; i < baud_c->count(); i++)
-    if(baud_c->text(i) == PPPData::data()->speed())
+    if(baud_c->text(i) == _ifaceppp->data()->speed())
       baud_c->setCurrentItem(i);
 
   tl->setRowStretch(7, 1);
 }
 
 
 void ModemWidget::speed_selection(int) {
-  PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem()));
+  _ifaceppp->data()->setSpeed(baud_c->text(baud_c->currentItem()));
 }
 
 
 void ModemWidget::setenter(int ) {
-  PPPData::data()->setEnter(enter->text(enter->currentItem()));
+  _ifaceppp->data()->setEnter(enter->text(enter->currentItem()));
 }
 
 
 void ModemWidget::setmodemdc(int i) {
-  PPPData::data()->setModemDevice(modemdevice->text(i));
+  _ifaceppp->data()->setModemDevice(modemdevice->text(i));
 }
 
 
 void ModemWidget::setflowcontrol(int i) {
-  PPPData::data()->setFlowcontrol(flowcontrol->text(i));
+  _ifaceppp->data()->setFlowcontrol(flowcontrol->text(i));
 }
 
 
 void ModemWidget::modemlockfilechanged(bool set) {
-  PPPData::data()->setModemLockFile(set);
+  _ifaceppp->data()->setModemLockFile(set);
 }
 
 
 void ModemWidget::modemtimeoutchanged(int n) {
-  PPPData::data()->setModemTimeout(n);
+  _ifaceppp->data()->setModemTimeout(n);
 }
 
 
-ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
-  : QWidget(parent, name)
+ModemWidget2::ModemWidget2( InterfacePPP* ifp, QWidget *parent,
+                            const char *name)
+    : QWidget(parent, name), _ifaceppp(ifp)
 {
     QVBoxLayout *l1 = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
 
   waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this);
-  waitfordt->setChecked(PPPData::data()->waitForDialTone());
+  waitfordt->setChecked(_ifaceppp->data()->waitForDialTone());
   connect(waitfordt, SIGNAL(toggled(bool)), SLOT(waitfordtchanged(bool)));
   l1->addWidget(waitfordt);
   QWhatsThis::add(waitfordt,
                   i18n("<p>Normally the modem waits for a dial tone\n"
                        "from your phone line, indicating that it can\n"
                        "start to dial a number. If your modem does not\n"
@@ -290,13 +292,13 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
                        "\n"
                        "<b>Default:</b>: On"));
 
   QHBoxLayout *waitLayout = new QHBoxLayout( this );
   QLabel *waitLabel = new QLabel( tr("Busy wait:"), this, "busyWait" );
   busywait = new QSpinBox( 0, 300, 5, this, "busyWait" );
-//   busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
+//   busywait = new KIntNumInput(_pppdata->busyWait(), this);
 //   busywait->setLabel(i18n("B&usy wait:"));
 //   busywait->setRange(0, 300, 5, true);
    busywait->setSuffix(i18n(" sec"));
   connect(busywait, SIGNAL(valueChanged(int)), SLOT(busywaitchanged(int)));
   waitLayout->addWidget(waitLabel);
   waitLayout->addWidget(busywait);
@@ -315,13 +317,14 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
 
   QHBoxLayout *hbl = new QHBoxLayout;
   hbl->setSpacing(2);//KDialog::spacingHint());
 
   QLabel *volumeLabel = new QLabel(i18n("Modem &volume:"), this);
   hbl->addWidget(volumeLabel);
-  volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this);
+  volume = new QSlider(0, 2, 1, _ifaceppp->data()->volume(),
+                       QSlider::Horizontal, this);
   volumeLabel->setBuddy(volume);
   volume->setTickmarks(QSlider::Below);
   hbl->addWidget(volume);
 
   l1->addLayout(hbl);
 
@@ -339,13 +342,13 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
   QWhatsThis::add(volume, tmp);
 
   l1->addSpacing(20);
 
 #if 0
   chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this);
-  chkbox1->setChecked(PPPData::data()->UseCDLine());
+  chkbox1->setChecked(_ifaceppp->data()->UseCDLine());
   connect(chkbox1,SIGNAL(toggled(bool)),
           this,SLOT(use_cdline_toggled(bool)));
   l12->addWidget(chkbox1);
   l12->addStretch(1);
   l1->addStretch(1);
   QWhatsThis::add(chkbox1,
@@ -396,43 +399,43 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
 //   connect(terminal_button, SIGNAL(clicked()),
         //   SLOT(terminal()));
 }
 
 
 void ModemWidget2::modemcmdsbutton() {
-  ModemCommands mc(this);
+  ModemCommands mc(_ifaceppp->data(), this);
   mc.showMaximized();
   mc.exec();
 }
 
 
 void ModemWidget2::query_modem() {
-  ModemTransfer mt(this);
+  ModemTransfer mt(_ifaceppp->modem(), this);
   mt.exec();
 }
 
 
 // void ModemWidget2::terminal() {
 //   MiniTerm terminal(NULL,NULL);
 //   terminal.exec();
 // }
 
 
 #if 0
 void ModemWidget2::use_cdline_toggled(bool on) {
-    PPPData::data()->setUseCDLine(on);
+    _ifaceppp->data()->setUseCDLine(on);
 }
 #endif
 
 void ModemWidget2::waitfordtchanged(bool b) {
-  PPPData::data()->setWaitForDialTone((int)b);
+  _ifaceppp->data()->setWaitForDialTone((int)b);
 }
 
 void ModemWidget2::busywaitchanged(int n) {
-  PPPData::data()->setbusyWait(n);
+  _ifaceppp->data()->setbusyWait(n);
 }
 
 
 void ModemWidget2::volumeChanged(int v) {
-  PPPData::data()->setVolume(v);
+  _ifaceppp->data()->setVolume(v);
 }