-rw-r--r-- | noncore/net/networksetup/interface.h | 1 | ||||
-rw-r--r-- | noncore/net/networksetup/module.h | 9 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 40 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 7 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.h | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.h | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/module.h | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 40 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.h | 4 |
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 @@ -49,9 +49,8 @@ public slots: private: // Interface information bool status; bool attached; - QString interfaceName; QString hardwareName; Module *moduleOwner; // Network information 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 @@ -15,9 +15,16 @@ signals: void updateInterface(Interface *i); public: Module(){}; - + + /** + * The current profile has been changed and the module should do any + * neccesary changes also. + * @param newProfile what the profile should be changed to. + */ + virtual void setProfile(QString newProfile) = 0; + /** * get the icon name for this device. * @param Interface* can be used in determining the icon. * @return QString the icon name (minus .png, .gif etc) 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 @@ -25,37 +25,37 @@ void WLANImp::readConfig() qWarning( "WLANImp::readConfig() called." ); config.setGroup( "Properties" ); QString ssid = config.readEntry( "SSID", "any" ); if( ssid == "any" || ssid == "ANY" ){ - essNon->setChecked( TRUE ); + essNon->setChecked( true ); } else { - essSpecific->setChecked( TRUE ); + essSpecific->setChecked( true ); essSpecificLineEdit->setText( ssid ); } QString mode = config.readEntry( "Mode", "Managed" ); if( mode == "adhoc" ) { - network802->setChecked( TRUE ); + network802->setChecked( true ); } else { - networkInfrastructure->setChecked( TRUE ); + networkInfrastructure->setChecked( true ); } networkChannel->setValue( config.readNumEntry( "CHANNEL", 1 ) ); // config.readEntry( "RATE", "auto" ); - config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( TRUE ) : wepEnabled->setChecked( FALSE ); + config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false ); config.readEntry( "AuthType", "opensystem" ); - config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( TRUE ) : key128->setChecked( TRUE ); + config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true ); int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); switch( defaultkey ){ case 0: - keyRadio0->setChecked( TRUE ); + keyRadio0->setChecked( true ); break; case 1: - keyRadio1->setChecked( TRUE ); + keyRadio1->setChecked( true ); break; case 2: - keyRadio2->setChecked( TRUE ); + keyRadio2->setChecked( true ); break; case 3: - keyRadio3->setChecked( TRUE ); + keyRadio3->setChecked( true ); break; } keyLineEdit0->setText(config.readEntry( "dot11WEPDefaultKey0" )); keyLineEdit1->setText(config.readEntry( "dot11WEPDefaultKey1" )); @@ -96,9 +96,9 @@ bool WLANImp::writeConfig() config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); return writeWirelessOpts( config ); -// return TRUE; +// return true; } /** */ @@ -119,40 +119,40 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) qWarning( "WLANImp::writeWirelessOpts entered." ); QString prev = "/etc/pcmcia/wireless.opts"; QFile prevFile(prev); if ( !prevFile.open( IO_ReadOnly ) ) - return FALSE; + return false; QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; QFile tmpFile(tmp); if ( !tmpFile.open( IO_WriteOnly ) ) - return FALSE; + return false; - bool retval = TRUE; + bool retval = true; QTextStream in( &prevFile ); QTextStream out( &tmpFile ); config.setGroup("Properties"); QString line; - bool found=FALSE; - bool done=FALSE; + bool found=false; + bool done=false; while ( !in.atEnd() ) { QString line = in.readLine(); QString wline = line.simplifyWhiteSpace(); if ( !done ) { if ( found ) { // skip existing entry for this scheme, and write our own. if ( wline == ";;" ) { - found = FALSE; + found = false; continue; } else { continue; } } else { if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { - found=TRUE; + found=true; continue; // skip this line } else if ( wline == "esac" || wline == "*,*,*,*)" ) { // end - add new entry // Not all fields have a GUI, but all are supported @@ -200,9 +200,9 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) out << " " << *f << "=" << config.readEntry(*f,"") << "\n"; ++f; } out << " ;;\n"; - done = TRUE; + done = true; } } } out << line << "\n"; @@ -220,9 +220,9 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) if( initpath ) system(QString("%1/pcmcia stop").arg(initpath)); if( system( "mv " + tmp + " " + prev ) ) - retval = FALSE; + retval = false; //#ifdef USE_SCHEMES // if ( retval ) // SchemeChanger::changeScheme(scheme); //#endif 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 @@ -9,8 +9,15 @@ WLANModule::WLANModule() : Module() { // get output from iwconfig } /** + * Change the current profile + */ +void WLANModule::setProfile(QString newProfile){ + profile = newProfile; +} + +/** * get the icon name for this device. * @param Interface* can be used in determining the icon. * @return QString the icon name (minus .png, .gif etc) */ 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 @@ -10,8 +10,9 @@ signals: public: WLANModule(); + virtual void setProfile(QString newProfile); virtual bool isOwner(Interface *); virtual QWidget *configure(QTabWidget **tabWidget); virtual QWidget *information(QTabWidget **tabWidget); virtual QList<Interface> getInterfaces(); @@ -21,9 +22,10 @@ public: virtual QString getPixmapName(Interface* i); private: QList<Interface> list; - + QString profile; + }; extern "C" { 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 @@ -49,9 +49,8 @@ public slots: private: // Interface information bool status; bool attached; - QString interfaceName; QString hardwareName; Module *moduleOwner; // Network information 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 @@ -15,9 +15,16 @@ signals: void updateInterface(Interface *i); public: Module(){}; - + + /** + * The current profile has been changed and the module should do any + * neccesary changes also. + * @param newProfile what the profile should be changed to. + */ + virtual void setProfile(QString newProfile) = 0; + /** * get the icon name for this device. * @param Interface* can be used in determining the icon. * @return QString the icon name (minus .png, .gif etc) 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 @@ -25,37 +25,37 @@ void WLANImp::readConfig() qWarning( "WLANImp::readConfig() called." ); config.setGroup( "Properties" ); QString ssid = config.readEntry( "SSID", "any" ); if( ssid == "any" || ssid == "ANY" ){ - essNon->setChecked( TRUE ); + essNon->setChecked( true ); } else { - essSpecific->setChecked( TRUE ); + essSpecific->setChecked( true ); essSpecificLineEdit->setText( ssid ); } QString mode = config.readEntry( "Mode", "Managed" ); if( mode == "adhoc" ) { - network802->setChecked( TRUE ); + network802->setChecked( true ); } else { - networkInfrastructure->setChecked( TRUE ); + networkInfrastructure->setChecked( true ); } networkChannel->setValue( config.readNumEntry( "CHANNEL", 1 ) ); // config.readEntry( "RATE", "auto" ); - config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( TRUE ) : wepEnabled->setChecked( FALSE ); + config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false ); config.readEntry( "AuthType", "opensystem" ); - config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( TRUE ) : key128->setChecked( TRUE ); + config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true ); int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); switch( defaultkey ){ case 0: - keyRadio0->setChecked( TRUE ); + keyRadio0->setChecked( true ); break; case 1: - keyRadio1->setChecked( TRUE ); + keyRadio1->setChecked( true ); break; case 2: - keyRadio2->setChecked( TRUE ); + keyRadio2->setChecked( true ); break; case 3: - keyRadio3->setChecked( TRUE ); + keyRadio3->setChecked( true ); break; } keyLineEdit0->setText(config.readEntry( "dot11WEPDefaultKey0" )); keyLineEdit1->setText(config.readEntry( "dot11WEPDefaultKey1" )); @@ -96,9 +96,9 @@ bool WLANImp::writeConfig() config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); return writeWirelessOpts( config ); -// return TRUE; +// return true; } /** */ @@ -119,40 +119,40 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) qWarning( "WLANImp::writeWirelessOpts entered." ); QString prev = "/etc/pcmcia/wireless.opts"; QFile prevFile(prev); if ( !prevFile.open( IO_ReadOnly ) ) - return FALSE; + return false; QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; QFile tmpFile(tmp); if ( !tmpFile.open( IO_WriteOnly ) ) - return FALSE; + return false; - bool retval = TRUE; + bool retval = true; QTextStream in( &prevFile ); QTextStream out( &tmpFile ); config.setGroup("Properties"); QString line; - bool found=FALSE; - bool done=FALSE; + bool found=false; + bool done=false; while ( !in.atEnd() ) { QString line = in.readLine(); QString wline = line.simplifyWhiteSpace(); if ( !done ) { if ( found ) { // skip existing entry for this scheme, and write our own. if ( wline == ";;" ) { - found = FALSE; + found = false; continue; } else { continue; } } else { if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { - found=TRUE; + found=true; continue; // skip this line } else if ( wline == "esac" || wline == "*,*,*,*)" ) { // end - add new entry // Not all fields have a GUI, but all are supported @@ -200,9 +200,9 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) out << " " << *f << "=" << config.readEntry(*f,"") << "\n"; ++f; } out << " ;;\n"; - done = TRUE; + done = true; } } } out << line << "\n"; @@ -220,9 +220,9 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) if( initpath ) system(QString("%1/pcmcia stop").arg(initpath)); if( system( "mv " + tmp + " " + prev ) ) - retval = FALSE; + retval = false; //#ifdef USE_SCHEMES // if ( retval ) // SchemeChanger::changeScheme(scheme); //#endif 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 @@ -9,8 +9,15 @@ WLANModule::WLANModule() : Module() { // get output from iwconfig } /** + * Change the current profile + */ +void WLANModule::setProfile(QString newProfile){ + profile = newProfile; +} + +/** * get the icon name for this device. * @param Interface* can be used in determining the icon. * @return QString the icon name (minus .png, .gif etc) */ 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 @@ -10,8 +10,9 @@ signals: public: WLANModule(); + virtual void setProfile(QString newProfile); virtual bool isOwner(Interface *); virtual QWidget *configure(QTabWidget **tabWidget); virtual QWidget *information(QTabWidget **tabWidget); virtual QList<Interface> getInterfaces(); @@ -21,9 +22,10 @@ public: virtual QString getPixmapName(Interface* i); private: QList<Interface> list; - + QString profile; + }; extern "C" { |