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

Macros: Clean up singleton APIs

Browse Source 
Task-number: QTCREATORBUG-9763

Change-Id: I76c4d60279f738272b0cf5fda651ce266f798c2c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-08-02 12:33:17 +02:00
parent 7b9ebdcb3b
commit 1ab065add3
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/macros/macromanager.cpp
View File

@@ -253,10 +253,10 @@ MacroManager::MacroManager(QObject *parent) :
QObject(parent),
d(new MacroManagerPrivate(this))
{
m_instance = this;
registerMacroHandler(d->actionHandler);
registerMacroHandler(d->findHandler);
registerMacroHandler(d->textEditorHandler);
m_instance = this;
}
MacroManager::~MacroManager()
@@ -360,14 +360,14 @@ void MacroManager::deleteMacro(const QString &name)
}
}
const QMap<QString,Macro*> &MacroManager::macros() const
const QMap<QString,Macro*> &MacroManager::macros()
{
return d->macros;
return m_instance->d->macros;
}
void MacroManager::registerMacroHandler(IMacroHandler *handler)
{
d->handlers.prepend(handler);
m_instance->d->handlers.prepend(handler);
}
MacroManager *MacroManager::instance()
@@ -392,7 +392,7 @@ void Macros::MacroManager::saveLastMacro()
d->showSaveDialog();
}
QString Macros::MacroManager::macrosDirectory() const
QString Macros::MacroManager::macrosDirectory()
{
const QString &path =
Core::ICore::userResourcePath() + QLatin1String("/macros");