Merge the KConfig branch. This are the 3 main modules (+kdeadmin), which are

needed now because friday is the last BC day. The rest of the modules will
follow as fast as my laptop allows.

svn path=/trunk/KDE/kdelibs/; revision=721704

abstractrunner.cpp

@@ -22,6 +22,7 @@
 #include <QAction>
 #include <KActionCollection>
 #include <KServiceTypeTrader>
+#include <KDebug>
 
 namespace Plasma
 {

corona.cpp

@@ -140,7 +140,7 @@ void Corona::loadApplets(const QString& config)
 {
     clearApplets();
 
-    KConfig cg(config, KConfig::OnlyLocal);
+    KConfig cg(config, KConfig::SimpleConfig);
 
     QList<KConfigGroup> applets;
     QHash<int, Containment*> containments;
@@ -167,7 +167,7 @@ void Corona::loadApplets(const QString& config)
     //kDebug() << "number of applets?" << applets.count();
     foreach (KConfigGroup cg, applets) {
         int cid = cg.readEntry("containment", 0);
-        kDebug() << "trying to load applet" << cg.group() << cid;
+        kDebug() << "trying to load applet" << cg.name() << cid;
 
         Containment* c = containments.value(cid, 0);
 
@@ -177,8 +177,8 @@ void Corona::loadApplets(const QString& config)
 
         kDebug() << "loading containment " << cid;
 
-        kDebug() << "creating applet " << cg.group();
+        kDebug() << "creating applet " << cg.name();
-        int appId = cg.group().left(cg.group().indexOf('-')).toUInt();
+        int appId = cg.name().left(cg.name().indexOf('-')).toUInt();
         c->addApplet(cg.readEntry("plugin", QString()), QVariantList(),
                         appId, cg.readEntry("geometry", QRectF()), true);
     }

datacontainer_p.h

@@ -21,6 +21,7 @@
 #define PLASMA_DATACONTAINER_P_H
 
 #include <QtCore/QTimerEvent>
+#include <QtCore/QTime>
 
 namespace Plasma
 {

dataengine.cpp

@@ -21,6 +21,7 @@
 
 #include <QQueue>
 #include <QTimer>
+#include <QTime>
 #include <QTimerEvent>
 #include <QVariant>
 

package.cpp

@@ -32,6 +32,7 @@
 #include <KStandardDirs>
 #include <KTemporaryFile>
 #include <KZip>
+#include <KDebug>
 
 #include "packagemetadata.h"
 #include "packagestructure.h"

theme.cpp

@@ -21,6 +21,7 @@
 
 #include <KSharedConfig>
 #include <KStandardDirs>
+#include <kdebug.h>
 #include <kconfiggroup.h>
 
 namespace Plasma