-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 7 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 843f630..9d81ab1 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -85,2 +85,9 @@ MainWindowImp::~MainWindowImp(){ | |||
85 | 85 | ||
86 | // Delete all interfaces that don't have owners. | ||
87 | QMap<Interface*, QListViewItem*>::Iterator iIt; | ||
88 | for( iIt = items.begin(); iIt != items.end(); ++iIt ){ | ||
89 | if(iIt.key()->getModuleOwner() == NULL) | ||
90 | delete iIt.key(); | ||
91 | } | ||
92 | |||
86 | // Delete Modules and Libraries | 93 | // Delete Modules and Libraries |
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp index cbb520d..24cb1cd 100644 --- a/noncore/net/networksetup/wlan/wlanmodule.cpp +++ b/noncore/net/networksetup/wlan/wlanmodule.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "wlanmodule.h" | 1 | #include "wlanmodule.h" |
2 | #include <qpe/config.h> | ||
3 | #include "wlanimp.h" | 2 | #include "wlanimp.h" |
@@ -5,3 +4,2 @@ | |||
5 | 4 | ||
6 | |||
7 | #include <arpa/inet.h> | 5 | #include <arpa/inet.h> |
@@ -65,3 +63,3 @@ bool WLANModule::isOwner(Interface *i){ | |||
65 | QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ | 63 | QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ |
66 | WLANImp *wlanconfig = new WLANImp( ); | 64 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); |
67 | (*tabWidget) = wlanconfig->tabWidget; | 65 | (*tabWidget) = wlanconfig->tabWidget; |
@@ -76,2 +74,3 @@ QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ | |||
76 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | 74 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ |
75 | return NULL; | ||
77 | WlanInfo *info = new WlanInfo(0, "wireless info"); | 76 | WlanInfo *info = new WlanInfo(0, "wireless info"); |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 843f630..9d81ab1 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -85,2 +85,9 @@ MainWindowImp::~MainWindowImp(){ | |||
85 | 85 | ||
86 | // Delete all interfaces that don't have owners. | ||
87 | QMap<Interface*, QListViewItem*>::Iterator iIt; | ||
88 | for( iIt = items.begin(); iIt != items.end(); ++iIt ){ | ||
89 | if(iIt.key()->getModuleOwner() == NULL) | ||
90 | delete iIt.key(); | ||
91 | } | ||
92 | |||
86 | // Delete Modules and Libraries | 93 | // Delete Modules and Libraries |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index cbb520d..24cb1cd 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "wlanmodule.h" | 1 | #include "wlanmodule.h" |
2 | #include <qpe/config.h> | ||
3 | #include "wlanimp.h" | 2 | #include "wlanimp.h" |
@@ -5,3 +4,2 @@ | |||
5 | 4 | ||
6 | |||
7 | #include <arpa/inet.h> | 5 | #include <arpa/inet.h> |
@@ -65,3 +63,3 @@ bool WLANModule::isOwner(Interface *i){ | |||
65 | QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ | 63 | QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ |
66 | WLANImp *wlanconfig = new WLANImp( ); | 64 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); |
67 | (*tabWidget) = wlanconfig->tabWidget; | 65 | (*tabWidget) = wlanconfig->tabWidget; |
@@ -76,2 +74,3 @@ QWidget *WLANModule::configure(Interface *i, QTabWidget **tabWidget){ | |||
76 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | 74 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ |
75 | return NULL; | ||
77 | WlanInfo *info = new WlanInfo(0, "wireless info"); | 76 | WlanInfo *info = new WlanInfo(0, "wireless info"); |