4 files changed, 14 insertions, 14 deletions

diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 7d21605..3b2393c 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -527,98 +527,98 @@ void IPWidget::hitIPSelect( int i )
 DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
         : QWidget(parent, name), _pppdata(pd)
 {
     QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );
 
     dnsdomain_label = new QLabel(tr("Domain name:"), this);
     tl->addWidget(dnsdomain_label, 0, 0);
 
     dnsdomain = new QLineEdit(this);
 
     tl->addWidget(dnsdomain, 0, 1);
     QString tmp = tr("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(tr("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(tr("Automatic"), this);
     bg->insert(autodns, 0);
     tl->addWidget(autodns, 1, 1);
     if(!_pppdata->pppdVersionMin(2, 3, 7))
         autodns->setEnabled(false);
 
     mandns = new QRadioButton(tr("Manual"), this);
     bg->insert(mandns, 1);
     tl->addWidget(mandns, 2, 1);
 
     dns_label = new QLabel(tr("DNS IP address:"), this);
     tl->addWidget(dns_label, 3, 0);
 
     QHBoxLayout *l2 = new QHBoxLayout;
     tl->addLayout(l2, 3, 1);
     dnsipaddr = new IPLineEdit(this);
     connect(dnsipaddr, SIGNAL(returnPressed()),
             SLOT(adddns()));
-    connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
-            SLOT(DNS_Edit_Changed(const QString &)));
+    connect(dnsipaddr, SIGNAL(textChanged(const QString&)),
+            SLOT(DNS_Edit_Changed(const QString&)));
     l2->addWidget(dnsipaddr, 1);
     l2->addStretch(1);
     tmp = tr("<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(tr("Add"), this);
     connect(add, SIGNAL(clicked()), SLOT(adddns()));
     l1->addWidget(add);
     //  l1->addStretch(1);
     QWhatsThis::add(add,
                         tr("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(tr("Remove"), this);
     connect(remove, SIGNAL(clicked()), SLOT(removedns()));
     l1->addWidget(remove);
     QWhatsThis::add(remove,
                         tr("Click this button to remove the selected DNS\n"
                            "server entry from the list below"));
 
     servers_label = new QLabel(tr("DNS address list:"), this);
     servers_label->setAlignment(AlignTop|AlignLeft);
     tl->addWidget(servers_label, 5, 0);
 
     dnsservers = new QListBox(this);
     dnsservers->setMinimumSize(150, 80);
     connect(dnsservers, SIGNAL(highlighted(int)),
             SLOT(DNS_Entry_Selected(int)));
     tl->addWidget(dnsservers, 5, 1);
     tmp = tr("<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(tr("Disable DNS servers during connection"), this);
@@ -1139,73 +1139,73 @@ void ScriptWidget::insertButton()
         break;
     }
     adjustScrollBar();
     se->setText("");
 }
 
 
 void ScriptWidget::removeButton()
 {
     if(sl->currentItem() >= 0)
     {
         int stlc = stl->currentItem();
         sl->removeItem(sl->currentItem());
         stl->removeItem(stlc);
         adjustScrollBar();
         insert->setEnabled(sl->currentItem() != -1);
         remove->setEnabled(sl->currentItem() != -1);
     }
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
         : QDialog(parent,"PhoneNumberDialog",true)
 {
     setCaption( tr("Add Phone Number") );
 
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setSpacing( 3 );
     layout->setMargin( 3 );
 
     //    QHBox *hbox = new QHBox(this);
     //  setMainWidget(hbox);
 
     //  hbox->setSpacing( 2 );//KDialog::spacingHint());
 
     QLabel *label = new QLabel(this, tr("Enter a phone number:"));
     layout->addWidget( label );
 
     le = new QLineEdit(this, "lineEdit");
     layout->addWidget( le );
 
-    connect(le, SIGNAL(textChanged(const QString &)),
-            this, SLOT(textChanged(const QString &)));
+    connect(le, SIGNAL(textChanged(const QString&)),
+            this, SLOT(textChanged(const QString&)));
 
     le->setFocus();
     textChanged("");
 
 
 }
 
 
 QString PhoneNumberDialog::phoneNumber()
 {
     QString s = le->text();
 
     return s;
 }
 
 
 void PhoneNumberDialog::textChanged(const QString &s)
 {
     //  enableButtonOK(s.length() > 0);
 }
 
 
 //#include "edit.moc"
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp
index ff1b11b..81dab38 100644
--- a/noncore/settings/networksettings/ppp/general.cpp
+++ b/noncore/settings/networksettings/ppp/general.cpp
@@ -39,98 +39,98 @@
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qwhatsthis.h>
 
 /* STD */
 #include <termios.h>
 #include <string.h>
 
 
 ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name )
         : QWidget(parent, name), _pppdata(pd)
 {
     int k;
 
     QGridLayout *tl = new QGridLayout(this, 8, 2, 0 );//, KDialog::spacingHint());
 
     QLabel *label1;
 
     label1 = new QLabel(tr("Modem &name:"), this);
     tl->addWidget(label1, 0, 0);
 
     modemname = new QLineEdit(this, "modemName");
     modemname->setText( _pppdata->devname() );
     label1->setBuddy(modemname);
     tl->addWidget(modemname, 0, 1);
 
     label1 = new QLabel(tr("Modem de&vice:"), this);
     tl->addWidget(label1, 1, 0);
 
     modemdevice = new QComboBox(false, this);
     modemdevice->setEditable( true );
     modemdevice->setDuplicatesEnabled ( false );
     modemdevice->setInsertionPolicy( QComboBox::AtTop );
     label1->setBuddy(modemdevice);
 
     Config cfg("NetworkSetupPPP");
     cfg.setGroup("Devices_General");
     QStringList devs = cfg.readListEntry("devices",',');
     if (devs.isEmpty()) devs << "/dev/modem" << "/dev/ircomm0" << "/dev/ttyS0";
     modemdevice->insertStringList( devs );
     tl->addWidget(modemdevice, 1, 1);
 
     //   connect(modemdevice, SIGNAL(activated(int)),
             //   SLOT(setmodemdc(int)));
-    //   connect(modemdevice, SIGNAL(textChanged( const QString & ) ),
-    //           SLOT( setmodemdc( const QString &) ) );
+    //   connect(modemdevice, SIGNAL(textChanged(const QString&) ),
+    //           SLOT( setmodemdc(const QString&) ) );
 
     QString tmp = tr("This specifies the serial port your modem is attached \n"
                      "to. On Linux/x86, typically this is either /dev/ttyS0 \n"
                      "(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).\n"
                      "\n"
                      "If you have an internal ISDN card with AT command\n"
                      "emulation (most cards under Linux support this), you\n"
                      "should select one of the /dev/ttyIx devices.");
 
     QWhatsThis::add(label1,tmp);
     QWhatsThis::add(modemdevice,tmp);
 
 
     label1 = new QLabel(tr("&Flow control:"), this);
     tl->addWidget(label1, 2, 0);
 
     flowcontrol = new QComboBox(false, this);
     label1->setBuddy(flowcontrol);
     flowcontrol->insertItem(tr("Hardware [CRTSCTS]"));
     flowcontrol->insertItem(tr("Software [XON/XOFF]"));
     flowcontrol->insertItem(tr("None"));
     tl->addWidget(flowcontrol, 2, 1);
     //   connect(flowcontrol, SIGNAL(activated(int)),
             //   SLOT(setflowcontrol(int)));
 
     tmp = tr("<p>Specifies how the serial port and modem\n"
              "communicate. You should not change this unless\n"
              "you know what you are doing.\n"
              "\n"
              "<b>Default</b>: CRTSCTS");
 
     QWhatsThis::add(label1,tmp);
     QWhatsThis::add(flowcontrol,tmp);
 
     QLabel *labelenter = new QLabel(tr("&Line termination:"), this);
     tl->addWidget(labelenter, 3, 0);
 
     enter = new QComboBox(false, this);
     labelenter->setBuddy(enter);
     enter->insertItem("CR");
     enter->insertItem("LF");
     enter->insertItem("CR/LF");
     tl->addWidget(enter, 3, 1);
     //  connect(enter, SIGNAL(activated(int)), SLOT(setenter(int)));
     tmp = tr("<p>Specifies how AT commands are sent to your\n"
              "modem. Most modems will work fine with the\n"
              "default <i>CR/LF</i>. If your modem does not react\n"
              "to the init string, you should try different\n"
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp
index e466358..e21bbc7 100644
--- a/noncore/settings/networksettings/ppp/kpppwidget.cpp
+++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp
@@ -351,101 +351,101 @@ void KPPPWidget::shutDown() {
     interruptConnection();
     saveMyself();
 }
 
 void KPPPWidget::log_window_toggled(bool on) {
   _pppdata->set_show_log_window(on);
 }
 
 
 
 
 // void KPPPWidget::resetaccounts() {
 //   connectto_c->clear();
 
 //   int count = _pppdata->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++) {
 //     _pppdata->setAccountbyIndex(i);
 //      connectto_c->insertItem(_pppdata->accname());
 //   }
 
 //   //set the default account
 //   if(!_pppdata->defaultAccount().isEmpty()) {
 //     for(int i=0; i < count; i++)
 //        if(_pppdata->defaultAccount() == connectto_c->text(i)) {
         //  connectto_c->setCurrentItem(i);
         // _pppdata->setAccountbyIndex(i);
 
         // ID_Edit->setText(_pppdata->storedUsername());
         // PW_Edit->setText(_pppdata->storedPassword());
 //     }
 //   }
 //   else
 //     if(count > 0) {
 //        _pppdata->setDefaultAccount(connectto_c->text(0));
 //         _pppdata->save();
         // ID_Edit->setText(_pppdata->storedUsername());
         // PW_Edit->setText(_pppdata->storedPassword());
 //     }
 
-//   connect(ID_Edit, SIGNAL(textChanged(const QString &)),
-        //    this, SLOT(usernameChanged(const QString &)));
+//   connect(ID_Edit, SIGNAL(textChanged(const QString&)),
+        //    this, SLOT(usernameChanged(const QString&)));
 
-//   connect(PW_Edit, SIGNAL(textChanged(const QString &)),
-        //    this, SLOT(passwordChanged(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 (_pppdata->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(_pppdata->pppdRunning() || _pppdata->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);
 
         _pppdata->setpppdRunning(false);
 
         qDebug( "Executing command on disconnect since pppd has died." );
         QApplication::flushX();
         execute_command(_pppdata->command_on_disconnect());
 
 //      stopAccounting();
 
         con_win->stopClock();
@@ -676,98 +676,98 @@ void KPPPWidget::disconnect() {
 // void KPPPWidget::helpbutton() {
 //   kapp->invokeHelp();
 // }
 
 
 void KPPPWidget::quitbutton() {
   if(_pppdata->pppdRunning()) {
     int ok = QMessageBox::warning(this,
                             QObject::tr("Exiting kPPP will close your PPP Session."),
                             QObject::tr("Quit kPPP?"));
     if(ok == QMessageBox::Yes) {
       Modem::modem->killPPPDaemon();
       QApplication::flushX();
       execute_command(_pppdata->command_on_disconnect());
       removedns();
       Modem::modem->unlockdevice();
     }
   } else {
     if (!_pppdata->accname().isEmpty() && !_pppdata->storePassword())
       _pppdata->setStoredPassword("");
   }
   _pppdata->save();
   qApp->quit();
 }
 
 
 // void KPPPWidget::rulesetLoadError() {
 //   QMessageBox::warning(this,"error", ruleset_load_errmsg);
 // }
 
 
 // void KPPPWidget::startAccounting() {
 //   // volume accounting
 //   stats->totalbytes = 0;
 
 //   kdDebug() << "AcctEnabled: " << _pppdata->AcctEnabled() << endl;
 
 //   // load the ruleset
 //   if(!_pppdata->AcctEnabled())
 //     return;
 
 //   QString d = AccountingBase::getAccountingFile(_pppdata->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)));
+//   connect(acct, SIGNAL(changed(QString,QString)),
+        //   con_win, SLOT(slotAccounting(QString,QString)));
 
 // //   if(!acct->loadRuleSet(_pppdata->accountingFile())) {
 // //     QString s= QObject::tr("Can not load the accounting "
         // //               "ruleset \"%1\"!").arg(_pppdata->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)
 // //     _pppdata->setTotalBytes(stats->totalbytes);
 
 //   if(!_pppdata->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
   _pppdata->setStoredUsername(ID_Edit->text());
 }
 
 
 void KPPPWidget::passwordChanged(const QString &) {
     // store the password if so requested
   if(_pppdata->storePassword())
diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp
index 66a4d82..d6d8d88 100644
--- a/noncore/settings/networksettings/ppp/pppdargs.cpp
+++ b/noncore/settings/networksettings/ppp/pppdargs.cpp
@@ -10,98 +10,98 @@
  * Copyright (C) 1997  Jay Painter
  *
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <qlayout.h>
 #include <qbuttongroup.h>
 #include <qapplication.h>
 #include "pppdargs.h"
 #include "pppdata.h"
 
 
 PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
     : QDialog(parent, name, TRUE), _pppdata(pd)
 {
   setCaption(tr("Customize pppd Arguments"));
 //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
   QVBoxLayout *l = new QVBoxLayout(this, 10, 10);
   QHBoxLayout *tl = new QHBoxLayout(10);
   l->addLayout(tl);
   QVBoxLayout *l1 = new QVBoxLayout();
   QVBoxLayout *l2 = new QVBoxLayout();
   tl->addLayout(l1, 1);
   tl->addLayout(l2, 0);
 
   QHBoxLayout *l11 = new QHBoxLayout(10);
   l1->addLayout(l11);
 
   argument_label = new QLabel(tr("Argument:"), this);
   l11->addWidget(argument_label);
 
   argument = new QLineEdit(this);
   connect(argument, SIGNAL(returnPressed()),
           SLOT(addbutton()));
   l11->addWidget(argument);
-  connect(argument, SIGNAL(textChanged(const QString &)),
-          this, SLOT(textChanged(const QString &)));
+  connect(argument, SIGNAL(textChanged(const QString&)),
+          this, SLOT(textChanged(const QString&)));
 
   arguments = new QListBox(this);
   arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10);
   connect(arguments, SIGNAL(highlighted(int)),
           this, SLOT(itemSelected(int)));
   l1->addWidget(arguments, 1);
 
   add = new QPushButton(tr("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(addbutton()));
   l2->addWidget(add);
   l2->addStretch(1);
 
   remove = new QPushButton(tr("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removebutton()));
   l2->addWidget(remove);
 
   defaults = new QPushButton(tr("Defaults"), this);
   connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton()));
   l2->addWidget(defaults);
 
   l->addSpacing(5);
 
 
   //load info from gpppdata
   init();
 
   add->setEnabled(false);
   remove->setEnabled(false);
   argument->setFocus();
 }
 
 
 void PPPdArguments::addbutton() {
   if(!argument->text().isEmpty() && arguments->count() < MAX_PPPD_ARGUMENTS) {
     arguments->insertItem(argument->text());
     argument->setText("");
   }
 }
 
 
 void PPPdArguments::removebutton() {
   if(arguments->currentItem() >= 0)
     arguments->removeItem(arguments->currentItem());
 }
 
 
 void PPPdArguments::defaultsbutton() {
   // all of this is a hack