summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-10-17 18:35:56 (UTC)
committer benmeyer <benmeyer>2002-10-17 18:35:56 (UTC)
commit0af393f729c3c6fb31b6794d31daf1dba9ed6eb6 (patch) (unidiff)
tree83bf6904aa174ff026170ac6380bb857a6807468
parent7a8d68c1dff37a5a50d1dfa84513ed1f7b7e2008 (diff)
downloadopie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.zip
opie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.tar.gz
opie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.tar.bz2
Profile changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interface.h1
-rw-r--r--noncore/net/networksetup/module.h9
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp40
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.cpp7
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.h4
-rw-r--r--noncore/settings/networksettings/interface.h1
-rw-r--r--noncore/settings/networksettings/module.h9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp40
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp7
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.h4
10 files changed, 76 insertions, 46 deletions
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h
index 7943fd6..dc9c6d3 100644
--- a/noncore/net/networksetup/interface.h
+++ b/noncore/net/networksetup/interface.h
@@ -52,3 +52,2 @@ private:
52 bool attached; 52 bool attached;
53 QString interfaceName;
54 QString hardwareName; 53 QString hardwareName;
diff --git a/noncore/net/networksetup/module.h b/noncore/net/networksetup/module.h
index 0c81928..a30f492 100644
--- a/noncore/net/networksetup/module.h
+++ b/noncore/net/networksetup/module.h
@@ -18,3 +18,10 @@ public:
18 Module(){}; 18 Module(){};
19 19
20 /**
21 * The current profile has been changed and the module should do any
22 * neccesary changes also.
23 * @param newProfile what the profile should be changed to.
24 */
25 virtual void setProfile(QString newProfile) = 0;
26
20 /** 27 /**
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 806643d..74eef5f 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -28,5 +28,5 @@ void WLANImp::readConfig()
28 if( ssid == "any" || ssid == "ANY" ){ 28 if( ssid == "any" || ssid == "ANY" ){
29 essNon->setChecked( TRUE ); 29 essNon->setChecked( true );
30 } else { 30 } else {
31 essSpecific->setChecked( TRUE ); 31 essSpecific->setChecked( true );
32 essSpecificLineEdit->setText( ssid ); 32 essSpecificLineEdit->setText( ssid );
@@ -35,5 +35,5 @@ void WLANImp::readConfig()
35 if( mode == "adhoc" ) { 35 if( mode == "adhoc" ) {
36 network802->setChecked( TRUE ); 36 network802->setChecked( true );
37 } else { 37 } else {
38 networkInfrastructure->setChecked( TRUE ); 38 networkInfrastructure->setChecked( true );
39 } 39 }
@@ -41,5 +41,5 @@ void WLANImp::readConfig()
41// config.readEntry( "RATE", "auto" ); 41// config.readEntry( "RATE", "auto" );
42 config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( TRUE ) : wepEnabled->setChecked( FALSE ); 42 config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false );
43 config.readEntry( "AuthType", "opensystem" ); 43 config.readEntry( "AuthType", "opensystem" );
44 config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( TRUE ) : key128->setChecked( TRUE ); 44 config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true );
45 int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); 45 int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 );
@@ -47,12 +47,12 @@ void WLANImp::readConfig()
47 case 0: 47 case 0:
48 keyRadio0->setChecked( TRUE ); 48 keyRadio0->setChecked( true );
49 break; 49 break;
50 case 1: 50 case 1:
51 keyRadio1->setChecked( TRUE ); 51 keyRadio1->setChecked( true );
52 break; 52 break;
53 case 2: 53 case 2:
54 keyRadio2->setChecked( TRUE ); 54 keyRadio2->setChecked( true );
55 break; 55 break;
56 case 3: 56 case 3:
57 keyRadio3->setChecked( TRUE ); 57 keyRadio3->setChecked( true );
58 break; 58 break;
@@ -99,3 +99,3 @@ bool WLANImp::writeConfig()
99 return writeWirelessOpts( config ); 99 return writeWirelessOpts( config );
100// return TRUE; 100// return true;
101} 101}
@@ -122,3 +122,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
122 if ( !prevFile.open( IO_ReadOnly ) ) 122 if ( !prevFile.open( IO_ReadOnly ) )
123 return FALSE; 123 return false;
124 124
@@ -127,5 +127,5 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
127 if ( !tmpFile.open( IO_WriteOnly ) ) 127 if ( !tmpFile.open( IO_WriteOnly ) )
128 return FALSE; 128 return false;
129 129
130 bool retval = TRUE; 130 bool retval = true;
131 131
@@ -137,4 +137,4 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
137 QString line; 137 QString line;
138 bool found=FALSE; 138 bool found=false;
139 bool done=FALSE; 139 bool done=false;
140 while ( !in.atEnd() ) { 140 while ( !in.atEnd() ) {
@@ -146,3 +146,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
146 if ( wline == ";;" ) { 146 if ( wline == ";;" ) {
147 found = FALSE; 147 found = false;
148 continue; 148 continue;
@@ -153,3 +153,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
153 if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { 153 if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) {
154 found=TRUE; 154 found=true;
155 continue; // skip this line 155 continue; // skip this line
@@ -203,3 +203,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
203 out << " ;;\n"; 203 out << " ;;\n";
204 done = TRUE; 204 done = true;
205 } 205 }
@@ -223,3 +223,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
223 if( system( "mv " + tmp + " " + prev ) ) 223 if( system( "mv " + tmp + " " + prev ) )
224 retval = FALSE; 224 retval = false;
225//#ifdef USE_SCHEMES 225//#ifdef USE_SCHEMES
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index f0394b4..9d34d75 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -12,2 +12,9 @@ WLANModule::WLANModule() : Module() {
12/** 12/**
13 * Change the current profile
14 */
15void WLANModule::setProfile(QString newProfile){
16 profile = newProfile;
17}
18
19/**
13 * get the icon name for this device. 20 * get the icon name for this device.
diff --git a/noncore/net/networksetup/wlan/wlanmodule.h b/noncore/net/networksetup/wlan/wlanmodule.h
index 7ebe129..833d4b1 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.h
+++ b/noncore/net/networksetup/wlan/wlanmodule.h
@@ -13,2 +13,3 @@ public:
13 13
14 virtual void setProfile(QString newProfile);
14 virtual bool isOwner(Interface *); 15 virtual bool isOwner(Interface *);
@@ -24,3 +25,4 @@ private:
24 QList<Interface> list; 25 QList<Interface> list;
25 26 QString profile;
27
26}; 28};
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h
index 7943fd6..dc9c6d3 100644
--- a/noncore/settings/networksettings/interface.h
+++ b/noncore/settings/networksettings/interface.h
@@ -52,3 +52,2 @@ private:
52 bool attached; 52 bool attached;
53 QString interfaceName;
54 QString hardwareName; 53 QString hardwareName;
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index 0c81928..a30f492 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -18,3 +18,10 @@ public:
18 Module(){}; 18 Module(){};
19 19
20 /**
21 * The current profile has been changed and the module should do any
22 * neccesary changes also.
23 * @param newProfile what the profile should be changed to.
24 */
25 virtual void setProfile(QString newProfile) = 0;
26
20 /** 27 /**
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 806643d..74eef5f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -28,5 +28,5 @@ void WLANImp::readConfig()
28 if( ssid == "any" || ssid == "ANY" ){ 28 if( ssid == "any" || ssid == "ANY" ){
29 essNon->setChecked( TRUE ); 29 essNon->setChecked( true );
30 } else { 30 } else {
31 essSpecific->setChecked( TRUE ); 31 essSpecific->setChecked( true );
32 essSpecificLineEdit->setText( ssid ); 32 essSpecificLineEdit->setText( ssid );
@@ -35,5 +35,5 @@ void WLANImp::readConfig()
35 if( mode == "adhoc" ) { 35 if( mode == "adhoc" ) {
36 network802->setChecked( TRUE ); 36 network802->setChecked( true );
37 } else { 37 } else {
38 networkInfrastructure->setChecked( TRUE ); 38 networkInfrastructure->setChecked( true );
39 } 39 }
@@ -41,5 +41,5 @@ void WLANImp::readConfig()
41// config.readEntry( "RATE", "auto" ); 41// config.readEntry( "RATE", "auto" );
42 config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( TRUE ) : wepEnabled->setChecked( FALSE ); 42 config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false );
43 config.readEntry( "AuthType", "opensystem" ); 43 config.readEntry( "AuthType", "opensystem" );
44 config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( TRUE ) : key128->setChecked( TRUE ); 44 config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true );
45 int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); 45 int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 );
@@ -47,12 +47,12 @@ void WLANImp::readConfig()
47 case 0: 47 case 0:
48 keyRadio0->setChecked( TRUE ); 48 keyRadio0->setChecked( true );
49 break; 49 break;
50 case 1: 50 case 1:
51 keyRadio1->setChecked( TRUE ); 51 keyRadio1->setChecked( true );
52 break; 52 break;
53 case 2: 53 case 2:
54 keyRadio2->setChecked( TRUE ); 54 keyRadio2->setChecked( true );
55 break; 55 break;
56 case 3: 56 case 3:
57 keyRadio3->setChecked( TRUE ); 57 keyRadio3->setChecked( true );
58 break; 58 break;
@@ -99,3 +99,3 @@ bool WLANImp::writeConfig()
99 return writeWirelessOpts( config ); 99 return writeWirelessOpts( config );
100// return TRUE; 100// return true;
101} 101}
@@ -122,3 +122,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
122 if ( !prevFile.open( IO_ReadOnly ) ) 122 if ( !prevFile.open( IO_ReadOnly ) )
123 return FALSE; 123 return false;
124 124
@@ -127,5 +127,5 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
127 if ( !tmpFile.open( IO_WriteOnly ) ) 127 if ( !tmpFile.open( IO_WriteOnly ) )
128 return FALSE; 128 return false;
129 129
130 bool retval = TRUE; 130 bool retval = true;
131 131
@@ -137,4 +137,4 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
137 QString line; 137 QString line;
138 bool found=FALSE; 138 bool found=false;
139 bool done=FALSE; 139 bool done=false;
140 while ( !in.atEnd() ) { 140 while ( !in.atEnd() ) {
@@ -146,3 +146,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
146 if ( wline == ";;" ) { 146 if ( wline == ";;" ) {
147 found = FALSE; 147 found = false;
148 continue; 148 continue;
@@ -153,3 +153,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
153 if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { 153 if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) {
154 found=TRUE; 154 found=true;
155 continue; // skip this line 155 continue; // skip this line
@@ -203,3 +203,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
203 out << " ;;\n"; 203 out << " ;;\n";
204 done = TRUE; 204 done = true;
205 } 205 }
@@ -223,3 +223,3 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme )
223 if( system( "mv " + tmp + " " + prev ) ) 223 if( system( "mv " + tmp + " " + prev ) )
224 retval = FALSE; 224 retval = false;
225//#ifdef USE_SCHEMES 225//#ifdef USE_SCHEMES
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index f0394b4..9d34d75 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -12,2 +12,9 @@ WLANModule::WLANModule() : Module() {
12/** 12/**
13 * Change the current profile
14 */
15void WLANModule::setProfile(QString newProfile){
16 profile = newProfile;
17}
18
19/**
13 * get the icon name for this device. 20 * get the icon name for this device.
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h
index 7ebe129..833d4b1 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.h
+++ b/noncore/settings/networksettings/wlan/wlanmodule.h
@@ -13,2 +13,3 @@ public:
13 13
14 virtual void setProfile(QString newProfile);
14 virtual bool isOwner(Interface *); 15 virtual bool isOwner(Interface *);
@@ -24,3 +25,4 @@ private:
24 QList<Interface> list; 25 QList<Interface> list;
25 26 QString profile;
27
26}; 28};