Network Settings: libopie->libopie2

12 files changed, 74 insertions, 71 deletions

diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index 4965a6e..e23e96a 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,13 +1,13 @@
 config NETWORKSETUP
   boolean "opie-networksettings (TCP/IP network settings)"
   default "y"
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2NET
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2NET
 
 config NETWORKSETUP-CORE
   boolean
   default "y" if NETWORKSETUP
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && NETWORKSETUP && INTERFACES
 
   source noncore/settings/networksettings/ppp/config.in
   source noncore/settings/networksettings/wlan/config.in
   source noncore/settings/networksettings/interfaces/config.in
diff --git a/noncore/settings/networksettings/interfaces/.cvsignore b/noncore/settings/networksettings/interfaces/.cvsignore
index 1655b12..0b2d203 100644
--- a/noncore/settings/networksettings/interfaces/.cvsignore
+++ b/noncore/settings/networksettings/interfaces/.cvsignore
@@ -1,11 +1,12 @@
-
 Makefile
 Makefile.in
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 lib*.so*
 moc*
+.moc
+.obj
\ No newline at end of file
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 6c21aeb..d84cd24 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
   config INTERFACES
     boolean
     default "y" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 78466d0..ab0e4cc 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -1,206 +1,206 @@
 #include "interfacesetupimp.h"
 #include "interface.h"
 
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 
 #include <qmessagebox.h>
 
 #include <opie/oprocess.h>
 
 #ifdef QWS
-#include <opie/owait.h>
+#include <opie2/owait.h>
 #include <qpe/global.h>
 #include <qapplication.h>
 #endif
 
 #define DNSSCRIPT "changedns"
 
 /**
  * Constuctor.  Set up the connection. A profile must be set.
  */
 InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
   if (j == 0) {
     delInterfaces = true;
     interfaces = new Interfaces;
   }
 }
 
 /**
  * Destructor
  */
 InterfaceSetupImp::~InterfaceSetupImp(){
   if(delInterfaces) {
     delete interfaces;
   }
 }
 
 /**
  * Save the current settings, then write out the interfaces file and close.
  */
 bool InterfaceSetupImp::saveChanges(){
   bool error;
   QString iface = interfaces->getInterfaceName(error);
   qDebug("InterfaceSetupImp::saveChanges saves interface %s", iface.latin1() );
   if(!saveSettings())
     return false;
 
   interfaces->write();
 
   if (interface->getStatus()) {
     QString ifup;
     ifup += "ifdown ";
     ifup += iface;
     ifup += "; ifup ";
     ifup += iface;
     ifup += ";";
 
     OProcess restart;
     restart << "sh";
     restart << "-c";
     restart << ifup;
 
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Restarting interface" ) );
 
     owait->show();
     qApp->processEvents();
 
     if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) {
       qWarning("unstable to spawn ifdown/ifup");
     }
 
     owait->hide();
     delete owait;
 
     interface->refresh();
   }
   return true;
 }
 
 /**
  * Save the settings for the current Interface.
  * @return bool true if successful, false otherwise
  */
 bool InterfaceSetupImp::saveSettings(){
   // eh can't really do anything about it other then return. :-D
   if(!interfaces->isInterfaceSet())
     return true;
 
   bool error = false;
   // Loopback case
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
     return true;
   }
 
   if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
    QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
    return false;
   }
   // DHCP
   if(dhcpCheckBox->isChecked()) {
     interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
     interfaces->removeInterfaceOption("address");
     interfaces->removeInterfaceOption("netmask");
     interfaces->removeInterfaceOption("gateway");
     interfaces->removeInterfaceOption("up "DNSSCRIPT" -a ");
     interfaces->removeInterfaceOption("down "DNSSCRIPT" -r ");
   } else{
     interfaces->setInterfaceMethod("static");
     interfaces->setInterfaceOption("address", ipAddressEdit->text());
     interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
     interfaces->setInterfaceOption("gateway", gatewayEdit->text());
     if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
       QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
       interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
       interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
     }else{
         interfaces->removeInterfaceOption("up "DNSSCRIPT" -a ");
         interfaces->removeInterfaceOption("down "DNSSCRIPT" -r");
     }
   }
 
   // IP Information
   interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
   return true;
 }
 
 /**
  * The Profile has changed.
  * @param QString profile the new profile.
  */
 void InterfaceSetupImp::setProfile(const QString &profile){
    /*
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     staticGroupBox->hide();
     dhcpCheckBox->hide();
     leaseTime->hide();
     leaseHoursLabel->hide();
   }
   */
 
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
   // See if we have to make a interface.
   if(!interfaces->setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
       interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
       if(!interfaces->setMapping(interface->getInterfaceName())){
         interfaces->addMapping(interface->getInterfaceName());
         if(!interfaces->setMapping(interface->getInterfaceName())){
-	  qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
+      qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
           return;
-	}
+    }
       }
       interfaces->setMap("map", newInterfaceName);
       interfaces->setScript("getprofile.sh");
     }
     else{
       interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
       if(!interfaces->setInterface(newInterfaceName)){
         qDebug("InterfaceSetupImp: Added interface, but still can't setInterface.");
         return;
       }
     }
   }
 
   // We must have a valid interface to get this far so read some settings.
 
   // DHCP
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
     dhcpCheckBox->setChecked(true);
   else
     dhcpCheckBox->setChecked(false);
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
   QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
   qDebug("dns >%s<",dns.latin1());
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
   }else firstDNSLineEdit->setText(dns);
 
   ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
   subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
   if (subnetMaskEdit->text().isEmpty())
       subnetMaskEdit->setText( "255.255.255.0" );
   gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error));
 
 
 
   qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1());
   qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1());
 
 }
 
 // interfacesetup.cpp
 
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp
index 5d275ac..bc11ab4 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/main.cpp
@@ -1,6 +1,6 @@
 #include "mainwindowimp.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
 
 
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 0615ea4..5db2d6b 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,12 +1,12 @@
 CONFIG   = qt warn_on debug quick-app
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  module.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp
 INCLUDEPATH += $(OPIEDIR)/include interfaces/
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan/ ppp/
-LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie 
+LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
 INTERFACES = mainwindow.ui addconnection.ui
 TARGET    = networksettings
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 25e1e26..fbbddca 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,10 +1,10 @@
 Package: opie-networksettings
 Files: plugins/application/libnetworksettings.so* bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, libopiecore2, libopienet2
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopienet2
 Description: Network settings.
 Replaces: opie-networksetup
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/.cvsignore b/noncore/settings/networksettings/wlan/.cvsignore
index 7073cac..ae45698 100644
--- a/noncore/settings/networksettings/wlan/.cvsignore
+++ b/noncore/settings/networksettings/wlan/.cvsignore
@@ -1,7 +1,9 @@
 Makefile
 Makefile.in
 info.cpp
 info.h
 moc_*
 wlan.cpp
 wlan.h
+.moc
+.obj
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index e459788..97fa468 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,6 +1,6 @@
   config WLAN
     boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
     default "n" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
-    #comment "opie-networksettingsplugin-wlan needs libopie, libopie2net and networksetup"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
+    #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
     #depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP)
\ No newline at end of file
diff --git a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
index 1147621..f4f20b1 100644
--- a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
+++ b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
@@ -1,9 +1,9 @@
 Package: opie-networksettingsplugin-wlan
-Files: plugins/networksettings/libwlan.so* 
+Files: plugins/networksettings/libwlan.so*
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Depends: opie-networksettings, libopienet2
+Depends: opie-networksettings, libopiecore2, libopienet2
 Description: Network settings wavelan plugin.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 719be1b..95f4abe 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -1,244 +1,244 @@
 #include "wlanimp.h"
 #include "interfacesetupimp.h"
 
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 
-#ifdef QWS 
- #include <opie/oprocess.h>
+#ifdef QWS
+ #include <opie2/oprocess.h>
 #else
  #define OProcess KProcess
  #include <kprocess.h>
 #endif
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 
 /**
  * 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), currentProfile("*") {
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Read in the config file.
   QString wlanFile = WIRELESS_OPTS;
   QFile file(wlanFile);
   if (file.open(IO_ReadOnly)){
     QTextStream stream( &file );
     QString line = "";
     while ( !stream.eof() ) {
       line += stream.readLine();
       line += "\n";
     }
     file.close();
     settingsFileText = QStringList::split("\n", line, true);
     parseSettingFile();
   }
   else
     qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
   connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
 }
 
 void WLANImp::typeChanged(int mod){
   networkChannel->setEnabled(mod);
   channelLabel->setEnabled(mod);
 }
 
 /**
  * Change the profile for both wireless settings and network settings.
- */ 
+ */
 void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
   parseSettingFile();
 }
 
 /**
  * Parses the settings file that was read in and gets any setting from it.
- */ 
+ */
 void WLANImp::parseSettingFile(){
   bool foundCase = false;
   bool found = false;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
-    if((foundCase && line.contains("esac")) || 
+    if((foundCase && line.contains("esac")) ||
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#'))
       found = true;
 
     if(line.contains(";;"))
       found = false;
     if(found){
       // write out scheme
       if(line.contains("ESSID=")){
         QString id = line.mid(line.find("ESSID=")+6, line.length());
         if(id == "any"){
           essAny->setChecked(false);
-        }else{ 
+        }else{
           essAny->setChecked(true);
-	  essSpecificLineEdit->setText(id);
-	}
+      essSpecificLineEdit->setText(id);
+    }
       }
       if(line.contains("MODE=")){
         QString mode = line.mid(line.find("MODE=")+5, line.length());
         if(mode == "Managed"){
           networkType->setCurrentItem(0);
-	  channelLabel->setEnabled(false);
-	  networkChannel->setEnabled(false);
-	}
-	else{
-	  networkType->setCurrentItem(1);
+      channelLabel->setEnabled(false);
+      networkChannel->setEnabled(false);
+    }
+    else{
+      networkType->setCurrentItem(1);
           networkChannel->setEnabled(true);
-	  channelLabel->setEnabled(true);
-	}
+      channelLabel->setEnabled(true);
+    }
       }
       if(line.contains("#KEY0="))
         keyLineEdit0->setText(line.mid(6, line.length()));
       if(line.contains("#KEY1="))
         keyLineEdit1->setText(line.mid(6, line.length()));
       if(line.contains("#KEY2="))
         keyLineEdit2->setText(line.mid(6, line.length()));
       if(line.contains("#KEY3="))
         keyLineEdit3->setText(line.mid(6, line.length()));
-      
+
       if(line.contains("KEY=")){
         wepEnabled->setChecked(true);
         QString key;
-	if(line.right(5) == (" open")){
-	  key = line.mid(4, line.length()-5);
-	  authOpen->setChecked(true);
-	  authShared->setChecked(false);
-	}
-	else{
-	  authOpen->setChecked(false);
-	  authShared->setChecked(true);
-	  key = line.mid(4, line.length());
-	}
+    if(line.right(5) == (" open")){
+      key = line.mid(4, line.length()-5);
+      authOpen->setChecked(true);
+      authShared->setChecked(false);
+    }
+    else{
+      authOpen->setChecked(false);
+      authShared->setChecked(true);
+      key = line.mid(4, line.length());
+    }
         if(key == keyLineEdit0->text()) keyRadio0->setChecked(true);
-	if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
-	if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
-	if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
+    if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
+    if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
+    if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
       }
       if(line.contains("CHANNEL=")){
         networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt());
       }
     }
   }
 }
 
 /**
  * Saves settings to the wireless.opts file using the current profile
- */ 
+ */
 void WLANImp::changeAndSaveSettingFile(){
   QString wlanFile = WIRELESS_OPTS;
   QFile::remove(wlanFile);
   QFile file(wlanFile);
 
   if (!file.open(IO_ReadWrite)){
     qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1());
     return;
   }
-  
+
   QTextStream stream( &file );
   bool foundCase = false;
   bool found = false;
   bool output = true;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
-    if((foundCase && line.contains("esac") && !found) || 
+    if((foundCase && line.contains("esac") && !found) ||
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
       // write out scheme
       found = true;
       output = false;
-      
+
       if(!line.contains("esac"))
-        stream << line << "\n"; 
+        stream << line << "\n";
       if(!essAny->isChecked() == true){
         stream << "\tESSID=any\n";
-	stream << "\tMODE=Managed\n";
+    stream << "\tMODE=Managed\n";
       }
       else{
         stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
         stream << "\tMODE=" << ( networkType->currentItem() == 0  ? "Managed" : "ad-hoc") << '\n';
         stream << "\tCHANNEL=" << networkChannel->value() << "\n";
-      } 
+      }
 
       stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
       stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
       stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
       stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
-      
+
       if(wepEnabled->isChecked()){
         stream << "\tKEY=\"";
         if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
         if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
         if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
         if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
-	if(authOpen->isChecked())
-	  stream << " open";
-	else
-	  stream << " restricted";
-	stream << "\"\n";
+    if(authOpen->isChecked())
+      stream << " open";
+    else
+      stream << " restricted";
+    stream << "\"\n";
       }
       stream << "\tRATE=auto\n";
       if(line.contains("esac"))
-        stream << line << "\n"; 
+        stream << line << "\n";
     }
     if(line.contains(";;"))
       output = true;
     if(output && (*it).length() )
       stream << (*it) << '\n';
   }
   file.close();
 }
 
 /**
  * Check to see if the current config is valid
  * Save wireless.opts, save interfaces
  */
 void WLANImp::accept(){
   if(wepEnabled->isChecked()){
     if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
       QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
       return;
     }
-  }	
-  
+  }
+
   if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
     QMessageBox::information(this, "Error", "Please enter a SSID.", QMessageBox::Ok);
     return;
   }
-  
+
   // Ok settings are good here, save
   changeAndSaveSettingFile();
-  
+
   // Try to save the interfaces settings.
   if(!interfaceSetup->saveChanges())
     return;
 
   OProcess insert;
   insert << "sh";
   insert << "-c";
   insert << "cardctl eject && cardctl insert";
 
   if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) {
     qWarning("could not start cardctl");
   }
 
   // Close out the dialog
   QDialog::accept();
 }
 
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index e7d6ff5..92339d6 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -1,490 +1,490 @@
 #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 <opie/oprocess.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* ) ) );
   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;
+      break;
         case 2:
           keyRadio1->setChecked(true);
-	  break;
+      break;
         case 3:
           keyRadio2->setChecked(true);
-	  break;
+      break;
         case 4:
           keyRadio3->setChecked(true);
-	  break;
+      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;
+        break;
           case 2:
             keyLineEdit1->setText(key);
-	    break;
+        break;
           case 3:
             keyLineEdit2->setText(key);
-	    break;
+        break;
           case 4:
             keyLineEdit3->setText(key);
-	    break;
+        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();
 }
 
 void WLANImp::writeOpts() {
     // 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;
 
     qDebug("setting wlan interface %s", interfaces->getInterfaceName( error ).latin1() );
 
     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"));
   }
 
   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();
     qDebug( "rescanNeighbourhood via '%s'", (const char*) name );
 
     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() )
     {
         qWarning( "rescanNeighbourhood(): couldn't guess device type :(" );
         return;
     }
     else
     {
         qDebug( "rescanNeighbourhood(): device type seems to be '%s'", (const char*) devicetype );
     }
 
     // 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
     {
         qDebug( "rescanNeighbourhood(): unsupported device type for monitoring :(" );
         return;
     }
 
     wiface->setMode( "monitor" );
     if ( wiface->mode() != "monitor" )
     {
         qWarning( "rescanNeighbourhood(): Unable to bring device into monitor mode (%s).", strerror( errno ) );
         return;
     }
 
     // open a packet capturer
     OPacketCapturer* cap = new OPacketCapturer();
     cap->open( name );
     if ( !cap->isOpen() )
     {
         qWarning( "rescanNeighbourhood(): Unable to open libpcap (%s).", strerror( errno ) );
         return;
     }
 
     // display splash screen
     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();
         qDebug( "rescanNeighbourhood(): listening on channel %d...", i );
         OPacket* p = cap->next( 1000 );
         if ( !p )
         {
             qDebug( "rescanNeighbourhood(): nothing received on channel %d", i );
         }
         else
         {
             qDebug( "rescanNeighbourhood(): TADAA - something came in on channel %d", i );
             handlePacket( p );
         }
     }
 
     cap->close();
     wiface->setMode( "managed" ); // TODO: use previous mode
     wiface->setPromiscuousMode( false );
 
     splash->hide();
     delete splash;
 
 }
 
 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
         {
             qWarning( "handlePacket(): invalid frame [possibly noise] detected!" );
             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 )
 {
 
     qDebug( "found network: <%s>, chn %d, ssid '%s', mac '%s'", (const char*) mode, channel,
                                                                 (const char*) ssid,
                                                                 (const char*) mac.toString() );
 
     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 ) );
         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 );
     }
 }