saves config (still in the kppp way)

17 files changed, 587 insertions, 614 deletions

diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index d902517..19db9ef 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -44,48 +44,48 @@
 
 #include "pppdata.h"
 #include "accounts.h"
 //#include "accounting.h"
 //#include "providerdb.h"
 #include "edit.h"
 
 void parseargs(char* buf, char** args);
 
 AccountWidget::AccountWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  int min = 0;
+//  int min = 0;
   QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
 
   // add a hbox
 //   QHBoxLayout *l11 = new QHBoxLayout;
 //   l1->addLayout(l11);
 
   accountlist_l = new QListBox(this);
-  accountlist_l->setMinimumSize(160, 128);
+//  accountlist_l->setMinimumSize(160, 128);
   connect(accountlist_l, SIGNAL(highlighted(int)),
           this, SLOT(slotListBoxSelect(int)));
   connect(accountlist_l, SIGNAL(selected(int)),
           this, SLOT(editaccount()));
   l1->addWidget(accountlist_l, 10);
 
 //   QVBoxLayout *l111 = new QVBoxLayout(this);
 //   l11->addLayout(l111, 1);
   edit_b = new QPushButton(i18n("&Edit..."), this);
   connect(edit_b, SIGNAL(clicked()), SLOT(editaccount()));
   QWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
 
-  min = edit_b->sizeHint().width();
-  min = QMAX(70,min);
-  edit_b->setMinimumWidth(min);
+//   min = edit_b->sizeHint().width();
+//   min = QMAX(70,min);
+//   edit_b->setMinimumWidth(min);
 
   l1->addWidget(edit_b);
 
   new_b = new QPushButton(i18n("&New..."), this);
   connect(new_b, SIGNAL(clicked()), SLOT(newaccount()));
   l1->addWidget(new_b);
   QWhatsThis::add(new_b, i18n("Create a new dialup connection\n"
                               "to the Internet"));
 
   copy_b = new QPushButton(i18n("Co&py"), this);
   connect(copy_b, SIGNAL(clicked()), SLOT(copyaccount()));
   l1->addWidget(copy_b);
@@ -156,55 +156,55 @@ AccountWidget::AccountWidget( QWidget *parent, const char *name )
 //   reset->setEnabled(FALSE);
 //   connect(reset, SIGNAL(clicked()),
         //   this, SLOT(resetClicked()));
 //   l122->addWidget(reset);
 
 //   log = new QPushButton(i18n("&View Logs"), this);
 //   connect(log, SIGNAL(clicked()),
         //   this, SLOT(viewLogClicked()));
 //   l122->addWidget(log);
 //   l122->addStretch(1);
 
   //load up account list from gppdata to the list box
-  if(gpppdata.count() > 0) {
-    for(int i=0; i <= gpppdata.count()-1; i++) {
-      gpppdata.setAccountbyIndex(i);
-      accountlist_l->insertItem(gpppdata.accname());
+  if(PPPData::data()->count() > 0) {
+    for(int i=0; i <= PPPData::data()->count()-1; i++) {
+      PPPData::data()->setAccountbyIndex(i);
+      accountlist_l->insertItem(PPPData::data()->accname());
     }
   }
 
   slotListBoxSelect(accountlist_l->currentItem());
 
   l1->activate();
 }
 
 
 
 void AccountWidget::slotListBoxSelect(int idx) {
   delete_b->setEnabled((bool)(idx != -1));
   edit_b->setEnabled((bool)(idx != -1));
   copy_b->setEnabled((bool)(idx != -1));
   if(idx!=-1) {
-    QString account = gpppdata.accname();
-    gpppdata.setAccountbyIndex(accountlist_l->currentItem());
+    QString account = PPPData::data()->accname();
+    PPPData::data()->setAccountbyIndex(accountlist_l->currentItem());
 //    reset->setEnabled(TRUE);
 //     costlabel->setEnabled(TRUE);
 //     costedit->setEnabled(TRUE);
 //     costedit->setText(AccountingBase::getCosts(accountlist_l->text(accountlist_l->currentItem())));
 
 //     vollabel->setEnabled(TRUE);
 //     voledit->setEnabled(TRUE);
-    int bytes = gpppdata.totalBytes();
+//    int bytes = PPPData::data()->totalBytes();
 //    voledit->setText(prettyPrintVolume(bytes));
-    gpppdata.setAccount(account);
+    PPPData::data()->setAccount(account);
  } else{
      //  reset->setEnabled(FALSE);
 //     costlabel->setEnabled(FALSE);
 //     costedit->setText("");
 //     costedit->setEnabled(FALSE);
 //     vollabel->setEnabled(FALSE);
 //     voledit->setText("");
 //     voledit->setEnabled(FALSE);
   }
 }
 
 
@@ -231,157 +231,161 @@ void AccountWidget::slotListBoxSelect(int idx) {
 // //     emit resetCosts(accountlist_l->text(accountlist_l->currentItem()));
 // //     costedit->setText("0");
 // //   }
 
 // //   if(what && QueryReset::VOLUME) {
 // //     emit resetVolume(accountlist_l->text(accountlist_l->currentItem()));
 // //     voledit->setText(prettyPrintVolume(0));
 // //   }
 // }
 
 
 void AccountWidget::editaccount() {
-  gpppdata.setAccount(accountlist_l->text(accountlist_l->currentItem()));
+  PPPData::data()->setAccount(accountlist_l->text(accountlist_l->currentItem()));
 
   int result = doTab();
 
   if(result == QDialog::Accepted) {
-    accountlist_l->changeItem(gpppdata.accname(),accountlist_l->currentItem());
+    accountlist_l->changeItem(PPPData::data()->accname(),accountlist_l->currentItem());
 //    emit resetaccounts();
-    gpppdata.save();
+    PPPData::data()->save();
   }
 }
 
 
 void AccountWidget::newaccount() {
   if(accountlist_l->count() == MAX_ACCOUNTS) {
       QMessageBox::information(this, "sorry", i18n("Maximum number of accounts reached."));
     return;
   }
 
   int result;
 //   int query = QMessageBox::information(this,
 //    i18n("Do you want to use the wizard to create the new account or the "
         // "standard, dialog-based setup?\n"
         // "The wizard is easier and sufficient in most cases. If you need "
         // "very special settings, you might want to try the standard, "
         //      "dialog-based setup."),
         //      i18n("Create New Account"),
         //      i18n("Wizard"), i18n("Dialog Setup"), i18n("Cancel"));
 
 //   switch(query) {
 //   case QMessageBox::Yes:
 //     {
-//       if (gpppdata.newaccount() == -1)
+//       if (PPPData::data()->newaccount() == -1)
         // return;
 // //       ProviderDB pdb(this);
 // //       result = pdb.exec();
 //       break;
 //     }
 //   case QMessageBox::No:
-  if (gpppdata.newaccount() == -1){
-      qDebug("gpppdata.newaccount() == -1");
+  if (PPPData::data()->newaccount() == -1){
+      qDebug("PPPData::data()->newaccount() == -1");
       return;
   }
     result = doTab();
 //     break;
 //   default:
 //     return;
 //   }
 
   if(result == QDialog::Accepted) {
-    accountlist_l->insertItem(gpppdata.accname());
-    accountlist_l->setSelected(accountlist_l->findItem(gpppdata.accname()),
+    accountlist_l->insertItem(PPPData::data()->accname());
+    accountlist_l->setSelected(accountlist_l->findItem(PPPData::data()->accname()),
                                true);
 //    emit resetaccounts();
-    gpppdata.save();
+    PPPData::data()->save();
   } else
-    gpppdata.deleteAccount();
+    PPPData::data()->deleteAccount();
 }
 
 
 void AccountWidget::copyaccount() {
   if(accountlist_l->count() == MAX_ACCOUNTS) {
     QMessageBox::information(this, "sorry", i18n("Maximum number of accounts reached."));
     return;
   }
 
   if(accountlist_l->currentItem()<0) {
     QMessageBox::information(this, "sorry", i18n("No account selected."));
     return;
   }
 
-  gpppdata.copyaccount(accountlist_l->currentItem());
+  PPPData::data()->copyaccount(accountlist_l->currentItem());
 
-  accountlist_l->insertItem(gpppdata.accname());
+  accountlist_l->insertItem(PPPData::data()->accname());
 //  emit resetaccounts();
-  gpppdata.save();
+  PPPData::data()->save();
 }
 
 
 void AccountWidget::deleteaccount() {
 
   QString s = i18n("Are you sure you want to delete\nthe account \"%1\"?")
     .arg(accountlist_l->text(accountlist_l->currentItem()));
 
   if(QMessageBox::warning(this, s, i18n("Confirm")) != QMessageBox::Yes)
     return;
 
-  if(gpppdata.deleteAccount(accountlist_l->text(accountlist_l->currentItem())))
+  if(PPPData::data()->deleteAccount(accountlist_l->text(accountlist_l->currentItem())))
     accountlist_l->removeItem(accountlist_l->currentItem());
 
   emit resetaccounts();
-  gpppdata.save();
+  PPPData::data()->save();
 
   slotListBoxSelect(accountlist_l->currentItem());
 
 }
 
 
 int AccountWidget::doTab(){
-    QDialog *dlg = new QDialog( this );
-    tabWindow = new QTabWidget( dlg );
- //  tabWindow = new KDialogBase( KDialogBase::Tabbed, QString::null,
-//                                KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
-//                               0, 0, true);
-//  KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
+    QDialog *dlg = new QDialog( this, "newAccount", true );
+    QVBoxLayout *layout = new QVBoxLayout( dlg );
+    layout->setSpacing( 0 );
+    layout->setMargin( 1 );
+
+    tabWindow = new QTabWidget( dlg, "tabWindow" );
+  layout->addWidget( tabWindow );
+
     bool isnewaccount;
 
-  if(gpppdata.accname().isEmpty()) {
-    tabWindow->setCaption(i18n("New Account"));
+  if(PPPData::data()->accname().isEmpty()) {
+      dlg->setCaption(i18n("New Account"));
     isnewaccount = true;
   } else {
     QString tit = i18n("Edit Account: ");
-    tit += gpppdata.accname();
-    tabWindow->setCaption(tit);
+      tit += PPPData::data()->accname();
+      dlg->setCaption(tit);
     isnewaccount = false;
   }
 
-  dial_w = new DialWidget( tabWindow );
-  tabWindow->addTab( dial_w, i18n("Dial") );//, i18n("Dial Setup")), isnewaccount);
-  ip_w = new IPWidget( tabWindow );
-  tabWindow->addTab( ip_w, i18n("IP") );//, i18n("IP Setup")), isnewaccount);
-  gateway_w = new GatewayWidget( tabWindow );
-  tabWindow->addTab( gateway_w, i18n("Gateway") );//, i18n("Gateway Setup")), isnewaccount);
-  dns_w = new DNSWidget( tabWindow );
-  tabWindow->addTab( dns_w, i18n("DNS") );//, i18n("DNS Servers")), isnewaccount);
-  script_w = new ScriptWidget( tabWindow );
-  tabWindow->addTab( script_w, i18n("Login Script") ); //, i18n("Edit Login Script")), isnewaccount);
-  ExecWidget *exec_w = new ExecWidget( tabWindow );
-  tabWindow->addTab( exec_w, i18n("Execute") );//, i18n("Execute Programs")), isnewaccount);
+  dial_w = new DialWidget( tabWindow, isnewaccount, "Dial Setup");
+  tabWindow->addTab( dial_w, i18n("Dial") );
+  ip_w = new IPWidget( tabWindow, isnewaccount, i18n("IP Setup"));
+  tabWindow->addTab( ip_w, i18n("IP") );
+  gateway_w = new GatewayWidget( tabWindow, isnewaccount, i18n("Gateway Setup"));
+  tabWindow->addTab( gateway_w, i18n("Gateway") );
+  dns_w = new DNSWidget( tabWindow, isnewaccount, i18n("DNS Servers") );
+  tabWindow->addTab( dns_w, i18n("DNS") );
+  script_w = new ScriptWidget( tabWindow, isnewaccount, i18n("Edit Login Script"));
+  tabWindow->addTab( script_w, i18n("Login Script") );
+  ExecWidget *exec_w = new ExecWidget( tabWindow, isnewaccount, i18n("Execute Programs"));
+  tabWindow->addTab( exec_w, i18n("Execute") );
 //   acct = new AccountingSelector( tabWindow, isnewaccount );
 //   tabWindow->addTab( acct, i18n("Accounting"));
 
   int result = 0;
   bool ok = false;
+  qDebug("AccountWidget::doTab dlg->showMinimized");
+  dlg->showMinimized();
   while (!ok){
 
     result = dlg->exec();
     ok = true;
 
     if(result == QDialog::Accepted) {
       if (script_w->check()) {
           if(dial_w->save()) {
                 ip_w->save();
                 dns_w->save();
                 gateway_w->save();
                 script_w->save();
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index b7e229e..a3eda9d 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -170,59 +170,59 @@ ConnectWidget::~ConnectWidget() {
 }
 
 
 void ConnectWidget::preinit() {
   // this is all just to keep the GUI nice and snappy ....
   // you have to see to believe ...
   messg->setText(i18n("Looking for modem..."));
   inittimer->start(100);
 }
 
 
 void ConnectWidget::init() {
-  gpppdata.setpppdError(0);
+  PPPData::data()->setpppdError(0);
   inittimer->stop();
   vmain = 0;
   substate = -1;
   expecting = false;
   pausing = false;
   scriptindex = 0;
   myreadbuffer = "";
   scanning = false;
   scanvar = "";
   firstrunID = true;
   firstrunPW = true;
 //  stats->totalbytes = 0;
   dialnumber = 0;
 
   p_kppp->con_speed = "";
 
-//  p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || gpppdata.quit_on_disconnect());
+//  p_kppp->setQuitOnDisconnect (p_kppp->quitOnDisconnect() || PPPData::data()->quit_on_disconnect());
 
-  comlist = &gpppdata.scriptType();
-  arglist = &gpppdata.script();
+  comlist = &PPPData::data()->scriptType();
+  arglist = &PPPData::data()->script();
 
-  QString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
+  QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname());
   setCaption(tit);
 
   qApp->processEvents();
 
   // run the "before-connect" command
-  if (!gpppdata.command_before_connect().isEmpty()) {
+  if (!PPPData::data()->command_before_connect().isEmpty()) {
     messg->setText(i18n("Running pre-startup command..."));
     emit debugMessage(i18n("Running pre-startup command..."));
 
     qApp->processEvents();
     QApplication::flushX();
-    pid_t id = execute_command(gpppdata.command_before_connect());
+    pid_t id = execute_command(PPPData::data()->command_before_connect());
 //     int i, status;
 
 //     do {
 //       qApp->processEvents();
 //       i = waitpid(id, &status, WNOHANG);
 //       usleep(100000);
 //     } while (i == 0 && errno == 0);
   }
 
   int lock = Modem::modem->lockdevice();
 
   if (lock == 1) {
@@ -241,25 +241,25 @@ void ConnectWidget::init() {
     messg->setText(Modem::modem->modemMessage());
     qApp->processEvents();
     if(Modem::modem->hangup()) {
 
       qApp->processEvents();
 
       semaphore = false;
 
       Modem::modem->stop();
       Modem::modem->notify(this, SLOT(readChar(unsigned char)));
 
       // if we are stuck anywhere we will time out
-      timeout_timer->start(gpppdata.modemTimeout()*1000);
+      timeout_timer->start(PPPData::data()->modemTimeout()*1000);
 
       // this timer will run the script etc.
       main_timer_ID = startTimer(10);
 
       return;
     }
   }
 
   // initialization failed
   messg->setText(Modem::modem->modemMessage());
   vmain = 20; // wait until cancel is pressed
   Modem::modem->unlockdevice();
@@ -275,198 +275,198 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
     vmain = 10;
     return;
 #endif
 
     assert(PPPData::NumInitStrings > 0);
     // first init string ?
     if(substate == -1) {
       messg->setText(i18n("Initializing modem..."));
       emit debugMessage(i18n("Initializing modem..."));
       substate = 0;
     }
 
-    QString initStr = gpppdata.modemInitStr(substate);
+    QString initStr = PPPData::data()->modemInitStr(substate);
     if (!initStr.isEmpty()) {
         // send a carriage return and then wait a bit so that the modem will
         // let us issue commands.
-        if(gpppdata.modemPreInitDelay() > 0) {
-            usleep(gpppdata.modemPreInitDelay() * 5000);
+        if(PPPData::data()->modemPreInitDelay() > 0) {
+            usleep(PPPData::data()->modemPreInitDelay() * 5000);
             writeline("");
-            usleep(gpppdata.modemPreInitDelay() * 5000);
+            usleep(PPPData::data()->modemPreInitDelay() * 5000);
         }
-        setExpect(gpppdata.modemInitResp());
+        setExpect(PPPData::data()->modemInitResp());
         writeline(initStr);
-        usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+        usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
     }
 
     substate++;
 
     /*
      * FIXME after 3.0: Make it possible to disable ATS11 since it
      * seems to be incompatible with some ISDN adapters (e.g. DataBox
      * Speed Dragon). Even better would be to detect this when doing
      * a "Modem Query"
      */
-    if (MODEM_TONEDURATION != gpppdata.modemToneDuration())
+    if (MODEM_TONEDURATION != PPPData::data()->modemToneDuration())
         vmain = 5;
     else
         vmain = 3;
 
     return;
   }
 
   if (vmain == 5) {
     if(!expecting) {
-        QString sToneDuration = "ATS11=" + QString::number(gpppdata.modemToneDuration());
+        QString sToneDuration = "ATS11=" + QString::number(PPPData::data()->modemToneDuration());
         QString msg = i18n("Setting ") + sToneDuration;
         messg->setText(msg);
         emit debugMessage(msg);
-        setExpect(gpppdata.modemInitResp());
+        setExpect(PPPData::data()->modemInitResp());
         writeline(sToneDuration);
       }
     vmain = 3;
     return;
   }
 
   if(vmain == 3) {
     if(!expecting) {
       // done with all init strings ?
       if(substate < PPPData::NumInitStrings) {
         vmain = 0;
         return;
       }
       substate = -1;
       // skip setting the volume if command is empty
-      if(gpppdata.volumeInitString().isEmpty()) {
+      if(PPPData::data()->volumeInitString().isEmpty()) {
         vmain = 4;
         return;
       }
       messg->setText(i18n("Setting speaker volume..."));
       emit debugMessage(i18n("Setting speaker volume..."));
 
-      setExpect(gpppdata.modemInitResp());
+      setExpect(PPPData::data()->modemInitResp());
       QString vol("AT");
-      vol += gpppdata.volumeInitString();
+      vol += PPPData::data()->volumeInitString();
       writeline(vol);
-      usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+      usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
       vmain = 4;
       return;
     }
   }
 
   if(vmain == 4) {
     if(!expecting) {
-      if(!gpppdata.waitForDialTone()) {
+      if(!PPPData::data()->waitForDialTone()) {
         QString msg = i18n("Turning off dial tone waiting...");
         messg->setText(msg);
         emit debugMessage(msg);
-        setExpect(gpppdata.modemInitResp());
-        writeline(gpppdata.modemNoDialToneDetectionStr());
+        setExpect(PPPData::data()->modemInitResp());
+        writeline(PPPData::data()->modemNoDialToneDetectionStr());
       }
       vmain = 1;
       return;
     }
   }
 
   // dial the number and wait to connect
   if(vmain == 1) {
     if(!expecting) {
 
       timeout_timer->stop();
-      timeout_timer->start(gpppdata.modemTimeout()*1000);
+      timeout_timer->start(PPPData::data()->modemTimeout()*1000);
 
-      QStringList &plist = gpppdata.phonenumbers();
-      QString bmarg= gpppdata.dialPrefix();
+      QStringList &plist = PPPData::data()->phonenumbers();
+      QString bmarg= PPPData::data()->dialPrefix();
       bmarg += *plist.at(dialnumber);
       QString bm = i18n("Dialing %1").arg(bmarg);
       messg->setText(bm);
       emit debugMessage(bm);
 
-      QString pn = gpppdata.modemDialStr();
-      pn += gpppdata.dialPrefix();
+      QString pn = PPPData::data()->modemDialStr();
+      pn += PPPData::data()->dialPrefix();
       pn += *plist.at(dialnumber);
       if(++dialnumber >= plist.count())
         dialnumber = 0;
       writeline(pn);
 
-      setExpect(gpppdata.modemConnectResp());
+      setExpect(PPPData::data()->modemConnectResp());
       vmain = 100;
       return;
     }
   }
 
   // wait for connect, but redial if BUSY or wait for user cancel
   // if NO CARRIER or NO DIALTONE
   if(vmain == 100) {
     if(!expecting) {
-      myreadbuffer = gpppdata.modemConnectResp();
+      myreadbuffer = PPPData::data()->modemConnectResp();
       setExpect("\n");
       vmain = 101;
       return;
     }
 
-    if(readbuffer.contains(gpppdata.modemBusyResp())) {
+    if(readbuffer.contains(PPPData::data()->modemBusyResp())) {
       timeout_timer->stop();
-      timeout_timer->start(gpppdata.modemTimeout()*1000);
+      timeout_timer->start(PPPData::data()->modemTimeout()*1000);
 
       messg->setText(i18n("Line busy. Hanging up..."));
       emit debugPutChar('\n');
       Modem::modem->hangup();
 
-      if(gpppdata.busyWait() > 0) {
-        QString bm = i18n("Line busy. Waiting: %1 seconds").arg(gpppdata.busyWait());
+      if(PPPData::data()->busyWait() > 0) {
+        QString bm = i18n("Line busy. Waiting: %1 seconds").arg(PPPData::data()->busyWait());
         messg->setText(bm);
         emit debugMessage(bm);
 
         pausing = true;
 
-        pausetimer->start(gpppdata.busyWait()*1000, true);
+        pausetimer->start(PPPData::data()->busyWait()*1000, true);
         timeout_timer->stop();
       }
 
       Modem::modem->setDataMode(false);
       vmain = 0;
       substate = -1;
       return;
     }
 
-    if(readbuffer.contains(gpppdata.modemNoDialtoneResp())) {
+    if(readbuffer.contains(PPPData::data()->modemNoDialtoneResp())) {
       timeout_timer->stop();
 
       messg->setText(i18n("No Dialtone"));
       vmain = 20;
       Modem::modem->unlockdevice();
       return;
     }
 
-    if(readbuffer.contains(gpppdata.modemNoCarrierResp())) {
+    if(readbuffer.contains(PPPData::data()->modemNoCarrierResp())) {
       timeout_timer->stop();
 
       messg->setText(i18n("No Carrier"));
       vmain = 20;
       Modem::modem->unlockdevice();
       return;
     }
   }
 
   // wait for newline after CONNECT response (so we get the speed)
   if(vmain == 101) {
     if(!expecting) {
       Modem::modem->setDataMode(true); // modem will no longer respond to AT commands
 
       emit startAccounting();
 //      p_kppp->con_win->startClock();
 
       vmain = 2;
-      scriptTimeout=gpppdata.modemTimeout()*1000;
+      scriptTimeout=PPPData::data()->modemTimeout()*1000;
       return;
     }
   }
 
   // execute the script
   if(vmain == 2) {
     if(!expecting && !pausing && !scanning) {
 
       timeout_timer->stop();
       timeout_timer->start(scriptTimeout);
 
       if((unsigned) scriptindex < comlist->count()) {
@@ -485,45 +485,45 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
 
         setScan(scriptArgument);
         scriptindex++;
         return;
       }
 
       if (scriptCommand == "Save") {
         QString bm = i18n("Saving %1").arg(scriptArgument);
         messg->setText(bm);
         emit debugMessage(bm);
 
         if (scriptArgument.lower() == "password") {
-          gpppdata.setPassword(scanvar);
+          PPPData::data()->setPassword(scanvar);
           p_kppp->setPW_Edit(scanvar);
-          if(gpppdata.storePassword())
-            gpppdata.setStoredPassword(scanvar);
+          if(PPPData::data()->storePassword())
+            PPPData::data()->setStoredPassword(scanvar);
           firstrunPW = true;
         }
 
         scriptindex++;
         return;
       }
 
 
       if (scriptCommand == "Send" || scriptCommand == "SendNoEcho") {
         QString bm = i18n("Sending %1");
 
         // replace %USERNAME% and %PASSWORD%
         QString arg = scriptArgument;
         QRegExp re1("%USERNAME%");
         QRegExp re2("%PASSWORD%");
-        arg = arg.replace(re1, gpppdata.storedUsername());
-        arg = arg.replace(re2, gpppdata.storedPassword());
+        arg = arg.replace(re1, PPPData::data()->storedUsername());
+        arg = arg.replace(re2, PPPData::data()->storedPassword());
 
         if (scriptCommand == "Send")
           bm = bm.arg(scriptArgument);
         else {
           for(uint i = 0; i < scriptArgument.length(); i++)
             bm = bm.arg("*");
         }
 
         messg->setText(bm);
         emit debugMessage(bm);
 
         writeline(scriptArgument);
@@ -569,49 +569,49 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
 
         scriptTimeout=scriptArgument.toInt()*1000;
         timeout_timer->start(scriptTimeout);
 
         scriptindex++;
         return;
       }
 
       if (scriptCommand == "Hangup") {
         messg->setText(i18n("Hangup"));
         emit debugMessage(i18n("Hangup"));
 
-        writeline(gpppdata.modemHangupStr());
-        setExpect(gpppdata.modemHangupResp());
+        writeline(PPPData::data()->modemHangupStr());
+        setExpect(PPPData::data()->modemHangupResp());
 
         scriptindex++;
         return;
       }
 
       if (scriptCommand == "Answer") {
 
         timeout_timer->stop();
 
         messg->setText(i18n("Answer"));
         emit debugMessage(i18n("Answer"));
 
-        setExpect(gpppdata.modemRingResp());
+        setExpect(PPPData::data()->modemRingResp());
         vmain = 150;
         return;
       }
 
       if (scriptCommand == "ID") {
         QString bm = i18n("ID %1").arg(scriptArgument);
         messg->setText(bm);
         emit debugMessage(bm);
 
-        QString idstring = gpppdata.storedUsername();
+        QString idstring = PPPData::data()->storedUsername();
 
         if(!idstring.isEmpty() && firstrunID) {
           // the user entered an Id on the main kppp dialog
           writeline(idstring);
           firstrunID = false;
           scriptindex++;
         }
         else {
           // the user didn't enter and Id on the main kppp dialog
           // let's query for an ID
              /* if not around yet, then post window... */
              if (prompt->Consumed()) {
@@ -629,25 +629,25 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
                  return;
                }
                /* replace timeout value */
              }
         }
       }
 
       if (scriptCommand == "Password") {
         QString bm = i18n("Password %1").arg(scriptArgument);
         messg->setText(bm);
         emit debugMessage(bm);
 
-        QString pwstring = gpppdata.password();
+        QString pwstring = PPPData::data()->password();
 
         if(!pwstring.isEmpty() && firstrunPW) {
           // the user entered a password on the main kppp dialog
           writeline(pwstring);
           firstrunPW = false;
           scriptindex++;
         }
         else {
           // the user didn't enter a password on the main kppp dialog
           // let's query for a password
              /* if not around yet, then post window... */
              if (prompt->Consumed()) {
@@ -776,26 +776,26 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
         }
         messg->setText(bm);
         emit debugMessage(bm);
 
       }
     }
   }
 
   // this is a subroutine for the "Answer" script option
 
   if(vmain == 150) {
     if(!expecting) {
-      writeline(gpppdata.modemAnswerStr());
-      setExpect(gpppdata.modemAnswerResp());
+      writeline(PPPData::data()->modemAnswerStr());
+      setExpect(PPPData::data()->modemAnswerResp());
 
       vmain = 2;
       scriptindex++;
       return;
     }
   }
 
   if(vmain == 30) {
 //     if (termwindow->isVisible())
 //       return;
 //     if (termwindow->pressedContinue())
 //       vmain = 10;
@@ -805,60 +805,60 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
 
   if(vmain == 10) {
     if(!expecting) {
 
       int result;
 
       timeout_timer->stop();
       if_timeout_timer->stop(); // better be sure.
 
       // stop reading of data
       Modem::modem->stop();
 
-      if(gpppdata.authMethod() == AUTH_TERMINAL) {
+      if(PPPData::data()->authMethod() == AUTH_TERMINAL) {
       //     if (termwindow) {
         //   delete termwindow;
         //   termwindow = 0L;
         //   this->show();
         // } else {
         //   termwindow = new LoginTerm(0L, 0L);
         //   hide();
         //   termwindow->show();
         //   vmain = 30;
         //   return;
         // }
       }
 
       // Close the tty. This prevents the QTimer::singleShot() in
       // Modem::readtty() from re-enabling the socket notifier.
       // The port is still held open by the helper process.
       Modem::modem->closetty();
 
       killTimer( main_timer_ID );
 
-      if_timeout_timer->start(gpppdata.pppdTimeout()*1000);
-      qDebug( "started if timeout timer with %i", gpppdata.pppdTimeout()*1000);
+      if_timeout_timer->start(PPPData::data()->pppdTimeout()*1000);
+      qDebug( "started if timeout timer with %i", PPPData::data()->pppdTimeout()*1000);
 
       // find out PPP interface and notify the stats module
 //      stats->setUnit(pppInterfaceNumber());
 
       qApp->flushX();
       semaphore = true;
       result = execppp();
 
       emit debugMessage(i18n("Starting pppd..."));
       qDebug("execppp() returned with return-code %i", result );
 
       if(result) {
-        if(!gpppdata.autoDNS())
+        if(!PPPData::data()->autoDNS())
           adddns();
 
         // O.K we are done here, let's change over to the if_waiting loop
         // where we wait for the ppp if (interface) to come up.
 
         emit if_waiting_signal();
       } else {
 
         // starting pppd wasn't successful. Error messages were
         // handled by execppp();
         if_timeout_timer->stop();
         this->hide();
@@ -1054,195 +1054,195 @@ void ConnectWidget::setExpect(const QString &n) {
   emit debugMessage(ts);
 
   // check if the expected string is in the read buffer already.
   checkBuffers();
 }
 
 
 void ConnectWidget::if_waiting_timed_out() {
   if_timer->stop();
   if_timeout_timer->stop();
   qDebug("if_waiting_timed_out()");
 
-  gpppdata.setpppdError(E_IF_TIMEOUT);
+  PPPData::data()->setpppdError(E_IF_TIMEOUT);
 
   // let's kill the stuck pppd
   Modem::modem->killPPPDaemon();
 
   emit stopAccounting();
 //  p_kppp->con_win->stopClock();
 
 
   // killing ppp will generate a SIGCHLD which will be caught in pppdie()
   // in main.cpp what happens next will depend on the boolean
   // reconnect_on_disconnect which is set in ConnectWidget::init();
 }
 
 void ConnectWidget::pppdDied()
 {
   if_timer->stop();
   if_timeout_timer->stop();
 }
 
 void ConnectWidget::if_waiting_slot() {
   messg->setText(i18n("Logging on to network..."));
 
 //   if(!stats->ifIsUp()) {
 
-//     if(gpppdata.pppdError() != 0) {
+//     if(PPPData::data()->pppdError() != 0) {
 //       // we are here if pppd died immediately after starting it.
 //       pppdDied();
 //       // error message handled in main.cpp: sigPPPDDied()
 //       return;
 //     }
 
 //     if_timer->start(100, TRUE); // single shot
 //     return;
 //   }
 
   // O.K the ppp interface is up and running
   // give it a few time to come up completly (0.2 seconds)
   if_timeout_timer->stop();
   if_timer->stop();
   usleep(200000);
 
-  if(gpppdata.autoDNS())
+  if(PPPData::data()->autoDNS())
     addpeerdns();
 
   // Close the debugging window. If we are connected, we
   // are not really interested in debug output
   emit closeDebugWindow();
 //  p_kppp->statdlg->take_stats(); // start taking ppp statistics
   auto_hostname();
 
-  if(!gpppdata.command_on_connect().isEmpty()) {
+  if(!PPPData::data()->command_on_connect().isEmpty()) {
     messg->setText(i18n("Running startup command..."));
 
     // make sure that we don't get any async errors
     qApp->flushX();
-    execute_command(gpppdata.command_on_connect());
+    execute_command(PPPData::data()->command_on_connect());
     messg->setText(i18n("Done"));
   }
 
   // remove the authentication file
   Modem::modem->removeSecret(AUTH_PAP);
   Modem::modem->removeSecret(AUTH_CHAP);
 
   emit debugMessage(i18n("Done"));
   set_con_speed_string();
 
 //  p_kppp->con_win->setConnectionSpeed(p_kppp->con_speed);
   this->hide();
   messg->setText("");
 
   // prepare the con_win so as to have the right size for
   // accounting / non-accounting mode
 //   if(p_kppp->acct != 0)
 //     p_kppp->con_win->accounting(p_kppp->acct->running());
 //   else
 //     p_kppp->con_win->accounting(false);
 
-  if (gpppdata.get_dock_into_panel()) {
+  if (PPPData::data()->get_dock_into_panel()) {
 //    DockWidget::dock_widget->show();
 //    DockWidget::dock_widget->take_stats();
 //    this->hide();
   }
   else {
 //    p_kppp->con_win->show();
 
-    if(gpppdata.get_iconify_on_connect()) {
+    if(PPPData::data()->get_iconify_on_connect()) {
         //    p_kppp->con_win->showMinimized();
     }
   }
 
   Modem::modem->closetty();
 }
 
 
 bool ConnectWidget::execppp() {
   QString command;
 
   command = "pppd";
 
   // as of version 2.3.6 pppd falls back to the real user rights when
   // opening a device given in a command line. To avoid permission conflicts
   // we'll simply leave this argument away. pppd will then use the default tty
   // which is the serial port we connected stdin/stdout to in opener.cpp.
   //  command += " ";
-  //  command += gpppdata.modemDevice();
+  //  command += PPPData::data()->modemDevice();
 
-  command += " " + gpppdata.speed();
+  command += " " + PPPData::data()->speed();
 
   command += " -detach";
 
-  if(gpppdata.ipaddr() != "0.0.0.0" ||
-     gpppdata.gateway() != "0.0.0.0") {
-    if(gpppdata.ipaddr() != "0.0.0.0") {
+  if(PPPData::data()->ipaddr() != "0.0.0.0" ||
+     PPPData::data()->gateway() != "0.0.0.0") {
+    if(PPPData::data()->ipaddr() != "0.0.0.0") {
       command += " ";
-      command += gpppdata.ipaddr();
+      command += PPPData::data()->ipaddr();
       command +=  ":";
     }
     else {
       command += " ";
       command += ":";
     }
 
-    if(gpppdata.gateway() != "0.0.0.0")
-      command += gpppdata.gateway();
+    if(PPPData::data()->gateway() != "0.0.0.0")
+      command += PPPData::data()->gateway();
   }
 
-  if(gpppdata.subnetmask() != "0.0.0.0")
-    command += " netmask " + gpppdata.subnetmask();
+  if(PPPData::data()->subnetmask() != "0.0.0.0")
+    command += " netmask " + PPPData::data()->subnetmask();
 
-  if(gpppdata.flowcontrol() != "None") {
-    if(gpppdata.flowcontrol() == "CRTSCTS")
+  if(PPPData::data()->flowcontrol() != "None") {
+    if(PPPData::data()->flowcontrol() == "CRTSCTS")
       command += " crtscts";
     else
       command += " xonxoff";
   }
 
-  if(gpppdata.defaultroute())
+  if(PPPData::data()->defaultroute())
     command += " defaultroute";
 
-  if(gpppdata.autoDNS())
+  if(PPPData::data()->autoDNS())
     command += " usepeerdns";
 
-  QStringList &arglist = gpppdata.pppdArgument();
+  QStringList &arglist = PPPData::data()->pppdArgument();
   for ( QStringList::Iterator it = arglist.begin();
         it != arglist.end();
         ++it )
   {
     command += " " + *it;
   }
 
   // PAP settings
-  if(gpppdata.authMethod() == AUTH_PAP) {
+  if(PPPData::data()->authMethod() == AUTH_PAP) {
     command += " -chap user ";
-    command = command + "\"" + gpppdata.storedUsername() + "\"";
+    command = command + "\"" + PPPData::data()->storedUsername() + "\"";
   }
 
   // CHAP settings
-  if(gpppdata.authMethod() == AUTH_CHAP) {
+  if(PPPData::data()->authMethod() == AUTH_CHAP) {
     command += " -pap user ";
-    command = command + "\"" + gpppdata.storedUsername() + "\"";
+    command = command + "\"" + PPPData::data()->storedUsername() + "\"";
   }
 
   // PAP/CHAP settings
-  if(gpppdata.authMethod() == AUTH_PAPCHAP) {
+  if(PPPData::data()->authMethod() == AUTH_PAPCHAP) {
     command += " user ";
-    command = command + "\"" + gpppdata.storedUsername() + "\"";
+    command = command + "\"" + PPPData::data()->storedUsername() + "\"";
   }
 
   // check for debug
-  if(gpppdata.getPPPDebug())
+  if(PPPData::data()->getPPPDebug())
     command += " debug";
 
   if (command.length() > MAX_CMDLEN) {
       QMessageBox::critical(this, "error", i18n(
                               "pppd command + command-line arguments exceed "
                               "2024 characters in length."
                               ));
 
     return false; // nonsensically long command which would bust my buffer buf.
   }
 
   qApp->flushX();
@@ -1268,26 +1268,26 @@ void ConnectWidget::writeline(const QString &s) {
 // Set the hostname and domain from DNS Server
 void auto_hostname() {
   struct in_addr local_ip;
   struct hostent *hostname_entry;
   QString new_hostname;
   int    dot;
   char   tmp_str[100]; // buffer overflow safe
 
   gethostname(tmp_str, sizeof(tmp_str));
   tmp_str[sizeof(tmp_str)-1]=0; // panic
   old_hostname=tmp_str; // copy to QString
 
-  // if (!p_kppp->stats->local_ip_address.isEmpty() && gpppdata.autoname()) {
-  if ( gpppdata.autoname()) {
+  // if (!p_kppp->stats->local_ip_address.isEmpty() && PPPData::data()->autoname()) {
+  if ( PPPData::data()->autoname()) {
 //    local_ip.s_addr=inet_addr(p_kppp->stats->local_ip_address.ascii());
     hostname_entry=gethostbyaddr((const char *)&local_ip,sizeof(in_addr),AF_INET);
 
     if (hostname_entry != 0L) {
       new_hostname=hostname_entry->h_name;
       dot=new_hostname.find('.');
       new_hostname=new_hostname.remove(dot,new_hostname.length()-dot);
       Modem::modem->setHostname(new_hostname);
       modified_hostname = TRUE;
 
       new_hostname=hostname_entry->h_name;
       new_hostname.remove(0,dot+1);
@@ -1323,80 +1323,80 @@ void add_domain(const QString &domain) {
     close(fd);
     if ((c != '\n') && (i < MAX_RESOLVCONF_LINES)) i++;
 
     if((fd = Modem::modem->openResolv(O_WRONLY|O_TRUNC)) >= 0) {
       QCString tmp = "domain " + domain.local8Bit() +
                      " \t\t#kppp temp entry\n";
       write(fd, tmp.data(), tmp.length());
 
       for(int j=0; j < i; j++) {
         if((resolv[j].contains("domain") ||
               ( resolv[j].contains("nameserver")
                 && !resolv[j].contains("#kppp temp entry")
-                && gpppdata.exDNSDisabled()))
+                && PPPData::data()->exDNSDisabled()))
                 && !resolv[j].contains("#entry disabled by kppp")) {
           QCString tmp = "# " + resolv[j].local8Bit() +
                          " \t#entry disabled by kppp\n";
           write(fd, tmp, tmp.length());
         }
         else {
           QCString tmp = resolv[j].local8Bit() + "\n";
           write(fd, tmp, tmp.length());
         }
       }
     }
     close(fd);
   }
 }
 
 
 // adds the DNS entries in the /etc/resolv.conf file
 void adddns()
 {
   int fd;
 
   if ((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) {
-    QStringList &dnslist = gpppdata.dns();
+    QStringList &dnslist = PPPData::data()->dns();
     for ( QStringList::Iterator it = dnslist.begin();
           it != dnslist.end();
           ++it )
     {
       QCString dns = "nameserver " + (*it).local8Bit() +
                      " \t#kppp temp entry\n";
       write(fd, dns.data(), dns.length());
     }
     close(fd);
   }
-  add_domain(gpppdata.domain());
+  add_domain(PPPData::data()->domain());
 }
 
 void addpeerdns() {
   int fd, fd2;
 
   if((fd = Modem::modem->openResolv(O_WRONLY|O_APPEND)) >= 0) {
     if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) {
       char c;
       int i = 0;
       while(i++ < 100 && read(fd2, &c, 1) == 1) {
         if(c == '\n')
           write(fd, "\t#kppp temp entry\n", 18);
         else
           write(fd, &c, 1);
       }
       close(fd2);
     } else
       fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n");
     close(fd);
   }
-  add_domain(gpppdata.domain());
+  add_domain(PPPData::data()->domain());
 }
 
 // remove the dns entries from the /etc/resolv.conf file
 void removedns() {
 
   int fd;
   char c;
   QString resolv[MAX_RESOLVCONF_LINES];
 
   if((fd = Modem::modem->openResolv(O_RDONLY)) >= 0) {
 
     int i=0;
diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp
index d6b3fbe..ad89005 100644
--- a/noncore/settings/networksettings/ppp/conwindow.cpp
+++ b/noncore/settings/networksettings/ppp/conwindow.cpp
@@ -66,38 +66,38 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget )
   cancelbutton->setText(i18n("Disconnect"));
   connect(cancelbutton, SIGNAL(clicked()), mainwidget, SLOT(disconnect()));
 
  //  statsbutton = new QPushButton(this);
 //   statsbutton->setText(i18n("Details"));
 //   statsbutton->setFocus();
 //   connect(statsbutton, SIGNAL(clicked()), mainwidget, SLOT(showStats()));
 
   clocktimer = new QTimer(this);
   connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick()));
 
   // read window position from config file
-  int p_x, p_y;
-  gpppdata.winPosConWin(p_x, p_y);
-  setGeometry(p_x, p_y, 320, 110);
+//  int p_x, p_y;
+//   PPPData::data()->winPosConWin(p_x, p_y);
+//   setGeometry(p_x, p_y, 320, 110);
 }
 
 ConWindow::~ConWindow() {
   stopClock();
 }
 
 // save window position when window was closed
 bool ConWindow::event(QEvent *e) {
   if (e->type() == QEvent::Hide)
   {
-    gpppdata.setWinPosConWin(x(), y());
+//    PPPData::data()->setWinPosConWin(x(), y());
     return true;
   }
   else
     return QWidget::event(e);
 }
 
 QString ConWindow::prettyPrintVolume(unsigned int n) {
   int idx = 0;
   const QString quant[] = {i18n("Byte"), i18n("KB"),
                    i18n("MB"), i18n("GB"), QString::null};
 
   float n1 = n;
@@ -109,40 +109,40 @@ QString ConWindow::prettyPrintVolume(unsigned int n) {
   int i = idx;
   while(i--)
     n1 = n1 / 1024.0;
 
   QString s = QString::number( n1, 'f', idx==0 ? 0 : 1 ); //KGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 );
   s += " " + quant[idx];
   return s;
 }
 
 void ConWindow::accounting(bool on) {
   // cache accounting settings
   accountingEnabled = on;
-  volumeAccountingEnabled = gpppdata.VolAcctEnabled();
+  volumeAccountingEnabled = PPPData::data()->VolAcctEnabled();
 
   // delete old layout
   if(tl1 != 0)
     delete tl1;
 
   // add layout now
   tl1 = new QVBoxLayout(this, 10, 10);
   tl1->addSpacing(5);
   QHBoxLayout *tl = new QHBoxLayout;
   tl1->addLayout(tl);
   tl->addSpacing(20);
   QGridLayout *l1;
 
   int vol_lines = 0;
-  if(gpppdata.VolAcctEnabled())
+  if(PPPData::data()->VolAcctEnabled())
     vol_lines = 1;
 
   if(accountingEnabled)
     l1 = new QGridLayout(4 + vol_lines, 2, 5);
   else
     l1 = new QGridLayout(2 + vol_lines, 2, 5);
   tl->addLayout(l1);
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
   info2->setAlignment(AlignRight|AlignVCenter);
   timelabel2->setAlignment(AlignRight|AlignVCenter);
@@ -230,61 +230,61 @@ void ConWindow::accounting(bool on) {
 void ConWindow::dock() {
 //  DockWidget::dock_widget->show();
   this->hide();
 }
 
 
 void ConWindow::startClock() {
   minutes = 0;
   seconds = 0;
   hours = 0;
   QString title ;
 
-  title = gpppdata.accname();
+  title = PPPData::data()->accname();
 
-  if(gpppdata.get_show_clock_on_caption()){
+  if(PPPData::data()->get_show_clock_on_caption()){
     title += " 00:00" ;
   }
   this->setCaption(title);
 
   timelabel2->setText("00:00:00");
   clocktimer->start(1000);
 }
 
 
 void ConWindow::setConnectionSpeed(const QString &speed) {
   info2->setText(speed);
 }
 
 
 void ConWindow::stopClock() {
   clocktimer->stop();
 }
 
 
 void ConWindow::timeclick() {
   QString tooltip = i18n("Connection: %1\n"
                          "Connected at: %2\n"
                          "Time connected: %3")
-                    .arg(gpppdata.accname()).arg(info2->text())
+                    .arg(PPPData::data()->accname()).arg(info2->text())
                     .arg(time_string2);
 
   if(accountingEnabled)
       tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")
                  .arg(session_bill->text()).arg(total_bill->text());
   // volume accounting
   if(volumeAccountingEnabled) {
 
     volinfo->setEnabled(TRUE);
-    int bytes = gpppdata.totalBytes();
+    int bytes = PPPData::data()->totalBytes();
     volinfo->setText(prettyPrintVolume(bytes));
   }
 
   seconds++;
 
   if(seconds >= 60 ) {
     minutes ++;
     seconds = 0;
   }
 
   if (minutes >= 60){
     minutes = 0;
@@ -296,46 +296,46 @@ void ConWindow::timeclick() {
     hours = 0;
   }
 
   time_string.sprintf("%02d:%02d",hours,minutes);
   time_string2 = "";
   if (days)
       time_string2.sprintf("%d d %02d:%02d:%02d",
                            days,hours,minutes,seconds);
 
   else
     time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds);
 
-  caption_string = gpppdata.accname();
+  caption_string = PPPData::data()->accname();
   caption_string += " ";
   caption_string += time_string;
 
 
   timelabel2->setText(time_string2);
 
-  if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){
+  if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){
     // we update the Caption only once per minute not every second
     // otherwise I get a flickering icon
     this->setCaption(caption_string);
   }
 
 //  QToolTip::add(DockWidget::dock_widget, tooltip);
 }
 
 
 void ConWindow::closeEvent( QCloseEvent *e ){
   // we don't want to lose the
   // conwindow since this is our last connection kppp.
   // if we lost it we could only kill the program by hand to get on with life.
   e->ignore();
 
-  if(gpppdata.get_dock_into_panel())
+  if(PPPData::data()->get_dock_into_panel())
     dock();
 }
 
 
 void ConWindow::slotAccounting(QString total, QString session) {
   total_bill->setText(total);
   session_bill->setText(session);
 }
 
 
diff --git a/noncore/settings/networksettings/ppp/debug.cpp b/noncore/settings/networksettings/ppp/debug.cpp
index 8652931..447ccf2 100644
--- a/noncore/settings/networksettings/ppp/debug.cpp
+++ b/noncore/settings/networksettings/ppp/debug.cpp
@@ -124,18 +124,18 @@ void DebugWidget::resizeEvent(QResizeEvent *e){
 void DebugWidget::enter() {
   text_window->append("\r\n");
 }
 
 
 void DebugWidget::toggleVisibility() {
   if(isVisible())
     hide();
   else
     show();
 
   bool showlog = isVisible();
-  gpppdata.set_show_log_window(showlog);
+  PPPData::data()->set_show_log_window(showlog);
 }
 
 
 
 
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 961047b..6132b80 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -32,65 +32,65 @@
 #include <qapplication.h>
 //#include <kiconloader.h>
 #include <qbuttongroup.h>
 //#include <klocale.h>
 #define i18n QObject::tr
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
 //#include <kwin.h>
 
 #include "edit.h"
 #include "pppdata.h"
-#include "newwidget.h"
+//#include "newwidget.h"
 #include "iplined.h"
 #include "auth.h"
 
 DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
   const int GRIDROWS = 6;
 
-  QGridLayout *tl = new QGridLayout(parent, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
+  QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
 
-  connect_label = new QLabel(i18n("Connection name:"), parent);
+  connect_label = new QLabel(i18n("Connection name:"), this);
   tl->addWidget(connect_label, 0, 0);
 
-  connectname_l = new QLineEdit(parent);
-  connectname_l->setMaxLength(ACCNAME_SIZE);
+  connectname_l = new QLineEdit(this);
+//  connectname_l->setMaxLength(ACCNAME_SIZE);
   tl->addWidget(connectname_l, 0, 1);
   QString tmp = i18n("Type in a unique name for this connection");
 
   QWhatsThis::add(connect_label,tmp);
   QWhatsThis::add(connectname_l,tmp);
 
 
-  number_label = new QLabel(i18n("Phone number:"), parent);
+  number_label = new QLabel(i18n("Phone number:"), this);
   number_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(number_label, 1, 0);
 
   QHBoxLayout *lpn = new QHBoxLayout(5);
   tl->addLayout(lpn, 1, 1);
-  numbers = new QListBox(parent);
+  numbers = new QListBox(this);
   numbers->setMinimumSize(120, 70);
   lpn->addWidget(numbers);
   QVBoxLayout *lpn1 = new QVBoxLayout;
   lpn->addLayout(lpn1);
-  add = new QPushButton(i18n("&Add..."), parent);
-  del = new QPushButton(i18n("&Remove"), parent);
+  add = new QPushButton(i18n("&Add..."), this);
+  del = new QPushButton(i18n("&Remove"), this);
 
-  up = new QPushButton(parent);
+  up = new QPushButton(this);
 //FIXME:  QPixmap pm = BarIcon("up");
 //  up->setPixmap(pm);
-  down = new QPushButton(parent);
+  down = new QPushButton(this);
 //FIXME:  pm = BarIcon("down");
 //  down->setPixmap(pm);
   lpn1->addWidget(add);
   lpn1->addWidget(del);
   lpn1->addStretch(1);
   lpn1->addWidget(up);
   lpn1->addWidget(down);
   connect(add, SIGNAL(clicked()),
           this, SLOT(addNumber()));
   connect(del, SIGNAL(clicked()),
           this, SLOT(delNumber()));
   connect(up, SIGNAL(clicked()),
@@ -103,114 +103,114 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
   tmp = i18n("<p>Specifies the phone numbers to dial. You\n"
              "can supply multiple numbers here, simply\n"
              "click on \"Add\". You can arrange the\n"
              "order the numbers are tried by using the\n"
              "arrow buttons.\n\n"
              "When a number is busy or fails, <i>kppp</i> will \n"
              "try the next number and so on");
 
   QWhatsThis::add(number_label,tmp);
   QWhatsThis::add(numbers,tmp);
 
-  auth_l = new QLabel(i18n("Authentication:"), parent);
+  auth_l = new QLabel(i18n("Authentication:"), this);
   tl->addWidget(auth_l, 3, 0);
 
-  auth = new QComboBox(parent);
+  auth = new QComboBox(this);
   auth->insertItem(i18n("Script-based"));
   auth->insertItem(i18n("PAP"));
   auth->insertItem(i18n("Terminal-based"));
   auth->insertItem(i18n("CHAP"));
   auth->insertItem(i18n("PAP/CHAP"));
   tl->addWidget(auth, 3, 1);
   tmp = i18n("<p>Specifies the method used to identify yourself to\n"
              "the PPP server. Most universities still use\n"
              "<b>Terminal</b>- or <b>Script</b>-based authentication,\n"
              "while most ISP use <b>PAP</b> and/or <b>CHAP</b>. If\n"
              "unsure, contact your ISP.\n"
              "\n"
              "If you can choose between PAP and CHAP,\n"
              "choose CHAP, because it's much safer. If you don't know\n"
              "whether PAP or CHAP is right, choose PAP/CHAP.");
 
   QWhatsThis::add(auth_l,tmp);
   QWhatsThis::add(auth,tmp);
 
-  store_password = new QCheckBox(i18n("Store password"), parent);
+  store_password = new QCheckBox(i18n("Store password"), this);
   store_password->setChecked(true);
   tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight);
   QWhatsThis::add(store_password,
                   i18n("<p>When this is turned on, your ISP password\n"
                        "will be saved in <i>kppp</i>'s config file, so\n"
                        "you do not need to type it in every time.\n"
                        "\n"
                        "<b><font color=\"red\">Warning:</font> your password will be stored as\n"
                        "plain text in the config file, which is\n"
                        "readable only to you. Make sure nobody\n"
                        "gains access to this file!"));
 
-  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), parent);
+  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this);
   connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
   tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
 
   // Set defaults if editing an existing connection
   if(!isnewaccount) {
-    connectname_l->setText(gpppdata.accname());
+    connectname_l->setText(PPPData::data()->accname());
 
     // insert the phone numbers into the listbox
-    QString n = gpppdata.phonenumber();
+    QString n = PPPData::data()->phonenumber();
     QString tmp = "";
     uint idx = 0;
     while(idx != n.length()) {
       if(n[idx] == ':') {
         if(tmp.length() > 0)
           numbers->insertItem(tmp);
         tmp = "";
       } else
         tmp += n[idx];
       idx++;
     }
     if(tmp.length() > 0)
       numbers->insertItem(tmp);
 
-    auth->setCurrentItem(gpppdata.authMethod());
-    store_password->setChecked(gpppdata.storePassword());
+    auth->setCurrentItem(PPPData::data()->authMethod());
+    store_password->setChecked(PPPData::data()->storePassword());
   } else {
     // select PAP/CHAP as default
     auth->setCurrentItem(AUTH_PAPCHAP);
   }
 
   numbersChanged();
   tl->activate();
 }
 
 
 bool DialWidget::save() {
   //first check to make sure that the account name is unique!
   if(connectname_l->text().isEmpty() ||
-     !gpppdata.isUniqueAccname(connectname_l->text())) {
+     !PPPData::data()->isUniqueAccname(connectname_l->text())) {
     return false;
   } else {
-    gpppdata.setAccname(connectname_l->text());
+    PPPData::data()->setAccname(connectname_l->text());
 
     QString number = "";
     for(uint i = 0; i < numbers->count(); i++) {
       if(i != 0)
         number += ":";
       number += numbers->text(i);
     }
 
-    gpppdata.setPhonenumber(number);
-    gpppdata.setAuthMethod(auth->currentItem());
-    gpppdata.setStorePassword(store_password->isChecked());
+    PPPData::data()->setPhonenumber(number);
+    PPPData::data()->setAuthMethod(auth->currentItem());
+    PPPData::data()->setStorePassword(store_password->isChecked());
     return true;
   }
 }
 
 
 void DialWidget::numbersChanged() {
   int sel = numbers->currentItem();
 
   del->setEnabled(sel != -1);
   up->setEnabled(sel != -1 && sel != 0);
   down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
 }
@@ -266,142 +266,142 @@ void DialWidget::pppdargsbutton() {
   PPPdArguments pa(this);
   pa.exec();
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(QWidget *parent, bool isnewaccount, const char *name) :
   QWidget(parent, name)
 {
-    QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint());
+    QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
   QLabel *l = new QLabel(\
 i18n("Here you can select commands to run at certain stages of the\n"
      "connection. The commands are run with your real user id, so\n"
      "you cannot run any commands here requiring root permissions\n"
      "(unless, of course, you are root).\n\n"
      "Be sure to supply the whole path to the program otherwise\n"
-     "kppp might be unable to find it."), parent);
-  l->setMinimumHeight(l->sizeHint().height());
+     "kppp might be unable to find it."), this);
+//  l->setMinimumHeight(l->sizeHint().height());
   tl->addWidget(l);
   tl->addStretch(1);
 
   QGridLayout *l1 = new QGridLayout(4, 2, 10);
   tl->addLayout(l1);
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
-  before_connect_l = new QLabel(i18n("Before connect:"), parent);
+  before_connect_l = new QLabel(i18n("Before connect:"), this);
   before_connect_l->setAlignment(AlignVCenter);
   l1->addWidget(before_connect_l, 0, 0);
-  before_connect = new QLineEdit(parent);
-  before_connect->setMaxLength(COMMAND_SIZE);
+  before_connect = new QLineEdit(this);
+//  before_connect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(before_connect, 0, 1);
   QString tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
              "is established. It is called immediately before\n"
              "dialing has begun.\n\n"
              "This might be useful, e.g. to stop HylaFAX blocking the\n"
              "modem.");
 
   QWhatsThis::add(before_connect_l,tmp);
   QWhatsThis::add(before_connect,tmp);
 
-  command_label = new QLabel(i18n("Upon connect:"), parent);
+  command_label = new QLabel(i18n("Upon connect:"), this);
   command_label->setAlignment(AlignVCenter);
   l1->addWidget(command_label, 1, 0);
-  command = new QLineEdit(parent);
-  command->setMaxLength(COMMAND_SIZE);
+  command = new QLineEdit(this);
+//  command->setMaxLength(COMMAND_SIZE);
   l1->addWidget(command, 1, 1);
   tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
              "is established. When your program is called, all\n"
              "preparations for an Internet connection are finished.\n"
              "\n"
              "Very useful for fetching mail and news");
 
   QWhatsThis::add(command_label,tmp);
   QWhatsThis::add(command,tmp);
 
   predisconnect_label = new QLabel(i18n("Before disconnect:"),
-                                 parent);
+                                 this);
   predisconnect_label->setAlignment(AlignVCenter);
   l1->addWidget(predisconnect_label, 2, 0);
-  predisconnect = new QLineEdit(parent);
-  predisconnect->setMaxLength(COMMAND_SIZE);
+  predisconnect = new QLineEdit(this);
+//  predisconnect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(predisconnect, 2, 1);
   tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
              "is closed. The connection will stay open until\n"
              "the program exits.");
 
   QWhatsThis::add(predisconnect_label,tmp);
   QWhatsThis::add(predisconnect,tmp);
 
   discommand_label = new QLabel(i18n("Upon disconnect:"),
-                              parent);
+                              this);
   discommand_label->setAlignment(AlignVCenter);
   l1->addWidget(discommand_label, 3, 0);
 
-  discommand = new QLineEdit(parent);
-  discommand->setMaxLength(COMMAND_SIZE);
+  discommand = new QLineEdit(this);
+//  discommand->setMaxLength(COMMAND_SIZE);
   l1->addWidget(discommand, 3, 1);
   tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
              "has been closed.");
 
   QWhatsThis::add(discommand_label,tmp);
   QWhatsThis::add(discommand,tmp);
 
   // extra space between entries
   l1->addRowSpacing(1, 5);
   l1->addRowSpacing(3, 5);
 
   tl->addStretch(1);
   tl->activate();
 
   // Set defaults if editing an existing connection
   if(!isnewaccount) {
-    before_connect->setText(gpppdata.command_before_connect());
-    command->setText(gpppdata.command_on_connect());
-    discommand->setText(gpppdata.command_on_disconnect());
-    predisconnect->setText(gpppdata.command_before_disconnect());
+    before_connect->setText(PPPData::data()->command_before_connect());
+    command->setText(PPPData::data()->command_on_connect());
+    discommand->setText(PPPData::data()->command_on_disconnect());
+    predisconnect->setText(PPPData::data()->command_before_disconnect());
   }
 }
 
 
 bool ExecWidget::save() {
-  gpppdata.setCommand_before_connect(before_connect->text());
-  gpppdata.setCommand_on_connect(command->text());
-  gpppdata.setCommand_before_disconnect(predisconnect->text());
-  gpppdata.setCommand_on_disconnect(discommand->text());
+  PPPData::data()->setCommand_before_connect(before_connect->text());
+  PPPData::data()->setCommand_on_connect(command->text());
+  PPPData::data()->setCommand_before_disconnect(predisconnect->text());
+  PPPData::data()->setCommand_on_disconnect(discommand->text());
   return true;
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // IPWidget
 //
 /////////////////////////////////////////////////////////////////////////////
 IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(parent);
+  QVBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->setSpacing( 3 );//KDialog::spacingHint());
 
-  box = new QVGroupBox(i18n("Configuration"), parent);
+  box = new QVGroupBox(i18n("Configuration"), this);
 //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
 
-  rb = new QButtonGroup(parent);
+  rb = new QButtonGroup(this);
   rb->hide();
   connect(rb, SIGNAL(clicked(int)),
           SLOT(hitIPSelect(int)));
 
   dynamicadd_rb = new QRadioButton(box);
   dynamicadd_rb->setText(i18n("Dynamic IP address"));
   QWhatsThis::add(dynamicadd_rb,
                   i18n("Select this option when your computer gets an\n"
                        "internet address (IP) every time a\n"
                        "connection is made.\n"
                        "\n"
                        "Almost every Internet Service Provider uses\n"
@@ -439,54 +439,54 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
              "all cases this netmask will be <b>255.255.255.0</b>,\n"
              "but your mileage may vary.\n"
              "\n"
              "If unsure, contact your Internet Service Provider");
   ipLayout->addWidget(sub_label, 1, 0);
 
   subnetmask_l = new IPLineEdit(ipWidget);
   ipLayout->addWidget(subnetmask_l, 1, 1);
 
   QWhatsThis::add(sub_label,tmp);
   QWhatsThis::add(subnetmask_l,tmp);
 
-  autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), parent);
-  autoname->setChecked(gpppdata.autoname());
+  autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this);
+  autoname->setChecked(PPPData::data()->autoname());
   connect(autoname,SIGNAL(toggled(bool)),
           this,SLOT(autoname_t(bool)));
 
   QWhatsThis::add(autoname,
                   i18n("<p>Whenever you connect, this reconfigures\n"
                        "your hostname to match the IP address you\n"
                        "got from the PPP server. This may be useful\n"
                        "if you need to use a protocol which depends\n"
                        "on this information, but it can also cause several\n"
                        "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
                        "\n"
                        "Don't enable this unless you really need it."));
 
   topLayout->addWidget(box);
   topLayout->addWidget(autoname);
   topLayout->addStretch();
 
   //load info from gpppdata
   if(!isnewaccount) {
-    if(gpppdata.ipaddr() == "0.0.0.0" &&
-       gpppdata.subnetmask() == "0.0.0.0") {
+    if(PPPData::data()->ipaddr() == "0.0.0.0" &&
+       PPPData::data()->subnetmask() == "0.0.0.0") {
       dynamicadd_rb->setChecked(true);
       hitIPSelect(0);
-      autoname->setChecked(gpppdata.autoname());
+      autoname->setChecked(PPPData::data()->autoname());
     }
     else {
-      ipaddress_l->setText(gpppdata.ipaddr());
-      subnetmask_l->setText(gpppdata.subnetmask());
+      ipaddress_l->setText(PPPData::data()->ipaddr());
+      subnetmask_l->setText(PPPData::data()->subnetmask());
       staticadd_rb->setChecked(true);
       autoname->setChecked(false);
     }
   }
   else {
     dynamicadd_rb->setChecked(true);
     hitIPSelect(0);
   }
 
 }
 
 void IPWidget::autoname_t(bool on) {
@@ -501,180 +501,180 @@ void IPWidget::autoname_t(bool on) {
                               "you know what you are doing!\n"
                               "For more information take a look at the "
                               "handbook (or help) in the section \"Frequently "
                               "asked questions\"."),
                          i18n("Warning"));
     was_warned = true;
   }
 }
 
 
 void IPWidget::save() {
   if(dynamicadd_rb->isChecked()) {
-    gpppdata.setIpaddr("0.0.0.0");
-    gpppdata.setSubnetmask("0.0.0.0");
+    PPPData::data()->setIpaddr("0.0.0.0");
+    PPPData::data()->setSubnetmask("0.0.0.0");
   } else {
-    gpppdata.setIpaddr(ipaddress_l->text());
-    gpppdata.setSubnetmask(subnetmask_l->text());
+    PPPData::data()->setIpaddr(ipaddress_l->text());
+    PPPData::data()->setSubnetmask(subnetmask_l->text());
   }
-  gpppdata.setAutoname(autoname->isChecked());
+  PPPData::data()->setAutoname(autoname->isChecked());
 }
 
 
 void IPWidget::hitIPSelect( int i ) {
   if(i == 0) {
     ipaddress_label->setEnabled(false);
     sub_label->setEnabled(false);
     ipaddress_l->setEnabled(false);
     subnetmask_l->setEnabled(false);
   }
   else {
     ipaddress_label->setEnabled(true);
     sub_label->setEnabled(true);
     ipaddress_l->setEnabled(true);
     subnetmask_l->setEnabled(true);
   }
 }
 
 
 
 DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
-  //  box = new QGroupBox(parent);
-    QGridLayout *tl = new QGridLayout(parent, 7, 2, 0 );//, KDialog::spacingHint());
+  //  box = new QGroupBox(this);
+    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );//, KDialog::spacingHint());
 
-  dnsdomain_label = new QLabel(i18n("Domain name:"), parent);
+  dnsdomain_label = new QLabel(i18n("Domain name:"), this);
   tl->addWidget(dnsdomain_label, 0, 0);
 
-  dnsdomain = new QLineEdit(parent);
-  dnsdomain->setMaxLength(DOMAIN_SIZE);
+  dnsdomain = new QLineEdit(this);
+//  dnsdomain->setMaxLength(DOMAIN_SIZE);
   tl->addWidget(dnsdomain, 0, 1);
   QString tmp = i18n("If you enter a domain name here, this domain\n"
                      "name is used for your computer while you are\n"
                      "connected. When the connection is closed, the\n"
                      "original domain name of your computer is\n"
                      "restored.\n"
                      "\n"
                      "If you leave this field blank, no changes are\n"
                      "made to the domain name.");
 
   QWhatsThis::add(dnsdomain_label,tmp);
   QWhatsThis::add(dnsdomain,tmp);
 
-  conf_label = new QLabel(i18n("Configuration:"), parent);
+  conf_label = new QLabel(i18n("Configuration:"), this);
   tl->addWidget(conf_label, 1, 0);
 
   bg = new QButtonGroup("Group", this);
   connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int)));
   bg->hide();
 
-  autodns = new QRadioButton(i18n("Automatic"), parent);
+  autodns = new QRadioButton(i18n("Automatic"), this);
   bg->insert(autodns, 0);
   tl->addWidget(autodns, 1, 1);
   // no automatic DNS detection for pppd < 2.3.7
-  if(!gpppdata.pppdVersionMin(2, 3, 7))
+  if(!PPPData::data()->pppdVersionMin(2, 3, 7))
     autodns->setEnabled(false);
 
-  mandns = new QRadioButton(i18n("Manual"), parent);
+  mandns = new QRadioButton(i18n("Manual"), this);
   bg->insert(mandns, 1);
   tl->addWidget(mandns, 2, 1);
 
-  dns_label = new QLabel(i18n("DNS IP address:"), parent);
+  dns_label = new QLabel(i18n("DNS IP address:"), this);
   tl->addWidget(dns_label, 3, 0);
 
   QHBoxLayout *l2 = new QHBoxLayout;
   tl->addLayout(l2, 3, 1);
-  dnsipaddr = new IPLineEdit(parent);
+  dnsipaddr = new IPLineEdit(this);
   connect(dnsipaddr, SIGNAL(returnPressed()),
           SLOT(adddns()));
   connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
           SLOT(DNS_Edit_Changed(const QString &)));
   l2->addWidget(dnsipaddr, 1);
   l2->addStretch(1);
   tmp = i18n("<p>Allows you to specify a new DNS server to be\n"
              "used while you are connected. When the\n"
              "connection is closed, this DNS entry will be\n"
              "removed again.\n"
              "\n"
              "To add a DNS server, type in the IP address of\n"
              "the DNS server here and click on <b>Add</b>");
 
   QWhatsThis::add(dns_label, tmp);
   QWhatsThis::add(dnsipaddr, tmp);
 
   QHBoxLayout *l1 = new QHBoxLayout;
   tl->addLayout(l1, 4, 1);
-  add = new QPushButton(i18n("Add"), parent);
+  add = new QPushButton(i18n("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(adddns()));
-  int width = add->sizeHint().width();
-  width = QMAX(width,60);
-  add->setMinimumWidth(width);
+//   int width = add->sizeHint().width();
+//   width = QMAX(width,60);
+//   add->setMinimumWidth(width);
   l1->addWidget(add);
   l1->addStretch(1);
   QWhatsThis::add(add,
                   i18n("Click this button to add the DNS server\n"
                        "specified in the field above. The entry\n"
                        "will then be added to the list below"));
 
-  remove = new QPushButton(i18n("Remove"), parent);
+  remove = new QPushButton(i18n("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removedns()));
-  width = remove->sizeHint().width();
-  width = QMAX(width,60);
-  remove->setMinimumWidth(width);
+//   width = remove->sizeHint().width();
+//   width = QMAX(width,60);
+//   remove->setMinimumWidth(width);
   l1->addWidget(remove);
   QWhatsThis::add(remove,
                   i18n("Click this button to remove the selected DNS\n"
                        "server entry from the list below"));
 
-  servers_label = new QLabel(i18n("DNS address list:"), parent);
+  servers_label = new QLabel(i18n("DNS address list:"), this);
   servers_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(servers_label, 5, 0);
 
-  dnsservers = new QListBox(parent);
+  dnsservers = new QListBox(this);
   dnsservers->setMinimumSize(150, 80);
   connect(dnsservers, SIGNAL(highlighted(int)),
           SLOT(DNS_Entry_Selected(int)));
   tl->addWidget(dnsservers, 5, 1);
   tmp = i18n("<p>This shows all defined DNS servers to use\n"
              "while you are connected. Use the <b>Add</b> and\n"
              "<b>Remove</b> buttons to modify the list");
 
   QWhatsThis::add(servers_label,tmp);
   QWhatsThis::add(dnsservers,tmp);
 
   exdnsdisabled_toggle = new QCheckBox(i18n( \
 "Disable existing DNS servers during connection"),
-                                     parent);
-  exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled());
+                                     this);
+  exdnsdisabled_toggle->setChecked(PPPData::data()->exDNSDisabled());
   tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
   QWhatsThis::add(exdnsdisabled_toggle,
                   i18n("<p>When this option is selected, all DNS\n"
                        "servers specified in <tt>/etc/resolv.conf</tt> are\n"
                        "temporary disabled while the dialup connection\n"
                        "is established. After the connection is\n"
                        "closed, the servers will be re-enabled\n"
                        "\n"
                        "Typically, there is no reason to use this\n"
                        "option, but it may become useful under \n"
                        "some circumstances."));
 
 
   // restore data if editing
   if(!isnewaccount) {
-    dnsservers->insertStringList(gpppdata.dns());
-    dnsdomain->setText(gpppdata.domain());
+    dnsservers->insertStringList(PPPData::data()->dns());
+    dnsdomain->setText(PPPData::data()->domain());
   }
 
-  int mode = gpppdata.autoDNS() ? 0 : 1;
+  int mode = PPPData::data()->autoDNS() ? 0 : 1;
   bg->setButton(mode);
   DNS_Mode_Selected(mode);
 
   tl->activate();
 }
 
 void DNSWidget::DNS_Edit_Changed(const QString &text) {
   QRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
   add->setEnabled(text.find(r) != -1);
 }
 
 void DNSWidget::DNS_Entry_Selected(int) {
@@ -686,38 +686,38 @@ void DNSWidget::DNS_Mode_Selected(int mode) {
   dns_label->setEnabled(on);
   servers_label->setEnabled(on);
   dnsipaddr->setText("");
   dnsipaddr->setEnabled(on);
   add->setEnabled(false);
   remove->setEnabled(dnsservers->count()>0 && on);
   dnsservers->clearSelection();
   dnsservers->setEnabled(on);
   dnsservers->triggerUpdate(false);
 }
 
 void DNSWidget::save() {
-  gpppdata.setAutoDNS(bg->id(bg->selected()) == 0);
+  PPPData::data()->setAutoDNS(bg->id(bg->selected()) == 0);
   QStringList serverlist;
   for(uint i=0; i < dnsservers->count(); i++)
     serverlist.append(dnsservers->text(i));
-  gpppdata.setDns(serverlist);
+  PPPData::data()->setDns(serverlist);
 
   // strip leading dot
   QString s(dnsdomain->text());
   if(s.left(1) == ".")
-    gpppdata.setDomain(s.mid(1));
+    PPPData::data()->setDomain(s.mid(1));
   else
-    gpppdata.setDomain(dnsdomain->text());
+    PPPData::data()->setDomain(dnsdomain->text());
 
-  gpppdata.setExDNSDisabled(exdnsdisabled_toggle->isChecked());
+  PPPData::data()->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
 }
 
 
 void DNSWidget::adddns() {
   if(dnsservers->count() < MAX_DNS_ENTRIES) {
     dnsservers->insertItem(dnsipaddr->text());
     dnsipaddr->setText("");
   }
 }
 
 
 void DNSWidget::removedns() {
@@ -726,31 +726,31 @@ void DNSWidget::removedns() {
   if(i != -1)
     dnsservers->removeItem(i);
   remove->setEnabled(dnsservers->count()>0);
 }
 
 
 //
 // GatewayWidget
 //
 GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout(parent);
+  QVBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->setSpacing( 2 );//KDialog::spacingHint());
 
-  box = new QVGroupBox(i18n("Configuration"), parent);
+  box = new QVGroupBox(i18n("Configuration"), this);
 //  box->setInsideSpacing( 2 );//KDialog::spacingHint());
 
-  rb = new QButtonGroup(parent);
+  rb = new QButtonGroup(this);
   rb->hide();
   connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
 
   defaultgateway = new QRadioButton(box);
   defaultgateway->setText(i18n("Default gateway"));
   rb->insert(defaultgateway, 0);
   QWhatsThis::add(defaultgateway,
                   i18n("This makes the PPP peer computer (the computer\n"
                        "you are connected to with your modem) to act as\n"
                        "a gateway. Your computer will send all packets not\n"
                        "going to a computer inside your local net to this\n"
                        "computer, which will route these packets.\n"
@@ -762,124 +762,124 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
   staticgateway = new QRadioButton(box);
   staticgateway->setText(i18n("Static gateway"));
   rb->insert(staticgateway, 1);
   QWhatsThis::add(staticgateway,
                   i18n("<p>Allows you to specify which computer you want\n"
                        "to use as gateway (see <i>Default Gateway</i> above)"));
 
   QHBox *gateBox = new QHBox(box);
   gate_label = new QLabel(i18n("Gateway IP address:"), gateBox);
   gatewayaddr = new IPLineEdit(gateBox);
 
   defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"),
-                             parent);
+                             this);
   QWhatsThis::add(defaultroute,
                   i18n("If this option is enabled, all packets not\n"
                        "going to the local net are routed through\n"
                        "the PPP connection.\n"
                        "\n"
                        "Normally, you should turn this on"));
 
   topLayout->addWidget(box);
   topLayout->addWidget(defaultroute);
   topLayout->addStretch();
 
   //load info from gpppdata
   if(!isnewaccount) {
-    if(gpppdata.gateway() == "0.0.0.0") {
+    if(PPPData::data()->gateway() == "0.0.0.0") {
       defaultgateway->setChecked(true);
       hitGatewaySelect(0);
     }
     else {
-      gatewayaddr->setText(gpppdata.gateway());
+      gatewayaddr->setText(PPPData::data()->gateway());
       staticgateway->setChecked(true);
     }
-    defaultroute->setChecked(gpppdata.defaultroute());
+    defaultroute->setChecked(PPPData::data()->defaultroute());
   }
   else {
     defaultgateway->setChecked(true);
     hitGatewaySelect(0);
     defaultroute->setChecked(true);
   }
 }
 
 void GatewayWidget::save() {
-  gpppdata.setGateway(gatewayaddr->text());
-  gpppdata.setDefaultroute(defaultroute->isChecked());
+  PPPData::data()->setGateway(gatewayaddr->text());
+  PPPData::data()->setDefaultroute(defaultroute->isChecked());
 }
 
 
 void GatewayWidget::hitGatewaySelect( int i ) {
   if(i == 0) {
     gatewayaddr->setText("0.0.0.0");
     gatewayaddr->setEnabled(false);
     gate_label->setEnabled(false);
   }
   else {
     gatewayaddr->setEnabled(true);
     gatewayaddr->setText("");
     gate_label->setEnabled(true);
   }
 }
 
 
 
 ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name )
   : QWidget(parent, name)
 {
-    QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint());
-  se = new ScriptEdit(parent);
+    QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
+  se = new ScriptEdit(this);
   connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
   tl->addWidget(se);
 
   // insert equal-sized buttons
-  QButtonGroup *bbox = new QButtonGroup(parent);
+  QButtonGroup *bbox = new QButtonGroup(this);
   add = new QPushButton( bbox, i18n("Add") );
   bbox->insert(add);
   connect(add, SIGNAL(clicked()), SLOT(addButton()));
 //  bbox->addStretch(1);
   insert = new QPushButton( bbox, i18n("Insert") );
   bbox->insert(insert);
   connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
 //  bbox->addStretch(1);
   remove = new QPushButton( bbox, i18n("Remove") );
   bbox->insert(remove);
   connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
   bbox->layout();
   tl->addWidget(bbox);
 
   QHBoxLayout *l12 = new QHBoxLayout(0);
   tl->addLayout(l12);
-  stl = new QListBox(parent);
+  stl = new QListBox(this);
   stl->setVScrollBarMode( QScrollView::AlwaysOff );
   connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
   stl->setMinimumSize(QSize(70, 140));
 
-  sl = new QListBox(parent);
+  sl = new QListBox(this);
   sl->setVScrollBarMode( QScrollView::AlwaysOff );
   connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
   sl->setMinimumSize(QSize(150, 140));
 
-  slb = new QScrollBar(parent);
-  slb->setFixedWidth(slb->sizeHint().width());
+  slb = new QScrollBar(this);
+//  slb->setFixedWidth(slb->sizeHint().width());
   connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
 
   l12->addWidget(stl, 1);
   l12->addWidget(sl, 3);
   l12->addWidget(slb, 0);
 
   //load data from gpppdata
   if(!isnewaccount) {
-    QStringList &comlist = gpppdata.scriptType();
-    QStringList &arglist = gpppdata.script();
+    QStringList &comlist = PPPData::data()->scriptType();
+    QStringList &arglist = PPPData::data()->script();
     QStringList::Iterator itcom = comlist.begin();
     QStringList::Iterator itarg = arglist.begin();
 
     for ( ;
           itcom != comlist.end() && itarg != arglist.end();
           ++itcom, ++itarg )
     {
       stl->insertItem(*itcom);
       sl->insertItem(*itarg);
     }
   }
 
@@ -907,26 +907,26 @@ bool ScriptWidget::check() {
     return ( (errcnt == 0 ) && (lstart == lend) );
   }
   return true;
 }
 
 
 void ScriptWidget::save() {
   QStringList typelist, arglist;
   for(uint i=0; i < sl->count(); i++) {
     typelist.append(stl->text(i));
     arglist.append(sl->text(i));
   }
-  gpppdata.setScriptType(typelist);
-  gpppdata.setScript(arglist);
+  PPPData::data()->setScriptType(typelist);
+  PPPData::data()->setScript(arglist);
 }
 
 
 
 void ScriptWidget::adjustScrollBar() {
   if((int)sl->count() <= sl->numItemsVisible())
     slb->setRange(0, 0);
   else
     slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
 }
 
 
@@ -1145,37 +1145,37 @@ void ScriptWidget::removeButton() {
    remove->setEnabled(sl->currentItem() != -1);
  }
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
-    : QDialog(parent, 0, true ) {
+    : QDialog(parent,"PhoneNumberDialog",true) {
     setCaption( i18n("Add Phone Number") );
 //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   QHBox *hbox = new QHBox(this);
 //  setMainWidget(hbox);
 
   hbox->setSpacing( 2 );//KDialog::spacingHint());
 
   new QLabel(i18n("Enter a phone number:"), hbox);
 
-  le = newLineEdit(14, hbox);
-  le->setMinimumWidth(125);
+  le = new QLineEdit(hbox);
+//  le->setMinimumWidth(125);
 
   connect(le, SIGNAL(textChanged(const QString &)),
           this, SLOT(textChanged(const QString &)));
 
   le->setFocus();
   textChanged("");
 
 //  enableButtonSeparator(true);
 }
 
 
 QString PhoneNumberDialog::phoneNumber() {
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
@@ -155,186 +155,186 @@ ModemWidget::ModemWidget( QWidget *parent, const char *name)
 
   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
@@ -393,29 +393,29 @@ void ModemWidget2::query_modem() {
   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);
 }
 
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp
index 2f9feda..8d70cd4 100644
--- a/noncore/settings/networksettings/ppp/kpppwidget.cpp
+++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp
@@ -149,25 +149,25 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
 
 //   QWhatsThis::add(PW_Label,tmp);
 //   QWhatsThis::add(PW_Edit,tmp);
 
 //    QHBoxLayout *l3 = new QHBoxLayout;
 //    tl->addSpacing(5);
 //    tl->addLayout(l3);
 //    tl->addSpacing(5);
 //    l3->addSpacing(10);
 //    log = new QCheckBox(i18n("Show lo&g window"), this);
 //    connect(log, SIGNAL(toggled(bool)),
         //     this, SLOT(log_window_toggled(bool)));
-//    log->setChecked(gpppdata.get_show_log_window());
+//    log->setChecked(PPPData::data()->get_show_log_window());
 //    l3->addWidget(log);
 
 //    QWhatsThis::add(log,
         //        i18n("<p>This controls whether a log window is shown.\n"
         //             "A log window shows the communication between\n"
         //             "<i>kppp</i> and your modem. This will help you\n"
         //             "in tracking down problems.\n"
         //             "\n"
         //             "Turn it off if <i>kppp</i> routinely connects without\n"
         //             "problems"));
 
 // //  fline = new QSeparator( KSeparator::HLine, this);
@@ -182,25 +182,25 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
 //   connect( quit_b, SIGNAL(clicked()), SLOT(quitbutton()));
 //   if(quit_b->sizeHint().width() > minw)
 //       minw = quit_b->sizeHint().width();
 
 //   setup_b = new QPushButton(i18n("&Setup..."), this);
 // //  setup_b->setGuiItem (KGuiItem(i18n("&Setup...")) );
 //   connect( setup_b, SIGNAL(clicked()), SLOT(expandbutton()));
 //   if(setup_b->sizeHint().width() > minw)
 //       minw = setup_b->sizeHint().width();
 
 
 
-//   if(gpppdata.access() != KConfig::ReadWrite)
+//   if(PPPData::data()->access() != KConfig::ReadWrite)
 //     setup_b->setEnabled(false);
 
 //   help_b = new QPushButton(i18n("&Help"), this);
 //   connect( help_b, SIGNAL(clicked()), SLOT(helpbutton()));
 
 //   KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true);
 //   help_b->setPopup((QPopupMenu*)helpMenu->menu());
 //   help_b->setGuiItem (KGuiItem(i18n("&Help"), "help" ) );
 
 //    if(help_b->sizeHint().width() > minw)
 //        minw = help_b->sizeHint().width();
 
@@ -282,25 +282,25 @@ KPPPWidget::KPPPWidget( QWidget *parent, const char *name, bool modal, WFlags fl
 
 //   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
 //   m_strCmdlAccount = args->getOption("c");
 //   m_bQuitOnDisconnect = args->isSet("q");
 
 //   if(!m_strCmdlAccount.isEmpty()) {
 //     m_bCmdlAccount = true;
 //     kdDebug(5002) << "cmdl_account: " << m_bCmdlAccount << endl;
 //   }
 
 //   if(m_bCmdlAccount){
-//     bool result = gpppdata.setAccount(m_strCmdlAccount);
+//     bool result = PPPData::data()->setAccount(m_strCmdlAccount);
 //     if (!result){
 //       QString string;
 //       string = i18n("No such Account:\n%1").arg(m_strCmdlAccount);
 //       KMessageBox::error(this, string);
 //       m_bCmdlAccount = false;
 //       this->show();
 //     } else {
 //       beginConnect();
 //     }
 //   } else
 //    expandbutton();
 //    show();
@@ -354,339 +354,339 @@ KPPPWidget::~KPPPWidget()
 
 void KPPPWidget::enterPressedInID() {
   PW_Edit->setFocus();
 }
 
 
 void KPPPWidget::enterPressedInPW() {
   connect_b->setFocus();
 }
 
 // triggered by the session manager
 void KPPPWidget::saveMyself() {
-    gpppdata.save();
+    PPPData::data()->save();
 }
 
 void KPPPWidget::shutDown() {
     interruptConnection();
     saveMyself();
 }
 
 void KPPPWidget::log_window_toggled(bool on) {
-  gpppdata.set_show_log_window(on);
+  PPPData::data()->set_show_log_window(on);
 }
 
 
 
 
 // void KPPPWidget::resetaccounts() {
 //   connectto_c->clear();
 
-//   int count = gpppdata.count();
+//   int count = PPPData::data()->count();
 
 //   // enable/disable controls
 //   connectto_c->setEnabled(count > 0);
 //   connect_b->setEnabled(count > 0);
 //   log->setEnabled(count > 0);
 //   ID_Edit->setEnabled(count > 0);
 //   PW_Edit->setEnabled(count > 0);
 
 //   //load the accounts
 //   for(int i=0; i < count; i++) {
-//     gpppdata.setAccountbyIndex(i);
-//      connectto_c->insertItem(gpppdata.accname());
+//     PPPData::data()->setAccountbyIndex(i);
+//      connectto_c->insertItem(PPPData::data()->accname());
 //   }
 
 //   //set the default account
-//   if(!gpppdata.defaultAccount().isEmpty()) {
+//   if(!PPPData::data()->defaultAccount().isEmpty()) {
 //     for(int i=0; i < count; i++)
-//        if(gpppdata.defaultAccount() == connectto_c->text(i)) {
+//        if(PPPData::data()->defaultAccount() == connectto_c->text(i)) {
         //  connectto_c->setCurrentItem(i);
-        // gpppdata.setAccountbyIndex(i);
+        // PPPData::data()->setAccountbyIndex(i);
 
-        // ID_Edit->setText(gpppdata.storedUsername());
-        // PW_Edit->setText(gpppdata.storedPassword());
+        // ID_Edit->setText(PPPData::data()->storedUsername());
+        // PW_Edit->setText(PPPData::data()->storedPassword());
 //     }
 //   }
 //   else
 //     if(count > 0) {
-//        gpppdata.setDefaultAccount(connectto_c->text(0));
-//         gpppdata.save();
-        // ID_Edit->setText(gpppdata.storedUsername());
-        // PW_Edit->setText(gpppdata.storedPassword());
+//        PPPData::data()->setDefaultAccount(connectto_c->text(0));
+//         PPPData::data()->save();
+        // ID_Edit->setText(PPPData::data()->storedUsername());
+        // PW_Edit->setText(PPPData::data()->storedPassword());
 //     }
 
 //   connect(ID_Edit, SIGNAL(textChanged(const QString &)),
         //    this, SLOT(usernameChanged(const QString &)));
 
 //   connect(PW_Edit, SIGNAL(textChanged(const QString &)),
         //    this, SLOT(passwordChanged(const QString &)));
 
 //   if (ID_Edit->text().isEmpty())
 //       ID_Edit->setFocus();
 //   else if (PW_Edit->text().isEmpty())
 //       PW_Edit->setFocus();
 // }
 
 
 void KPPPWidget::interruptConnection() {
   // interrupt dial up
 //   if (con->isVisible())
 //     emit con->cancelbutton();
 
   // disconnect if online
-  if (gpppdata.pppdRunning())
+  if (PPPData::data()->pppdRunning())
     emit disconnect();
 }
 
 
 void KPPPWidget::sigPPPDDied() {
     qDebug( "Received a SIGUSR1" );
 
     // if we are not connected pppdpid is -1 so have have to check for that
     // in the followin line to make sure that we don't raise a false alarm
     // such as would be the case when the log file viewer exits.
-    if(gpppdata.pppdRunning() || gpppdata.pppdError()) {
+    if(PPPData::data()->pppdRunning() || PPPData::data()->pppdError()) {
         qDebug( "It was pppd that died" );
 
         // when we killpppd() on Cancel in ConnectWidget
         // we set pppid to -1 so we won't
         // enter this block
 
         // just to be sure
 
         Modem::modem->removeSecret(AUTH_PAP);
         Modem::modem->removeSecret(AUTH_CHAP);
 
-        gpppdata.setpppdRunning(false);
+        PPPData::data()->setpppdRunning(false);
 
         qDebug( "Executing command on disconnect since pppd has died." );
         QApplication::flushX();
-        execute_command(gpppdata.command_on_disconnect());
+        execute_command(PPPData::data()->command_on_disconnect());
 
 //      stopAccounting();
 
 //        con_win->stopClock();
 //       DockWidget::dock_widget->stop_stats();
 //       DockWidget::dock_widget->hide();
 
-        if(!gpppdata.pppdError())
-            gpppdata.setpppdError(E_PPPD_DIED);
+        if(!PPPData::data()->pppdError())
+            PPPData::data()->setpppdError(E_PPPD_DIED);
         removedns();
         Modem::modem->unlockdevice();
         //      con->pppdDied();
 
-        if(!gpppdata.automatic_redial()) {
+        if(!PPPData::data()->automatic_redial()) {
             quit_b->setFocus();
             show();
 //            con_win->stopClock();
         //stopAccounting();
 //            con_win->hide();
 //            con->hide();
 
-            gpppdata.setpppdRunning(false);
+            PPPData::data()->setpppdRunning(false);
             // // not in a signal handler !!!  KNotifyClient::beep();
             QString msg;
-            if (gpppdata.pppdError() == E_IF_TIMEOUT)
+            if (PPPData::data()->pppdError() == E_IF_TIMEOUT)
                 msg = i18n("Timeout expired while waiting for the PPP interface "
                            "to come up!");
             else {
                 msg = i18n("<p>The pppd daemon died unexpectedly!</p>");
                 Modem::modem->pppdExitStatus();
                         if (Modem::modem->lastStatus != 99) {// more recent pppds only
                     msg += i18n("<p>Exit status: %1").arg(Modem::modem->lastStatus);
                     msg += i18n("</p><p>See 'man pppd' for an explanation of the error "
                                 "codes or take a look at the kppp FAQ on "
                                 "  <a href=http://devel-home.kde.org/~kppp/index.html>"
                                 "http://devel-home.kde.org/~kppp/index.html</a></p>");
                 }
             }
 
         // if(QMessageBox::warning(0, msg, i18n("Error"), i18n("&OK"), i18n("&Details...")) == QMessageBox::No)
         // //  PPPL_ShowLog();
 //       } else { /* reconnect on disconnect */
             if (false){
                 qDebug( "Trying to reconnect... " );
 
-                if(gpppdata.authMethod() == AUTH_PAP ||
-                   gpppdata.authMethod() == AUTH_CHAP ||
-                   gpppdata.authMethod() == AUTH_PAPCHAP)
-                    Modem::modem->setSecret(gpppdata.authMethod(),
-                                            encodeWord(gpppdata.storedUsername()),
-                                            encodeWord(gpppdata.password()));
+                if(PPPData::data()->authMethod() == AUTH_PAP ||
+                   PPPData::data()->authMethod() == AUTH_CHAP ||
+                   PPPData::data()->authMethod() == AUTH_PAPCHAP)
+                    Modem::modem->setSecret(PPPData::data()->authMethod(),
+                                            encodeWord(PPPData::data()->storedUsername()),
+                                            encodeWord(PPPData::data()->password()));
 
 //                con_win->hide();
                 //               con_win->stopClock();
         //stopAccounting();
-                gpppdata.setpppdRunning(false);
+                PPPData::data()->setpppdRunning(false);
                         // not in a signal handler !!!KNotifyClient::beep();
                 emit cmdl_start();
             }
         }
-        gpppdata.setpppdError(0);
+        PPPData::data()->setpppdError(0);
     }
 }
 
 // void KPPPWidget::sigChld() {
 //   qDebug( "sigchld()" );
 //   //  pid_t id = wait(0L);
 //   //  if(id == helperPid && helperPid != -1) {
 //   //    kdDebug(5002) << "It was the setuid child that died" << endl;
 //  // helperPid = -1;
 //     QString msg = i18n("kppp's helper process just died.\n"
 //                        "Since a further execution would be pointless, "
 //                        "kppp will shut down now.");
 //     QMessageBox::warning(0L,"error", msg);
 //     //remove_pidfile();
 //     exit(1);
 //     //  }
 // }
 
 
 void KPPPWidget::newdefaultaccount(int i) {
-  gpppdata.setDefaultAccount(connectto_c->text(i));
-  gpppdata.save();
-  ID_Edit->setText(gpppdata.storedUsername());
-  PW_Edit->setText(gpppdata.storedPassword());
+  PPPData::data()->setDefaultAccount(connectto_c->text(i));
+  PPPData::data()->save();
+  ID_Edit->setText(PPPData::data()->storedUsername());
+  PW_Edit->setText(PPPData::data()->storedPassword());
 }
 
 
 
 
 void KPPPWidget::beginConnect() {
   // make sure to connect to the account that is selected in the combo box
   // (exeption: an account given by a command line argument)
  //  if(!m_bCmdlAccount) {
-//     gpppdata.setAccount(connectto_c->currentText());
-//     gpppdata.setPassword(PW_Edit->text());
+//     PPPData::data()->setAccount(connectto_c->currentText());
+//     PPPData::data()->setPassword(PW_Edit->text());
 //   } else {
-    gpppdata.setPassword(gpppdata.storedPassword());
+    PPPData::data()->setPassword(PPPData::data()->storedPassword());
 //  }
 
   QFileInfo info(pppdPath());
 
   if(!info.exists()){
     QMessageBox::warning(this, "error", i18n("Cannot find the PPP daemon!\n"
                               "Make sure that pppd is installed and "
                               "that you have entered the correct path."));
     return;
   }
 #if 0
   if(!info.isExecutable()){
 
     QString string;
     string = i18n("kppp cannot execute:\n %1\n"
                    "Please make sure that you have given kppp "
                    "setuid permission and that "
-                   "pppd is executable.").arg(gpppdata.pppdPath());
+                   "pppd is executable.").arg(PPPData::data()->pppdPath());
     KMessageBox::error(this, string);
     return;
 
   }
 #endif
 
-  QFileInfo info2(gpppdata.modemDevice());
+  QFileInfo info2(PPPData::data()->modemDevice());
 
   if(!info2.exists()){
     QString string;
     string = i18n("kppp can not find:\n %1\nPlease make sure you have setup "
                    "your modem device properly "
                    "and/or adjust the location of the modem device on "
                    "the modem tab of "
-                   "the setup dialog.").arg(gpppdata.modemDevice());
+                   "the setup dialog.").arg(PPPData::data()->modemDevice());
     QMessageBox::warning(this, "error", string);
     return;
   }
 
   // if this is a PAP or CHAP account, ensure that username is
   // supplied
-  if(gpppdata.authMethod() == AUTH_PAP ||
-     gpppdata.authMethod() == AUTH_CHAP ||
-     gpppdata.authMethod() == AUTH_PAPCHAP ) {
+  if(PPPData::data()->authMethod() == AUTH_PAP ||
+     PPPData::data()->authMethod() == AUTH_CHAP ||
+     PPPData::data()->authMethod() == AUTH_PAPCHAP ) {
     if(ID_Edit->text().isEmpty()) {
         QMessageBox::warning(this,"error",
                            i18n(
                            "You have selected the authentication "
                            "method PAP or CHAP. This requires that you "
                            "supply a username and a password!"));
       return;
     } else {
-      if(!Modem::modem->setSecret(gpppdata.authMethod(),
-                                   encodeWord(gpppdata.storedUsername()),
-                                   encodeWord(gpppdata.password()))) {
+      if(!Modem::modem->setSecret(PPPData::data()->authMethod(),
+                                   encodeWord(PPPData::data()->storedUsername()),
+                                   encodeWord(PPPData::data()->password()))) {
         QString s;
         s = i18n("Cannot create PAP/CHAP authentication\n"
                                      "file \"%1\"").arg(PAP_AUTH_FILE);
         QMessageBox::warning(this, "error", s);
         return;
       }
     }
   }
 
-  if (gpppdata.phonenumber().isEmpty()) {
+  if (PPPData::data()->phonenumber().isEmpty()) {
     QString s = i18n("You must specify a telephone number!");
     QMessageBox::warning(this, "error", s);
     return;
   }
 
   this->hide();
 
-  QString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
+  QString tit = i18n("Connecting to: %1").arg(PPPData::data()->accname());
 //   con->setCaption(tit);
 
 //   con->show();
 
-  bool show_debug = gpppdata.get_show_log_window();
+  bool show_debug = PPPData::data()->get_show_log_window();
         //  con->debug->setOn(show_debug);// toggle button
   debugwindow->clear();
   if (!show_debug)
     debugwindow->hide();
   else {
     debugwindow->show();
 //    con->raise();
   }
 
   emit begin_connect();
 }
 
 
 void KPPPWidget::disconnect() {
-  if (!gpppdata.command_before_disconnect().isEmpty()) {
+  if (!PPPData::data()->command_before_disconnect().isEmpty()) {
 //     con_win->hide();
 //     con->show();
 //     con->setCaption(i18n("Disconnecting..."));
 //     con->setMsg(i18n("Executing command before disconnection."));
 
     qApp->processEvents();
     QApplication::flushX();
 //    pid_t id =
-        execute_command(gpppdata.command_before_disconnect());
+        execute_command(PPPData::data()->command_before_disconnect());
 //    int i, status;
 
 //     do {
 //       kapp->processEvents();
 //       i = waitpid(id, &status, WNOHANG);
 //       usleep(500000);
 //     } while (i == 0 && errno == 0);
 
 //    con->hide();
   }
 
   qApp->processEvents();
 
 //  statdlg->stop_stats();
   Modem::modem->killPPPDaemon();
 
   QApplication::flushX();
-  execute_command(gpppdata.command_on_disconnect());
+  execute_command(PPPData::data()->command_on_disconnect());
 
   Modem::modem->removeSecret(AUTH_PAP);
   Modem::modem->removeSecret(AUTH_CHAP);
 
   removedns();
   Modem::modem->unlockdevice();
 
 //  con_win->stopClock();
 //  p_kppp->stopAccounting();
 //  con_win->hide();
 
 //   DockWidget::dock_widget->stop_stats();
@@ -698,119 +698,119 @@ void KPPPWidget::disconnect() {
     this->quit_b->setFocus();
     this->show();
 //  }
 }
 
 
 // void KPPPWidget::helpbutton() {
 //   kapp->invokeHelp();
 // }
 
 
 void KPPPWidget::quitbutton() {
-  if(gpppdata.pppdRunning()) {
+  if(PPPData::data()->pppdRunning()) {
     int ok = QMessageBox::warning(this,
                             i18n("Exiting kPPP will close your PPP Session."),
                             i18n("Quit kPPP?"));
     if(ok == QMessageBox::Yes) {
       Modem::modem->killPPPDaemon();
       QApplication::flushX();
-      execute_command(gpppdata.command_on_disconnect());
+      execute_command(PPPData::data()->command_on_disconnect());
       removedns();
       Modem::modem->unlockdevice();
     }
   } else {
-    if (!gpppdata.accname().isEmpty() && !gpppdata.storePassword())
-      gpppdata.setStoredPassword("");
+    if (!PPPData::data()->accname().isEmpty() && !PPPData::data()->storePassword())
+      PPPData::data()->setStoredPassword("");
   }
-  gpppdata.save();
+  PPPData::data()->save();
   qApp->quit();
 }
 
 
 // void KPPPWidget::rulesetLoadError() {
 //   QMessageBox::warning(this,"error", ruleset_load_errmsg);
 // }
 
 
 // void KPPPWidget::startAccounting() {
 //   // volume accounting
 //   stats->totalbytes = 0;
 
-//   kdDebug() << "AcctEnabled: " << gpppdata.AcctEnabled() << endl;
+//   kdDebug() << "AcctEnabled: " << PPPData::data()->AcctEnabled() << endl;
 
 //   // load the ruleset
-//   if(!gpppdata.AcctEnabled())
+//   if(!PPPData::data()->AcctEnabled())
 //     return;
 
-//   QString d = AccountingBase::getAccountingFile(gpppdata.accountingFile());
+//   QString d = AccountingBase::getAccountingFile(PPPData::data()->accountingFile());
 //   //  if(::access(d.data(), X_OK) != 0)
 //     acct = new Accounting(this, stats);
 //     //  else
 //     //    acct = new ExecutableAccounting(this);
 
 //   // connect to the accounting object
 //   connect(acct, SIGNAL(changed(QString, QString)),
         //   con_win, SLOT(slotAccounting(QString, QString)));
 
-// //   if(!acct->loadRuleSet(gpppdata.accountingFile())) {
+// //   if(!acct->loadRuleSet(PPPData::data()->accountingFile())) {
 // //     QString s= i18n("Can not load the accounting "
-        // //               "ruleset \"%1\"!").arg(gpppdata.accountingFile());
+        // //               "ruleset \"%1\"!").arg(PPPData::data()->accountingFile());
 
 //     // starting the messagebox with a timer will prevent us
 //     // from blocking the calling function ConnectWidget::timerEvent
 //     ruleset_load_errmsg = s;
 //     QTimer::singleShot(0, this, SLOT(rulesetLoadError()));
 //     return;
 //   }
 // //else
 // //    acct->slotStart();
 // }
 
 // void KPPPWidget::stopAccounting() {
 //   // store volume accounting
 // //   if(stats->totalbytes != 0)
-// //     gpppdata.setTotalBytes(stats->totalbytes);
+// //     PPPData::data()->setTotalBytes(stats->totalbytes);
 
-//   if(!gpppdata.AcctEnabled())
+//   if(!PPPData::data()->AcctEnabled())
 //     return;
 
 // //   if(acct != 0) {
 // //     acct->slotStop();
 // //     delete acct;
 // //     acct = 0;
 // //   }
 // }
 
 
 // void KPPPWidget::showStats() {
 //   if(statdlg) {
 //     statdlg->show();
 //     statdlg->raise();
 //   }
 // }
 
 
 void KPPPWidget::usernameChanged(const QString &) {
   // store username for later use
-  gpppdata.setStoredUsername(ID_Edit->text());
+  PPPData::data()->setStoredUsername(ID_Edit->text());
 }
 
 
 void KPPPWidget::passwordChanged(const QString &) {
     // store the password if so requested
-  if(gpppdata.storePassword())
-    gpppdata.setStoredPassword(PW_Edit->text());
+  if(PPPData::data()->storePassword())
+    PPPData::data()->setStoredPassword(PW_Edit->text());
   else
-    gpppdata.setStoredPassword("");
+    PPPData::data()->setStoredPassword("");
 }
 
 
 void KPPPWidget::setPW_Edit(const QString &pw) {
   PW_Edit->setText(pw);
 }
 
 
 // void KPPPWidget::resetCosts(const QString &s) {
 //   AccountingBase::resetCosts(s);
 // }
 
@@ -832,25 +832,25 @@ QString KPPPWidget::encodeWord(const QString &s) {
 
 // void KPPPWidget::setQuitOnDisconnect (bool b)
 // {
 //     m_bQuitOnDisconnect = b;
 // }
 
 void KPPPWidget::showNews() {
 #ifdef KPPP_SHOW_NEWS
   /*
    * Introduce the QuickHelp feature to new users of this version
    */
   #define QUICKHELP_HINT "Hint_QuickHelp"
-  if(gpppdata.readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
+  if(PPPData::data()->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
     QDialog dlg(0, 0, true);
     dlg.setCaption(i18n("Recent Changes in KPPP"));
 
     QVBoxLayout *tl = new QVBoxLayout(&dlg, 10, 10);
     QHBoxLayout *l1 = new QHBoxLayout(10);
     QVBoxLayout *l2 = new QVBoxLayout(10);
     tl->addLayout(l1);
 
     QLabel *icon = new QLabel(&dlg);
     icon->setPixmap(BarIcon("exclamation"));
     icon->setFixedSize(icon->sizeHint());
     l1->addWidget(icon);
@@ -884,22 +884,22 @@ void KPPPWidget::showNews() {
     l2->addWidget(cb);
     tl->addWidget(bbox);
 
     QString tmp = i18n("This is an example of <b>QuickHelp</b>.\n"
                        "This window will stay open until you\n"
                        "click a mouse button or a press a key.\n");
 
     QWhatsThis::add(cb,tmp);
     QWhatsThis::add(l, tmp);
 
     dlg.exec();
     if(cb->isChecked()) {
-      gpppdata.writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1);
-      gpppdata.save();
+      PPPData::data()->writeConfig(GENERAL_GRP, QUICKHELP_HINT, 1);
+      PPPData::data()->save();
     }
   }
 #endif
 }
 
 
 //#include "kpppwidget.moc"
 
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index a2f77c5..cd5d21c 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -92,25 +92,25 @@ Modem::Modem()
 }
 
 
 Modem::~Modem() {
   modem = 0;
 }
 
 
 speed_t Modem::modemspeed() {
   // convert the string modem speed int the gpppdata object to a t_speed type
   // to set the modem.  The constants here should all be ifdef'd because
   // other systems may not have them
-    int i = gpppdata.speed().toInt()/100;
+    int i = PPPData::data()->speed().toInt()/100;
 
   switch(i) {
   case 24:
     return B2400;
     break;
   case 96:
     return B9600;
     break;
   case 192:
     return B19200;
     break;
   case 384:
@@ -142,35 +142,35 @@ speed_t Modem::modemspeed() {
 
   default:
     return B38400;
     break;
   }
 }
 
 bool Modem::opentty() {
   //  int flags;
 
 //begin  if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
     close(modemfd);
-//    device = "/dev/modem";//deviceByIndex(request.modem.deviceNum);
+    device = PPPData::data()->modemDevice();
     if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) {
         qDebug("error opening modem device !");
         errmsg = i18n("Unable to open modem.");
         return false;
     }
 //bend  if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) {
 //}
 
 #if 0
-  if(gpppdata.UseCDLine()) {
+  if(PPPData::data()->UseCDLine()) {
     if(ioctl(modemfd, TIOCMGET, &flags) == -1) {
       errmsg = i18n("Unable to detect state of CD line.");
       ::close(modemfd);
       modemfd = -1;
       return false;
     }
     if ((flags&TIOCM_CD) == 0) {
       errmsg = i18n("The modem is not ready.");
       ::close(modemfd);
       modemfd = -1;
       return false;
     }
@@ -200,26 +200,26 @@ bool Modem::opentty() {
   tty.c_cc[VTIME] = 0;
   tty.c_oflag = 0;
   tty.c_lflag = 0;
 
   tty.c_cflag &= ~(CSIZE | CSTOPB | PARENB);
   tty.c_cflag |= CS8 | CREAD;
   tty.c_cflag |= CLOCAL;                   // ignore modem status lines
   tty.c_iflag = IGNBRK | IGNPAR /* | ISTRIP */ ;
   tty.c_lflag &= ~ICANON;                  // non-canonical mode
   tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHOKE);
 
 
-  if(gpppdata.flowcontrol() != "None") {
-      if(gpppdata.flowcontrol() == "CRTSCTS") {
+  if(PPPData::data()->flowcontrol() != "None") {
+      if(PPPData::data()->flowcontrol() == "CRTSCTS") {
       tty.c_cflag |= CRTSCTS;
     }
     else {
       tty.c_iflag |= IXON | IXOFF;
       tty.c_cc[VSTOP]  = 0x13; /* DC3 = XOFF = ^S */
       tty.c_cc[VSTART] = 0x11; /* DC1 = XON  = ^Q */
     }
   }
   else {
     tty.c_cflag &= ~CRTSCTS;
     tty.c_iflag &= ~(IXON | IXOFF);
   }
@@ -330,25 +330,25 @@ bool Modem::writeChar(unsigned char c) {
     }
   } while(s == 0);
 
   return true;
 }
 
 
 bool Modem::writeLine(const char *buf) {
   int len = strlen(buf);
   char *b = new char[len+2];
   memcpy(b, buf, len);
   // different modems seem to need different line terminations
-  QString term = gpppdata.enter();
+  QString term = PPPData::data()->enter();
   if(term == "LF")
     b[len++]='\n';
   else if(term == "CR")
     b[len++]='\r';
   else if(term == "CR/LF") {
     b[len++]='\r';
     b[len++]='\n';
   }
   int l = len;
   while(l) {
     int wr = write(modemfd, &b[len-l], l);
     if(wr < 0) {
@@ -370,27 +370,27 @@ bool Modem::hangup() {
   // this is probably the most imporant snippet of code in the whole of
   // kppp. If people complain about kppp being stuck, this piece of code
   // is most likely the reason.
   struct termios temptty;
 
   if(modemfd >= 0) {
 
     // is this Escape & HangupStr stuff really necessary ? (Harri)
 
     if (data_mode) escape_to_command_mode();
 
     // Then hangup command
-    writeLine(gpppdata.modemHangupStr().local8Bit());
+    writeLine(PPPData::data()->modemHangupStr().local8Bit());
 
-    usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+    usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
 
 #ifndef DEBUG_WO_DIALING
     if (sigsetjmp(jmp_buffer, 1) == 0) {
       // set alarm in case tcsendbreak() hangs
       signal(SIGALRM, alarm_handler);
       alarm(2);
 
       tcsendbreak(modemfd, 0);
 
       alarm(0);
       signal(SIGALRM, SIG_IGN);
     } else {
@@ -408,52 +408,52 @@ bool Modem::hangup() {
     cfsetispeed(&temptty, B0);
     tcsetattr(modemfd, TCSAFLUSH, &temptty);
 #else
     int modemstat;
     ioctl(modemfd, TIOCMGET, &modemstat);
     modemstat &= ~TIOCM_DTR;
     ioctl(modemfd, TIOCMSET, &modemstat);
     ioctl(modemfd, TIOCMGET, &modemstat);
     modemstat |= TIOCM_DTR;
     ioctl(modemfd, TIOCMSET, &modemstat);
 #endif
 
-    usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 secs
+    usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs
 
     cfsetospeed(&temptty, modemspeed());
     cfsetispeed(&temptty, modemspeed());
     tcsetattr(modemfd, TCSAFLUSH, &temptty);
 #endif
     return true;
   } else
     return false;
 }
 
 
 void Modem::escape_to_command_mode() {
   // Send Properly bracketed escape code to put the modem back into command state.
   // A modem will accept AT commands only when it is in command state.
   // When a modem sends the host the CONNECT string, that signals
   // that the modem is now in the connect state (no long accepts AT commands.)
   // Need to send properly timed escape sequence to put modem in command state.
   // Escape codes and guard times are controlled by S2 and S12 values.
   //
   tcflush(modemfd, TCIOFLUSH);
 
   // +3 because quiet time must be greater than guard time.
-  usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
-  QCString tmp = gpppdata.modemEscapeStr().local8Bit();
+  usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
+  QCString tmp = PPPData::data()->modemEscapeStr().local8Bit();
   write(modemfd, tmp.data(), tmp.length());
   tcflush(modemfd, TCIOFLUSH);
-  usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
+  usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
 
   data_mode = false;
 }
 
 
 const QString Modem::modemMessage() {
   return errmsg;
 }
 
 
 QString Modem::parseModemSpeed(const QString &s) {
   // this is a small (and bad) parser for modem speeds
@@ -551,34 +551,34 @@ QString Modem::parseModemSpeed(const QString &s) {
   qDebug( "The parsed result is: %s", result.latin1());
 
   return result;
 }
 
 
 // Lock modem device. Returns 0 on success 1 if the modem is locked and -1 if
 // a lock file can't be created ( permission problem )
 int Modem::lockdevice() {
   int fd;
   char newlock[80]=""; // safe
 
-  if(!gpppdata.modemLockFile()) {
+  if(!PPPData::data()->modemLockFile()) {
     qDebug("The user doesn't want a lockfile.");
     return 0;
   }
 
   if (modem_is_locked)
     return 1;
 
   QString lockfile = LOCK_DIR"/LCK..";
-  lockfile += gpppdata.modemDevice().mid(5); // append everything after /dev/
+  lockfile += PPPData::data()->modemDevice().mid(5); // append everything after /dev/
 
   if(access(QFile::encodeName(lockfile), F_OK) == 0) {
 //    if ((fd = Requester::rq->
 if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
       // Mario: it's not necessary to read more than lets say 32 bytes. If
       // file has more than 32 bytes, skip the rest
       char oldlock[33]; // safe
       int sz = read(fd, &oldlock, 32);
       close (fd);
       if (sz <= 0)
         return 1;
       oldlock[sz] = '\0';
@@ -591,25 +591,25 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
       // found a pid in lockfile ?
       if (match < 1 || oldpid <= 0)
         return 1;
 
       // check if process exists
       if (kill((pid_t)oldpid, 0) == 0 || errno != ESRCH)
         return 1;
 
       qDebug( "lockfile is stale" );
     }
   }
 
-  fd = openLockfile(gpppdata.modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
+  fd = openLockfile(PPPData::data()->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
   if(fd >= 0) {
     sprintf(newlock,"%010d\n", getpid());
     qDebug("Locking Device: %s", newlock);
 
     write(fd, newlock, strlen(newlock));
     close(fd);
     modem_is_locked=true;
 
     return 0;
   }
 
   return -1;
diff --git a/noncore/settings/networksettings/ppp/modemcmds.cpp b/noncore/settings/networksettings/ppp/modemcmds.cpp
index 766ba0f..65032e8 100644
--- a/noncore/settings/networksettings/ppp/modemcmds.cpp
+++ b/noncore/settings/networksettings/ppp/modemcmds.cpp
@@ -35,27 +35,24 @@
 #include "pppdata.h"
 //#include <kwin.h>
 
 #define ADJUSTEDIT(e) //e->setText("XXXXXXXXqy"); e->setMinimumSize(e->sizeHint()); /*e->setFixedHeight(e->sizeHint().height());*/ e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
 
 // a little trick to make the label look like a disabled lineedit
 #define FORMATSLIDERLABEL(l) //l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(QLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); l->setLineWidth(2);
 
 ModemCommands::ModemCommands(QWidget *parent, const char *name)
     : QDialog(parent, name, true ) //, i18n("Edit Modem Commands") , Ok|Cancel)
 {
     setCaption(i18n("Edit Modem Commands"));
-//  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
-  QWidget *dummyWidget = new QWidget(this);
-//  setMainWidget(dummyWidget);
 
   const int GRIDROWS = 22;
   int row = 0;
 
   // toplevel layout
   QVBoxLayout *tl = new QVBoxLayout(this, 10, 4);
 
   // add grid + frame
   QGridLayout *l1 = new QGridLayout(GRIDROWS, 4);
   tl->addLayout(l1);
   box = new QGroupBox(this, "box");
   l1->addMultiCellWidget(box, row++, GRIDROWS, 0, 3);
@@ -234,88 +231,88 @@ ModemCommands::ModemCommands(QWidget *parent, const char *name)
   l6->addWidget(volume_off);
   l6->addWidget(volume_medium);
   l6->addWidget(volume_high);
 
   initstr[0]->setFocus();
 
   l1->addColSpacing(0, 10);
   l1->addColSpacing(3, 10);
   l1->addRowSpacing(0, 5);
   l1->addRowSpacing(GRIDROWS, 5);
 
   //set stuff from gpppdata
-  preinitslider->setValue(gpppdata.modemPreInitDelay());
-  lpreinitslider->setNum(gpppdata.modemPreInitDelay());
+  preinitslider->setValue(PPPData::data()->modemPreInitDelay());
+  lpreinitslider->setNum(PPPData::data()->modemPreInitDelay());
   for(int i = 0; i < PPPData::NumInitStrings; i++)
-      initstr[i]->setText(gpppdata.modemInitStr(i));
-  initslider->setValue(gpppdata.modemInitDelay());
-  linitslider->setNum(gpppdata.modemInitDelay());
-  initresp->setText(gpppdata.modemInitResp());
+      initstr[i]->setText(PPPData::data()->modemInitStr(i));
+  initslider->setValue(PPPData::data()->modemInitDelay());
+  linitslider->setNum(PPPData::data()->modemInitDelay());
+  initresp->setText(PPPData::data()->modemInitResp());
 
-  durationslider->setValue(gpppdata.modemToneDuration());
-  ldurationslider->setNum(gpppdata.modemToneDuration());
+  durationslider->setValue(PPPData::data()->modemToneDuration());
+  ldurationslider->setNum(PPPData::data()->modemToneDuration());
 
-  nodetectdialtone->setText(gpppdata.modemNoDialToneDetectionStr());
-  dialstr->setText(gpppdata.modemDialStr());
-  connectresp->setText(gpppdata.modemConnectResp());
-  busyresp->setText(gpppdata.modemBusyResp());
-  nocarrierresp->setText(gpppdata.modemNoCarrierResp());
-  nodialtoneresp->setText(gpppdata.modemNoDialtoneResp());
+  nodetectdialtone->setText(PPPData::data()->modemNoDialToneDetectionStr());
+  dialstr->setText(PPPData::data()->modemDialStr());
+  connectresp->setText(PPPData::data()->modemConnectResp());
+  busyresp->setText(PPPData::data()->modemBusyResp());
+  nocarrierresp->setText(PPPData::data()->modemNoCarrierResp());
+  nodialtoneresp->setText(PPPData::data()->modemNoDialtoneResp());
 
-  escapestr->setText(gpppdata.modemEscapeStr());
-  escaperesp->setText(gpppdata.modemEscapeResp());
+  escapestr->setText(PPPData::data()->modemEscapeStr());
+  escaperesp->setText(PPPData::data()->modemEscapeResp());
 
-  hangupstr->setText(gpppdata.modemHangupStr());
-  hangupresp->setText(gpppdata.modemHangupResp());
+  hangupstr->setText(PPPData::data()->modemHangupStr());
+  hangupresp->setText(PPPData::data()->modemHangupResp());
 
-  answerstr->setText(gpppdata.modemAnswerStr());
-  ringresp->setText(gpppdata.modemRingResp());
-  answerresp->setText(gpppdata.modemAnswerResp());
+  answerstr->setText(PPPData::data()->modemAnswerStr());
+  ringresp->setText(PPPData::data()->modemRingResp());
+  answerresp->setText(PPPData::data()->modemAnswerResp());
 
-  slider->setValue(gpppdata.modemEscapeGuardTime());
-  lslider->setNum(gpppdata.modemEscapeGuardTime());
+  slider->setValue(PPPData::data()->modemEscapeGuardTime());
+  lslider->setNum(PPPData::data()->modemEscapeGuardTime());
 
-  volume_off->setText(gpppdata.volumeOff());
-  volume_medium->setText(gpppdata.volumeMedium());
-  volume_high->setText(gpppdata.volumeHigh());
+  volume_off->setText(PPPData::data()->volumeOff());
+  volume_medium->setText(PPPData::data()->volumeMedium());
+  volume_high->setText(PPPData::data()->volumeHigh());
 }
 
 
 void ModemCommands::slotOk() {
-  gpppdata.setModemPreInitDelay(lpreinitslider->text().toInt());
+  PPPData::data()->setModemPreInitDelay(lpreinitslider->text().toInt());
   for(int i = 0; i < PPPData::NumInitStrings; i++)
-      gpppdata.setModemInitStr(i, initstr[i]->text());
-  gpppdata.setModemInitResp(initresp->text());
-  gpppdata.setModemInitDelay(linitslider->text().toInt());
-
-  gpppdata.setModemToneDuration(ldurationslider->text().toInt());
-  gpppdata.setModemNoDialToneDetectionStr(nodetectdialtone->text());
-  gpppdata.setModemDialStr(dialstr->text());
-  gpppdata.setModemConnectResp(connectresp->text());
-  gpppdata.setModemBusyResp(busyresp->text());
-  gpppdata.setModemNoCarrierResp(nocarrierresp->text());
-  gpppdata.setModemNoDialtoneResp(nodialtoneresp->text());
-
-  gpppdata.setModemEscapeStr(escapestr->text());
-  gpppdata.setModemEscapeResp(escaperesp->text());
-  gpppdata.setModemEscapeGuardTime(lslider->text().toInt());
-  gpppdata.setModemHangupStr(hangupstr->text());
-  gpppdata.setModemHangupResp(hangupresp->text());
-
-  gpppdata.setModemAnswerStr(answerstr->text());
-  gpppdata.setModemRingResp(ringresp->text());
-  gpppdata.setModemAnswerResp(answerresp->text());
-
-  gpppdata.setVolumeHigh(volume_high->text());
-  gpppdata.setVolumeMedium(volume_medium->text());
-  gpppdata.setVolumeOff(volume_off->text());
-
-  gpppdata.save();
+      PPPData::data()->setModemInitStr(i, initstr[i]->text());
+  PPPData::data()->setModemInitResp(initresp->text());
+  PPPData::data()->setModemInitDelay(linitslider->text().toInt());
+
+  PPPData::data()->setModemToneDuration(ldurationslider->text().toInt());
+  PPPData::data()->setModemNoDialToneDetectionStr(nodetectdialtone->text());
+  PPPData::data()->setModemDialStr(dialstr->text());
+  PPPData::data()->setModemConnectResp(connectresp->text());
+  PPPData::data()->setModemBusyResp(busyresp->text());
+  PPPData::data()->setModemNoCarrierResp(nocarrierresp->text());
+  PPPData::data()->setModemNoDialtoneResp(nodialtoneresp->text());
+
+  PPPData::data()->setModemEscapeStr(escapestr->text());
+  PPPData::data()->setModemEscapeResp(escaperesp->text());
+  PPPData::data()->setModemEscapeGuardTime(lslider->text().toInt());
+  PPPData::data()->setModemHangupStr(hangupstr->text());
+  PPPData::data()->setModemHangupResp(hangupresp->text());
+
+  PPPData::data()->setModemAnswerStr(answerstr->text());
+  PPPData::data()->setModemRingResp(ringresp->text());
+  PPPData::data()->setModemAnswerResp(answerresp->text());
+
+  PPPData::data()->setVolumeHigh(volume_high->text());
+  PPPData::data()->setVolumeMedium(volume_medium->text());
+  PPPData::data()->setVolumeOff(volume_off->text());
+
+  PPPData::data()->save();
   accept();
 }
 
 
 void ModemCommands::slotCancel() {
   reject();
 }
 
 //#include "modemcmds.moc"
diff --git a/noncore/settings/networksettings/ppp/newwidget.cpp b/noncore/settings/networksettings/ppp/newwidget.cpp
deleted file mode 100644
index d2182fb..0000000
--- a/noncore/settings/networksettings/ppp/newwidget.cpp
+++ b/dev/null
@@ -1,17 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// functions generating layout-aware widgets
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include "newwidget.h"
-
-QLineEdit *newLineEdit(int visiblewidth, QWidget *parent) {
-  QLineEdit *l = new QLineEdit(parent);
-  if(visiblewidth == 0)
-    l->setMinimumWidth(l->sizeHint().width());
-  else
-    l->setFixedWidth(l->fontMetrics().width('H') * visiblewidth);
-  
-  return l;
-}
diff --git a/noncore/settings/networksettings/ppp/newwidget.h b/noncore/settings/networksettings/ppp/newwidget.h
deleted file mode 100644
index 52f2ec7..0000000
--- a/noncore/settings/networksettings/ppp/newwidget.h
+++ b/dev/null
@@ -1,19 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// functions generating layout-aware widgets
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __NEWWIDGET__H__
-#define __NEWWIDGET__H__
-
-#include <qwidget.h>
-#include <qlineedit.h>
-
-#define L_FIXEDW 1
-#define L_FIXEDH 2
-#define L_FIXED  (L_FIXEDW | L_FIXEDH)
-
-QLineEdit *newLineEdit(int visiblewidth, QWidget *parent);
-
-#endif
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index a456427..ebfc713 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -1,18 +1,18 @@
 #TEMPLATE        = app
 #
 TEMPLATE        = lib
 #CONFIG          += qt warn_on release
         CONFIG  += qt warn_on debug
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
-        HEADERS         = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.h accounts.h connect.h edit.h scriptedit.h pppdargs.h newwidget.h iplined.h pwentry.h pppconfig.h
-        SOURCES         = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp knuminput.cpp knumvalidator.cpp kpppwidget.cpp  conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp newwidget.cpp iplined.cpp pwentry.cpp pppconfig.cpp
+        HEADERS         = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h knuminput.h knumvalidator.h kpppwidget.h conwindow.h debug.h accounts.h connect.h edit.h scriptedit.h pppdargs.h  iplined.h pwentry.h pppconfig.h
+        SOURCES         = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp knuminput.cpp knumvalidator.cpp kpppwidget.cpp  conwindow.cpp debug.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp  iplined.cpp pwentry.cpp pppconfig.cpp
         INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
         INTERFACES=  
         TARGET  = pppplugin
         VERSION         = 1.0.0
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp
index 7b2b21b..c0f1fef 100644
--- a/noncore/settings/networksettings/ppp/pppconfig.cpp
+++ b/noncore/settings/networksettings/ppp/pppconfig.cpp
@@ -41,22 +41,22 @@ PPPConfigWidget::PPPConfigWidget( QWidget *parent, const char *name,
 //    general = new GeneralWidget( tabWindow->addPage( tr("M&isc"), tr("Miscellaneous Settings") ) );
 
 }
 
 
 PPPConfigWidget::~PPPConfigWidget()
 {
 
 }
 
 void PPPConfigWidget::accept()
 {
-    gpppdata.save();
+    PPPData::data()->save();
     QDialog::accept();
 }
 
 
 void PPPConfigWidget::reject()
 {
-    gpppdata.cancel();
+    PPPData::data()->cancel();
     QDialog::reject();
 }
diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp
index 04d0dd0..b7fca3f 100644
--- a/noncore/settings/networksettings/ppp/pppdargs.cpp
+++ b/noncore/settings/networksettings/ppp/pppdargs.cpp
@@ -112,50 +112,50 @@ void PPPdArguments::addbutton() {
 }
 
 
 void PPPdArguments::removebutton() {
   if(arguments->currentItem() >= 0)
     arguments->removeItem(arguments->currentItem());
 }
 
 
 void PPPdArguments::defaultsbutton() {
   // all of this is a hack
   // save current list
-  QStringList arglist(gpppdata.pppdArgument());
+  QStringList arglist(PPPData::data()->pppdArgument());
 
   // get defaults
-  gpppdata.setpppdArgumentDefaults();
+  PPPData::data()->setpppdArgumentDefaults();
   init();
 
   // restore old list
-  gpppdata.setpppdArgument(arglist);
+  PPPData::data()->setpppdArgument(arglist);
 }
 
 
 void PPPdArguments::closebutton() {
   QStringList arglist;
   for(uint i=0; i < arguments->count(); i++)
     arglist.append(arguments->text(i));
-  gpppdata.setpppdArgument(arglist);
+  PPPData::data()->setpppdArgument(arglist);
 
   done(0);
 }
 
 
 void PPPdArguments::init() {
   while(arguments->count())
     arguments->removeItem(0);
 
-  QStringList &arglist = gpppdata.pppdArgument();
+  QStringList &arglist = PPPData::data()->pppdArgument();
   for ( QStringList::Iterator it = arglist.begin();
         it != arglist.end();
         ++it )
     arguments->insertItem(*it);
 }
 
 
 void PPPdArguments::textChanged(const QString &s) {
   add->setEnabled(s.length() > 0);
 }
 
 
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index f2386fc..646facd 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -29,61 +29,58 @@
 #include "devices.h"
 //#include <klocale.h>
 #define i18n QObject::tr
 #include <qpe/config.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 // #include <klocale.h>
 // #include <kconfig.h>
 // #include <kmessagebox.h>
 // #include <kapplication.h>
 #include <assert.h>
 
-PPPData gpppdata;
+PPPData *PPPData::_data = 0;
+Config *PPPData::config = 0;
 
+PPPData* PPPData::data()
+{
+    if (!_data){
+        qDebug("PPPData::data() creates new Instance");
+        _data = new PPPData();
+    }
+    if (!_data->config){
+        qDebug("PPPData::data() opens conffile");
+        _data->open();
+    }
+    return _data;
+}
 
 PPPData::PPPData()
-  :  config(0L),
+    :  //config(0L),
      highcount(-1),        // start out with no entries
      caccount(-1),         // set the current account index also
      suidprocessid(-1),    // process ID of setuid child
      pppdisrunning(false),
      pppderror(0)
 {
 }
 
 
 //
 // open configuration file
 //
 bool PPPData::open() {
-
-    config = new Config("NetworkSetup");
-    /*
-  config = kapp->config();
-
-  if (config->getConfigState() == KConfig::NoAccess) {
-    KMessageBox::error(0L,
-                       i18n("The application-specific config file could not "
-                       "be opened in either read-write or read-only mode.\n"
-                       "The superuser might have to change its ownership "
-                       "by issuing the following command in your home directory:\n"
-                       "chown {YourUsername} .kde/share/config/kppprc"),
-                         kapp->name());
-    return false;
-  }
-
-  // don't expand shell variables
-  config->setDollarExpansion(false);
-    */
+    qDebug("opening configfile NetworkSetupPPP");
+    if (config) return true;
+    config = new Config("NetworkSetupPPP");
 
     highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1;
 
   if (highcount > MAX_ACCOUNTS)
     highcount = MAX_ACCOUNTS;
 
   if(highcount >= 0 && defaultAccount().isEmpty()) {
     setAccountbyIndex(0);
     setDefaultAccount(accname());
   } else if(!setAccount(defaultAccount()))
     setDefaultAccount(accname());
 
@@ -95,54 +92,61 @@ bool PPPData::open() {
 
   return true;
 }
 
 
 //
 // save configuration
 //
 void PPPData::save() {
 
   if (config) {
     writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count());
-//    config->sync();
+    delete config;
+    config = 0;
+    qDebug("worte confi NetworkSetupPPP");
+  }
+  if (_data){
+    delete _data;
+    _data = 0;
   }
 
 }
 
 
 //
 // cancel changes
 //
 void PPPData::cancel() {
 
 //   if (config) {
 //     config->rollback();
 //     config->reparseConfiguration();
 //   }
 
 }
 
 
-// currently differentiates between READWRITE and NONE only
-int PPPData::access() const {
+// // currently differentiates between READWRITE and NONE only
+// int PPPData::access() const {
 
-    return 0;//config->getConfigState();
-}
+//     return 1;//config->getConfigState();
+// }
 
 
 // functions to read/write date to configuration file
 QString PPPData::readConfig(const QString &group, const QString &key,
                             const QString &defvalue = "")
 {
+//    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
   if (config) {
     config->setGroup(group);
     return config->readEntry(key, defvalue);
   } else
     return defvalue;
 }
 
 
 int PPPData::readNumConfig(const QString &group, const QString &key,
                            int defvalue) {
   if (config) {
     config->setGroup(group);
@@ -709,32 +713,32 @@ bool PPPData::isUniqueAccname(const QString &n) {
     setAccountbyIndex(i);
     if(accname() == n && i != current) {
       setAccountbyIndex(current);
       return false;
     }
   }
   setAccountbyIndex(current);
   return true;
 }
 
 
 bool PPPData::deleteAccount() {
-  if(caccount < 0)
+    //FIXME:
+//   if(caccount < 0)
     return false;
 
 //   QMap <QString, QString> map;
 //   QMap <QString, QString>::Iterator it;
 
-  // set all entries of the current account to ""
-// tille: do not handle the accounts here... (?)
+//   // set all entries of the current account to ""
 //   map = config->entryMap(cgroup);
 //   it = map.begin();
 //   while (it != map.end()) {
 //     config->writeEntry(it.key(), "");
 //     it++;
 //   }
 
 //   // shift the succeeding accounts
 //   for(int i = caccount+1; i <= highcount; i++) {
 //     setAccountbyIndex(i);
 //     map = config->entryMap(cgroup);
 //     it = map.begin();
@@ -747,98 +751,99 @@ bool PPPData::deleteAccount() {
 //   }
 
 //   // make sure the top account is cleared
 //   setAccountbyIndex(highcount);
 //   map = config->entryMap(cgroup);
 //   it = map.begin();
 //   config->setGroup(cgroup);
 //   while (it.key() != QString::null) {
 //     config->writeEntry(it.key(), "");
 //     it++;
 //   }
 
-   highcount--;
-   if(caccount > highcount)
-     caccount = highcount;
+//    highcount--;
+//    if(caccount > highcount)
+//      caccount = highcount;
 
-  setAccountbyIndex(caccount);
+//   setAccountbyIndex(caccount);
 
-  return true;
+//   return true;
 }
 
 
 bool PPPData::deleteAccount(const QString &aname) {
   if(!setAccount(aname))
     return false;
 
   deleteAccount();
 
   return true;
 }
 
 
 int PPPData::newaccount() {
 
-  if(!config || highcount >= MAX_ACCOUNTS)
-    return -1;
+    qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS);
+  if(!config) open();
+  if (highcount >= MAX_ACCOUNTS) return -1;
 
   highcount++;
   setAccountbyIndex(highcount);
 
   setpppdArgumentDefaults();
-
+  qDebug("PPPData::newaccount -> %i",caccount);
   return caccount;
 }
 
 int PPPData::copyaccount(int i) {
 
-  if(highcount >= MAX_ACCOUNTS)
+//  if(highcount >= MAX_ACCOUNTS)
     return -1;
 
-  setAccountbyIndex(i);
+//   setAccountbyIndex(i);
 
 //   QMap <QString, QString> map = config->entryMap(cgroup);
 //   QMap <QString, QString>::ConstIterator it = map.begin();
 
-   QString newname = i18n("%1_copy").arg(accname());
+//    QString newname = i18n("%1_copy").arg(accname());
 
-   newaccount();
+//    newaccount();
 
 //   while (it != map.end()) {
 //     config->writeEntry(it.key(), *it);
 //     it++;
 //   }
 
-  setAccname(newname);
+//   setAccname(newname);
 
-  return caccount;
+//   return caccount;
 }
 
 
 const QString PPPData::accname() {
   return readConfig(cgroup, NAME_KEY);
 }
 
 void PPPData::setAccname(const QString &n) {
   if(!cgroup.isNull()) {
     // are we manipulating the default account's name ? then change it, too.
     bool def = accname() == defaultAccount();
     writeConfig(cgroup, NAME_KEY, n);
     if (def)
       setDefaultAccount(n);
   }
 }
 
 
-#define SEPARATOR_CHAR ':'
+#define SEPARATOR_CHAR '&'
 QStringList &PPPData::phonenumbers() {
 
   readListConfig(cgroup, PHONENUMBER_KEY, phonelist, SEPARATOR_CHAR);
   return phonelist;
 
 }
 
 
 const QString PPPData::phonenumber() {
   return readConfig(cgroup, PHONENUMBER_KEY);
 }
 
@@ -1002,25 +1007,25 @@ bool PPPData::defaultroute() {
   // default route is by default 'on'.
   return (bool) readNumConfig(cgroup, DEFAULTROUTE_KEY, true);
 }
 
 
 void PPPData::setDefaultroute(bool set) {
   writeConfig(cgroup, DEFAULTROUTE_KEY, (int) set);
 }
 
 
 bool PPPData::autoDNS() {
   bool set = (bool) readNumConfig(cgroup, AUTODNS_KEY, true);
-  return (set && gpppdata.pppdVersionMin(2, 3, 7));
+  return (set && PPPData::data()->pppdVersionMin(2, 3, 7));
 }
 
 
 void PPPData::setAutoDNS(bool set) {
   writeConfig(cgroup, AUTODNS_KEY, (int) set);
 }
 
 
 void PPPData::setExDNSDisabled(bool set) {
   writeConfig(cgroup, EXDNSDISABLED_KEY, (int) set);
 }
 
@@ -1130,100 +1135,100 @@ QStringList &PPPData::pppdArgument() {
 
 void PPPData::setpppdArgument(QStringList &args) {
   writeListConfig(cgroup, PPPDARG_KEY, args);
 }
 
 
 void PPPData::setpppdArgumentDefaults() {
   QStringList arg;
   setpppdArgument(arg);
 }
 
 
-// graphing widget
-void PPPData::setGraphingOptions(bool enable,
-                                 QColor bg,
-                                 QColor text,
-                                 QColor in,
-                                 QColor out)
-{
-  if(config) {
-    config->setGroup(GRAPH_GRP);
-    config->writeEntry(GENABLED, enable);
-//     config->writeEntry(GCOLOR_BG, bg);
-//     config->writeEntry(GCOLOR_TEXT, text);
-//     config->writeEntry(GCOLOR_IN, in);
-//     config->writeEntry(GCOLOR_OUT, out);
-  }
-}
+// // graphing widget
+// void PPPData::setGraphingOptions(bool enable,
+        //                       QColor bg,
+        //                       QColor text,
+        //                       QColor in,
+        //                       QColor out)
+// {
+//   if(config) {
+//     config->setGroup(GRAPH_GRP);
+//     config->writeEntry(GENABLED, enable);
+// //     config->writeEntry(GCOLOR_BG, bg);
+// //     config->writeEntry(GCOLOR_TEXT, text);
+// //     config->writeEntry(GCOLOR_IN, in);
+// //     config->writeEntry(GCOLOR_OUT, out);
+//   }
+// }
 
-void PPPData::graphingOptions(bool &enable,
-                              QColor &bg,
-                              QColor &text,
-                              QColor &in,
-                              QColor &out)
-{
-  QColor c;
+// void PPPData::graphingOptions(bool &enable,
+        //                    QColor &bg,
+        //                    QColor &text,
+        //                    QColor &in,
+        //                    QColor &out)
+// {
+//   QColor c;
 
-  if(config) {
-    config->setGroup(GRAPH_GRP);
-    enable = config->readBoolEntry(GENABLED, true);
-    bg = Qt::white;
-    //bg = config->readColorEntry(GCOLOR_BG, &c);
-    text = Qt::black;
-    //text = config->readColorEntry(GCOLOR_TEXT, &c);
-    in = Qt::blue;
-    //in = config->readColorEntry(GCOLOR_IN, &c);
-    out = Qt::red;
-    //out = config->readColorEntry(GCOLOR_OUT, &c);
-  }
-}
+//   if(config) {
+//     config->setGroup(GRAPH_GRP);
+//     enable = config->readBoolEntry(GENABLED, true);
+//     bg = Qt::white;
+//     //bg = config->readColorEntry(GCOLOR_BG, &c);
+//     text = Qt::black;
+//     //text = config->readColorEntry(GCOLOR_TEXT, &c);
+//     in = Qt::blue;
+//     //in = config->readColorEntry(GCOLOR_IN, &c);
+//     out = Qt::red;
+//     //out = config->readColorEntry(GCOLOR_OUT, &c);
+//   }
+// }
 
 
-bool PPPData::graphingEnabled() {
-  return (bool) readNumConfig(GRAPH_GRP, GENABLED, true);
-}
+// bool PPPData::graphingEnabled() {
+//   return (bool) readNumConfig(GRAPH_GRP, GENABLED, true);
+// }
 
 
 
 //
 //functions to change/set the child pppd process info
 //
 bool PPPData::pppdRunning() const {
   return pppdisrunning;
 }
 
 void PPPData::setpppdRunning(bool set) {
   pppdisrunning = set;
 }
 
 int PPPData::pppdError() const {
   return pppderror;
 }
 
 void PPPData::setpppdError(int err) {
   pppderror = err;
 }
 
 
-//
-// window position
-//
-void PPPData::winPosConWin(int& p_x, int& p_y) {
-  p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160);
-  p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55);
-}
+// //
+// // window position
+// //
+// void PPPData::winPosConWin(int& p_x, int& p_y) {
+//   p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, QApplication::desktop()->width()/2-160);
+//   p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, QApplication::desktop()->height()/2-55);
+// }
 
-void PPPData::setWinPosConWin(int p_x, int p_y) {
-  writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x);
-  writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y);
-}
+// void PPPData::setWinPosConWin(int p_x, int p_y) {
+//   writeConfig(WINPOS_GRP, WINPOS_CONWIN_X, p_x);
+//   writeConfig(WINPOS_GRP, WINPOS_CONWIN_Y, p_y);
+// }
 
-void PPPData::winPosStatWin(int& p_x, int& p_y) {
-  p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160);
-  p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55);
-}
+// void PPPData::winPosStatWin(int& p_x, int& p_y) {
+//   p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, QApplication::desktop()->width()/2-160);
+//   p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, QApplication::desktop()->height()/2-55);
+// }
 
-void PPPData::setWinPosStatWin(int p_x, int p_y) {
-  writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x);
-  writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y);
-}
+// void PPPData::setWinPosStatWin(int p_x, int p_y) {
+//   writeConfig(WINPOS_GRP, WINPOS_STATWIN_X, p_x);
+//   writeConfig(WINPOS_GRP, WINPOS_STATWIN_Y, p_y);
+// }
diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h
index e286b70..57ce2fd 100644
--- a/noncore/settings/networksettings/ppp/pppdata.h
+++ b/noncore/settings/networksettings/ppp/pppdata.h
@@ -46,29 +46,29 @@ class Config;
 #define ACCNAME_SIZE 50
 #define PHONENUMBER_SIZE 60
 #define COMMAND_SIZE 255
 #define IPADDR_SIZE 15
 #define DOMAIN_SIZE 50
 #define TIMEOUT_SIZE 60
 
 //
 // keys for config file
 //
 
 // groups
-#define GENERAL_GRP        "General"
-#define MODEM_GRP          "Modem"
-#define ACCOUNT_GRP        "Account"
-#define GRAPH_GRP          "Graph"
-#define WINPOS_GRP         "WindowPosition"
+#define GENERAL_GRP        "PPP_General"
+#define MODEM_GRP          "PPP_Modem"
+#define ACCOUNT_GRP        "PPP_Account"
+//#define GRAPH_GRP          "Graph"
+//#define WINPOS_GRP         "WindowPosition"
 
 // general
 #define DEFAULTACCOUNT_KEY "DefaultAccount"
 #define PPPDVERSION_KEY    "pppdVersion"
 #define PPPDTIMEOUT_KEY    "pppdTimeout"
 #define SHOWCLOCK_KEY      "ShowClock"
 #define SHOWLOGWIN_KEY     "ShowLogWindow"
 #define AUTOREDIAL_KEY     "AutomaticRedial"
 #define DISCONNECT_KEY     "DisconnectOnXServerExit"
 #define QUITONDISCONNECT_KEY "QuitOnDisconnect"
 #define NUMACCOUNTS_KEY    "NumberOfAccounts"
         #define ID_KEY     "ID"
@@ -152,32 +152,33 @@ class Config;
 #define E_PPPD_DIED        2
 
 // window position
 #define WINPOS_CONWIN_X    "WindowPositionConWinX"
 #define WINPOS_CONWIN_Y    "WindowPositionConWinY"
 #define WINPOS_STATWIN_X   "WindowPositionStatWinX"
 #define WINPOS_STATWIN_Y   "WindowPositionStatWinY"
 
 class PPPData {
 public:
   PPPData();
   ~PPPData() {};
+    static PPPData* data();
 
   enum { NumInitStrings = 2 };
 
   // general functions
   bool open();
   void save();
   void cancel();
-  int  access() const;       // read/write access
+//  int  access() const;       // read/write access
 
   // function to read/write date to configuration file
   QString readConfig(const QString &, const QString &, const QString &);
   int readNumConfig(const QString &, const QString &, int);
   bool readListConfig(const QString &, const QString &,
                       QStringList &, char sep = ',');
   void writeConfig(const QString &, const QString &, const QString &);
   void writeConfig(const QString &, const QString &, int);
   void writeListConfig(const QString &, const QString &,
                        QStringList &, char sep = ',');
 
   // return the current account group
@@ -417,49 +418,50 @@ public:
   void setpppdError(int err);
 
   // functions to set/query the accounting info
   const QString accountingFile();
   void setAccountingFile(const QString &);
 
   const QString totalCosts();
   void setTotalCosts(const QString &);
 
   int totalBytes();
   void  setTotalBytes(int);
 
-  // graphing widget
-  void setGraphingOptions(bool enabled,
-                          QColor bg,
-                          QColor text,
-                          QColor in,
-                          QColor out);
-  void graphingOptions(bool &enabled,
-                       QColor &bg,
-                       QColor &text,
-                       QColor &in,
-                       QColor &out);
-  bool graphingEnabled();
-
-  // window positions
-  void winPosConWin(int &, int &);
-  void setWinPosConWin(int, int);
-  void winPosStatWin(int &, int &);
-  void setWinPosStatWin(int, int);
+//   // graphing widget
+//   void setGraphingOptions(bool enabled,
+        //                QColor bg,
+        //                QColor text,
+        //                QColor in,
+        //                QColor out);
+//   void graphingOptions(bool &enabled,
+        //             QColor &bg,
+        //             QColor &text,
+        //             QColor &in,
+        //             QColor &out);
+//   bool graphingEnabled();
+
+//   // window positions
+//   void winPosConWin(int &, int &);
+//   void setWinPosConWin(int, int);
+//   void winPosStatWin(int &, int &);
+//   void setWinPosStatWin(int, int);
 
 private:
+
+    static PPPData *_data;
+
   QString passwd;
-  Config* config;                       // configuration object
+    static Config* config;                       // configuration object
   int highcount;                         // index of highest account
   int caccount;                          // index of the current account
   QString cgroup;                        // name of current config group
   pid_t suidprocessid;                   // process ID of setuid child
   bool pppdisrunning;                    // pppd process
                                          // daemon
   int pppderror;                         // error encounterd running pppd
   int pppdVer, pppdMod, pppdPatch;       // pppd version
 
   QStringList phonelist;
 };
 
-extern PPPData gpppdata;
-
 #endif
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index d6ca88a..da17e26 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -1,15 +1,15 @@
 #include "pppconfig.h"
 #include "pppmodule.h"
-//#include "pppimp.h"
+#include "pppdata.h"
 #include "kpppwidget.h"
 #include "interfaceinformationimp.h"
 //#include "devices.h"
 
 /**
  * Constructor, find all of the possible interfaces
  */
 PPPModule::PPPModule() : Module() {
 }
 
 /**
  * Delete any interfaces that we own.
@@ -89,24 +89,25 @@ QList<Interface> PPPModule::getInterfaces(){
  *  by possibleNewInterfaces();
  * @return Interface* NULL if it was unable to be created.
  */
 Interface *PPPModule::addNewInterface(const QString &newInterface){
 
   qDebug("try to add iface %s",newInterface.latin1());
 
   PPPConfigWidget imp(0, "PPPConfigImp", true);
   imp.showMaximized();
   if(imp.exec() == QDialog::Accepted ){
               qDebug("ACCEPTED");
               return new Interface( 0, newInterface );
+              PPPData::data()->save();
   }
   return NULL;
 }
 
 /**
  * Attempts to remove the interface, doesn't delete i
  * @return bool true if successfull, false otherwise.
  */
 bool PPPModule::remove(Interface*){
   // Can't remove a hardware device, you can stop it though.
   return false;
 }