Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
4 files changed, 8 insertions, 17 deletions
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro index 432a096..814a0b4 100644 --- a/noncore/settings/networksettings/wlan/wlan.pro +++ b/noncore/settings/networksettings/wlan/wlan.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | #CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | CONFIG += qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/plugins/networksetup | 4 | #DESTDIR = $(OPIEDIR)/plugins/networksetup |
5 | HEADERS = wlanimp.h wlanmodule.h wextensions.h | 5 | HEADERS = wlanimp.h wlanmodule.h wextensions.h |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 94c7518..45952b9 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -18,3 +18,3 @@ | |||
18 | 18 | ||
19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ | 19 | WLANImp::WLANImp( QWidget* parent, const char* name, bool modal, WFlags fl):WLAN(parent, name, modal, fl){ |
20 | config = new Config("wireless"); | 20 | config = new Config("wireless"); |
@@ -103,2 +103,3 @@ bool WLANImp::writeConfig() | |||
103 | config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); | 103 | config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); |
104 | return true; | ||
104 | return writeWirelessOpts( ); | 105 | return writeWirelessOpts( ); |
@@ -114,8 +115,2 @@ void WLANImp::accept() | |||
114 | 115 | ||
115 | void WLANImp::done ( int r ) | ||
116 | { | ||
117 | QDialog::done ( r ); | ||
118 | close ( ); | ||
119 | } | ||
120 | |||
121 | bool WLANImp::writeWirelessOpts( QString scheme ) | 116 | bool WLANImp::writeWirelessOpts( QString scheme ) |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h index 22ce143..59b7c59 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.h +++ b/noncore/settings/networksettings/wlan/wlanimp.h | |||
@@ -11,3 +11,3 @@ class WLANImp : public WLAN { | |||
11 | public: | 11 | public: |
12 | WLANImp( QWidget* parent = 0, const char* name = 0); | 12 | WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
13 | ~WLANImp( ); | 13 | ~WLANImp( ); |
@@ -16,3 +16,2 @@ protected: | |||
16 | void accept(); | 16 | void accept(); |
17 | void done ( int r ); | ||
18 | 17 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 7507c54..3363b8a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -17,2 +17,3 @@ WLANModule::WLANModule() : Module() { | |||
17 | WLANModule::~WLANModule(){ | 17 | WLANModule::~WLANModule(){ |
18 | qDebug("Deleting module"); | ||
18 | Interface *i; | 19 | Interface *i; |
@@ -59,3 +60,3 @@ bool WLANModule::isOwner(Interface *i){ | |||
59 | QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ | 60 | QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ |
60 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); | 61 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose); |
61 | (*tabWidget) = wlanconfig->tabWidget; | 62 | (*tabWidget) = wlanconfig->tabWidget; |
@@ -90,6 +91,2 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | |||
90 | info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); | 91 | info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); |
91 | //WlanInfo info (0, "wireless info", true); | ||
92 | //info.show(); | ||
93 | //return NULL; | ||
94 | |||
95 | return info; | 92 | return info; |