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

Macros: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: I0154e09c1a9e028f3a80772c4c07751f4e282091
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2016-05-29 00:20:16 +03:00
committed by Orgad Shaneh
parent 34a7ff07b7
commit 8641a5e956
9 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,8 +102,6 @@ public:
QList<IMacroHandler*> handlers;
QSignalMapper *mapper;
ActionMacroHandler *actionHandler;
TextEditorMacroHandler *textEditorHandler;
FindMacroHandler *findHandler;
@@ -120,11 +118,8 @@ public:
MacroManager::MacroManagerPrivate::MacroManagerPrivate(MacroManager *qq):
q(qq),
currentMacro(0),
isRecording(false),
mapper(new QSignalMapper(qq))
isRecording(false)
{
connect(mapper, SIGNAL(mapped(QString)), q, SLOT(executeMacro(QString)));
// Load existing macros
initialize();
@@ -164,8 +159,9 @@ void MacroManager::MacroManagerPrivate::addMacro(Macro *macro)
Core::Command *command = Core::ActionManager::registerAction(
action, makeId(macro->displayName()), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(action, SIGNAL(triggered()), mapper, SLOT(map()));
mapper->setMapping(action, macro->displayName());
connect(action, &QAction::triggered, q, [this, macro]() {
q->executeMacro(macro->displayName());
});
// Add macro to the map
macros[macro->displayName()] = macro;