SVN commit 704275 by marchand: kconfig deprecated stuff cleanup continued M +1 -1 klipper/urlgrabber.cpp M +8 -8 kmenuedit/basictab.cpp M +1 -1 kpager/desktop.cpp M +10 -10 ksmserver/server.cpp M +5 -5 ksmserver/shutdown.cpp M +9 -10 kwin/data/update_default_rules.cpp M +3 -5 kwin/data/update_window_settings.cpp --- trunk/KDE/kdebase/workspace/klipper/urlgrabber.cpp #704274:704275 @@ -146,7 +146,7 @@ actionMenu( true ); // also creates myMatches return ( !myMatches.isEmpty() && - (!m_config->readEntry("Put Matching URLs in history", true))); + (!m_config->group("General").readEntry("Put Matching URLs in history", true))); //XXX i am not sure this entry exists anymore } --- trunk/KDE/kdebase/workspace/kmenuedit/basictab.cpp #704274:704275 @@ -375,7 +375,7 @@ //_keyEdit->setShortcut( entryInfo->shortcut() ); } - QString temp = df->readPathEntry("Exec"); + QString temp = df->desktopGroup().readPathEntry("Exec"); if (temp.left(12) == "ksystraycmd ") { _execEdit->lineEdit()->setText(temp.right(temp.length()-12)); @@ -388,20 +388,20 @@ } _pathEdit->lineEdit()->setText(df->readPath()); - _termOptEdit->setText(df->readEntry("TerminalOptions")); - _uidEdit->setText(df->readEntry("X-KDE-Username")); + _termOptEdit->setText(df->desktopGroup().readEntry("TerminalOptions")); + _uidEdit->setText(df->desktopGroup().readEntry("X-KDE-Username")); - if( df->hasKey( "StartupNotify" )) - _launchCB->setChecked(df->readEntry("StartupNotify", true)); + if( df->desktopGroup().hasKey( "StartupNotify" )) + _launchCB->setChecked(df->desktopGroup().readEntry("StartupNotify", true)); else // backwards comp. - _launchCB->setChecked(df->readEntry("X-KDE-StartupNotify", true)); + _launchCB->setChecked(df->desktopGroup().readEntry("X-KDE-StartupNotify", true)); - if(df->readEntry("Terminal", 0) == 1) + if(df->desktopGroup().readEntry("Terminal", 0) == 1) _terminalCB->setChecked(true); else _terminalCB->setChecked(false); - _uidCB->setChecked(df->readEntry("X-KDE-SubstituteUID", false)); + _uidCB->setChecked(df->desktopGroup().readEntry("X-KDE-SubstituteUID", false)); enableWidgets(true, entryInfo->hidden); blockSignals(false); --- trunk/KDE/kdebase/workspace/kpager/desktop.cpp #704274:704275 @@ -67,7 +67,7 @@ if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true); KSharedConfig::Ptr cfg = KGlobal::config(); m_transparentMode=static_cast - (cfg->readEntry("windowTransparentMode", int(c_defWindowTransparentMode))); + (cfg->group("KPager").readEntry("windowTransparentMode", int(c_defWindowTransparentMode))); resize(67, 50); } --- trunk/KDE/kdebase/workspace/ksmserver/server.cpp #704274:704275 @@ -851,7 +851,7 @@ executeCommand( discardCommand ); } config->deleteGroup( sessionGroup ); //### does not work with global config object... - config->setGroup( sessionGroup ); + KConfigGroup cg( config, sessionGroup); count = 0; if ( !wm.isEmpty() ) { @@ -877,17 +877,17 @@ count++; QString n = QString::number(count); - config->writeEntry( QString("program")+n, program ); - config->writeEntry( QString("clientId")+n, c->clientId() ); - config->writeEntry( QString("restartCommand")+n, restartCommand ); - config->writePathEntry( QString("discardCommand")+n, c->discardCommand() ); - config->writeEntry( QString("restartStyleHint")+n, restartHint ); - config->writeEntry( QString("userId")+n, c->userId() ); + cg.writeEntry( QString("program")+n, program ); + cg.writeEntry( QString("clientId")+n, c->clientId() ); + cg.writeEntry( QString("restartCommand")+n, restartCommand ); + cg.writePathEntry( QString("discardCommand")+n, c->discardCommand() ); + cg.writeEntry( QString("restartStyleHint")+n, restartHint ); + cg.writeEntry( QString("userId")+n, c->userId() ); } - config->writeEntry( "count", count ); + cg.writeEntry( "count", count ); - config->setGroup("General"); - config->writeEntry( "screenCount", ScreenCount(QX11Info::display())); + KConfigGroup cg2( config, "General"); + cg2.writeEntry( "screenCount", ScreenCount(QX11Info::display())); storeLegacySession(config.data()); config->sync(); --- trunk/KDE/kdebase/workspace/ksmserver/shutdown.cpp #704274:704275 @@ -114,14 +114,14 @@ KSharedConfig::Ptr config = KGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module - config->setGroup("General" ); + KConfigGroup cg( config, "General"); bool logoutConfirmed = (confirm == KWorkSpace::ShutdownConfirmYes) ? false : (confirm == KWorkSpace::ShutdownConfirmNo) ? true : - !config->readEntry( "confirmLogout", true ); + !cg.readEntry( "confirmLogout", true ); bool maysd = false; - if (config->readEntry( "offerShutdown", true ) && DM().canShutdown()) + if (cg.readEntry( "offerShutdown", true ) && DM().canShutdown()) maysd = true; if (!maysd) { if (sdtype != KWorkSpace::ShutdownTypeNone && @@ -131,7 +131,7 @@ sdtype = KWorkSpace::ShutdownTypeNone; } else if (sdtype == KWorkSpace::ShutdownTypeDefault) sdtype = (KWorkSpace::ShutdownType) - config->readEntry( "shutdownType", (int)KWorkSpace::ShutdownTypeNone ); + cg.readEntry( "shutdownType", (int)KWorkSpace::ShutdownTypeNone ); if (sdmode == KWorkSpace::ShutdownModeDefault) sdmode = KWorkSpace::ShutdownModeInteractive; @@ -155,7 +155,7 @@ bootOption = bopt; // shall we save the session on logout? - saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" ); + saveSession = ( cg.readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" ); if ( saveSession ) sessionGroup = QString("Session: ") + SESSION_PREVIOUS_LOGOUT; --- trunk/KDE/kdebase/workspace/kwin/data/update_default_rules.cpp #704274:704275 @@ -29,10 +29,10 @@ } KConfig src_cfg( file ); KConfig dest_cfg( "kwinrulesrc" ); - src_cfg.setGroup( "General" ); - dest_cfg.setGroup( "General" ); - int count = src_cfg.readEntry( "count", 0 ); - int pos = dest_cfg.readEntry( "count", 0 ); + KConfigGroup scg(&src_cfg, "General"); + KConfigGroup dcg(&dest_cfg, "General"); + int count = scg.readEntry( "count", 0 ); + int pos = dcg.readEntry( "count", 0 ); for( int group = 1; group <= count; ++group ) @@ -40,16 +40,15 @@ QMap< QString, QString > entries = src_cfg.entryMap( QString::number( group )); ++pos; dest_cfg.deleteGroup( QString::number( pos )); - dest_cfg.setGroup( QString::number( pos )); + KConfigGroup dcg2 (&dest_cfg, QString::number( pos )); for( QMap< QString, QString >::ConstIterator it = entries.begin(); it != entries.end(); ++it ) - dest_cfg.writeEntry( it.key(), *it ); + dcg2.writeEntry( it.key(), *it ); } - dest_cfg.setGroup( "General" ); - dest_cfg.writeEntry( "count", pos ); - src_cfg.sync(); - dest_cfg.sync(); + dcg.writeEntry( "count", pos ); + scg.sync(); + dcg.sync(); // Send signal to all kwin instances QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); --- trunk/KDE/kdebase/workspace/kwin/data/update_window_settings.cpp #704274:704275 @@ -101,8 +101,8 @@ void writeRules( KConfig& cfg ) { - cfg.setGroup( "General" ); - int pos = cfg.readEntry( "count",0 ); + KConfigGroup cg(&cfg, "General"); + int pos = cg.readEntry( "count",0 ); QList::iterator it; for ( it = fakeSession.begin(); it != fakeSession.end(); ++it) @@ -110,7 +110,6 @@ if( (*it)->resourceName.isEmpty() && (*it)->resourceClass.isEmpty()) continue; ++pos; - cfg.setGroup( QString::number( pos )); KConfigGroup groupCfg(&cfg, QString::number( pos )); groupCfg.writeEntry( "description", ( const char* ) ( (*it)->resourceClass + " (KDE3.2)" )); groupCfg.writeEntry( "wmclass", ( const char* )( (*it)->resourceName + ' ' + (*it)->resourceClass )); @@ -154,8 +153,7 @@ groupCfg.writeEntry( "noborder", (*it)->userNoBorder ); groupCfg.writeEntry( "noborderrule", 4 ); } - cfg.setGroup( "General" ); - cfg.writeEntry( "count", pos ); + cg.writeEntry( "count", pos ); } int main()