make DataEngineManager private; use DataEngineConsumer instead

CMakeLists.txt

@@ -109,7 +109,6 @@ set(plasma_LIB_SRCS
     datacontainer.cpp
     dataengine.cpp
     dataengineconsumer.cpp
-    dataenginemanager.cpp
     package.cpp
     packagestructure.cpp
     paintutils.cpp
@@ -121,6 +120,7 @@ set(plasma_LIB_SRCS
     private/associatedapplicationmanager.cpp
     private/componentinstaller.cpp
     private/datacontainer_p.cpp
+    private/dataenginemanager.cpp
     private/dataengineservice.cpp
     private/effects/halopainter.cpp
     private/effectwatcher.cpp
@@ -343,7 +343,6 @@ set(plasma_LIB_INCLUDES
     corona.h
     datacontainer.h
     dataengine.h
-    dataenginemanager.h
     delegate.h
     dialog.h
     pluginloader.h

dataengineconsumer.cpp

@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 
-#include "dataenginemanager.h"
+#include "private/dataenginemanager_p.h"
 #include "private/remotedataengine_p.h"
 #include "servicejob.h"
 

private/dataengineconsumer_p.h

@@ -22,18 +22,18 @@
 #ifndef PLASMA_DATAENGINECONSUMER_P_H
 #define PLASMA_DATAENGINECONSUMER_P_H
 
-#include <QtCore/QSet>
-#include <QtCore/QUrl>
-
-#include "plasma/dataenginemanager.h"
-#include "servicejob.h"
+#include <QMap>
+#include <QSet>
+#include <QUrl>
 
 namespace Plasma
 {
 
 class DataEngineConsumer;
 class RemoteDataEngine;
+class Service;
 class ServiceMonitor;
+class ServiceJob;
 
 class DataEngineConsumerPrivate : public QObject
 {

private/dataenginemanager.cpp

@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "dataenginemanager.h"
+#include "dataenginemanager_p.h"
 
 #include <QFile>
 #include <QTextStream>
@@ -210,4 +210,4 @@ void DataEngineManager::timerEvent(QTimerEvent *)
 } // namespace Plasma
 
 
-#include "moc_dataenginemanager.cpp"
+#include "moc_dataenginemanager_p.cpp"

scripting/runnerscript.cpp

@@ -17,12 +17,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "plasma/scripting/runnerscript.h"
+#include "scripting/runnerscript.h"
 
-#include "plasma/abstractrunner.h"
-#include "plasma/dataenginemanager.h"
-#include "plasma/package.h"
-#include "plasma/private/abstractrunner_p.h"
+#include "abstractrunner.h"
+#include "package.h"
+#include "private/dataenginemanager_p.h"
+#include "private/abstractrunner_p.h"
 
 namespace Plasma
 {