1 files changed, 116 insertions, 116 deletions

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
@@ -43,3 +43,3 @@
 #include "pppdata.h"
-#include "newwidget.h"
+//#include "newwidget.h"
 #include "iplined.h"
@@ -52,9 +52,9 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  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);
@@ -66,3 +66,3 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  number_label = new QLabel(i18n("Phone number:"), parent);
+  number_label = new QLabel(i18n("Phone number:"), this);
   number_label->setAlignment(AlignTop|AlignLeft);
@@ -72,3 +72,3 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
   tl->addLayout(lpn, 1, 1);
-  numbers = new QListBox(parent);
+  numbers = new QListBox(this);
   numbers->setMinimumSize(120, 70);
@@ -77,9 +77,9 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
   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");
@@ -114,6 +114,6 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  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"));
@@ -137,3 +137,3 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  store_password = new QCheckBox(i18n("Store password"), parent);
+  store_password = new QCheckBox(i18n("Store password"), this);
   store_password->setChecked(true);
@@ -150,3 +150,3 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), parent);
+  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this);
   connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
@@ -156,6 +156,6 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
   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 = "";
@@ -174,4 +174,4 @@ DialWidget::DialWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-    auth->setCurrentItem(gpppdata.authMethod());
-    store_password->setChecked(gpppdata.storePassword());
+    auth->setCurrentItem(PPPData::data()->authMethod());
+    store_password->setChecked(PPPData::data()->storePassword());
   } else {
@@ -189,6 +189,6 @@ bool DialWidget::save() {
   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());
 
@@ -201,5 +201,5 @@ bool DialWidget::save() {
 
-    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;
@@ -277,3 +277,3 @@ ExecWidget::ExecWidget(QWidget *parent, bool isnewaccount, const char *name) :
 {
-    QVBoxLayout *tl = new QVBoxLayout(parent, 0 );//, KDialog::spacingHint());
+    QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
@@ -285,4 +285,4 @@ i18n("Here you can select commands to run at certain stages of the\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);
@@ -295,7 +295,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
 
-  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);
@@ -310,7 +310,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
 
-  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);
@@ -326,7 +326,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
   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);
@@ -340,3 +340,3 @@ i18n("Here you can select commands to run at certain stages of the\n"
   discommand_label = new QLabel(i18n("Upon disconnect:"),
-                              parent);
+                              this);
   discommand_label->setAlignment(AlignVCenter);
@@ -344,4 +344,4 @@ i18n("Here you can select commands to run at certain stages of the\n"
 
-  discommand = new QLineEdit(parent);
-  discommand->setMaxLength(COMMAND_SIZE);
+  discommand = new QLineEdit(this);
+//  discommand->setMaxLength(COMMAND_SIZE);
   l1->addWidget(discommand, 3, 1);
@@ -362,6 +362,6 @@ i18n("Here you can select commands to run at certain stages of the\n"
   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());
   }
@@ -371,6 +371,6 @@ i18n("Here you can select commands to run at certain stages of the\n"
 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;
@@ -388,9 +388,9 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *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();
@@ -450,4 +450,4 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  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)),
@@ -471,11 +471,11 @@ IPWidget::IPWidget( QWidget *parent, bool isnewaccount, const char *name )
   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);
@@ -512,9 +512,9 @@ 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());
 }
@@ -542,10 +542,10 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *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);
@@ -563,3 +563,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  conf_label = new QLabel(i18n("Configuration:"), parent);
+  conf_label = new QLabel(i18n("Configuration:"), this);
   tl->addWidget(conf_label, 1, 0);
@@ -570,3 +570,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  autodns = new QRadioButton(i18n("Automatic"), parent);
+  autodns = new QRadioButton(i18n("Automatic"), this);
   bg->insert(autodns, 0);
@@ -574,6 +574,6 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
   // 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);
@@ -581,3 +581,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  dns_label = new QLabel(i18n("DNS IP address:"), parent);
+  dns_label = new QLabel(i18n("DNS IP address:"), this);
   tl->addWidget(dns_label, 3, 0);
@@ -586,3 +586,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
   tl->addLayout(l2, 3, 1);
-  dnsipaddr = new IPLineEdit(parent);
+  dnsipaddr = new IPLineEdit(this);
   connect(dnsipaddr, SIGNAL(returnPressed()),
@@ -606,7 +606,7 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
   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);
@@ -618,7 +618,7 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  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);
@@ -628,3 +628,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  servers_label = new QLabel(i18n("DNS address list:"), parent);
+  servers_label = new QLabel(i18n("DNS address list:"), this);
   servers_label->setAlignment(AlignTop|AlignLeft);
@@ -632,3 +632,3 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 
-  dnsservers = new QListBox(parent);
+  dnsservers = new QListBox(this);
   dnsservers->setMinimumSize(150, 80);
@@ -646,4 +646,4 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
 "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);
@@ -663,7 +663,7 @@ DNSWidget::DNSWidget( QWidget *parent, bool isnewaccount, const char *name )
   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);
@@ -697,3 +697,3 @@ void DNSWidget::DNS_Mode_Selected(int mode) {
 void DNSWidget::save() {
-  gpppdata.setAutoDNS(bg->id(bg->selected()) == 0);
+  PPPData::data()->setAutoDNS(bg->id(bg->selected()) == 0);
   QStringList serverlist;
@@ -701,3 +701,3 @@ void DNSWidget::save() {
     serverlist.append(dnsservers->text(i));
-  gpppdata.setDns(serverlist);
+  PPPData::data()->setDns(serverlist);
 
@@ -706,7 +706,7 @@ void DNSWidget::save() {
   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());
 }
@@ -737,9 +737,9 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
 {
-  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();
@@ -773,3 +773,3 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
   defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"),
-                             parent);
+                             this);
   QWhatsThis::add(defaultroute,
@@ -787,3 +787,3 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
   if(!isnewaccount) {
-    if(gpppdata.gateway() == "0.0.0.0") {
+    if(PPPData::data()->gateway() == "0.0.0.0") {
       defaultgateway->setChecked(true);
@@ -792,6 +792,6 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
     else {
-      gatewayaddr->setText(gpppdata.gateway());
+      gatewayaddr->setText(PPPData::data()->gateway());
       staticgateway->setChecked(true);
     }
-    defaultroute->setChecked(gpppdata.defaultroute());
+    defaultroute->setChecked(PPPData::data()->defaultroute());
   }
@@ -805,4 +805,4 @@ GatewayWidget::GatewayWidget( QWidget *parent, bool isnewaccount, const char *na
 void GatewayWidget::save() {
-  gpppdata.setGateway(gatewayaddr->text());
-  gpppdata.setDefaultroute(defaultroute->isChecked());
+  PPPData::data()->setGateway(gatewayaddr->text());
+  PPPData::data()->setDefaultroute(defaultroute->isChecked());
 }
@@ -828,4 +828,4 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *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()));
@@ -834,3 +834,3 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
   // insert equal-sized buttons
-  QButtonGroup *bbox = new QButtonGroup(parent);
+  QButtonGroup *bbox = new QButtonGroup(this);
   add = new QPushButton( bbox, i18n("Add") );
@@ -851,3 +851,3 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
   tl->addLayout(l12);
-  stl = new QListBox(parent);
+  stl = new QListBox(this);
   stl->setVScrollBarMode( QScrollView::AlwaysOff );
@@ -856,3 +856,3 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
 
-  sl = new QListBox(parent);
+  sl = new QListBox(this);
   sl->setVScrollBarMode( QScrollView::AlwaysOff );
@@ -861,4 +861,4 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
 
-  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)));
@@ -871,4 +871,4 @@ ScriptWidget::ScriptWidget( QWidget *parent, bool isnewaccount, const char *name
   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();
@@ -918,4 +918,4 @@ void ScriptWidget::save() {
   }
-  gpppdata.setScriptType(typelist);
-  gpppdata.setScript(arglist);
+  PPPData::data()->setScriptType(typelist);
+  PPPData::data()->setScript(arglist);
 }
@@ -1156,3 +1156,3 @@ void ScriptWidget::removeButton() {
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
-    : QDialog(parent, 0, true ) {
+    : QDialog(parent,"PhoneNumberDialog",true) {
     setCaption( i18n("Add Phone Number") );
@@ -1167,4 +1167,4 @@ PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
 
-  le = newLineEdit(14, hbox);
-  le->setMinimumWidth(125);
+  le = new QLineEdit(hbox);
+//  le->setMinimumWidth(125);