7 files changed, 24 insertions, 24 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
index 698dfd3..ff65424 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
@@ -1,104 +1,104 @@
 
 #include "interfaceinformationimp.h"
 #include "interfaceadvanced.h"
 
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qmessagebox.h>
 
 
 #ifdef QWS
 #else
  #define showMaximized show
 #endif
 
 /**
  * Constructor for the InterfaceInformationImp class.  This class pretty much
  * just display's information about the interface that is passed to it.
  */
 InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i)
 {
-    connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
-    connect(i, SIGNAL(updateMessage(const QString &)), this, SLOT(showMessage(const QString &)));
+    connect(i, SIGNAL(updateInterface(Interface*)), this, SLOT(updateInterface(Interface*)));
+    connect(i, SIGNAL(updateMessage(const QString&)), this, SLOT(showMessage(const QString&)));
     updateInterface(interface);
     connect(startButton, SIGNAL(clicked()), interface, SLOT(start()));
     connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop()));
     connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart()));
     connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh()));
     connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced()));
     Config cfg("networksettings", Config::User);
     cfg.setGroup("interface");
     CheckBoxSilent->setChecked( cfg.readBoolEntry("silent", false) );
 }
 
 InterfaceInformationImp::~InterfaceInformationImp()
 {
     Config cfg("networksettings", Config::User);
     cfg.setGroup("interface");
     cfg.writeEntry("silent", CheckBoxSilent->isChecked() );
 }
 
 /**
  * Update the interface information and buttons.
  * @param Intarface *i the interface to update (should be the one we already
  *                     know about).
  */
 void InterfaceInformationImp::updateInterface(Interface *)
 {
     if(interface->getStatus())
     {
         startButton->setEnabled(false);
         stopButton->setEnabled(true);
         restartButton->setEnabled(true);
     }
     else
     {
         startButton->setEnabled(true);
         stopButton->setEnabled(false);
         restartButton->setEnabled(false);
     }
     macAddressLabel->setText(interface->getMacAddress());
     ipAddressLabel->setText(interface->getIp());
     subnetMaskLabel->setText(interface->getSubnetMask());
     broadcastLabel->setText(interface->getBroadcast());
 }
 
 /**
  * Create the advanced widget. Fill it with the current interface's information.
  * Display it.
  */
 void InterfaceInformationImp::advanced()
 {
     InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
     a->interfaceName->setText(interface->getInterfaceName());
     a->macAddressLabel->setText(interface->getMacAddress());
     a->ipAddressLabel->setText(interface->getIp());
     a->subnetMaskLabel->setText(interface->getSubnetMask());
     a->broadcastLabel->setText(interface->getBroadcast());
     a->dhcpServerLabel->setText(interface->getDhcpServerIp());
     a->leaseObtainedLabel->setText(interface->getLeaseObtained());
     a->leaseExpiresLabel->setText(interface->getLeaseExpires());
     a->dhcpInformation->setEnabled(interface->isDhcp());
     QPEApplication::showWidget( a );
 }
 
 /**
  * Messages from the interface if start/stop went as planned.
  * Purly for user feedback.
  * @param message the message to display.
  */
 void InterfaceInformationImp::showMessage(const QString &message)
 {
     if (CheckBoxSilent->isChecked()) return;
     QMessageBox::information(this, "Message", message, QMessageBox::Ok);
 }
 
 // infoimp.cpp
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index b0a1dd9..1e16b97 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -4,365 +4,365 @@
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
 #include "interfaces.h"
 #include "module.h"
 
 /* OPIE */
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
 
 /* QT */
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qtabwidget.h> // in order to disable the profiles tab
 #include <qmessagebox.h>
 
 
 #if QT_VERSION < 300
 #include <qlist.h>
 #else
 #include <qptrlist.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 /* STD */
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
 #define _PROCNETDEV "/proc/net/dev"
 
 MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME)
 {
     connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
     connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
     connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
     connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
 
     connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
     connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
     connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
 
     connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
 
     //FIXME: disable profiles for the moment:
     tabWidget->setTabEnabled( tab, false );
 
     // Load connections.
     // /usr/local/kde/lib/libinterfaces.la
 #ifdef QWS
     loadModules(QPEApplication::qpeDir() + "plugins/networksettings");
 #else
     loader = KLibLoader::self();
     loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
 #endif
     getAllInterfaces();
 
     Interfaces i;
     QStringList list = i.getInterfaceList();
     QMap<QString, Interface*>::Iterator it;
     for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni )
     {
         /*
          * we skipped it in getAllInterfaces now
          * we need to ignore it as well
          */
         if (m_handledIfaces.contains( *ni) )
         {
             qDebug("Not up iface handled by module");
             continue;
         }
         bool found = false;
         for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it )
         {
             if(it.key() == (*ni))
                 found = true;
         }
         if(!found)
         {
             if(!(*ni).contains("_"))
             {
                 Interface *i = new Interface(this, *ni, false);
                 i->setAttached(false);
                 i->setHardwareName(tr("Disconnected"));
                 interfaceNames.insert(i->getInterfaceName(), i);
                 updateInterface(i);
-                connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
+                connect(i, SIGNAL(updateInterface(Interface*)), this, SLOT(updateInterface(Interface*)));
             }
         }
     }
 
     //getInterfaceList();
     connectionList->header()->hide();
 
     Config cfg("NetworkSetup");
     profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
     for ( QStringList::Iterator it = profiles.begin();
             it != profiles.end(); ++it)
         profilesList->insertItem((*it));
     currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All"));
     advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
     scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME);
 
     QFile file(scheme);
     if ( file.open(IO_ReadOnly) )
     {    // file opened successfully
         QTextStream stream( &file );        // use a text stream
         while ( !stream.eof() )
         {        // until end of file...
             QString line = stream.readLine();       // line of text excluding '\n'
             if(line.contains("SCHEME"))
             {
                 line = line.mid(7, line.length());
                 currentProfileLabel->setText(line);
                 break;
             }
         }
         file.close();
     }
     makeChannel();
 }
 
 /**
  * Deconstructor. Save profiles.  Delete loaded libraries.
  */
 MainWindowImp::~MainWindowImp()
 {
     // Save profiles.
     Config cfg("NetworkSetup");
     cfg.setGroup("General");
     cfg.writeEntry("Profiles", profiles.join(" "));
 
     // Delete all interfaces that don't have owners.
     QMap<Interface*, QListViewItem*>::Iterator iIt;
     for( iIt = items.begin(); iIt != items.end(); ++iIt )
     {
         if(iIt.key()->getModuleOwner() == NULL)
             delete iIt.key();
     }
 
 #ifdef QWS
     // Delete Modules and Libraries
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         delete it.key();
         // I wonder why I can't delete the libraries
         // What fucking shit this is.
         //delete it.data();
     }
 #else
     // klibloader automaticly deletes the libraries for us...
 #endif
 }
 
 /**
  * Query the kernel for all of the interfaces.
  */
 void MainWindowImp::getAllInterfaces()
 {
     int sockfd = socket(PF_INET, SOCK_DGRAM, 0);
     if(sockfd == -1)
         return;
 
     struct ifreq ifr;
     QStringList ifaces;
     QFile procFile(QString(_PROCNETDEV));
     int result;
     Interface *i;
 
     if (! procFile.exists())
     {
         struct ifreq ifrs[100];
         struct ifconf ifc;
         ifc.ifc_len = sizeof(ifrs);
         ifc.ifc_req = ifrs;
         result = ioctl(sockfd, SIOCGIFCONF, &ifc);
 
         for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++)
         {
             struct ifreq *pifr = &ifrs[i];
 
             ifaces += pifr->ifr_name;
         }
     }
     else
     {
         procFile.open(IO_ReadOnly);
         QString line;
         QTextStream procTs(&procFile);
         int loc = -1;
 
         procTs.readLine(); // eat a line
         procTs.readLine(); // eat a line
         while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null)
         {
             if((loc = line.find(":")) != -1)
             {
                 ifaces += line.left(loc);
             }
         }
     }
 
     for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it)
     {
         int flags = 0;
         if ( m_handledIfaces.contains( (*it) ) )
         {
             qDebug(" %s is handled by a module", (*it).latin1() );
             continue;
         }
         //    int family;
         i = NULL;
 
         strcpy(ifr.ifr_name, (*it).latin1());
 
         struct ifreq ifcopy;
         ifcopy = ifr;
         result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);
         flags = ifcopy.ifr_flags;
         i = new Interface(this, ifr.ifr_name, false);
         i->setAttached(true);
         if ((flags & IFF_UP) == IFF_UP)
             i->setStatus(true);
         else
             i->setStatus(false);
 
         if ((flags & IFF_BROADCAST) == IFF_BROADCAST)
             i->setHardwareName("Ethernet");
         else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)
             i->setHardwareName("Point to Point");
         else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)
             i->setHardwareName("Multicast");
         else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)
             i->setHardwareName("Loopback");
         else
             i->setHardwareName("Unknown");
 
         qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name);
         interfaceNames.insert(i->getInterfaceName(), i);
         updateInterface(i);
-        connect(i, SIGNAL(updateInterface(Interface *)),
-                this, SLOT(updateInterface(Interface *)));
+        connect(i, SIGNAL(updateInterface(Interface*)),
+                this, SLOT(updateInterface(Interface*)));
     }
     // now lets ask the plugins too ;)
     QMap<Module*, QLibrary*>::Iterator it;
     QList<Interface> ilist;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         if(it.key())
         {
             ilist = it.key()->getInterfaces();
             for( i = ilist.first(); i != 0; i = ilist.next() )
             {
                 qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() );
                 interfaceNames.insert(i->getInterfaceName(), i);
                 updateInterface(i);
-                connect(i, SIGNAL(updateInterface(Interface *)),
-                        this, SLOT(updateInterface(Interface *)));
+                connect(i, SIGNAL(updateInterface(Interface*)),
+                        this, SLOT(updateInterface(Interface*)));
             }
         }
     }
 }
 
 /**
  * Load all modules that are found in the path
  * @param path a directory that is scaned for any plugins that can be loaded
  *  and attempts to load them
  */
 void MainWindowImp::loadModules(const QString &path)
 {
 #ifdef DEBUG
     qDebug("MainWindowImp::loadModules: %s", path.latin1());
 #endif
     QDir d(path);
     if(!d.exists())
         return;
 
     // Don't want sym links
     d.setFilter( QDir::Files | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
 #ifdef QWS
         if(fi->fileName().contains(".so"))
         {
 #else
         if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_"))
         {
 #endif
             loadPlugin(path + "/" + fi->fileName());
             qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1());
         }
         ++it;
     }
 }
 
 /**
  * Attempt to load a function and resolve a function.
  * @param pluginFileName - the name of the file in which to attempt to load
  * @param resolveString - function pointer to resolve
  * @return pointer to the function with name resolveString or NULL
  */
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString)
 {
 #ifdef DEBUG
     qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1());
 #endif
 #ifdef QWS
     QLibrary *lib = new QLibrary(pluginFileName);
     void *functionPointer = lib->resolve(resolveString);
     if( !functionPointer )
     {
 #ifdef DEBUG
         qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1());
 #endif
         delete lib;
         return NULL;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) functionPointer)();
     if(object == NULL)
     {
 #ifdef DEBUG
         qDebug("MainWindowImp: Couldn't create object, but did load library!");
 #endif
         delete lib;
         return NULL;
     }
 
     m_handledIfaces += object->handledInterfaceNames();
     // Store for deletion later
     libraries.insert(object, lib);
     return object;
 
 #else
     QLibrary *lib = loader->library(pluginFileName);
     if( !lib || !lib->hasSymbol(resolveString) )
     {
         qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
         return NULL;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) lib->symbol(resolveString))();
     if(object == NULL)
     {
 #ifdef DEBUG
         qDebug("MainWindowImp: Couldn't create object, but did load library!");
 #endif
         return NULL;
     }
 #ifdef DEBUG
     qDebug("MainWindowImp::loadPlugin:: Found object, storing.");
@@ -619,130 +619,130 @@ void MainWindowImp::removeProfile()
 {
     if(profilesList->count() <= 1)
     {
         QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);
         return;
     }
     QString profileToRemove = profilesList->currentText();
     if(profileToRemove == "All")
     {
         QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);
         return;
     }
     // Can't remove the curent profile
     if(profileToRemove == currentProfileLabel->text())
     {
         QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);
         return;
 
     }
 
     if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok)
     {
         profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));
         profilesList->clear();
         for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
             profilesList->insertItem((*it));
 
         // Remove any interface settings and mappings.
         Interfaces interfaces;
         // Go through them one by one
         QMap<Interface*, QListViewItem*>::Iterator it;
         for( it = items.begin(); it != items.end(); ++it )
         {
             QString interfaceName = it.key()->getInterfaceName();
             qDebug(interfaceName.latin1());
             if(interfaces.setInterface(interfaceName + "_" + profileToRemove))
             {
                 interfaces.removeInterface();
                 if(interfaces.setMapping(interfaceName))
                 {
                     if(profilesList->count() == 1)
                         interfaces.removeMapping();
                     else
                     {
                         interfaces.removeMap("map", interfaceName + "_" + profileToRemove);
                     }
                 }
                 interfaces.write();
                 break;
             }
         }
     }
 }
 
 /**
  * A new profile has been selected, change.
  * @param newProfile the new profile.
  */
 void MainWindowImp::changeProfile()
 {
     if(profilesList->currentItem() == -1)
     {
         QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);
         return;
     }
     QString newProfile = profilesList->text(profilesList->currentItem());
     if(newProfile != currentProfileLabel->text())
     {
         currentProfileLabel->setText(newProfile);
         QFile::remove(scheme);
         QFile file(scheme);
         if ( file.open(IO_ReadWrite) )
         {
             QTextStream stream( &file );
             stream << QString("SCHEME=%1").arg(newProfile);
             file.close();
         }
         // restart all up devices?
         if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok)
         {
             // Go through them one by one
             QMap<Interface*, QListViewItem*>::Iterator it;
             for( it = items.begin(); it != items.end(); ++it )
             {
                 if(it.key()->getStatus() == true)
                     it.key()->restart();
             }
         }
     }
     // TODO change the profile in the modules
 }
 
 
 void MainWindowImp::makeChannel()
 {
     channel = new QCopChannel( "QPE/Application/networksettings", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(receive(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(receive(const QCString&,const QByteArray&)) );
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
     if (msg == "raise")
     {
         raise();
         return;
     }
 
     QString dest = msg.left(msg.find("("));
     QCString param = msg.right(msg.length() - msg.find("(") - 1);
     param = param.left( param.length() - 1 );
     qDebug("dest >%s< param >"+param+"<",dest.latin1());
 
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         qDebug("plugin >%s<", it.key()->type().latin1() );
         if(it.key()->type() == dest)
         {
             it.key()->receive( param, arg );
             found = true;
         }
     }
 
 
     if (found) QPEApplication::setKeepRunning();
     else qDebug("Huh what do ya want");
 }
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
@@ -479,194 +479,194 @@ void IPWidget::autoname_t(bool on)
                                     "problems with the X-server and applications "
                                     "while kppp is connected. Don't use it until "
                                     "you know what you are doing!\n"
                                     "For more information take a look at the "
                                     "handbook (or help) in the section \"Frequently "
                                     "asked questions\"."),
                                  tr("Warning"));
         was_warned = true;
     }
 }
 
 
 void IPWidget::save()
 {
     if(dynamicadd_rb->isChecked())
     {
         _pppdata->setIpaddr("0.0.0.0");
         _pppdata->setSubnetmask("0.0.0.0");
     }
     else
     {
         _pppdata->setIpaddr(ipaddress_l->text());
         _pppdata->setSubnetmask(subnetmask_l->text());
     }
     _pppdata->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( 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);
     // exdnsdisabled_toggle = new QCheckBox(tr("Disable existing DNS servers during connection"), this);
     exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
     tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
     QWhatsThis::add(exdnsdisabled_toggle,
                         tr("<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(_pppdata->dns());
         dnsdomain->setText(_pppdata->domain());
     }
 
     int mode = _pppdata->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)
 {
     remove->setEnabled(true);
 }
 
 void DNSWidget::DNS_Mode_Selected(int mode)
 {
     bool on = (mode == 1);
     dns_label->setEnabled(on);
     servers_label->setEnabled(on);
     dnsipaddr->setText("");
     dnsipaddr->setEnabled(on);
     add->setEnabled(false);
@@ -1091,121 +1091,121 @@ void ScriptWidget::insertButton()
         break;
 
     case ScriptEdit::Timeout:
         stl->insertItem("Timeout", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Password:
         stl->insertItem("Password", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::ID:
         stl->insertItem("ID", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Prompt:
         stl->insertItem("Prompt", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::PWPrompt:
         stl->insertItem("PWPrompt", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::LoopStart:
         stl->insertItem("LoopStart", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::LoopEnd:
         stl->insertItem("LoopEnd", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Scan:
         stl->insertItem("Scan", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Save:
         stl->insertItem("Save", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     default:
         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
@@ -1,184 +1,184 @@
 /*
  *            kPPP: A pppd front end for the KDE project
  *
  * $Id$
  *
  *            Copyright (C) 1997 Bernd Johannes Wuebben
  *                   wuebben@math.cornell.edu
  *
  * based on EzPPP:
  * Copyright (C) 1997  Jay Painter
  *
  * This program 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 program 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 "general.h"
 #include "interfaceppp.h"
 #include "modeminfo.h"
 #include "modemcmds.h"
 #include "pppdata.h"
 
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #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"
              "settings here\n"
              "\n"
              "<b>Default</b>: CR/LF");
 
     QWhatsThis::add(labelenter,tmp);
     QWhatsThis::add(enter, tmp);
 
     QLabel *baud_label = new QLabel(tr("Co&nnection speed:"), this);
     tl->addWidget(baud_label, 4, 0);
     baud_c = new QComboBox(this);
     baud_label->setBuddy(baud_c);
 
     static const char *baudrates[] =
         {
 
 #ifdef B460800
             "460800",
 #endif
 
 #ifdef B230400
             "230400",
 #endif
 
 #ifdef B115200
             "115200",
 #endif
 
 #ifdef B57600
             "57600",
 #endif
 
             "38400",
             "19200",
             "9600",
             "2400",
             0
         };
 
     for(k = 0; baudrates[k]; k++)
         baud_c->insertItem(baudrates[k]);
 
     baud_c->setCurrentItem(3);
     //   connect(baud_c, SIGNAL(activated(int)),
             //   this, SLOT(speed_selection(int)));
     tl->addWidget(baud_c, 4, 1);
 
     tmp = tr("Specifies the speed your modem and the serial\n"
              "port talk to each other. You should begin with\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
@@ -303,197 +303,197 @@ KPPPWidget::~KPPPWidget()
 
 // bool KPPPWidget::eventFilter(QObject *o, QEvent *e) {
 //   if(e->type() == QEvent::User) {
 //     switch(((SignalEvent*)e)->sigType()) {
 //     case SIGINT:
 //       qDebug( "Received a SIGINT" );
 //       interruptConnection();
 //       break;
 //     case SIGCHLD:
 //       sigChld();
 //       break;
 //     case SIGUSR1:
 //       sigPPPDDied();
 //       break;
 //     }
 //     return true;
 //   }
 
 //     if(o == connect_b) {
 //       if(e->type() == QEvent::KeyPress) {
 //         if(connect_b->hasFocus() && ((QKeyEvent *)e)->key() == Qt::Key_Return) {
 //           beginConnect();
 //           return true;
 //         }
 //       }
 //     }
 
 //     return false;
 // }
 
 
 
 
 void KPPPWidget::enterPressedInID() {
   PW_Edit->setFocus();
 }
 
 
 void KPPPWidget::enterPressedInPW() {
   connect_b->setFocus();
 }
 
 // triggered by the session manager
 void KPPPWidget::saveMyself() {
     _pppdata->save();
 }
 
 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();
 //       DockWidget::dock_widget->stop_stats();
 //       DockWidget::dock_widget->hide();
 
         if(!_pppdata->pppdError())
             _pppdata->setpppdError(E_PPPD_DIED);
         removedns();
         Modem::modem->unlockdevice();
         //
         con->pppdDied();
 
         if(!_pppdata->automatic_redial()) {
             quit_b->setFocus();
             show();
             con_win->stopClock();
         //stopAccounting();
             con_win->hide();
             con->hide();
 
             _pppdata->setpppdRunning(false);
             // // not in a signal handler !!!  KNotifyClient::beep();
             QString msg;
             if (_pppdata->pppdError() == E_IF_TIMEOUT)
                 msg = QObject::tr("Timeout expired while waiting for the PPP interface "
                            "to come up!");
             else {
                 msg = QObject::tr("<p>The pppd daemon died unexpectedly!</p>");
                 Modem::modem->pppdExitStatus();
                         if (Modem::modem->lastStatus != 99) {// more recent pppds only
                     msg += QObject::tr("<p>Exit status: %1").arg(Modem::modem->lastStatus);
                     msg += QObject::tr("</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, QObject::tr("Error"), QObject::tr("&OK"), QObject::tr("&Details...")) == QMessageBox::No)
         // //  PPPL_ShowLog();
 //       } else { /* reconnect on disconnect */
             if (false){
                 qDebug( "Trying to reconnect... " );
 
                 if(_pppdata->authMethod() == AUTH_PAP ||
                    _pppdata->authMethod() == AUTH_CHAP ||
                    _pppdata->authMethod() == AUTH_PAPCHAP)
                     Modem::modem->setSecret(_pppdata->authMethod(),
                                             encodeWord(_pppdata->storedUsername()),
                                             encodeWord(_pppdata->password()));
@@ -628,194 +628,194 @@ void KPPPWidget::disconnect() {
      con->setCaption(QObject::tr("Disconnecting..."));
      con->setMsg(QObject::tr("Executing command before disconnection."));
 
     qApp->processEvents();
     QApplication::flushX();
 //    pid_t id =
         execute_command(_pppdata->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(_pppdata->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();
 //   DockWidget::dock_widget->hide();
 
 //   if(m_bQuitOnDisconnect)
 //     kapp->exit(0);
 //   else {
     this->quit_b->setFocus();
     this->show();
 //  }
 }
 
 
 // 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())
     _pppdata->setStoredPassword(PW_Edit->text());
   else
     _pppdata->setStoredPassword("");
 }
 
 
 void KPPPWidget::setPW_Edit(const QString &pw) {
   PW_Edit->setText(pw);
 }
 
 
 // void KPPPWidget::resetCosts(const QString &s) {
 //   AccountingBase::resetCosts(s);
 // }
 
 
 // void KPPPWidget::resetVolume(const QString &s) {
 //   AccountingBase::resetVolume(s);
 // }
 
 /**
  * pppd's getword() function knows about escape characters.
  * If we write the username and password to the secrets file
  * we'll therefore have to escape back slashes.
  */
 QString KPPPWidget::encodeWord(const QString &s) {
     QString r = s;
     r.replace(QRegExp("\\"), "\\\\");
     return r;
 }
 
 // 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(_pppdata->readNumConfig(GENERAL_GRP, QUICKHELP_HINT, 0) == 0) {
     QDialog dlg(0, 0, true);
     dlg.setCaption(QObject::tr("Recent Changes in KPPP"));
 
     QVBoxLayout *tl = new QVBoxLayout(&dlg, 10, 10);
     QHBoxLayout *l1 = new QHBoxLayout(10);
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
@@ -1,151 +1,151 @@
 /*
  *            kPPP: A pppd front end for the KDE project
  *
  * $Id$
  *
  *            Copyright (C) 1997 Bernd Johannes Wuebben
  *                   wuebben@math.cornell.edu
  *
  * based on EzPPP:
  * 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
   // save current list
   QStringList arglist(_pppdata->pppdArgument());
 
   // get defaults
   _pppdata->setpppdArgumentDefaults();
   init();
 
   // restore old list
   _pppdata->setpppdArgument(arglist);
 }
 
 
 void PPPdArguments::accept() {
   QStringList arglist;
   for(uint i=0; i < arguments->count(); i++)
     arglist.append(arguments->text(i));
   _pppdata->setpppdArgument(arglist);
 
   QDialog::accept();
 }
 
 
 void PPPdArguments::init() {
   while(arguments->count())
     arguments->removeItem(0);
 
   QStringList &arglist = _pppdata->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);
 }
 
 
 void PPPdArguments::itemSelected(int idx) {
   remove->setEnabled(idx != -1);
 }
 
 
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index 92339d6..dd1db28 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -1,153 +1,153 @@
 #include "wlanimp2.h"
 #include "keyedit.h"
 #include "interfacesetupimp.h"
 
 #include "../interfaces/interface.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #include <qapplication.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qvbox.h>
 #include <qprogressbar.h>
 
 #ifdef QWS
  #include <qpe/resource.h>
  #include <opie2/oprocess.h>
  #include <opie2/onetwork.h>
  #include <opie2/opcap.h>
 #else
  #define OProcess KProcess
  #include <kprocess.h>
 #endif
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 #define PREUP "/etc/network/if-pre-up.d/wireless-tools"
 
 /**
  * Constructor, read in the wireless.opts file for parsing later.
  */
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") {
   interfaces = new Interfaces();
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Check sanity - the existance of the wireless-tools if-pre-up script
   QFile file(QString(PREUP));
   if (file.exists()) {
     qWarning(QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools"));
   }
 
   connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) );
-  connect( netView, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( selectNetwork( QListViewItem* ) ) );
+  connect( netView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( selectNetwork(QListViewItem*) ) );
   netView->setColumnAlignment( col_chn, AlignCenter );
   netView->setItemMargin( 3 );
   netView->setAllColumnsShowFocus( true );
 
 }
 
 WLANImp::~WLANImp() {
 //FIXME:  delete interfaces;
 }
 
 /**
  * Change the profile for both wireless settings and network settings.
  */
 void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
   parseOpts();
 }
 
 void WLANImp::parseOpts() {
   bool error;
   QString opt;
 
   if (! interfaces->isInterfaceSet())
     return;
 
 
   opt = interfaces->getInterfaceOption("wireless_essid", error);
   if(opt == "any" || opt == "off" || opt.isNull()){
     essid->setEditText("any");
   } else {
     essid->setEditText(opt);
   }
 
   opt = interfaces->getInterfaceOption("wireless_mode", error).simplifyWhiteSpace();
 
   for ( int i = 0; i < mode->count(); i++)
       if ( mode->text( i ) == opt ) mode->setCurrentItem( i );
 
   opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace();
   if (! opt.isNull()) {
     specifyAp->setChecked(true);
     macEdit->setText(opt);
   }
 
   opt = interfaces->getInterfaceOption("wireless_channel", error).simplifyWhiteSpace();
   if (! opt.isNull()) {
     specifyChan->setChecked(true);
     networkChannel->setValue(opt.toInt());
   }
 
   opt = interfaces->getInterfaceOption("wireless_key", error).simplifyWhiteSpace();
   if (opt.isNull())
     opt = interfaces->getInterfaceOption("wireless_enc", error).simplifyWhiteSpace();
   parseKeyStr(opt);
 }
 
 void WLANImp::parseKeyStr(QString keystr) {
   int loc = 0;
   int index = 1;
   QString key;
   QStringList keys = QStringList::split(QRegExp("\\s+"), keystr);
   int enc = -1; // encryption state
 
   for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) {
     if ((*it).left(3) == "off") {
       // encryption disabled
       enc = 0;
     } else if ((*it).left(2) == "on") {
       // encryption enabled
       enc = 1;
     } else if ((*it).left(4) == "open") {
       // open mode, accept non encrypted packets
       acceptNonEnc->setChecked(true);
     } else if ((*it).left(10) == "restricted") {
       // restricted mode, only accept encrypted packets
       rejectNonEnc->setChecked(true);
     } else if ((*it).left(3) == "key") {
       // new set of options
     } else if ((*it).left(1) == "[") {
       index = (*it).mid(1, 1).toInt();
       // switch current key to index
       switch (index) {
         case 1:
           keyRadio0->setChecked(true);
       break;
         case 2:
           keyRadio1->setChecked(true);
       break;
         case 3:
           keyRadio2->setChecked(true);
       break;
         case 4:
           keyRadio3->setChecked(true);
       break;
       }
     } else {