author | kergoth <kergoth> | 2002-10-19 21:27:09 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-10-19 21:27:09 (UTC) |
commit | 174ae2b9de0d4d002c549976561e66668453e5a4 (patch) (unidiff) | |
tree | be53f0e8626ac8410b46a32ce70c0858df8dccdb | |
parent | d7449e1e0070a068c5e83366cb75b64142b71b89 (diff) | |
download | opie-174ae2b9de0d4d002c549976561e66668453e5a4.zip opie-174ae2b9de0d4d002c549976561e66668453e5a4.tar.gz opie-174ae2b9de0d4d002c549976561e66668453e5a4.tar.bz2 |
geh, never code before coffee!
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.h | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.h | 1 |
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 | |||
@@ -8,32 +8,36 @@ | |||
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qfile.h> | 9 | #include <qfile.h> |
10 | #include <qdir.h> | 10 | #include <qdir.h> |
11 | #include <qtextstream.h> | 11 | #include <qtextstream.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
13 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
14 | #include <qspinbox.h> | 14 | #include <qspinbox.h> |
15 | #include <qradiobutton.h> | 15 | #include <qradiobutton.h> |
16 | #include <qcheckbox.h> | 16 | #include <qcheckbox.h> |
17 | #include <qregexp.h> | 17 | #include <qregexp.h> |
18 | 18 | ||
19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ | 19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ |
20 | config = new Config("wireless"); | 20 | config = new Config("wireless"); |
21 | readConfig(); | 21 | readConfig(); |
22 | } | 22 | } |
23 | 23 | ||
24 | WLANImp::~WLANImp( ){ | ||
25 | delete config; | ||
26 | } | ||
27 | |||
24 | void WLANImp::readConfig() | 28 | void WLANImp::readConfig() |
25 | { | 29 | { |
26 | qWarning( "WLANImp::readConfig() called." ); | 30 | qWarning( "WLANImp::readConfig() called." ); |
27 | config->setGroup( "Properties" ); | 31 | config->setGroup( "Properties" ); |
28 | QString ssid = config->readEntry( "SSID", "any" ); | 32 | QString ssid = config->readEntry( "SSID", "any" ); |
29 | if( ssid == "any" || ssid == "ANY" ){ | 33 | if( ssid == "any" || ssid == "ANY" ){ |
30 | essNon->setChecked( true ); | 34 | essNon->setChecked( true ); |
31 | } else { | 35 | } else { |
32 | essSpecific->setChecked( true ); | 36 | essSpecific->setChecked( true ); |
33 | essSpecificLineEdit->setText( ssid ); | 37 | essSpecificLineEdit->setText( ssid ); |
34 | } | 38 | } |
35 | QString mode = config->readEntry( "Mode", "Managed" ); | 39 | QString mode = config->readEntry( "Mode", "Managed" ); |
36 | if( mode == "adhoc" ) { | 40 | if( mode == "adhoc" ) { |
37 | network802->setChecked( true ); | 41 | network802->setChecked( true ); |
38 | } else { | 42 | } else { |
39 | networkInfrastructure->setChecked( true ); | 43 | networkInfrastructure->setChecked( true ); |
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 @@ | |||
1 | #ifndef WLANIMP_H | 1 | #ifndef WLANIMP_H |
2 | #define WLANIMP_H | 2 | #define WLANIMP_H |
3 | 3 | ||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | 7 | ||
8 | class WLANImp : public WLAN { | 8 | class WLANImp : public WLAN { |
9 | Q_OBJECT | 9 | Q_OBJECT |
10 | 10 | ||
11 | public: | 11 | public: |
12 | WLANImp( QWidget* parent = 0, const char* name = 0); | 12 | WLANImp( QWidget* parent = 0, const char* name = 0); |
13 | ~WLANImp( ); | ||
13 | 14 | ||
14 | protected: | 15 | protected: |
15 | void accept(); | 16 | void accept(); |
16 | void done ( int r ); | 17 | void done ( int r ); |
17 | 18 | ||
18 | private: | 19 | private: |
19 | void readConfig(); | 20 | void readConfig(); |
20 | bool writeConfig(); | 21 | bool writeConfig(); |
21 | bool writeWirelessOpts( QString scheme = "*" ); | 22 | bool writeWirelessOpts( QString scheme = "*" ); |
22 | bool writeWlanngOpts( QString scheme = "*" ); | 23 | bool writeWlanngOpts( QString scheme = "*" ); |
23 | Config* config; | 24 | Config* config; |
24 | }; | 25 | }; |
25 | 26 | ||
26 | #endif | 27 | #endif |
27 | 28 | ||
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 | |||
@@ -8,32 +8,36 @@ | |||
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qfile.h> | 9 | #include <qfile.h> |
10 | #include <qdir.h> | 10 | #include <qdir.h> |
11 | #include <qtextstream.h> | 11 | #include <qtextstream.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
13 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
14 | #include <qspinbox.h> | 14 | #include <qspinbox.h> |
15 | #include <qradiobutton.h> | 15 | #include <qradiobutton.h> |
16 | #include <qcheckbox.h> | 16 | #include <qcheckbox.h> |
17 | #include <qregexp.h> | 17 | #include <qregexp.h> |
18 | 18 | ||
19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ | 19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){ |
20 | config = new Config("wireless"); | 20 | config = new Config("wireless"); |
21 | readConfig(); | 21 | readConfig(); |
22 | } | 22 | } |
23 | 23 | ||
24 | WLANImp::~WLANImp( ){ | ||
25 | delete config; | ||
26 | } | ||
27 | |||
24 | void WLANImp::readConfig() | 28 | void WLANImp::readConfig() |
25 | { | 29 | { |
26 | qWarning( "WLANImp::readConfig() called." ); | 30 | qWarning( "WLANImp::readConfig() called." ); |
27 | config->setGroup( "Properties" ); | 31 | config->setGroup( "Properties" ); |
28 | QString ssid = config->readEntry( "SSID", "any" ); | 32 | QString ssid = config->readEntry( "SSID", "any" ); |
29 | if( ssid == "any" || ssid == "ANY" ){ | 33 | if( ssid == "any" || ssid == "ANY" ){ |
30 | essNon->setChecked( true ); | 34 | essNon->setChecked( true ); |
31 | } else { | 35 | } else { |
32 | essSpecific->setChecked( true ); | 36 | essSpecific->setChecked( true ); |
33 | essSpecificLineEdit->setText( ssid ); | 37 | essSpecificLineEdit->setText( ssid ); |
34 | } | 38 | } |
35 | QString mode = config->readEntry( "Mode", "Managed" ); | 39 | QString mode = config->readEntry( "Mode", "Managed" ); |
36 | if( mode == "adhoc" ) { | 40 | if( mode == "adhoc" ) { |
37 | network802->setChecked( true ); | 41 | network802->setChecked( true ); |
38 | } else { | 42 | } else { |
39 | networkInfrastructure->setChecked( true ); | 43 | networkInfrastructure->setChecked( true ); |
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 @@ | |||
1 | #ifndef WLANIMP_H | 1 | #ifndef WLANIMP_H |
2 | #define WLANIMP_H | 2 | #define WLANIMP_H |
3 | 3 | ||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | 7 | ||
8 | class WLANImp : public WLAN { | 8 | class WLANImp : public WLAN { |
9 | Q_OBJECT | 9 | Q_OBJECT |
10 | 10 | ||
11 | public: | 11 | public: |
12 | WLANImp( QWidget* parent = 0, const char* name = 0); | 12 | WLANImp( QWidget* parent = 0, const char* name = 0); |
13 | ~WLANImp( ); | ||
13 | 14 | ||
14 | protected: | 15 | protected: |
15 | void accept(); | 16 | void accept(); |
16 | void done ( int r ); | 17 | void done ( int r ); |
17 | 18 | ||
18 | private: | 19 | private: |
19 | void readConfig(); | 20 | void readConfig(); |
20 | bool writeConfig(); | 21 | bool writeConfig(); |
21 | bool writeWirelessOpts( QString scheme = "*" ); | 22 | bool writeWirelessOpts( QString scheme = "*" ); |
22 | bool writeWlanngOpts( QString scheme = "*" ); | 23 | bool writeWlanngOpts( QString scheme = "*" ); |
23 | Config* config; | 24 | Config* config; |
24 | }; | 25 | }; |
25 | 26 | ||
26 | #endif | 27 | #endif |
27 | 28 | ||