alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make DataEngineManager private; use DataEngineConsumer instead

Browse Source
This commit is contained in:
Aaron Seigo 2012-09-24 16:09:16 +02:00
parent e2033b2db7
commit 1c00d44a50
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

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

2
dataengineconsumer.cpp
View File

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

10
private/dataengineconsumer_p.h
View File

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

4
dataenginemanager.cpp → private/dataenginemanager.cpp
View File

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

0
dataenginemanager.h → private/dataenginemanager_p.h
View File

10
scripting/runnerscript.cpp
View File

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