From 6ee2e5cb5e269f58e75b759f0bb12d477ba1e789 Mon Sep 17 00:00:00 2001
From: Matthias Kretz <kretz@kde.org>
Date: Mon, 29 Jan 2007 17:14:20 +0000
Subject: [PATCH] merge the kinstance-redesign branch back to trunk.

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=628276
---
 tests/testAppletInfo.cpp | 7 +++----
 tests/testAppletInfo.h   | 4 ++--
 theme.cpp                | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/testAppletInfo.cpp b/tests/testAppletInfo.cpp
index c2c192b68..8bcd771aa 100644
--- a/tests/testAppletInfo.cpp
+++ b/tests/testAppletInfo.cpp
@@ -22,16 +22,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QMimeData>
 
 #include <kaboutdata.h>
-#include <kinstance.h>
+#include <kcomponentdata.h>
 
 #include "appletinfo.h"
 #include "testAppletInfo.h"
 
 TestAppletInfo::TestAppletInfo(QObject* parent)
-    : QObject(parent)
+    : QObject(parent),
+    m_componentData("testappletinfo")
 {
     m_aboutData = new KAboutData("Test Applet Info", "testappletinfo", "1");
-    m_instance = new KInstance("testappletinfo");
     QString pwd = QDir::currentPath();
     notUniqueNative = new Plasma::AppletInfo(pwd + "/nativeApplet.desktop");
     uniqueJavascript = new Plasma::AppletInfo(pwd + "/uniqueJavaScriptApplet.desktop");
@@ -39,7 +39,6 @@ TestAppletInfo::TestAppletInfo(QObject* parent)
 
 TestAppletInfo::~TestAppletInfo()
 {
-    delete m_instance;
     delete m_aboutData;
 }
 
diff --git a/tests/testAppletInfo.h b/tests/testAppletInfo.h
index 72419145c..ce5539823 100644
--- a/tests/testAppletInfo.h
+++ b/tests/testAppletInfo.h
@@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define testappletinfo_h_
 
 #include <QtTest/QtTest>
+#include <kcomponentdata.h>
 
 namespace Plasma
 {
     class AppletInfo;
 }
 class KAboutData;
-class KInstance;
 
 class TestAppletInfo: public QObject
 {
@@ -64,7 +64,7 @@ class TestAppletInfo: public QObject
         Plasma::AppletInfo* notUniqueNative;
         Plasma::AppletInfo* uniqueJavascript;
         KAboutData* m_aboutData;
-        KInstance* m_instance;
+        KComponentData m_componentData;
 };
 
 #endif
diff --git a/theme.cpp b/theme.cpp
index 08f8f7871..21fa216d9 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -18,6 +18,7 @@
 
 #include <KSharedConfig>
 #include <KStandardDirs>
+#include <kconfiggroup.h>
 
 #include "theme.h"