Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (show 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,7 +1,7 @@ TEMPLATE = lib -CONFIG += qt warn_on release -#CONFIG += qt warn_on debug -DESTDIR = $(OPIEDIR)/plugins/networksetup +#CONFIG += qt warn_on release +CONFIG += qt warn_on debug +#DESTDIR = $(OPIEDIR)/plugins/networksetup HEADERS = wlanimp.h wlanmodule.h wextensions.h SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp INCLUDEPATH += $(OPIEDIR)/include ../ 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 @@ -16,7 +16,7 @@ #include <qcheckbox.h> #include <qregexp.h> -WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ +WLANImp::WLANImp( QWidget* parent, const char* name, bool modal, WFlags fl):WLAN(parent, name, modal, fl){ config = new Config("wireless"); readConfig(); } @@ -101,6 +101,7 @@ bool WLANImp::writeConfig() config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); + return true; return writeWirelessOpts( ); } @@ -112,12 +113,6 @@ void WLANImp::accept() QDialog::accept(); } -void WLANImp::done ( int r ) -{ - QDialog::done ( r ); - close ( ); -} - bool WLANImp::writeWirelessOpts( QString scheme ) { qWarning( "WLANImp::writeWirelessOpts entered." ); 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 @@ -9,12 +9,11 @@ class WLANImp : public WLAN { Q_OBJECT public: - WLANImp( QWidget* parent = 0, const char* name = 0); + WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~WLANImp( ); protected: void accept(); - void done ( int r ); private: void readConfig(); 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 @@ -15,6 +15,7 @@ WLANModule::WLANModule() : Module() { /** */ WLANModule::~WLANModule(){ + qDebug("Deleting module"); Interface *i; for ( i=list.first(); i != 0; i=list.next() ) delete i; @@ -57,7 +58,7 @@ bool WLANModule::isOwner(Interface *i){ * @return QWidget* pointer to the tab widget in this modules configure. */ QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ - WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); + WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose); (*tabWidget) = wlanconfig->tabWidget; return wlanconfig; } @@ -88,10 +89,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ info->noiseProgressBar->setProgress(noise); info->qualityProgressBar->setProgress(quality); info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); - //WlanInfo info (0, "wireless info", true); - //info.show(); - //return NULL; - return info; } |