removed return statment that shouldn't be there

2 files changed, 0 insertions, 2 deletions

diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 7c902e0..a466020 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -64,97 +64,96 @@ void WLANImp::readConfig()
         keyRadio1->setChecked( true );
 	break;
     case 2:
         keyRadio2->setChecked( true );
 	break;
     case 3:
         keyRadio3->setChecked( true );
 	break;
     }
     keyLineEdit0->setText(config->readEntry( "dot11WEPDefaultKey0" ));
     keyLineEdit1->setText(config->readEntry( "dot11WEPDefaultKey1" ));
     keyLineEdit2->setText(config->readEntry( "dot11WEPDefaultKey2" ));
     keyLineEdit3->setText(config->readEntry( "dot11WEPDefaultKey3" ));
     return;
 }
 
 bool WLANImp::writeConfig()
 {
     qWarning( "WLANImp::writeConfig() called." );
     config->setGroup( "Properties" );
     if( essNon->isChecked() ) {
         config->writeEntry( "SSID", "any" );
     } else {
         config->writeEntry( "SSID", essSpecificLineEdit->text() );
     }
     if( networkInfrastructure->isChecked() ){
         config->writeEntry( "Mode", "Managed" );
     } else if( network802->isChecked() ){
         config->writeEntry( "Mode", "adhoc" );
     }
     config->writeEntry( "CHANNEL", networkChannel->value() );
 //    config->readEntry( "RATE", "auto" );
     wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" );
     authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" );
     key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" );
     if( keyRadio0->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 0 );
     } else if( keyRadio1->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 1 );
     } else if( keyRadio2->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 2 );
     } else if( keyRadio3->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 3 );
     }
     config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
     config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
     config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
     config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
-    return true;
     return writeWirelessOpts( );
 }
 
 /**
  */
 void WLANImp::accept()
 {
   if ( writeConfig() ){
     interfaceSetup->saveChanges();
     QDialog::accept();
   }
 }
 
 bool WLANImp::writeWirelessOpts( QString scheme )
 {
     qWarning( "WLANImp::writeWirelessOpts entered." );
     QString prev = "/etc/pcmcia/wireless.opts";
     QFile prevFile(prev);
     if ( !prevFile.open( IO_ReadOnly ) )
 	return false;
 
     QString tmp = "/etc/pcmcia/wireless.opts-qpe-new";
     QFile tmpFile(tmp);
     if ( !tmpFile.open( IO_WriteOnly ) )
 	return false;
 
     bool retval = true;
     
     QTextStream in( &prevFile );
     QTextStream out( &tmpFile );
 
     config->setGroup("Properties");
     
     QString line;
     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;
 		    continue;
 		} else {
 		    continue;
 		}
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 7c902e0..a466020 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -64,97 +64,96 @@ void WLANImp::readConfig()
         keyRadio1->setChecked( true );
 	break;
     case 2:
         keyRadio2->setChecked( true );
 	break;
     case 3:
         keyRadio3->setChecked( true );
 	break;
     }
     keyLineEdit0->setText(config->readEntry( "dot11WEPDefaultKey0" ));
     keyLineEdit1->setText(config->readEntry( "dot11WEPDefaultKey1" ));
     keyLineEdit2->setText(config->readEntry( "dot11WEPDefaultKey2" ));
     keyLineEdit3->setText(config->readEntry( "dot11WEPDefaultKey3" ));
     return;
 }
 
 bool WLANImp::writeConfig()
 {
     qWarning( "WLANImp::writeConfig() called." );
     config->setGroup( "Properties" );
     if( essNon->isChecked() ) {
         config->writeEntry( "SSID", "any" );
     } else {
         config->writeEntry( "SSID", essSpecificLineEdit->text() );
     }
     if( networkInfrastructure->isChecked() ){
         config->writeEntry( "Mode", "Managed" );
     } else if( network802->isChecked() ){
         config->writeEntry( "Mode", "adhoc" );
     }
     config->writeEntry( "CHANNEL", networkChannel->value() );
 //    config->readEntry( "RATE", "auto" );
     wepEnabled->isChecked() ? config->writeEntry( "dot11PrivacyInvoked", "true" ) : config->writeEntry( "dot11PrivacyInvoked", "false" );
     authOpen->isChecked() ? config->writeEntry( "AuthType", "opensystem" ) : config->writeEntry( "AuthType", "sharedkey" );
     key40->isChecked() ? config->writeEntry( "PRIV_KEY128", "false" ) : config->writeEntry( "PRIV_KEY128", "true" );
     if( keyRadio0->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 0 );
     } else if( keyRadio1->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 1 );
     } else if( keyRadio2->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 2 );
     } else if( keyRadio3->isChecked() ){
         config->writeEntry( "dot11WEPDefaultKeyID", 3 );
     }
     config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
     config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
     config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
     config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
-    return true;
     return writeWirelessOpts( );
 }
 
 /**
  */
 void WLANImp::accept()
 {
   if ( writeConfig() ){
     interfaceSetup->saveChanges();
     QDialog::accept();
   }
 }
 
 bool WLANImp::writeWirelessOpts( QString scheme )
 {
     qWarning( "WLANImp::writeWirelessOpts entered." );
     QString prev = "/etc/pcmcia/wireless.opts";
     QFile prevFile(prev);
     if ( !prevFile.open( IO_ReadOnly ) )
 	return false;
 
     QString tmp = "/etc/pcmcia/wireless.opts-qpe-new";
     QFile tmpFile(tmp);
     if ( !tmpFile.open( IO_WriteOnly ) )
 	return false;
 
     bool retval = true;
     
     QTextStream in( &prevFile );
     QTextStream out( &tmpFile );
 
     config->setGroup("Properties");
     
     QString line;
     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;
 		    continue;
 		} else {
 		    continue;
 		}