namespace Core {
-class VMMapExpander : public Utils::AbstractQtcMacroExpander {
+class VMMapExpander : public Utils::AbstractQtcMacroExpander
+{
public:
virtual bool resolveMacro(const QString &name, QString *ret)
{
}
};
-class VariableManagerPrivate : public QObject
+class VariableManagerPrivate
{
- Q_OBJECT
-
public:
QHash<QString, QString> m_map;
VMMapExpander m_macroExpander;
QMap<QString, QString> m_descriptions;
- static VariableManager *m_instance;
};
-VariableManager *VariableManagerPrivate::m_instance = 0;
+static VariableManager *variableManagerInstance = 0;
VariableManager::VariableManager() : d(new VariableManagerPrivate)
{
- VariableManagerPrivate::m_instance = this;
+ variableManagerInstance = this;
}
VariableManager::~VariableManager()
{
- VariableManagerPrivate::m_instance = 0;
+ variableManagerInstance = 0;
+ delete d;
}
void VariableManager::insert(const QString &variable, const QString &value)
return &d->m_macroExpander;
}
-VariableManager* VariableManager::instance()
+VariableManager *VariableManager::instance()
{
- return VariableManagerPrivate::m_instance;
+ return variableManagerInstance;
}
void VariableManager::registerVariable(const QString &variable, const QString &description)
}
} // namespace Core
-
-#include "variablemanager.moc"
}
namespace Core {
+
class VariableManagerPrivate;
class CORE_EXPORT VariableManager : public QObject
VariableManager();
~VariableManager();
- static VariableManager* instance();
+ static VariableManager *instance();
void insert(const QString &variable, const QString &value);
bool remove(const QString &variable);
void variableUpdateRequested(const QString &variable);
private:
- QScopedPointer<VariableManagerPrivate> d;
+ VariableManagerPrivate *d;
};
} // namespace Core