4 files changed, 10 insertions, 0 deletions

diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 3b0e0b7..ea19207 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -1,87 +1,91 @@
 #include "wlanimp.h"
 
 /* Config class */
 #include <qpe/config.h>
 /* Global namespace */
 #include <qpe/global.h>
 /* system() */
 #include <stdlib.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qregexp.h>
 
 WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){
   config = new Config("wireless");
   readConfig();
 }
 
+WLANImp::~WLANImp( ){
+  delete config;
+}
+
 void WLANImp::readConfig()
 {
     qWarning( "WLANImp::readConfig() called." );
     config->setGroup( "Properties" );
     QString ssid = config->readEntry( "SSID", "any" );
     if( ssid == "any" || ssid == "ANY" ){
         essNon->setChecked( true );
     } else {
         essSpecific->setChecked( true );
         essSpecificLineEdit->setText( ssid );
     }
     QString mode = config->readEntry( "Mode", "Managed" );
     if( mode == "adhoc" ) {
         network802->setChecked( true );
     } else {
         networkInfrastructure->setChecked( true );
     }
     networkChannel->setValue( config->readNumEntry( "CHANNEL", 1 ) );
 //    config->readEntry( "RATE", "auto" );
     config->readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false );
     config->readEntry( "AuthType", "opensystem" );
     config->readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true );
     int defaultkey = config->readNumEntry( "dot11WEPDefaultKeyID", 0 );
     switch( defaultkey ){
     case 0:
         keyRadio0->setChecked( true );
         break;
     case 1:
         keyRadio1->setChecked( true );
         break;
     case 2:
         keyRadio2->setChecked( true );
         break;
     case 3:
         keyRadio3->setChecked( true );
         break;
     }
     keyLineEdit0->setText(config->readEntry( "dot11WEPDefaultKey0" ));
     keyLineEdit1->setText(config->readEntry( "dot11WEPDefaultKey1" ));
     keyLineEdit2->setText(config->readEntry( "dot11WEPDefaultKey2" ));
     keyLineEdit3->setText(config->readEntry( "dot11WEPDefaultKey3" ));
     return;
 }
 
 bool WLANImp::writeConfig()
 {
     qWarning( "WLANImp::writeConfig() called." );
     config->setGroup( "Properties" );
     if( essNon->isChecked() ) {
         config->writeEntry( "SSID", "any" );
     } else {
         config->writeEntry( "SSID", essSpecificLineEdit->text() );
     }
     if( networkInfrastructure->isChecked() ){
         config->writeEntry( "Mode", "Managed" );
     } else if( network802->isChecked() ){
         config->writeEntry( "Mode", "adhoc" );
     }
     config->writeEntry( "CHANNEL", networkChannel->value() );
 //    config->readEntry( "RATE", "auto" );
     wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" );
     authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" );
     key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" );
     if( keyRadio0->isChecked() ){
diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h
index 79e931d..22ce143 100644
--- a/noncore/net/networksetup/wlan/wlanimp.h
+++ b/noncore/net/networksetup/wlan/wlanimp.h
@@ -1,27 +1,28 @@
 #ifndef WLANIMP_H
 #define WLANIMP_H
 
 #include "wlan.h"
 
 #include <qpe/config.h>
 
 class WLANImp : public WLAN { 
   Q_OBJECT
 
 public:
   WLANImp( QWidget* parent = 0, const char* name = 0);
+  ~WLANImp( );
 
 protected:
   void accept();
   void done ( int r );
 
 private:
   void readConfig();
   bool writeConfig();
   bool writeWirelessOpts( QString scheme = "*" );
   bool writeWlanngOpts( QString scheme = "*" );
   Config* config;
 };
 
 #endif
  
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 3b0e0b7..ea19207 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -1,87 +1,91 @@
 #include "wlanimp.h"
 
 /* Config class */
 #include <qpe/config.h>
 /* Global namespace */
 #include <qpe/global.h>
 /* system() */
 #include <stdlib.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qregexp.h>
 
 WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){
   config = new Config("wireless");
   readConfig();
 }
 
+WLANImp::~WLANImp( ){
+  delete config;
+}
+
 void WLANImp::readConfig()
 {
     qWarning( "WLANImp::readConfig() called." );
     config->setGroup( "Properties" );
     QString ssid = config->readEntry( "SSID", "any" );
     if( ssid == "any" || ssid == "ANY" ){
         essNon->setChecked( true );
     } else {
         essSpecific->setChecked( true );
         essSpecificLineEdit->setText( ssid );
     }
     QString mode = config->readEntry( "Mode", "Managed" );
     if( mode == "adhoc" ) {
         network802->setChecked( true );
     } else {
         networkInfrastructure->setChecked( true );
     }
     networkChannel->setValue( config->readNumEntry( "CHANNEL", 1 ) );
 //    config->readEntry( "RATE", "auto" );
     config->readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false );
     config->readEntry( "AuthType", "opensystem" );
     config->readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true );
     int defaultkey = config->readNumEntry( "dot11WEPDefaultKeyID", 0 );
     switch( defaultkey ){
     case 0:
         keyRadio0->setChecked( true );
         break;
     case 1:
         keyRadio1->setChecked( true );
         break;
     case 2:
         keyRadio2->setChecked( true );
         break;
     case 3:
         keyRadio3->setChecked( true );
         break;
     }
     keyLineEdit0->setText(config->readEntry( "dot11WEPDefaultKey0" ));
     keyLineEdit1->setText(config->readEntry( "dot11WEPDefaultKey1" ));
     keyLineEdit2->setText(config->readEntry( "dot11WEPDefaultKey2" ));
     keyLineEdit3->setText(config->readEntry( "dot11WEPDefaultKey3" ));
     return;
 }
 
 bool WLANImp::writeConfig()
 {
     qWarning( "WLANImp::writeConfig() called." );
     config->setGroup( "Properties" );
     if( essNon->isChecked() ) {
         config->writeEntry( "SSID", "any" );
     } else {
         config->writeEntry( "SSID", essSpecificLineEdit->text() );
     }
     if( networkInfrastructure->isChecked() ){
         config->writeEntry( "Mode", "Managed" );
     } else if( network802->isChecked() ){
         config->writeEntry( "Mode", "adhoc" );
     }
     config->writeEntry( "CHANNEL", networkChannel->value() );
 //    config->readEntry( "RATE", "auto" );
     wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" );
     authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" );
     key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" );
     if( keyRadio0->isChecked() ){
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index 79e931d..22ce143 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -1,27 +1,28 @@
 #ifndef WLANIMP_H
 #define WLANIMP_H
 
 #include "wlan.h"
 
 #include <qpe/config.h>
 
 class WLANImp : public WLAN { 
   Q_OBJECT
 
 public:
   WLANImp( QWidget* parent = 0, const char* name = 0);
+  ~WLANImp( );
 
 protected:
   void accept();
   void done ( int r );
 
 private:
   void readConfig();
   bool writeConfig();
   bool writeWirelessOpts( QString scheme = "*" );
   bool writeWlanngOpts( QString scheme = "*" );
   Config* config;
 };
 
 #endif