author | zecke <zecke> | 2004-12-20 22:02:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-12-20 22:02:47 (UTC) |
commit | 4a9d317adb576fed2164638a1d4d15c75eebfd6b (patch) (side-by-side diff) | |
tree | c4634ae780964cb96edae64a3fd07a641c46e427 | |
parent | 086e832c16265a086e455ead0e5a64f61e2078e7 (diff) | |
download | opie-4a9d317adb576fed2164638a1d4d15c75eebfd6b.zip opie-4a9d317adb576fed2164638a1d4d15c75eebfd6b.tar.gz opie-4a9d317adb576fed2164638a1d4d15c75eebfd6b.tar.bz2 |
Keep only 'local' Config instances to avoid some older
instance reverting changes! (weakness of Config class)
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp index 45d691b..7a5f7b9 100644 --- a/core/settings/security/multiauthconfig.cpp +++ b/core/settings/security/multiauthconfig.cpp @@ -276,10 +276,10 @@ MultiauthConfig::~MultiauthConfig() /// saves the general and plugin(s) configurations void MultiauthConfig::writeConfigs() { - writeConfig(); - MultiauthConfigWidget* confWidget = 0; for ( confWidget = configWidgetList.first(); confWidget != 0; confWidget = configWidgetList.next() ) confWidget->writeConfig(); + + writeConfig(); } @@ -400,9 +400,9 @@ void MultiauthConfig::readConfig() void MultiauthConfig::writeConfig() { - Config* pcfg = new Config("Security"); + Config pcfg("Security"); if (m_pluginsInstalled) { - pcfg->setGroup( "Plugins" ); + pcfg.setGroup( "Plugins" ); QStringList exclude; QStringList include; @@ -425,19 +425,19 @@ void MultiauthConfig::writeConfig() } } - pcfg->writeEntry( "ExcludePlugins", exclude, ',' ); - pcfg->writeEntry( "IncludePlugins", include, ',' ); - pcfg->writeEntry( "AllPlugins", allPlugins, ',' ); + pcfg.writeEntry( "ExcludePlugins", exclude, ',' ); + pcfg.writeEntry( "IncludePlugins", include, ',' ); + pcfg.writeEntry( "AllPlugins", allPlugins, ',' ); - pcfg->setGroup( "Misc" ); - pcfg->writeEntry( "onStart", m_generalConfig->m_onStart->isChecked() ); - pcfg->writeEntry( "onResume", m_generalConfig->m_onResume->isChecked() ); - pcfg->writeEntry( "nbSuccessMin", m_generalConfig->m_nbSuccessMin->text() ); - pcfg->writeEntry( "noProtectConfig", m_generalConfig->m_noProtectConfig->isChecked() ); - pcfg->writeEntry( "explanScreens", m_generalConfig->m_explanScreens->isChecked() ); + pcfg.setGroup( "Misc" ); + pcfg.writeEntry( "onStart", m_generalConfig->m_onStart->isChecked() ); + pcfg.writeEntry( "onResume", m_generalConfig->m_onResume->isChecked() ); + pcfg.writeEntry( "nbSuccessMin", m_generalConfig->m_nbSuccessMin->text() ); + pcfg.writeEntry( "noProtectConfig", m_generalConfig->m_noProtectConfig->isChecked() ); + pcfg.writeEntry( "explanScreens", m_generalConfig->m_explanScreens->isChecked() ); } /* Login and Sync stuff */ - pcfg->setGroup("Sync"); + pcfg.setGroup("Sync"); int auth_peer=0; int auth_peer_bits; @@ -446,6 +446,6 @@ void MultiauthConfig::writeConfig() //this is the *selected* (active) net range - pcfg->writeEntry("auth_peer",auth_peer); - pcfg->writeEntry("auth_peer_bits",auth_peer_bits); + pcfg.writeEntry("auth_peer",auth_peer); + pcfg.writeEntry("auth_peer_bits",auth_peer_bits); //write back all other net ranges in *cleartext* @@ -454,7 +454,7 @@ void MultiauthConfig::writeConfig() target.sprintf("net%d", i); if ( i < m_syncWidget->syncnet->count() ) - pcfg->writeEntry(target, m_syncWidget->syncnet->text(i)); + pcfg.writeEntry(target, m_syncWidget->syncnet->text(i)); else // no more entry in the syncnet list -> we clear the line - pcfg->writeEntry(target, ""); + pcfg.writeEntry(target, ""); } @@ -475,18 +475,18 @@ void MultiauthConfig::writeConfig() break; } - pcfg->setGroup("SyncMode"); - pcfg->writeEntry( "Mode", value ); + pcfg.setGroup("SyncMode"); + pcfg.writeEntry( "Mode", value ); /* - pcfg->setGroup("Remote"); + pcfg.setGroup("Remote"); if ( telnetAvailable() ) - pcfg->writeEntry("allow_telnet",telnet->isChecked()); + pcfg.writeEntry("allow_telnet",telnet->isChecked()); if ( sshAvailable() ) - pcfg->writeEntry("allow_ssh",ssh->isChecked()); + pcfg.writeEntry("allow_ssh",ssh->isChecked()); // ### write ssh/telnet sys config files */ //release the Config handler - delete pcfg; + pcfg.write(); QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf"; |