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

Revert "remove unused typedefs"

Browse Source 
This reverts commit 104e8d9e1f.
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:
typedef QHash<QString, DataEngine*> Dict;
typedef QMap<QString, QVariant> Data;
typedef QMapIterator<QString, QVariant> DataIterator;
typedef QHash<QString, DataContainer*> SourceDict;
/**
* Constructor.

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

@ -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;

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) {
return d->dataEngine->containerDict();
}
return QHash<QString, DataContainer*>();
return DataEngine::SourceDict();
}
void DataEngineScript::removeSource(const QString &source)

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

@ -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();