Resource -> OResource and fix compiler warning

3 files changed, 15 insertions, 19 deletions

diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index a7b0bdc..650e634 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -1,793 +1,785 @@
 
 #include "mainwindowimp.h"
 #include "addconnectionimp.h"
 #include "interfaceinformationimp.h"
 #include "interfacesetupimp.h"
 #include "interfaces.h"
 #include "module.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/oprocess.h>
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 #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>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 
 #if QT_VERSION < 0x030000
 #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"
 
 // is this always right?
 #define _HOSTFILE "/etc/hostname"
 #define _IRDANAME "/proc/sys/net/irda/devname"
 
 using namespace Opie::Core;
 
 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()));
 
     //remove tab with no function
     tabWidget->removePage( tab );
 
     // Load connections.
     // /usr/local/kde/lib/libinterfaces.la
     loadModules(QPEApplication::qpeDir() + "plugins/networksettings");
     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) )
         {
             odebug << "Not up iface handled by module" << oendl;
             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*)));
             }
         }
     }
 
     //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();
     initHostname();
 }
 
 /**
  * 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();
     }
 
     // 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();
     }
 }
 
 /**
  * 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];
             if ( !QString( pifr->ifr_name ).startsWith( "wifi" ) ) ifaces += pifr->ifr_name;
             else odebug << "ignoring hostap control interface " << pifr->ifr_name << oendl;
         }
     }
     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)
             {
                 // ignore wifi* (hostap control interfaces)
                 if ( !line.left(loc).startsWith( "wifi" ) ) ifaces += line.left(loc);
                 else odebug << "ignoring hostap control interface " << line.left(loc) << oendl;
             }
         }
     }
 
     for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it)
     {
         int flags = 0;
         if ( m_handledIfaces.contains( (*it) ) )
         {
             odebug << " " << (*it).latin1() << " is handled by a module" << oendl;
             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");
 
         owarn << "Adding interface " << ifr.ifr_name << " to interfaceNames\n" << oendl;
         interfaceNames.insert(i->getInterfaceName(), i);
         updateInterface(i);
         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() )
             {
                 owarn << "Adding interface " << i->getInterfaceName().latin1() << " to interfaceNames\n" << oendl;
                 interfaceNames.insert(i->getInterfaceName(), i);
                 updateInterface(i);
                 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
     odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl;
 #endif
     QDir d(path);
     if(!d.exists())
         return;
 
     QString lang = ::getenv("LANG");
     // 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()) )
     {
         if(fi->fileName().contains(".so"))
         {
             /* if loaded install translation */
             if( loadPlugin(path + "/" + fi->fileName()) != 0l ){
                 QTranslator *trans = new QTranslator(qApp);
                 QString fn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+ fi->fileName().left( fi->fileName().find(".") )+".qm";
                 if( trans->load( fn ) )
                     qApp->installTranslator( trans );
                 else
                     delete trans;
             }
             odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl;
         }
         ++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
     odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl;
 #endif
     QLibrary *lib = new QLibrary(pluginFileName);
     void *functionPointer = lib->resolve(resolveString);
     if( !functionPointer )
     {
 #ifdef DEBUG
         odebug << "MainWindowImp::loadPlugin: Warning: " << pluginFileName.latin1() << " is not a plugin" << oendl;
 #endif
         delete lib;
         return 0;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) functionPointer)();
     if(object == 0)
     {
 #ifdef DEBUG
         odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
 #endif
         delete lib;
         return 0;
     }
 
     m_handledIfaces += object->handledInterfaceNames();
     // Store for deletion later
     libraries.insert(object, lib);
     return object;
 }
 
 /**
  * The Add button was clicked.  Bring up the add dialog and if OK is hit
  * load the plugin and append it to the list
  */
 void MainWindowImp::addClicked()
 {
     QMap<Module*, QLibrary*>::Iterator it;
     QMap<QString, QString> list;
     QMap<QString, Module*> newInterfaceOwners;
 
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         if(it.key())
         {
             (it.key())->possibleNewInterfaces(list);
         }
     }
     // See if the list has anything that we can add.
     if(list.count() == 0)
     {
         QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);
         return;
     }
     AddConnectionImp addNewConnection(this, "AddConnectionImp", true);
     addNewConnection.addConnections(list);
     if( QDialog::Accepted == QPEApplication::execDialog( &addNewConnection ) )
     {
         QListViewItem *item = addNewConnection.registeredServicesList->currentItem();
         if(!item)
             return;
 
         for( it = libraries.begin(); it != libraries.end(); ++it )
         {
             if(it.key())
             {
                 Interface *i = (it.key())->addNewInterface(item->text(0));
                 if(i)
                 {
                     odebug << "iface name " << i->getInterfaceName().latin1() << "" << oendl;
                     interfaceNames.insert(i->getInterfaceName(), i);
                     updateInterface(i);
                 }
             }
         }
     }
 }
 
 /**
  * Prompt the user to see if they really want to do this.
  * If they do then remove from the list and unload.
  */
 void MainWindowImp::removeClicked()
 {
     QListViewItem *item = connectionList->currentItem();
     if(!item)
     {
         QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
         return;
     }
 
     Interface *i = interfaceItems[item];
     if(i->getModuleOwner() == NULL)
     {
         QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
     }
     else
     {
         if(!i->getModuleOwner()->remove(i))
             QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok);
         else
         {
             delete item;
             //      QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);
         }
     }
 }
 
 /**
  * Pull up the configure about the currently selected interface.
  * Report an error if no interface is selected.
  * If the interface has a module owner then request its configure.
  */
 void MainWindowImp::configureClicked()
 {
     QListViewItem *item = connectionList->currentItem();
     if(!item)
     {
         QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok);
         return;
     }
 
     QString currentProfileText = currentProfileLabel->text();
     if(currentProfileText.upper() == "ALL");
     currentProfileText = "";
 
     Interface *i = interfaceItems[item];
 
     if(i->getModuleOwner())
     {
         QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
         if(moduleConfigure != NULL)
         {
             i->getModuleOwner()->setProfile(currentProfileText);
             QPEApplication::showWidget( moduleConfigure );
             return;
         }
     }
 
     InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose  | Qt::WStyle_ContextHelp );
     configure->setProfile(currentProfileText);
     QPEApplication::showDialog( configure );
 }
 
 /**
  * Pull up the information about the currently selected interface.
  * Report an error if no interface is selected.
  * If the interface has a module owner then request its configure.
  */
 void MainWindowImp::informationClicked()
 {
     QListViewItem *item = connectionList->currentItem();
     if(!item)
     {
         QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
         return;
     }
 
     Interface *i = interfaceItems[item];
     //   if(!i->isAttached()){
     //     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);
     //     return;
     //   }
 
     if(i->getModuleOwner())
     {
         QWidget *moduleInformation = i->getModuleOwner()->information(i);
         if(moduleInformation != NULL)
         {
             QPEApplication::showWidget( moduleInformation );
 #ifdef DEBUG
             odebug << "MainWindowImp::informationClicked:: Module owner has created, we showed." << oendl;
 #endif
             return;
         }
     }
     InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog  | Qt::WStyle_ContextHelp);
     QPEApplication::showWidget( information );
 }
 
 /**
  * Update this interface.  If no QListViewItem exists create one.
  * @param Interface* pointer to the interface that needs to be updated.
  */
 void MainWindowImp::updateInterface(Interface *i)
 {
     if(!advancedUserMode)
     {
         if(i->getInterfaceName() == "lo")
             return;
     }
 
     QListViewItem *item = NULL;
 
     // Find the interface, making it if needed.
     if(items.find(i) == items.end())
     {
         item = new QListViewItem(connectionList, "", "", "");
         // See if you can't find a module owner for this interface
         QMap<Module*, QLibrary*>::Iterator it;
         for( it = libraries.begin(); it != libraries.end(); ++it )
         {
             if(it.key()->isOwner(i))
                 i->setModuleOwner(it.key());
         }
         items.insert(i, item);
         interfaceItems.insert(item, i);
     }
     else
         item = items[i];
 
     // Update the icons and information
-#ifdef QWS
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( i->getStatus() ? "up": "down" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    item->setPixmap(0, ( pic ));
-#else
-    item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
-#endif
+    item->setPixmap( 0, Opie::Core::OResource::loadPixmap( i->getStatus() ? "up" : "down", Opie::Core::OResource::SmallIcon ) );
 
     QString typeName = "lan";
     if(i->getInterfaceName() == "lo")
         typeName = "lo";
     if(i->getInterfaceName().contains("irda"))
         typeName = "irda";
     if(i->getInterfaceName().contains("wlan"))
         typeName = "wlan";
     if(i->getInterfaceName().contains("usb"))
         typeName = "usb";
 
     if(!i->isAttached())
         typeName = "connect_no";
     // Actually try to use the Module
     if(i->getModuleOwner() != NULL)
         typeName = i->getModuleOwner()->getPixmapName(i);
 
-#ifdef QWS
-    item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
-#else
-    item->setPixmap(1, (SmallIcon(typeName)));
-#endif
+    item->setPixmap( 1, ( Opie::Core::OResource::loadPixmap( "networksettings/" + typeName, Opie::Core::OResource::SmallIcon ) ) );
+    
     item->setText(2, i->getHardwareName());
     item->setText(3, QString("(%1)").arg(i->getInterfaceName()));
     item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
 }
 
 void MainWindowImp::newProfileChanged(const QString& newText)
 {
     if(newText.length() > 0)
         newProfileButton->setEnabled(true);
     else
         newProfileButton->setEnabled(false);
 }
 
 /**
  * Adds a new profile to the list of profiles.
  * Don't add profiles that already exists.
  * Appends to the list and QStringList
  */
 void MainWindowImp::addProfile()
 {
     QString newProfileName = newProfile->text();
     if(profiles.grep(newProfileName).count() > 0)
     {
         QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);
         return;
     }
     profiles.append(newProfileName);
     profilesList->insertItem(newProfileName);
 }
 
 /**
  * Removes the currently selected profile in the combo.
  * Doesn't delete if there are less then 2 profiles.
  */
 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();
             odebug << interfaceName.latin1() << oendl;
             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&)) );
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl;
     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 );
     odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl;
 
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl;
         if(it.key()->type() == dest)
         {
             it.key()->receive( param, arg );
             found = true;
         }
     }
 
 
     if (found) QPEApplication::setKeepRunning();
     else odebug << "Huh what do ya want" << oendl;
 }
 
 void MainWindowImp::setHostname()
 {
     static QRegExp filter("[^A-Za-z0-9_\\-\\.]");
     if (filter.match(m_Nameinput->text())!=-1) {
         odebug << "Wrong hostname" << oendl;
         QMessageBox::critical(0, tr("Sorry"), tr("This is a wrong name.<br>Please use A-Z, a-z, _, - or a single dot."));
         return;
     }
 
     OProcess h;
     _procTemp="";
     h << "hostname" << m_Nameinput->text();
     connect(&h,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
     h.start(OProcess::Block,OProcess::Stderr);
     odebug << "Got " << _procTemp << " - " << h.exitStatus() << oendl;
     if (h.exitStatus()!=0) {
         QMessageBox::critical(0, tr("Sorry"), QString(tr("Could not set name.\n%1")).arg(_procTemp.stripWhiteSpace()));
         return;
     }
     _procTemp="";
 
     QFile f(_HOSTFILE);
     if (f.open(IO_Truncate|IO_WriteOnly))
     {
         QTextStream s(&f);
         s << m_Nameinput->text();
     } else {
         QMessageBox::critical(0, tr("Sorry"), tr("Could not save name."));
         return;
     }
 
     f.close();
     f.setName(_IRDANAME);
     if (f.open(IO_WriteOnly))
     {
         QTextStream s(&f);
         s << m_Nameinput->text();
     } else {
         QMessageBox::critical(0, tr("Sorry"), tr("Could not set infrared name."));
     }
 }
 
 void MainWindowImp::initHostname()
 {
     OProcess h;
     _procTemp="";
 
     h << "hostname";
     connect(&h,SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
     h.start(OProcess::Block,OProcess::AllOutput);
     odebug << "Got " << _procTemp <<oendl;
     m_Nameinput->setText(_procTemp.stripWhiteSpace());
     _procTemp="";
 }
 
-void MainWindowImp::slotHostname(Opie::Core::OProcess *proc, char *buffer, int buflen)
+void MainWindowImp::slotHostname(Opie::Core::OProcess */*proc*/, char *buffer, int buflen)
 {
     if (buflen < 1 || buffer==0) return;
     char*_t = new char[buflen+1];
     ::memset(_t,0,buflen+1);
     ::memcpy(_t,buffer,buflen);
     _procTemp+=_t;
     delete[]_t;
 }
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 6c9735c..0abf161 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -1,1211 +1,1215 @@
 /*
  *              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 "edit.h"
 #include "pppdata.h"
 #include "iplined.h"
 #include "auth.h"
 
 /* OPIE */
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
 
 /* STD */
 
 #include <string.h>
 #include <termios.h>
 
 DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
                         , const char *name )
         : QWidget(parent, name), _pppdata(pd)
 {
     const int GRIDROWS = 6;
 
     QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );
 
     connect_label = new QLabel(tr("Connection name:"), this);
     tl->addWidget(connect_label, 0, 0);
 
     connectname_l = new QLineEdit(this);
     //  connectname_l->setMaxLength(ACCNAME_SIZE);
     tl->addWidget(connectname_l, 0, 1);
     QString tmp = tr("Type in a unique name for this connection");
 
     QWhatsThis::add(connect_label,tmp);
     QWhatsThis::add(connectname_l,tmp);
 
 
     number_label = new QLabel(tr("Phone number:"), this);
     number_label->setAlignment(AlignTop|AlignLeft);
     tl->addWidget(number_label, 1, 0);
 
     QHBoxLayout *lpn = new QHBoxLayout(5);
     tl->addLayout(lpn, 1, 1);
     numbers = new QListBox(this);
     //  numbers->setMinimumSize(120, 70);
     lpn->addWidget(numbers);
     QVBoxLayout *lpn1 = new QVBoxLayout;
     lpn->addLayout(lpn1);
     add = new QPushButton(tr("&Add..."), this);
     del = new QPushButton(tr("&Remove"), this);
 
     up = new QPushButton(this);
-    up->setPixmap( Resource::loadPixmap("up") );
+    up->setPixmap( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon) );
+    up->setMinimumHeight( AppLnk::smallIconSize()+4 );
     down = new QPushButton(this);
-    down->setPixmap( Resource::loadPixmap("down") );
+    down->setPixmap( Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon) );
+    down->setMinimumHeight( AppLnk::smallIconSize()+4 );
     lpn1->addWidget(add);
     lpn1->addWidget(del);
     lpn1->addStretch(1);
     lpn1->addWidget(up);
     lpn1->addWidget(down);
     connect(add, SIGNAL(clicked()),
             this, SLOT(addNumber()));
     connect(del, SIGNAL(clicked()),
             this, SLOT(delNumber()));
     connect(up, SIGNAL(clicked()),
             this, SLOT(upNumber()));
     connect(down, SIGNAL(clicked()),
             this, SLOT(downNumber()));
     connect(numbers, SIGNAL(highlighted(int)),
             this, SLOT(selectionChanged(int)));
     numbersChanged();
 
     tmp = tr("<p>Specifies the phone numbers to dial. You\n"
              "can supply multiple numbers here, simply\n"
              "click on \"Add\". You can arrange the\n"
              "order the numbers are tried by using the\n"
              "arrow buttons.\n\n"
              "When a number is busy or fails, <i>kppp</i> will \n"
              "try the next number and so on");
 
     QWhatsThis::add(number_label,tmp);
     QWhatsThis::add(numbers,tmp);
 
     pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
     connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
     tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
 
     // Set defaults if editing an existing connection
     if(!isnewaccount)
     {
         connectname_l->setText(_pppdata->accname());
 
         // insert the phone numbers into the listbox
         QString n = _pppdata->phonenumber();
         QString tmp = "";
         uint idx = 0;
         while(idx != n.length())
         {
             if(n[idx] == ':')
             {
                 if(tmp.length() > 0)
                     numbers->insertItem(tmp);
                 tmp = "";
             }
             else
                 tmp += n[idx];
             idx++;
         }
         if(tmp.length() > 0)
             numbers->insertItem(tmp);
 
     }
 
     numbersChanged();
     tl->activate();
 }
 
 bool DialWidget::save()
 {
     //first check to make sure that the account name is unique!
     if(connectname_l->text().isEmpty() ||
             !_pppdata->isUniqueAccname(connectname_l->text()))
     {
         return false;
     }
     else
     {
         _pppdata->setAccname(connectname_l->text());
 
         QString number = "";
         for(uint i = 0; i < numbers->count(); i++)
         {
             if(i != 0)
                 number += ":";
             number += numbers->text(i);
         }
 
         _pppdata->setPhonenumber(number);
         return true;
     }
 }
 
 
 void DialWidget::numbersChanged()
 {
     int sel = numbers->currentItem();
 
     del->setEnabled(sel != -1);
     up->setEnabled(sel != -1 && sel != 0);
     down->setEnabled(sel != -1 && sel != (int)numbers->count()-1);
 }
 
 
 void DialWidget::selectionChanged(int)
 {
     numbersChanged();
 }
 
 
 void DialWidget::addNumber()
 {
     PhoneNumberDialog dlg(this);
     if(dlg.exec())
     {
         numbers->insertItem(dlg.phoneNumber());
         numbersChanged();
     }
 }
 
 
 void DialWidget::delNumber()
 {
     if(numbers->currentItem() != -1)
     {
         numbers->removeItem(numbers->currentItem());
         numbersChanged();
     }
 }
 
 
 void DialWidget::upNumber()
 {
     int idx = numbers->currentItem();
     if(idx != -1)
     {
         QString item = numbers->text(idx);
         numbers->removeItem(idx);
         numbers->insertItem(item, idx-1);
         numbers->setCurrentItem(idx-1);
         numbersChanged();
     }
 }
 
 
 void DialWidget::downNumber()
 {
     int idx = numbers->currentItem();
     if(idx != -1)
     {
         QString item = numbers->text(idx);
         numbers->removeItem(idx);
         numbers->insertItem(item, idx+1);
         numbers->setCurrentItem(idx+1);
         numbersChanged();
     }
 }
 
 
 void DialWidget::pppdargsbutton()
 {
     PPPdArguments pa(_pppdata, this);
     QPEApplication::execDialog( &pa );
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) :
         QWidget(parent, name), _pppdata(pd)
 {
     QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
     QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this);
 
     tl->addWidget(l);
     tl->addStretch(1);
 
     QGridLayout *l1 = new QGridLayout(4, 2, 10);
     tl->addLayout(l1);
     l1->setColStretch(0, 0);
     l1->setColStretch(1, 1);
 
     before_connect_l = new QLabel(tr("Before connect:"), this);
     before_connect_l->setAlignment(AlignVCenter);
     l1->addWidget(before_connect_l, 0, 0);
     before_connect = new QLineEdit(this);
     //  before_connect->setMaxLength(COMMAND_SIZE);
     l1->addWidget(before_connect, 0, 1);
     QString tmp = tr("Allows you to run a program <b>before</b> a connection\n"
                      "is established. It is called immediately before\n"
                      "dialing has begun.\n\n"
                      "This might be useful, e.g. to stop HylaFAX blocking the\n"
                      "modem.");
 
     QWhatsThis::add(before_connect_l,tmp);
     QWhatsThis::add(before_connect,tmp);
 
     command_label = new QLabel(tr("Upon connect:"), this);
     command_label->setAlignment(AlignVCenter);
     l1->addWidget(command_label, 1, 0);
     command = new QLineEdit(this);
     //  command->setMaxLength(COMMAND_SIZE);
     l1->addWidget(command, 1, 1);
     tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "is established. When your program is called, all\n"
              "preparations for an Internet connection are finished.\n"
              "\n"
              "Very useful for fetching mail and news");
 
     QWhatsThis::add(command_label,tmp);
     QWhatsThis::add(command,tmp);
 
     predisconnect_label = new QLabel(tr("Before disconnect:"),
                                      this);
     predisconnect_label->setAlignment(AlignVCenter);
     l1->addWidget(predisconnect_label, 2, 0);
     predisconnect = new QLineEdit(this);
     //  predisconnect->setMaxLength(COMMAND_SIZE);
     l1->addWidget(predisconnect, 2, 1);
     tmp = tr("Allows you to run a program <b>before</b> a connection\n"
              "is closed. The connection will stay open until\n"
              "the program exits.");
 
     QWhatsThis::add(predisconnect_label,tmp);
     QWhatsThis::add(predisconnect,tmp);
 
     discommand_label = new QLabel(tr("Upon disconnect:"),
                                   this);
     discommand_label->setAlignment(AlignVCenter);
     l1->addWidget(discommand_label, 3, 0);
 
     discommand = new QLineEdit(this);
     //  discommand->setMaxLength(COMMAND_SIZE);
     l1->addWidget(discommand, 3, 1);
     tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "has been closed.");
 
     QWhatsThis::add(discommand_label,tmp);
     QWhatsThis::add(discommand,tmp);
 
     // extra space between entries
     l1->addRowSpacing(1, 5);
     l1->addRowSpacing(3, 5);
 
     tl->addStretch(1);
     tl->activate();
 
     // Set defaults if editing an existing connection
     if(!isnewaccount)
     {
         before_connect->setText(_pppdata->command_before_connect());
         command->setText(_pppdata->command_on_connect());
         discommand->setText(_pppdata->command_on_disconnect());
         predisconnect->setText(_pppdata->command_before_disconnect());
     }
 }
 
 
 bool ExecWidget::save()
 {
     _pppdata->setCommand_before_connect(before_connect->text());
     _pppdata->setCommand_on_connect(command->text());
     _pppdata->setCommand_before_disconnect(predisconnect->text());
     _pppdata->setCommand_on_disconnect(discommand->text());
     return true;
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // IPWidget
 //
 /////////////////////////////////////////////////////////////////////////////
 IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
         : QWidget(parent, name), _pppdata(pd)
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setSpacing( 3 );//KDialog::spacingHint());
 
     box = new QVGroupBox(tr("Configuration"), this);
     //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
 
     rb = new QButtonGroup(this);
     rb->hide();
     connect(rb, SIGNAL(clicked(int)),
             SLOT(hitIPSelect(int)));
 
     dynamicadd_rb = new QRadioButton(box);
     dynamicadd_rb->setText(tr("Dynamic IP address"));
     QWhatsThis::add(dynamicadd_rb,
                         tr("Select this option when your computer gets an\n"
                            "internet address (IP) every time a\n"
                            "connection is made.\n"
                            "\n"
                            "Almost every Internet Service Provider uses\n"
                            "this method, so this should be turned on."));
 
     staticadd_rb = new QRadioButton(box);
     staticadd_rb->setText(tr("Static IP address"));
     rb->insert(dynamicadd_rb, 0);
     rb->insert(staticadd_rb, 1);
     QWhatsThis::add(staticadd_rb,
                         tr("Select this option when your computer has a\n"
                            "fixed internet address (IP). Most computers\n"
                            "don't have this, so you should probably select\n"
                            "dynamic IP addressing unless you know what you\n"
                            "are doing."));
 
     QWidget *ipWidget = new QWidget(box);
     QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
     ipLayout->setSpacing( 2 );//KDialog::spacingHint());
 
     ipaddress_label = new QLabel(tr("IP address:"), ipWidget);
     QString tmp = tr("If your computer has a permanent internet\n"
                      "address, you must supply your IP address here.");
     ipLayout->addWidget(ipaddress_label, 0, 0);
 
     ipaddress_l = new IPLineEdit(ipWidget);
     ipLayout->addWidget(ipaddress_l, 0, 1);
 
     QWhatsThis::add(ipaddress_label,tmp);
     QWhatsThis::add(ipaddress_l,tmp);
 
     sub_label = new QLabel(tr("Subnet mask:"), ipWidget);
     tmp = tr("<p>If your computer has a static Internet address,\n"
              "you must supply a network mask here. In almost\n"
              "all cases this netmask will be <b>255.255.255.0</b>,\n"
              "but your mileage may vary.\n"
              "\n"
              "If unsure, contact your Internet Service Provider");
     ipLayout->addWidget(sub_label, 1, 0);
 
     subnetmask_l = new IPLineEdit(ipWidget);
     ipLayout->addWidget(subnetmask_l, 1, 1);
 
     QWhatsThis::add(sub_label,tmp);
     QWhatsThis::add(subnetmask_l,tmp);
 
     autoname = new QCheckBox(tr("Auto-configure hostname from this IP"), this);
     autoname->setChecked(_pppdata->autoname());
     connect(autoname,SIGNAL(toggled(bool)),
             this,SLOT(autoname_t(bool)));
 
     QWhatsThis::add(autoname,
                         tr("<p>Whenever you connect, this reconfigures\n"
                            "your hostname to match the IP address you\n"
                            "got from the PPP server. This may be useful\n"
                            "if you need to use a protocol which depends\n"
                            "on this information, but it can also cause several\n"
                            "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
                            "\n"
                            "Don't enable this unless you really need it."));
 
     topLayout->addWidget(box);
     topLayout->addWidget(autoname);
     topLayout->addStretch();
 
     //load info from gpppdata
     if(!isnewaccount)
     {
         if(_pppdata->ipaddr() == "0.0.0.0" &&
                 _pppdata->subnetmask() == "0.0.0.0")
         {
             dynamicadd_rb->setChecked(true);
             hitIPSelect(0);
             autoname->setChecked(_pppdata->autoname());
         }
         else
         {
             ipaddress_l->setText(_pppdata->ipaddr());
             subnetmask_l->setText(_pppdata->subnetmask());
             staticadd_rb->setChecked(true);
             autoname->setChecked(false);
         }
     }
     else
     {
         dynamicadd_rb->setChecked(true);
         hitIPSelect(0);
     }
 
 }
 
 void IPWidget::autoname_t(bool on)
 {
     static bool was_warned = false;
 
     // big-fat warning when selecting the auto configure hostname option
     if(on && !was_warned)
     {
         QMessageBox::information(this,
                                  tr("Selecting this option might cause some weird "
                                     "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&)));
     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);
     remove->setEnabled(dnsservers->count()>0 && on);
     dnsservers->clearSelection();
     dnsservers->setEnabled(on);
     dnsservers->triggerUpdate(false);
 }
 
 void DNSWidget::save()
 {
     _pppdata->setAutoDNS(bg->id(bg->selected()) == 0);
     QStringList serverlist;
     for(uint i=0; i < dnsservers->count(); i++)
         serverlist.append(dnsservers->text(i));
     _pppdata->setDns(serverlist);
 
     // strip leading dot
     QString s(dnsdomain->text());
     if(s.left(1) == ".")
         _pppdata->setDomain(s.mid(1));
     else
         _pppdata->setDomain(dnsdomain->text());
 
     _pppdata->setExDNSDisabled(exdnsdisabled_toggle->isChecked());
 }
 
 
 void DNSWidget::adddns()
 {
     if(dnsservers->count() < MAX_DNS_ENTRIES)
     {
         dnsservers->insertItem(dnsipaddr->text());
         dnsipaddr->setText("");
     }
 }
 
 
 void DNSWidget::removedns()
 {
     int i;
     i = dnsservers->currentItem();
     if(i != -1)
         dnsservers->removeItem(i);
     remove->setEnabled(dnsservers->count()>0);
 }
 
 
 //
 // GatewayWidget
 //
 GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
         : QWidget(parent, name), _pppdata(pd)
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setSpacing( 2 );
     topLayout->setMargin( 0 );
 
     box = new QVGroupBox(tr("Configuration"), this);
 
     rb = new QButtonGroup(this);
     rb->hide();
     connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
 
     defaultgateway = new QRadioButton(box);
     defaultgateway->setText(tr("Default gateway"));
     rb->insert(defaultgateway, 0);
     QWhatsThis::add(defaultgateway,
                         tr("This makes the PPP peer computer (the computer\n"
                            "you are connected to with your modem) to act as\n"
                            "a gateway. Your computer will send all packets not\n"
                            "going to a computer inside your local net to this\n"
                            "computer, which will route these packets.\n"
                            "\n"
                            "This is the default for most ISPs, so you should\n"
                            "probably leave this option on."));
 
 
     staticgateway = new QRadioButton(box);
     staticgateway->setText(tr("Static gateway"));
     rb->insert(staticgateway, 1);
     QWhatsThis::add(staticgateway,
                         tr("<p>Allows you to specify which computer you want\n"
                            "to use as gateway (see <i>Default Gateway</i> above)"));
 
     QHBox *gateBox = new QHBox(box);
     gate_label = new QLabel(tr("Gateway IP address:"), gateBox);
     gatewayaddr = new IPLineEdit(gateBox);
 
     defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
                                  this);
     QWhatsThis::add(defaultroute,
                         tr("If this option is enabled, all packets not\n"
                            "going to the local net are routed through\n"
                            "the PPP connection.\n"
                            "\n"
                            "Normally, you should turn this on"));
 
     topLayout->addWidget(box);
     topLayout->addWidget(defaultroute);
     topLayout->addStretch();
 
     //load info from gpppdata
     if(!isnewaccount)
     {
         if(_pppdata->gateway() == "0.0.0.0")
         {
             defaultgateway->setChecked(true);
             hitGatewaySelect(0);
         }
         else
         {
             gatewayaddr->setText(_pppdata->gateway());
             staticgateway->setChecked(true);
         }
         defaultroute->setChecked(_pppdata->defaultroute());
     }
     else
     {
         defaultgateway->setChecked(true);
         hitGatewaySelect(0);
         defaultroute->setChecked(true);
     }
 }
 
 void GatewayWidget::save()
 {
     _pppdata->setGateway(gatewayaddr->text());
     _pppdata->setDefaultroute(defaultroute->isChecked());
 }
 
 
 void GatewayWidget::hitGatewaySelect( int i )
 {
     if(i == 0)
     {
         gatewayaddr->setText("0.0.0.0");
         gatewayaddr->setEnabled(false);
         gate_label->setEnabled(false);
     }
     else
     {
         gatewayaddr->setEnabled(true);
         gatewayaddr->setText("");
         gate_label->setEnabled(true);
     }
 }
 
 
 
 ScriptWidget::ScriptWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
         : QWidget(parent, name),_pppdata(pd)
 {
 
     QVBoxLayout *tl = new QVBoxLayout(this, 0 );
     se = new ScriptEdit(this);
     connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
     tl->addWidget(se);
 
     // insert equal-sized buttons
     QHBoxLayout *hl = new QHBoxLayout( this );
     tl->addLayout( hl );
     add = new QPushButton( tr("Add"), this );
     hl->addWidget( add );
     connect(add, SIGNAL(clicked()), SLOT(addButton()));
     insert = new QPushButton( tr("Insert"), this );
     hl->addWidget( insert );
     connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
     remove = new QPushButton( tr("Remove"), this );
     hl->addWidget( remove );
     connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
 
     QHBoxLayout *l12 = new QHBoxLayout(0);
     tl->addLayout(l12);
     stl = new QListBox(this);
     //  stl->setVScrollBarMode( QScrollView::AlwaysOff );
     connect(stl, SIGNAL(highlighted(int)), SLOT(stlhighlighted(int)));
     //  stl->setMinimumSize(QSize(70, 140));
 
     sl = new QListBox(this);
     //  sl->setVScrollBarMode( QScrollView::AlwaysOff );
     connect(sl, SIGNAL(highlighted(int)), SLOT(slhighlighted(int)));
     //  sl->setMinimumSize(QSize(150, 140));
 
     slb = new QScrollBar(this);
     //  slb->setFixedWidth(slb->sizeHint().width());
     connect(slb, SIGNAL(valueChanged(int)), SLOT(scrolling(int)));
 
     l12->addWidget(stl, 1);
     l12->addWidget(sl, 3);
     l12->addWidget(slb, 0);
 
     //load data from gpppdata
     if(!isnewaccount)
     {
         QStringList &comlist = _pppdata->scriptType();
         QStringList &arglist = _pppdata->script();
         QStringList::Iterator itcom = comlist.begin();
         QStringList::Iterator itarg = arglist.begin();
 
         for ( ;
                 itcom != comlist.end() && itarg != arglist.end();
                 ++itcom, ++itarg )
         {
             stl->insertItem(*itcom);
             sl->insertItem(*itarg);
         }
     }
 
     insert->setEnabled(false);
     remove->setEnabled(false);
     adjustScrollBar();
     tl->activate();
 }
 
 bool ScriptWidget::check()
 {
     uint lstart = 0;
     uint lend  = 0;
     uint errcnt = 0;
 
     if(sl->count() > 0)
     {
         for( uint i=0; i <= sl->count()-1; i++)
         {
             if(stl->text(i) == "LoopStart")
             {
                 lstart++;
             }
             if (stl->text(i) == "LoopEnd")
             {
                 lend++;
             }
             if ( lend > lstart ) errcnt++;
         }
         return ( (errcnt == 0 ) && (lstart == lend) );
     }
     return true;
 }
 
 
 void ScriptWidget::save()
 {
     QStringList typelist, arglist;
     for(uint i=0; i < sl->count(); i++)
     {
         typelist.append(stl->text(i));
         arglist.append(sl->text(i));
     }
     _pppdata->setScriptType(typelist);
     _pppdata->setScript(arglist);
 }
 
 
 
 void ScriptWidget::adjustScrollBar()
 {
     if((int)sl->count() <= sl->numItemsVisible())
         slb->setRange(0, 0);
     else
         slb->setRange(0, (sl->count() - sl->numItemsVisible())+1);
 }
 
 
 void ScriptWidget::scrolling(int i)
 {
     sl->setTopItem(i);
     stl->setTopItem(i);
 }
 
 
 void ScriptWidget::slhighlighted(int i)
 {
     insert->setEnabled(true);
     remove->setEnabled(true);
     stl->setCurrentItem(i);
 }
 
 
 void ScriptWidget::stlhighlighted(int i)
 {
     insert->setEnabled(true);
     remove->setEnabled(true);
     sl->setCurrentItem(i);
 }
 
 
 void ScriptWidget::addButton()
 {
     //don't allow more than the maximum script entries
     if(sl->count() == MAX_SCRIPT_ENTRIES-1)
         return;
 
     switch(se->type())
     {
     case ScriptEdit::Expect:
         stl->insertItem("Expect");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Send:
         stl->insertItem("Send");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::SendNoEcho:
         stl->insertItem("SendNoEcho");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Pause:
         stl->insertItem("Pause");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Hangup:
         stl->insertItem("Hangup");
         sl->insertItem("");
         break;
 
     case ScriptEdit::Answer:
         stl->insertItem("Answer");
         sl->insertItem("");
         break;
 
     case ScriptEdit::Timeout:
         stl->insertItem("Timeout");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Password:
         stl->insertItem("Password");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::ID:
         stl->insertItem("ID");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Prompt:
         stl->insertItem("Prompt");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::PWPrompt:
         stl->insertItem("PWPrompt");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::LoopStart:
         stl->insertItem("LoopStart");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::LoopEnd:
         stl->insertItem("LoopEnd");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Scan:
         stl->insertItem("Scan");
         sl->insertItem(se->text());
         break;
 
     case ScriptEdit::Save:
         stl->insertItem("Save");
         sl->insertItem(se->text());
         break;
 
     default:
         break;
     }
 
     //get the scrollbar adjusted, and scroll the list so we can see what
     //we're adding to
     adjustScrollBar();
     slb->setValue(slb->maxValue());
 
     //clear the text in the entry box
     se->setText("");
 }
 
 
 void ScriptWidget::insertButton()
 {
     //exit if there is no highlighted item, or we've reached the
     //maximum entries in the script list
     if(sl->currentItem() < 0 || (sl->count() == MAX_SCRIPT_ENTRIES-1))
         return;
 
     switch(se->type())
     {
     case ScriptEdit::Expect:
         stl->insertItem("Expect", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Send:
         stl->insertItem("Send", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::SendNoEcho:
         stl->insertItem("SendNoEcho", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Pause:
         stl->insertItem("Pause", stl->currentItem());
         sl->insertItem(se->text(), sl->currentItem());
         break;
 
     case ScriptEdit::Hangup:
         stl->insertItem("Hangup", stl->currentItem());
         sl->insertItem("", sl->currentItem());
         break;
 
     case ScriptEdit::Answer:
         stl->insertItem("Answer", stl->currentItem());
         sl->insertItem("", sl->currentItem());
         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&)));
 
     le->setFocus();
     textChanged("");
 
 
 }
 
 
 QString PhoneNumberDialog::phoneNumber()
 {
     QString s = le->text();
 
     return s;
 }
 
 
 void PhoneNumberDialog::textChanged(const QString &)
 {
     //  enableButtonOK(s.length() > 0);
 }
 
 
 //#include "edit.moc"
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index 2fd97c3..0c18bcc 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -1,627 +1,627 @@
 #include "wlanimp2.h"
 #include "keyedit.h"
 #include "interfacesetupimp.h"
 #include "../interfaces/interface.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/oprocess.h>
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 using namespace Opie::Core;
 using namespace Opie::Net;
 
 /* QT */
 #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>
 
 /* STD */
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #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()) {
     owarn << QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools") << oendl;
   }
 
   connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) );
   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,key;
 
   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_type", error).simplifyWhiteSpace();
 
   if ( opt == "wlan-ng") {
 
      //FIXME:Handle wlan_ng_priv_genstr
 
     // get default key_id
     opt = interfaces->getInterfaceOption("wlan_ng_default_key_id", error).simplifyWhiteSpace();
 
     if (opt == "0")
        keyRadio0->setChecked(true);
     if (opt == "1")
        keyRadio1->setChecked(true);
     if (opt == "2")
        keyRadio2->setChecked(true);
     if (opt == "3")
        keyRadio3->setChecked(true);
 
     // get key0
     key = interfaces->getInterfaceOption("wlan_ng_key0", error).simplifyWhiteSpace();
     key.replace(QString(":"),QString(""));
     keyLineEdit0->setText(key);
 
     // get key1
     key = interfaces->getInterfaceOption("wlan_ng_key1", error).simplifyWhiteSpace();
     key.replace(QString(":"),QString(""));
     keyLineEdit1->setText(key);
 
     // get key2
     key = interfaces->getInterfaceOption("wlan_ng_key2", error).simplifyWhiteSpace();
     key.replace(QString(":"),QString(""));
     keyLineEdit2->setText(key);
 
     // get key3
     key = interfaces->getInterfaceOption("wlan_ng_key3", error).simplifyWhiteSpace();
     key.replace(QString(":"),QString(""));
     keyLineEdit3->setText(key);
 
     opt = interfaces->getInterfaceOption("wireless_enc", error).simplifyWhiteSpace();
 
     // encryption on?
     if(opt == "on"){
       wepEnabled->setChecked(true);
     } else {
         wepEnabled->setChecked(false);
     }
 
     opt = interfaces->getInterfaceOption("wireless_keymode", error).simplifyWhiteSpace();
 
     if(opt == "restricted"){
       // restricted mode, only accept encrypted packets
       rejectNonEnc->setChecked(true);
     }
   }
   else {
     opt = interfaces->getInterfaceOption("wireless_key", error).simplifyWhiteSpace();
 
     parseKeyStr(opt);
   }
 }
 
 void WLANImp::parseKeyStr(QString keystr) {
   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 {
       // key
       key = (*it);
     }
     if (! key.isNull()) {
       if (enc == -1)
         enc = 1;
       QStringList::Iterator next = ++it;
       if (it == keys.end()) {
         break;
       }
       if ((*(next)).left(1) == "[") {
         // set key at index
         index = (*(next)).mid(1, 1).toInt();
       } else {
         index = 1;
       }
       switch (index) {
           case 1:
             keyLineEdit0->setText(key);
         break;
           case 2:
             keyLineEdit1->setText(key);
         break;
           case 3:
             keyLineEdit2->setText(key);
         break;
           case 4:
             keyLineEdit3->setText(key);
         break;
       }
       key = QString::null;
     }
   }
   if (enc == 1) {
     wepEnabled->setChecked(true);
   } else {
     wepEnabled->setChecked(false);
   }
 }
 
 /**
  * Check to see if the current config is valid
  * Save interfaces
  */
 void WLANImp::accept() {
   if (wepEnabled->isChecked()) {
     if ((keyRadio0->isChecked() && keyLineEdit0->text().isEmpty()) ||
         (keyRadio1->isChecked() && keyLineEdit1->text().isEmpty()) ||
         (keyRadio2->isChecked() && keyLineEdit2->text().isEmpty()) ||
         (keyRadio3->isChecked() && keyLineEdit3->text().isEmpty())) {
       QMessageBox::information(this, "Error", "Please enter a WEP key.", QMessageBox::Ok);
       return;
     }
   }
 
   if (essid->currentText().isEmpty()) {
     QMessageBox::information(this, "Error", "Please select/enter an ESSID.", QMessageBox::Ok);
     return;
   }
 
   if (specifyAp->isChecked() && macEdit->text().isEmpty()) {
     QMessageBox::information(this, "Error", "Please enter the MAC address of the Access Point.", QMessageBox::Ok);
     return;
   }
 
   // Try to save the interfaces settings.
   writeOpts();
 
   // Close out the dialog
 // FIXME:  QDialog::accept();
 }
 
 QString WLANImp::formatKey(QString input)
 {
   int len,r=0;
 
   len = input.length();
 
   if (!len)
     return input;
 
   for(int i=1;i<len/2;i++)
   {
     input.insert(r+i*2,QString(":"));
     r++;
   }
 
   return input;
 }
 
 void WLANImp::writeOpts() {
   QString para, devicetype;
 
   // eh can't really do anything about it other then return. :-D
   if(!interfaces->isInterfaceSet()){
     QMessageBox::warning(0,"Inface not set","should not happen!!!");
     return;
   }
   bool error = false;
 
   odebug << "setting wlan interface " << interfaces->getInterfaceName( error ).latin1() << "" << oendl;
 
   if (error)  QMessageBox::warning(0,"Inface not set","should not happen!!!");
 
   interfaces->setInterfaceOption(QString("wireless_mode"), mode->currentText());
   interfaces->setInterfaceOption(QString("wireless_essid"), essid->currentText());
 
   if (specifyAp->isChecked()) {
      interfaces->setInterfaceOption(QString("wireless_ap"), macEdit->text());
   } else {
      interfaces->removeInterfaceOption(QString("wireless_ap"));
   }
 
   if (specifyChan->isChecked()) {
     interfaces->setInterfaceOption(QString("wireless_channel"), networkChannel->text());
   } else {
     interfaces->removeInterfaceOption(QString("wireless_channel"));
   }
 
   devicetype = interfaces->getInterfaceOption("wireless_type", error).simplifyWhiteSpace();
 
   if ( devicetype == "wlan-ng") {
 
     // wlan-ng style
     interfaces->removeInterfaceOption(QString("wireless_key"));
 
     if (wepEnabled->isChecked()) {
 
       interfaces->setInterfaceOption(QString("wireless_enc"),"on");
 
       if (! keyLineEdit0->text().isNull()) {
         interfaces->setInterfaceOption(QString("wlan_ng_key0"), formatKey(keyLineEdit0->text()));
       } else
         interfaces->removeInterfaceOption(QString("wlan_ng_key0"));
       if (! keyLineEdit1->text().isNull()) {
         interfaces->setInterfaceOption(QString("wlan_ng_key1"), formatKey(keyLineEdit1->text()));
       } else
         interfaces->removeInterfaceOption(QString("wlan_ng_key1"));
       if (! keyLineEdit2->text().isNull()) {
         interfaces->setInterfaceOption(QString("wlan_ng_key2"), formatKey(keyLineEdit2->text()));
       } else
         interfaces->removeInterfaceOption(QString("wlan_ng_key2"));
       if (! keyLineEdit3->text().isNull()) {
         interfaces->setInterfaceOption(QString("wlan_ng_key3"), formatKey(keyLineEdit3->text()));
       } else
         interfaces->removeInterfaceOption(QString("wlan_ng_key3"));
 
       if (acceptNonEnc->isChecked())
         interfaces->removeInterfaceOption(QString("wireless_keymode"));
       else
         interfaces->setInterfaceOption(QString("wireless_keymode"),"restricted");
 
       para = "";
       if (keyRadio0->isChecked()) {
         para = "0";
       } else if (keyRadio1->isChecked()) {
         para = "1";
       } else if (keyRadio2->isChecked()) {
         para = "2";
       } else if (keyRadio3->isChecked()) {
         para = "3";
       }
 
       interfaces->setInterfaceOption(QString("wlan_ng_default_key_id"), para);
 
     } else {
       // No wep, remove all previous keys
       interfaces->removeInterfaceOption(QString("wireless_enc"));
       interfaces->removeInterfaceOption(QString("wlan_ng_default_key_id"));
       interfaces->removeInterfaceOption(QString("wlan_ng_key0"));
       interfaces->removeInterfaceOption(QString("wlan_ng_key1"));
       interfaces->removeInterfaceOption(QString("wlan_ng_key2"));
       interfaces->removeInterfaceOption(QString("wlan_ng_key3"));
     }
 
   } else {
     // This is the old style
     if (wepEnabled->isChecked()) {
       QStringList keyList;
 
       if (! keyLineEdit0->text().isNull()) {
         keyList += keyLineEdit0->text();
         keyList += "[1]";
       } //else
       if (! keyLineEdit1->text().isNull()) {
         keyList += keyLineEdit1->text();
         keyList += "[2]";
       } //else
       if (! keyLineEdit2->text().isNull()) {
         keyList += keyLineEdit2->text();
         keyList += "[3]";
       } //else
       if (! keyLineEdit3->text().isNull()) {
         keyList += keyLineEdit3->text();
         keyList += "[4]";
       }
       if (acceptNonEnc->isChecked()) {
         keyList += "open";
       } else {
         keyList += "restricted";
       }
 
       keyList += "key";
       if (keyRadio0->isChecked()) {
         keyList += "[1]";
       } else if (keyRadio1->isChecked()) {
         keyList += "[2]";
       } else if (keyRadio2->isChecked()) {
         keyList += "[3]";
       } else if (keyRadio3->isChecked()) {
         keyList += "[4]";
       }
       interfaces->setInterfaceOption(QString("wireless_key"), keyList.join(QString(" ")));
     } else {
       interfaces->removeInterfaceOption(QString("wireless_key"));
     }
     interfaces->removeInterfaceOption(QString("wireless_enc"));
   }
 
   if(!interfaceSetup->saveChanges())
     return;
 
   QDialog::accept();
 }
 
 /*
  * Scan for possible wireless networks around...
  * ... powered by Wellenreiter II technology (C) Michael 'Mickey' Lauer <mickeyl@handhelds.org>
  */
 
 void WLANImp::rescanNeighbourhood()
 {
     QString name = interface->getInterfaceName();
     odebug << "rescanNeighbourhood via '" << name << "'" << oendl;
 
     OWirelessNetworkInterface* wiface = static_cast<OWirelessNetworkInterface*>( ONetwork::instance()->interface( name ) );
     assert( wiface );
 
     // try to guess device type
     QString devicetype;
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         QString line;
         QTextStream modules( &m );
         while( !modules.atEnd() && !devicetype )
         {
             modules >> line;
             if ( line.contains( "cisco" ) ) devicetype = "cisco";
             else if ( line.contains( "hostap" ) ) devicetype = "hostap";
             else if ( line.contains( "prism" ) ) devicetype = "wlan-ng"; /* puke */
             else if ( line.contains( "orinoco" ) ) devicetype = "orinoco";
         }
     }
     if ( devicetype.isEmpty() )
     {
         owarn << "rescanNeighbourhood(): couldn't guess device type :(" << oendl;
         return;
     }
     else
     {
         odebug << "rescanNeighbourhood(): device type seems to be '" << devicetype << "'" << oendl;
     }
 
     // configure interface to receive 802.11 management frames
 
     wiface->setUp( true );
     wiface->setPromiscuousMode( true );
 
     if ( devicetype == "cisco" ) wiface->setMonitoring( new OCiscoMonitoringInterface( wiface, false ) );
     else if ( devicetype == "hostap" ) wiface->setMonitoring( new OHostAPMonitoringInterface( wiface, false ) );
     else if ( devicetype == "wlan-ng" ) wiface->setMonitoring( new OWlanNGMonitoringInterface( wiface, false ) );
     else if ( devicetype == "orinoco" ) wiface->setMonitoring( new OOrinocoMonitoringInterface( wiface, false ) );
     else
     {
         odebug << "rescanNeighbourhood(): unsupported device type for monitoring :(" << oendl;
         return;
     }
 
     wiface->setMode( "monitor" );
     if ( wiface->mode() != "monitor" )
     {
         owarn << "rescanNeighbourhood(): Unable to bring device into monitor mode (" << strerror( errno ) << ")." << oendl;
         return;
     }
 
     // open a packet capturer
     OPacketCapturer* cap = new OPacketCapturer();
     cap->open( name );
     if ( !cap->isOpen() )
     {
         owarn << "rescanNeighbourhood(): Unable to open libpcap (" << strerror( errno ) << ")." << oendl;
         return;
     }
 
     // disable button and display splash screen
     rescanButton->setEnabled( false );
     QFrame* splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize );
     splash->setLineWidth( 2 );
     splash->setFrameStyle( QFrame::Panel | QFrame::Raised );
     QVBoxLayout* vbox = new QVBoxLayout( splash, 4, 4 );
     QLabel* lab = new QLabel( "<center><b>Scanning...</b><br>Please Wait...</center>", splash );
     QProgressBar* pb = new QProgressBar( wiface->channels(), splash );
     vbox->addWidget( lab );
     vbox->addWidget( pb );
     pb->setCenterIndicator( true );
     pb->setFixedHeight( pb->sizeHint().height() );
     QWidget* widgetDesktop = qApp->desktop();
     int dw = widgetDesktop->width();
     int dh = widgetDesktop->height();
     int pw = vbox->sizeHint().width();
     int ph = vbox->sizeHint().height();
     splash->setGeometry((dw-pw)/2,(dh-ph)/2,pw,ph);
     splash->show();
     splash->raise();
     qApp->processEvents();
 
     // set capturer to non-blocking mode
     cap->setBlocking( false );
 
     for ( int i = 1; i <= wiface->channels(); ++i )
     {
         wiface->setChannel( i );
         pb->setProgress( i );
         qApp->processEvents();
         odebug << "rescanNeighbourhood(): listening on channel " << i << "..." << oendl;
         OPacket* p = cap->next( 1000 );
         if ( !p )
         {
             odebug << "rescanNeighbourhood(): nothing received on channel " << i << "" << oendl;
         }
         else
         {
             odebug << "rescanNeighbourhood(): TADAA - something came in on channel " << i << "" << oendl;
             handlePacket( p );
         }
     }
 
     cap->close();
     wiface->setMode( "managed" ); // TODO: use previous mode
     wiface->setPromiscuousMode( false );
 
     // hide splash screen and reenable button
     splash->hide();
     delete splash;
     rescanButton->setEnabled( true );
 }
 
 void WLANImp::handlePacket( OPacket* p )
 {
 
     // check if we received a beacon frame
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
     if ( beacon && beacon->managementType() == "Beacon" )
     {
 
         QString type;
         if ( beacon->canIBSS() )
         {
             type = "adhoc";
         }
         else if ( beacon->canESS() )
         {
             type = "managed";
         }
         else
         {
             owarn << "handlePacket(): invalid frame [possibly noise] detected!" << oendl;
             return;
         }
 
         OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
         QString essid = ssid ? ssid->ID() : QString("<unknown>");
         OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
         int channel = ds ? ds->channel() : -1;
         OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
         displayFoundNetwork( type, channel, essid, header->macAddress2() );
     }
 }
 
 
 void WLANImp::displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac )
 {
 
     odebug << "found network: <" << (const char*) mode << ">, chn " << channel
            << ", ssid '" << (const char*) ssid << "', mac '" << (const char*) mac.toString() << "'" << oendl;
 
     QListViewItemIterator it( netView );
     while ( it.current() && it.current()->text( col_ssid ) != ssid ) ++it;
     if ( !it.current() ) // ssid didn't show up yet
     {
         QListViewItem* item = new QListViewItem( netView, mode.left( 1 ).upper(), ssid, QString::number( channel ), mac.toString() );
         QString name;
         name.sprintf( "networksettings/%s", (const char*) mode );
-        item->setPixmap( col_mode, Resource::loadPixmap( name ) );
+        item->setPixmap( col_mode, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
         qApp->processEvents();
     }
 
 }
 
 
 void WLANImp::selectNetwork( QListViewItem* item )
 {
     bool ok;
     if ( item )
     {
         specifyAp->setChecked(true);
         macEdit->setText( item->text( col_mac ) );
         specifyChan->setChecked( item->text( col_mode ) == "A" );
         networkChannel->setValue( item->text( col_chn ).toInt( &ok ) );
         essid->setEditText( item->text( col_ssid ) );
         if ( item->text( col_mode ) == "A" )
             mode->setCurrentItem( 3 );
         else
             mode->setCurrentItem( 2 );
     }
 }