From 1c00d44a50904ce0c8a86307fd168ff7f877555f Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Mon, 24 Sep 2012 16:09:16 +0200
Subject: [PATCH] make DataEngineManager private; use DataEngineConsumer
 instead

---
 CMakeLists.txt                                         |  3 +--
 dataengineconsumer.cpp                                 |  2 +-
 private/dataengineconsumer_p.h                         | 10 +++++-----
 dataenginemanager.cpp => private/dataenginemanager.cpp |  4 ++--
 dataenginemanager.h => private/dataenginemanager_p.h   |  0
 scripting/runnerscript.cpp                             | 10 +++++-----
 6 files changed, 14 insertions(+), 15 deletions(-)
 rename dataenginemanager.cpp => private/dataenginemanager.cpp (98%)
 rename dataenginemanager.h => private/dataenginemanager_p.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3863c605c..a722f319b 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/dataengineconsumer.cpp b/dataengineconsumer.cpp
index e48fc1c63..0f8d928ca 100644
--- a/dataengineconsumer.cpp
+++ b/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"
 
diff --git a/private/dataengineconsumer_p.h b/private/dataengineconsumer_p.h
index 93536cbfb..1664e27e2 100644
--- a/private/dataengineconsumer_p.h
+++ b/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
 {
diff --git a/dataenginemanager.cpp b/private/dataenginemanager.cpp
similarity index 98%
rename from dataenginemanager.cpp
rename to private/dataenginemanager.cpp
index afadcc6b1..a3a6dfd51 100644
--- a/dataenginemanager.cpp
+++ b/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"
diff --git a/dataenginemanager.h b/private/dataenginemanager_p.h
similarity index 100%
rename from dataenginemanager.h
rename to private/dataenginemanager_p.h
diff --git a/scripting/runnerscript.cpp b/scripting/runnerscript.cpp
index 613ca7cfa..d5142a27a 100644
--- a/scripting/runnerscript.cpp
+++ b/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
 {