1 files changed, 21 insertions, 21 deletions

diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index f803628..a02ee35 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -143,210 +143,210 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
     "19200",
     "9600",
     "2400",
     0};
 
   for(k = 0; baudrates[k]; k++)
     baud_c->insertItem(baudrates[k]);
 
   baud_c->setCurrentItem(3);
   connect(baud_c, SIGNAL(activated(int)),
           this, SLOT(speed_selection(int)));
   tl->addWidget(baud_c, 3, 1);
 
   tmp = i18n("Specifies the speed your modem and the serial\n"
              "port talk to each other. You should begin with\n"
              "the default of 38400 bits/sec. If everything\n"
              "works you can try to increase this value, but to\n"
              "no more than 115200 bits/sec (unless you know\n"
              "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(gpppdata.enter() == enter->text(i))
+    if(PPPData::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(gpppdata.modemLockFile());
+  modemlockfile->setChecked(PPPData::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"
                        "modem while a connection is established, a\n"
                        "file can be created to indicate that the modem\n"
                        "is in use. On Linux an example file would be\n"
                        "<tt>/var/lock/LCK..ttyS1</tt>\n"
                        "Here you can select whether this locking will\n"
                        "be done.\n"
                        "\n"
                        "<b>Default</b>: On"));
 
   // Modem Timeout Line Edit Box
 
-  modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), this);
+  modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
   modemtimeout->setLabel(i18n("Modem &timeout:"));
   modemtimeout->setRange(1, 120, 1);
   modemtimeout->setSuffix(i18n(" sec"));
   connect(modemtimeout, SIGNAL(valueChanged(int)),
           SLOT(modemtimeoutchanged(int)));
   tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1);
 
   QWhatsThis::add(modemtimeout,
                   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(gpppdata.enter() == enter->text(i))
+    if(PPPData::data()->enter() == enter->text(i))
       enter->setCurrentItem(i);
   }
 
   for(int i=0; i <= modemdevice->count()-1; i++) {
-    if(gpppdata.modemDevice() == modemdevice->text(i))
+    if(PPPData::data()->modemDevice() == modemdevice->text(i))
       modemdevice->setCurrentItem(i);
   }
 
   for(int i=0; i <= flowcontrol->count()-1; i++) {
-    if(gpppdata.flowcontrol() == flowcontrol->text(i))
+    if(PPPData::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) == gpppdata.speed())
+    if(baud_c->text(i) == PPPData::data()->speed())
       baud_c->setCurrentItem(i);
 
   tl->setRowStretch(7, 1);
 }
 
 
 void ModemWidget::speed_selection(int) {
-  gpppdata.setSpeed(baud_c->text(baud_c->currentItem()));
+  PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem()));
 }
 
 
 void ModemWidget::setenter(int ) {
-  gpppdata.setEnter(enter->text(enter->currentItem()));
+  PPPData::data()->setEnter(enter->text(enter->currentItem()));
 }
 
 
 void ModemWidget::setmodemdc(int i) {
-  gpppdata.setModemDevice(modemdevice->text(i));
+  PPPData::data()->setModemDevice(modemdevice->text(i));
 }
 
 
 void ModemWidget::setflowcontrol(int i) {
-  gpppdata.setFlowcontrol(flowcontrol->text(i));
+  PPPData::data()->setFlowcontrol(flowcontrol->text(i));
 }
 
 
 void ModemWidget::modemlockfilechanged(bool set) {
-  gpppdata.setModemLockFile(set);
+  PPPData::data()->setModemLockFile(set);
 }
 
 
 void ModemWidget::modemtimeoutchanged(int n) {
-  gpppdata.setModemTimeout(n);
+  PPPData::data()->setModemTimeout(n);
 }
 
 
 ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
   : QWidget(parent, name)
 {
     QVBoxLayout *l1 = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
 
   waitfordt = new QCheckBox(i18n("&Wait for dial tone before dialing"), this);
-  waitfordt->setChecked(gpppdata.waitForDialTone());
+  waitfordt->setChecked(PPPData::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"
                        "recognize this sound, or your local phone system\n"
                        "does not emit such a tone, uncheck this option\n"
                        "\n"
                        "<b>Default:</b>: On"));
 
-  busywait = new KIntNumInput(gpppdata.busyWait(), this);
+  busywait = new KIntNumInput(PPPData::data()->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)));
   l1->addWidget(busywait);
 
   QWhatsThis::add(busywait,
                   i18n("Specifies the number of seconds to wait before\n"
                        "redial if all dialed numbers are busy. This is\n"
                        "necessary because some modems get stuck if the\n"
                        "same number is busy too often.\n"
                        "\n"
                        "The default is 0 seconds, you should not change\n"
                        "this unless you need to."));
 
   l1->addSpacing(10);
 
   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, gpppdata.volume(), QSlider::Horizontal, this);
+  volume = new QSlider(0, 2, 1, PPPData::data()->volume(), QSlider::Horizontal, this);
   volumeLabel->setBuddy(volume);
   volume->setTickmarks(QSlider::Below);
   hbl->addWidget(volume);
 
   l1->addLayout(hbl);
 
   connect(volume, SIGNAL(valueChanged(int)),
           this, SLOT(volumeChanged(int)));
   QString tmp = i18n("Most modems have a speaker which makes\n"
              "a lot of noise when dialing. Here you can\n"
              "either turn this completely off or select a\n"
              "lower volume.\n"
              "\n"
              "If this does not work for your modem,\n"
              "you must modify the modem volume command.");
 
   QWhatsThis::add(volumeLabel,tmp);
   QWhatsThis::add(volume, tmp);
 
   l1->addSpacing(20);
 
 #if 0
   chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this);
-  chkbox1->setChecked(gpppdata.UseCDLine());
+  chkbox1->setChecked(PPPData::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,
                   i18n("This controls how <i>kppp</i> detects that the modem\n"
                        "is not responding. Unless you are having\n"
                        "problems with this, do not modify this setting.\n"
                        "\n"
                        "<b>Default</b>: Off"));
 #endif
 
   modemcmds = new QPushButton(i18n("Mod&em Commands..."), this);
   QWhatsThis::add(modemcmds,
                   i18n("Allows you to change the AT command for\n"
                        "your modem."));
 
   modeminfo_button = new QPushButton(i18n("&Query Modem..."), this);
   QWhatsThis::add(modeminfo_button,
                   i18n("Most modems support the ATI command set to\n"
                        "find out vendor and revision of your modem.\n"
                        "\n"
                        "Press this button to query your modem for\n"
@@ -381,41 +381,41 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
 }
 
 
 void ModemWidget2::modemcmdsbutton() {
   ModemCommands mc(this);
   mc.showMaximized();
   mc.exec();
 }
 
 
 void ModemWidget2::query_modem() {
   ModemTransfer mt(this);
   mt.exec();
 }
 
 
 // void ModemWidget2::terminal() {
 //   MiniTerm terminal(NULL,NULL);
 //   terminal.exec();
 // }
 
 
 #if 0
 void ModemWidget2::use_cdline_toggled(bool on) {
-    gpppdata.setUseCDLine(on);
+    PPPData::data()->setUseCDLine(on);
 }
 #endif
 
 void ModemWidget2::waitfordtchanged(bool b) {
-  gpppdata.setWaitForDialTone((int)b);
+  PPPData::data()->setWaitForDialTone((int)b);
 }
 
 void ModemWidget2::busywaitchanged(int n) {
-  gpppdata.setbusyWait(n);
+  PPPData::data()->setbusyWait(n);
 }
 
 
 void ModemWidget2::volumeChanged(int v) {
-  gpppdata.setVolume(v);
+  PPPData::data()->setVolume(v);
 }