diff --git a/src/plasma/dataengine.h b/src/plasma/dataengine.h index ffe6b6ead..35920a317 100644 --- a/src/plasma/dataengine.h +++ b/src/plasma/dataengine.h @@ -62,8 +62,6 @@ class PLASMA_EXPORT DataEngine : public QObject public: typedef QHash Dict; typedef QMap Data; - typedef QMapIterator DataIterator; - typedef QHash SourceDict; /** * Constructor. diff --git a/src/plasma/private/dataengine_p.h b/src/plasma/private/dataengine_p.h index d8ade83af..53907cd89 100644 --- a/src/plasma/private/dataengine_p.h +++ b/src/plasma/private/dataengine_p.h @@ -98,7 +98,7 @@ class DataEnginePrivate int updateTimerId; int minPollingInterval; QTime updateTimestamp; - DataEngine::SourceDict sources; + QHash sources; bool valid; DataEngineScript *script; QString serviceName; diff --git a/src/plasma/scripting/dataenginescript.cpp b/src/plasma/scripting/dataenginescript.cpp index ac45e4a48..0b25b1baa 100644 --- a/src/plasma/scripting/dataenginescript.cpp +++ b/src/plasma/scripting/dataenginescript.cpp @@ -166,12 +166,12 @@ void DataEngineScript::addSource(DataContainer *source) } } -DataEngine::SourceDict DataEngineScript::containerDict() const +QHash DataEngineScript::containerDict() const { if (d->dataEngine) { return d->dataEngine->containerDict(); } - return DataEngine::SourceDict(); + return QHash(); } void DataEngineScript::removeSource(const QString &source) diff --git a/src/plasma/scripting/dataenginescript.h b/src/plasma/scripting/dataenginescript.h index 4618eacc0..6c0fbc78c 100644 --- a/src/plasma/scripting/dataenginescript.h +++ b/src/plasma/scripting/dataenginescript.h @@ -134,7 +134,7 @@ protected: void setPollingInterval(uint frequency); void removeAllSources(); void addSource(DataContainer *source); - DataEngine::SourceDict containerDict() const; + QHash containerDict() const; void removeSource(const QString &source); void updateAllSources(); void forceImmediateUpdateOfAllVisualizations();