SVN commit 643813 by dmacvicar: port to KConfigGroup kill some warnings M +4 -4 jabberaccount.cpp M +7 -6 ui/jabbereditaccountwidget.cpp --- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberaccount.cpp #643812:643813 @@ -361,9 +361,9 @@ m_jabberClient->setAllowPlainTextPassword ( configGroup()->readEntry ( "AllowPlainTextPassword", false ) ); // enable file transfer (if empty, IP will be set after connection has been established) - KGlobal::config()->setGroup ( "Jabber" ); - m_jabberClient->setFileTransfersEnabled ( true, KGlobal::config()->readEntry ( "LocalIP" ) ); - setS5BServerPort ( KGlobal::config()->readEntry ( "LocalPort", 8010 ) ); + KConfigGroup config = KGlobal::config()->group ( "Jabber" ); + m_jabberClient->setFileTransfersEnabled ( true, config.readEntry ( "LocalIP" ) ); + setS5BServerPort ( config.readEntry ( "LocalPort", 8010 ) ); // // Determine system name @@ -399,7 +399,7 @@ time(&x); char str[256]; char fmt[32]; - int timezoneOffset; + int timezoneOffset(0); QString timezoneString; strcpy ( fmt, "%z" ); --- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp #643812:643813 @@ -117,9 +117,9 @@ cbAllowPlainTextPassword->setChecked (account()->configGroup()->readEntry("AllowPlainTextPassword", true)); - KGlobal::config()->setGroup("Jabber"); - leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", QString())); - sbLocalPort->setValue (KGlobal::config()->readEntry("LocalPort", 8010)); + KConfigGroup config = KGlobal::config()->group("Jabber"); + leLocalIP->setText (config.readEntry("LocalIP", QString())); + sbLocalPort->setValue (config.readEntry("LocalPort", 8010)); leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", QString())); @@ -180,9 +180,10 @@ account()->setExcludeConnect(cbAutoConnect->isChecked()); - KGlobal::config()->setGroup("Jabber"); - KGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); - KGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); + KConfigGroup config = KGlobal::config()->group("Jabber"); + + config.writeEntry("LocalIP", leLocalIP->text()); + config.writeEntry("LocalPort", sbLocalPort->value()); account()->configGroup()->writeEntry("ProxyJID", leProxyJID->text());