merged kconfiggroup_port branch
svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=635490
This commit is contained in:
parent
6ee2e5cb5e
commit
b5a36666ab
@ -81,7 +81,7 @@ KSharedConfig::Ptr Applet::appletConfig() const
|
|||||||
QString file = KStandardDirs::locateLocal("appdata",
|
QString file = KStandardDirs::locateLocal("appdata",
|
||||||
"applets/" + instanceName() + "rc",
|
"applets/" + instanceName() + "rc",
|
||||||
true);
|
true);
|
||||||
d->appletConfig = KSharedConfig::openConfig(file, false, true);
|
d->appletConfig = KSharedConfig::openConfig(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
return d->appletConfig;
|
return d->appletConfig;
|
||||||
@ -92,7 +92,7 @@ KSharedConfig::Ptr Applet::globalAppletConfig() const
|
|||||||
if (!d->globalConfig)
|
if (!d->globalConfig)
|
||||||
{
|
{
|
||||||
QString file = KStandardDirs::locateLocal("config", "plasma_" + globalName() + "rc");
|
QString file = KStandardDirs::locateLocal("config", "plasma_" + globalName() + "rc");
|
||||||
d->globalConfig = KSharedConfig::openConfig(file, false, true);
|
d->globalConfig = KSharedConfig::openConfig(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
return d->globalConfig;
|
return d->globalConfig;
|
||||||
|
Loading…
Reference in New Issue
Block a user