5 files changed, 63 insertions, 61 deletions

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
@@ -7 +7,3 @@ 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
@@ -3,4 +3,4 @@
     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,3 +1,3 @@
 Package: opie-networksettingsplugin-wlan
-Files: plugins/networksettings/libwlan.so* 
+Files: plugins/networksettings/libwlan.so*
 Priority: optional
@@ -6,3 +6,3 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Depends: opie-networksettings, libopienet2
+Depends: opie-networksettings, libopiecore2, libopienet2
 Description: Network settings wavelan plugin.
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
@@ -15,4 +15,4 @@
 
-#ifdef QWS 
- #include <opie/oprocess.h>
+#ifdef QWS
+ #include <opie2/oprocess.h>
 #else
@@ -26,3 +26,3 @@
  * 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("*") {
@@ -57,3 +57,3 @@ void WLANImp::typeChanged(int mod){
  * Change the profile for both wireless settings and network settings.
- */ 
+ */
 void WLANImp::setProfile(const QString &profile){
@@ -65,3 +65,3 @@ void WLANImp::setProfile(const QString &profile){
  * Parses the settings file that was read in and gets any setting from it.
- */ 
+ */
 void WLANImp::parseSettingFile(){
@@ -74,3 +74,3 @@ void WLANImp::parseSettingFile(){
     // 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) != '#'))
@@ -86,6 +86,6 @@ void WLANImp::parseSettingFile(){
           essAny->setChecked(false);
-        }else{ 
+        }else{
           essAny->setChecked(true);
-          essSpecificLineEdit->setText(id);
-        }
+      essSpecificLineEdit->setText(id);
+    }
       }
@@ -95,10 +95,10 @@ void WLANImp::parseSettingFile(){
           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);
+    }
       }
@@ -112,3 +112,3 @@ void WLANImp::parseSettingFile(){
         keyLineEdit3->setText(line.mid(6, line.length()));
-      
+
       if(line.contains("KEY=")){
@@ -116,16 +116,16 @@ void WLANImp::parseSettingFile(){
         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);
       }
@@ -140,3 +140,3 @@ void WLANImp::parseSettingFile(){
  * Saves settings to the wireless.opts file using the current profile
- */ 
+ */
 void WLANImp::changeAndSaveSettingFile(){
@@ -150,3 +150,3 @@ void WLANImp::changeAndSaveSettingFile(){
   }
-  
+
   QTextStream stream( &file );
@@ -160,3 +160,3 @@ void WLANImp::changeAndSaveSettingFile(){
     // 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) != '#')){
@@ -165,8 +165,8 @@ void WLANImp::changeAndSaveSettingFile(){
       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";
       }
@@ -176,3 +176,3 @@ void WLANImp::changeAndSaveSettingFile(){
         stream << "\tCHANNEL=" << networkChannel->value() << "\n";
-      } 
+      }
 
@@ -182,3 +182,3 @@ void WLANImp::changeAndSaveSettingFile(){
       stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
-      
+
       if(wepEnabled->isChecked()){
@@ -189,7 +189,7 @@ void WLANImp::changeAndSaveSettingFile(){
         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";
       }
@@ -197,3 +197,3 @@ void WLANImp::changeAndSaveSettingFile(){
       if(line.contains("esac"))
-        stream << line << "\n"; 
+        stream << line << "\n";
     }
@@ -217,4 +217,4 @@ void WLANImp::accept(){
     }
-          }
-  
+  }
+
   if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
@@ -223,6 +223,6 @@ void WLANImp::accept(){
   }
-  
+
   // Ok settings are good here, save
   changeAndSaveSettingFile();
-  
+
   // Try to save the interfaces settings.
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
@@ -30,3 +30,3 @@
  #include <qpe/resource.h>
- #include <opie/oprocess.h>
+ #include <opie2/oprocess.h>
  #include <opie2/onetwork.h>
@@ -141,12 +141,12 @@ void WLANImp::parseKeyStr(QString keystr) {
           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;
       }
@@ -172,12 +172,12 @@ void WLANImp::parseKeyStr(QString keystr) {
             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;
       }