diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-29 15:46:04 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-08-30 11:22:56 +0200 |
| commit | 4a24df38a3a164c51f9cdddd566c9928a7482a0a (patch) | |
| tree | 0017d4109b5437e0da0c0e423c888a2cb7dd8dca /src/plugins/macros | |
| parent | e1823072a1094e9aba2781aec963fc2d2e56169f (diff) | |
EditorManager: Use static pattern, adjust surrounding code
Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/macros')
| -rw-r--r-- | src/plugins/macros/findmacrohandler.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/macros/macromanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/macros/texteditormacrohandler.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/macros/findmacrohandler.cpp b/src/plugins/macros/findmacrohandler.cpp index faf7965d8c..829475cb17 100644 --- a/src/plugins/macros/findmacrohandler.cpp +++ b/src/plugins/macros/findmacrohandler.cpp @@ -60,8 +60,7 @@ static const quint8 RESET = 5; FindMacroHandler::FindMacroHandler(): IMacroHandler() { - const Core::EditorManager *editorManager = Core::EditorManager::instance(); - connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)), + connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), this, SLOT(changeEditor(Core::IEditor*))); } diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 12f9f55f5f..32a57c418d 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -290,7 +290,7 @@ void MacroManager::startMacro() QString executeShortcut = Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->defaultKeySequence().toString(); QString help = tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play it") .arg(endShortcut).arg(executeShortcut); - Core::EditorManager::instance()->showEditorStatusBar( + Core::EditorManager::showEditorStatusBar( QLatin1String(Constants::M_STATUS_BUFFER), help, tr("Stop Recording Macro"), this, SLOT(endMacro())); @@ -298,7 +298,7 @@ void MacroManager::startMacro() void MacroManager::endMacro() { - Core::EditorManager::instance()->hideEditorStatusBar(QLatin1String(Constants::M_STATUS_BUFFER)); + Core::EditorManager::hideEditorStatusBar(QLatin1String(Constants::M_STATUS_BUFFER)); Core::ActionManager::command(Constants::START_MACRO)->action()->setEnabled(true); Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(false); diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 6a9aa1affa..8d156eac9e 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -61,7 +61,7 @@ static quint8 COUNT = 5; TextEditorMacroHandler::TextEditorMacroHandler(): IMacroHandler() { - const Core::EditorManager *editorManager = Core::EditorManager::instance(); + const QObject *editorManager = Core::EditorManager::instance(); connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)), this, SLOT(changeEditor(Core::IEditor*))); connect(editorManager, SIGNAL(editorAboutToClose(Core::IEditor*)), |