From 98d8bacf2b6b9dd1a49ef81c30b4ae4297cb291c Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 24 Dec 2013 14:02:20 +0100
Subject: [PATCH] Revert "remove unused typedefs"

This reverts commit 104e8d9e1fba2c1bade727dc1691365f93ff783b.
---
 src/plasma/dataengine.h                   | 2 ++
 src/plasma/private/dataengine_p.h         | 2 +-
 src/plasma/scripting/dataenginescript.cpp | 4 ++--
 src/plasma/scripting/dataenginescript.h   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

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