SVN commit 704335 by marchand:

kconfig cleanup last kdebase patch
not sure about componentchooser, but I think this code is just unused, anyway I patched it


 M  +13 -12    componentchooser/componentchooser.cpp  
 M  +10 -10    kded/kcmkded.cpp  


--- trunk/KDE/kdebase/runtime/kcontrol/componentchooser/componentchooser.cpp #704334:704335
@@ -71,10 +71,11 @@
 		if (!m_lookupDict[ComponentSelector->currentText()])
 			return;
 
-		QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
-		KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
-		store->setGroup(cfg->readEntry("valueSection"));
-		store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]);
+		QString ServiceTypeToConfigure=cfg->group("").readEntry("ServiceTypeToConfigure");
+		KConfig *store = new KConfig(cfg->group("").readPathEntry("storeInFile","null"));
+		KConfigGroup cg(store,cfg->group("").readEntry("valueSection"));
+//		store->setGroup(cfg->group("").readEntry("valueSection"));
+		cg.writePathEntry(cfg->group("").readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]);
 		store->sync();
 		delete store;
 		emit changed(false);
@@ -86,7 +87,7 @@
 	m_lookupDict.clear();
 	m_revLookupDict.clear();
 
-	QString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
+	QString ServiceTypeToConfigure=cfg->group("").readEntry("ServiceTypeToConfigure");
 
 	KService::List offers = KServiceTypeTrader::self()->query(ServiceTypeToConfigure);
 
@@ -97,11 +98,11 @@
 		m_revLookupDict.insert((*tit)->desktopEntryName(),new QString((*tit)->name()));
 	}
 
-	KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
-        KConfigGroup group(store, cfg->readEntry("valueSection"));
-	QString setting=group.readEntry(cfg->readEntry("valueName","kcm_componenchooser_null"), QString());
+	KConfig *store = new KConfig(cfg->group("").readPathEntry("storeInFile","null"));
+        KConfigGroup group(store, cfg->group("").readEntry("valueSection"));
+	QString setting=group.readEntry(cfg->group("").readEntry("valueName","kcm_componenchooser_null"), QString());
         delete store;
-	if (setting.isEmpty()) setting=cfg->readEntry("defaultImplementation", QString());
+	if (setting.isEmpty()) setting=cfg->group("").readEntry("defaultImplementation", QString());
 	QString *tmp=m_revLookupDict[setting];
 	if (tmp)
 		for (int i=0;i<ComponentSelector->count();i++)
@@ -322,7 +323,7 @@
 	for (QStringList::Iterator it=services.begin();it!=services.end();++it)
 	{
 		KConfig cfg(*it, KConfig::OnlyLocal);
-		ServiceChooser->addItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
+		ServiceChooser->addItem(new MyListBoxItem(cfg.group("").readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
 	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
@@ -341,11 +342,11 @@
 	}
 	KConfig cfg(static_cast<MyListBoxItem*>(it)->File, KConfig::OnlyLocal);
 
-	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
+	ComponentDescription->setText(cfg.group("").readEntry("Comment",i18n("No description available")));
 	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
 
 
-	QString cfgType=cfg.readEntry("configurationType");
+	QString cfgType=cfg.group("").readEntry("configurationType");
 	QWidget *newConfigWidget = 0;
 	if (cfgType.isEmpty() || (cfgType=="component"))
 	{
--- trunk/KDE/kdebase/runtime/kcontrol/kded/kcmkded.cpp #704334:704335
@@ -112,7 +112,7 @@
 	load();
 }
 
-void setModuleGroup(KConfig *config, const QString &filename)
+QString setModuleGroup(const QString &filename)
 {
 	QString module = filename;
 	int i = module.lastIndexOf('/');
@@ -122,19 +122,19 @@
 	if (i != -1)
 	   module = module.left(i);
 
-	config->setGroup(QString("Module-%1").arg(module));
+	return QString("Module-%1").arg(module);
 }
 
 bool KDEDConfig::autoloadEnabled(KConfig *config, const QString &filename)
 {
-	setModuleGroup(config, filename);
-	return config->readEntry("autoload", true);
+	KConfigGroup cg(config, setModuleGroup(filename));
+	return cg.readEntry("autoload", true);
 }
 
 void KDEDConfig::setAutoloadEnabled(KConfig *config, const QString &filename, bool b)
 {
-	setModuleGroup(config, filename);
-	return config->writeEntry("autoload", b);
+	KConfigGroup cg(config, setModuleGroup(filename));
+	return cg.writeEntry("autoload", b);
 }
 
 void KDEDConfig::load() {
@@ -156,7 +156,7 @@
 		if ( KDesktopFile::isDesktopFile( *it ) ) {
 			KDesktopFile file( "services", *it );
 
-			if ( file.readEntry("X-KDE-Kded-autoload", false) ) {
+			if ( file.desktopGroup().readEntry("X-KDE-Kded-autoload", false) ) {
 				clitem = new CheckListItem(_lvStartup, QString());
 				connect(clitem, SIGNAL(changed(Q3CheckListItem*)), SLOT(slotItemChecked(Q3CheckListItem*)));
 				clitem->setOn(autoloadEnabled(&kdedrc, *it));
@@ -164,13 +164,13 @@
 				item->setText(1, file.readName());
 				item->setText(2, file.readComment());
 				item->setText(3, NOT_RUNNING);
-				item->setText(4, file.readEntry("X-KDE-Library"));
+				item->setText(4, file.desktopGroup().readEntry("X-KDE-Library"));
 			}
-			else if ( file.readEntry("X-KDE-Kded-load-on-demand", false) ) {
+			else if ( file.desktopGroup().readEntry("X-KDE-Kded-load-on-demand", false) ) {
 				item = new Q3ListViewItem(_lvLoD, file.readName());
 				item->setText(1, file.readComment());
 				item->setText(2, NOT_RUNNING);
-				item->setText(4, file.readEntry("X-KDE-Library"));
+				item->setText(4, file.desktopGroup().readEntry("X-KDE-Library"));
 			}
 		}
 	}