From b5a36666ab45c4bad0d43575eb08e6a80dd2b469 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@kde.org>
Date: Tue, 20 Feb 2007 07:00:30 +0000
Subject: [PATCH] merged kconfiggroup_port branch

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=635490
---
 applet.cpp | 4 ++--
 applet.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index f6ae2dbc6..1630f7a65 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -81,7 +81,7 @@ KSharedConfig::Ptr Applet::appletConfig() const
         QString file = KStandardDirs::locateLocal("appdata",
                                                    "applets/" + instanceName() + "rc",
                                                    true);
-        d->appletConfig = KSharedConfig::openConfig(file, false, true);
+        d->appletConfig = KSharedConfig::openConfig(file);
     }
 
     return d->appletConfig;
@@ -92,7 +92,7 @@ KSharedConfig::Ptr Applet::globalAppletConfig() const
     if (!d->globalConfig)
     {
         QString file = KStandardDirs::locateLocal("config", "plasma_" + globalName() + "rc");
-        d->globalConfig = KSharedConfig::openConfig(file, false, true);
+        d->globalConfig = KSharedConfig::openConfig(file);
     }
 
     return d->globalConfig;
diff --git a/applet.h b/applet.h
index bdcc206f3..8762f6e79 100644
--- a/applet.h
+++ b/applet.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 
-#include <kconfig.h>
+#include <ksharedconfig.h>
 #include <kservice.h>
 
 #include "plasma.h"