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
@@ -166,3 +166,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   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);
@@ -175,3 +175,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
-  modemlockfile->setChecked(gpppdata.modemLockFile());
+  modemlockfile->setChecked(PPPData::data()->modemLockFile());
   connect(modemlockfile, SIGNAL(toggled(bool)),
@@ -193,3 +193,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
-  modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), this);
+  modemtimeout = new KIntNumInput(PPPData::data()->modemTimeout(), this);
   modemtimeout->setLabel(i18n("Modem &timeout:"));
@@ -208,3 +208,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   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);
@@ -213,3 +213,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   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);
@@ -218,3 +218,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   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);
@@ -224,3 +224,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
   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);
@@ -232,3 +232,3 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 void ModemWidget::speed_selection(int) {
-  gpppdata.setSpeed(baud_c->text(baud_c->currentItem()));
+  PPPData::data()->setSpeed(baud_c->text(baud_c->currentItem()));
 }
@@ -237,3 +237,3 @@ void ModemWidget::speed_selection(int) {
 void ModemWidget::setenter(int ) {
-  gpppdata.setEnter(enter->text(enter->currentItem()));
+  PPPData::data()->setEnter(enter->text(enter->currentItem()));
 }
@@ -242,3 +242,3 @@ void ModemWidget::setenter(int ) {
 void ModemWidget::setmodemdc(int i) {
-  gpppdata.setModemDevice(modemdevice->text(i));
+  PPPData::data()->setModemDevice(modemdevice->text(i));
 }
@@ -247,3 +247,3 @@ void ModemWidget::setmodemdc(int i) {
 void ModemWidget::setflowcontrol(int i) {
-  gpppdata.setFlowcontrol(flowcontrol->text(i));
+  PPPData::data()->setFlowcontrol(flowcontrol->text(i));
 }
@@ -252,3 +252,3 @@ void ModemWidget::setflowcontrol(int i) {
 void ModemWidget::modemlockfilechanged(bool set) {
-  gpppdata.setModemLockFile(set);
+  PPPData::data()->setModemLockFile(set);
 }
@@ -257,3 +257,3 @@ void ModemWidget::modemlockfilechanged(bool set) {
 void ModemWidget::modemtimeoutchanged(int n) {
-  gpppdata.setModemTimeout(n);
+  PPPData::data()->setModemTimeout(n);
 }
@@ -268,3 +268,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
   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)));
@@ -280,3 +280,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
 
-  busywait = new KIntNumInput(gpppdata.busyWait(), this);
+  busywait = new KIntNumInput(PPPData::data()->busyWait(), this);
   busywait->setLabel(i18n("B&usy wait:"));
@@ -303,3 +303,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
   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);
@@ -327,3 +327,3 @@ ModemWidget2::ModemWidget2( QWidget *parent, const char *name)
   chkbox1 = new QCheckBox(i18n("Modem asserts CD line"), this);
-  chkbox1->setChecked(gpppdata.UseCDLine());
+  chkbox1->setChecked(PPPData::data()->UseCDLine());
   connect(chkbox1,SIGNAL(toggled(bool)),
@@ -404,3 +404,3 @@ void ModemWidget2::query_modem() {
 void ModemWidget2::use_cdline_toggled(bool on) {
-    gpppdata.setUseCDLine(on);
+    PPPData::data()->setUseCDLine(on);
 }
@@ -409,3 +409,3 @@ void ModemWidget2::use_cdline_toggled(bool on) {
 void ModemWidget2::waitfordtchanged(bool b) {
-  gpppdata.setWaitForDialTone((int)b);
+  PPPData::data()->setWaitForDialTone((int)b);
 }
@@ -413,3 +413,3 @@ void ModemWidget2::waitfordtchanged(bool b) {
 void ModemWidget2::busywaitchanged(int n) {
-  gpppdata.setbusyWait(n);
+  PPPData::data()->setbusyWait(n);
 }
@@ -418,3 +418,3 @@ void ModemWidget2::busywaitchanged(int n) {
 void ModemWidget2::volumeChanged(int v) {
-  gpppdata.setVolume(v);
+  PPPData::data()->setVolume(v);
 }