feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make variable manager static.

Browse Source 
This makes it follow our preferred singleton pattern.

Change-Id: I230e5ac5ef7f156da7123f7efe3a49bcb6a20669
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Eike Ziller
2013-03-11 11:52:05 +01:00
committed by hjk
parent 3d7163c628
commit e7cb32d621
15 changed files with 70 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/variablemanager.cpp
View File

@@ -53,7 +53,7 @@ public:
virtual bool resolveMacro(const QString &name, QString *ret)
{
bool found;
*ret = Core::VariableManager::instance()->value(name.toUtf8(), &found);
*ret = Core::VariableManager::value(name.toUtf8(), &found);
return found;
}
};
@@ -77,9 +77,12 @@ public:
*/
static VariableManager *variableManagerInstance = 0;
static VariableManagerPrivate *d;
VariableManager::VariableManager() : d(new VariableManagerPrivate)
VariableManager::VariableManager()
{
d = new VariableManagerPrivate;
variableManagerInstance = this;
}
@@ -101,7 +104,7 @@ bool VariableManager::remove(const QByteArray &variable)
QString VariableManager::value(const QByteArray &variable, bool *found)
{
emit variableUpdateRequested(variable);
variableManagerInstance->variableUpdateRequested(variable);
if (found)
*found = d->m_map.contains(variable);
return d->m_map.value(variable);
@@ -158,12 +161,12 @@ QString VariableManager::fileVariableValue(const QByteArray &variable, const QBy
return QString();
}
QList<QByteArray> VariableManager::variables() const
QList<QByteArray> VariableManager::variables()
{
return d->m_descriptions.keys();
}
QString VariableManager::variableDescription(const QByteArray &variable) const
QString VariableManager::variableDescription(const QByteArray &variable)
{
return d->m_descriptions.value(variable);
}