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

Revert "remove unused typedefs"

Browse Source 
This reverts commit 104e8d9e1fba2c1bade727dc1691365f93ff783b.
This commit is contained in:
Marco Martin 2013-12-24 14:02:20 +01:00
parent 35b43f097e
commit 80d4ba326e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/dataengine.h
View File

@ -62,6 +62,8 @@ class PLASMA_EXPORT DataEngine : public QObject
public: public:
typedef QHash<QString, DataEngine*> Dict; typedef QHash<QString, DataEngine*> Dict;
typedef QMap<QString, QVariant> Data; typedef QMap<QString, QVariant> Data;
typedef QMapIterator<QString, QVariant> DataIterator;
typedef QHash<QString, DataContainer*> SourceDict;
/** /**
* Constructor. * Constructor.

2
src/plasma/private/dataengine_p.h
View File

@ -98,7 +98,7 @@ class DataEnginePrivate
int updateTimerId; int updateTimerId;
int minPollingInterval; int minPollingInterval;
QTime updateTimestamp; QTime updateTimestamp;
QHash<QString, DataContainer*> sources; DataEngine::SourceDict sources;
bool valid; bool valid;
DataEngineScript *script; DataEngineScript *script;
QString serviceName; QString serviceName;

4
src/plasma/scripting/dataenginescript.cpp
View File

@ -166,12 +166,12 @@ void DataEngineScript::addSource(DataContainer *source)
} }
} }
QHash<QString, DataContainer*> DataEngineScript::containerDict() const DataEngine::SourceDict DataEngineScript::containerDict() const
{ {
if (d->dataEngine) { if (d->dataEngine) {
return d->dataEngine->containerDict(); return d->dataEngine->containerDict();
} }
return QHash<QString, DataContainer*>(); return DataEngine::SourceDict();
} }
void DataEngineScript::removeSource(const QString &source) void DataEngineScript::removeSource(const QString &source)

2
src/plasma/scripting/dataenginescript.h
View File

@ -134,7 +134,7 @@ protected:
void setPollingInterval(uint frequency); void setPollingInterval(uint frequency);
void removeAllSources(); void removeAllSources();
void addSource(DataContainer *source); void addSource(DataContainer *source);
QHash<QString, DataContainer*> containerDict() const; DataEngine::SourceDict containerDict() const;
void removeSource(const QString &source); void removeSource(const QString &source);
void updateAllSources(); void updateAllSources();
void forceImmediateUpdateOfAllVisualizations(); void forceImmediateUpdateOfAllVisualizations();