merged kconfiggroup_port branch

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=635490
This commit is contained in:
Stephan Kulow 2007-02-20 07:00:30 +00:00
parent 6ee2e5cb5e
commit b5a36666ab
2 changed files with 3 additions and 3 deletions

View File

@ -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;

View File

@ -21,7 +21,7 @@
#include <QWidget> #include <QWidget>
#include <kconfig.h> #include <ksharedconfig.h>
#include <kservice.h> #include <kservice.h>
#include "plasma.h" #include "plasma.h"