diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-05-29 00:20:16 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2016-06-01 05:49:45 +0000 |
commit | 8641a5e956176a39579fd68cc9e449665c9c8ed5 (patch) | |
tree | 1e989e360c11a9c91f29ffd849a863dc219095ca /src/plugins/macros | |
parent | 34a7ff07b78ce3cf8fe57621894e578538d71dcd (diff) |
Macros: Use Qt5-style connects
The heavy lifting was done by clazy.
Change-Id: I0154e09c1a9e028f3a80772c4c07751f4e282091
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/macros')
-rw-r--r-- | src/plugins/macros/actionmacrohandler.cpp | 35 | ||||
-rw-r--r-- | src/plugins/macros/actionmacrohandler.h | 8 | ||||
-rw-r--r-- | src/plugins/macros/findmacrohandler.cpp | 4 | ||||
-rw-r--r-- | src/plugins/macros/findmacrohandler.h | 3 | ||||
-rw-r--r-- | src/plugins/macros/macromanager.cpp | 12 | ||||
-rw-r--r-- | src/plugins/macros/macromanager.h | 5 | ||||
-rw-r--r-- | src/plugins/macros/macrooptionswidget.h | 4 | ||||
-rw-r--r-- | src/plugins/macros/texteditormacrohandler.cpp | 10 | ||||
-rw-r--r-- | src/plugins/macros/texteditormacrohandler.h | 1 |
9 files changed, 28 insertions, 54 deletions
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index e1dd9166ee..be14cc6fab 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -48,12 +48,8 @@ namespace Internal { static const char EVENTNAME[] = "Action"; static quint8 ACTIONNAME = 0; -ActionMacroHandler::ActionMacroHandler(): - m_mapper(new QSignalMapper(this)) +ActionMacroHandler::ActionMacroHandler() { - connect(m_mapper, SIGNAL(mapped(QString)), - this, SLOT(addActionEvent(QString))); - connect(ActionManager::instance(), &ActionManager::commandAdded, this, &ActionMacroHandler::addCommand); @@ -80,30 +76,23 @@ bool ActionMacroHandler::executeEvent(const MacroEvent ¯oEvent) return true; } -void ActionMacroHandler::addActionEvent(const QString &name) -{ - if (!isRecording()) - return; - - const Id id = Id::fromString(name); - const Command *command = ActionManager::command(id); - if (command->isScriptable(command->context())) { - MacroEvent e; - e.setId(EVENTNAME); - e.setValue(ACTIONNAME, id.toSetting()); - addMacroEvent(e); - } -} - void ActionMacroHandler::registerCommand(Id id) { if (!m_commandIds.contains(id)) { m_commandIds.insert(id); const Command *command = ActionManager::command(id); if (QAction *action = command->action()) { - connect(action, SIGNAL(triggered()), m_mapper, SLOT(map())); - m_mapper->setMapping(action, id.toString()); - return; + connect(action, &QAction::triggered, this, [this, id, command]() { + if (!isRecording()) + return; + + if (command->isScriptable(command->context())) { + MacroEvent e; + e.setId(EVENTNAME); + e.setValue(ACTIONNAME, id.toSetting()); + addMacroEvent(e); + } + }); } } } diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h index 77c766d682..28077b2013 100644 --- a/src/plugins/macros/actionmacrohandler.h +++ b/src/plugins/macros/actionmacrohandler.h @@ -32,10 +32,6 @@ #include <QSet> -QT_BEGIN_NAMESPACE -class QSignalMapper; -QT_END_NAMESPACE - namespace Macros { namespace Internal { @@ -49,9 +45,6 @@ public: bool canExecuteEvent(const MacroEvent ¯oEvent); bool executeEvent(const MacroEvent ¯oEvent); -private slots: - void addActionEvent(const QString &id); - private: void registerCommand(Core::Id id); Core::Command *command(const QString &id); @@ -59,7 +52,6 @@ private: private: QSet<Core::Id> m_commandIds; - QSignalMapper *m_mapper; }; } // namespace Internal diff --git a/src/plugins/macros/findmacrohandler.cpp b/src/plugins/macros/findmacrohandler.cpp index 6940d57525..ee2709a9be 100644 --- a/src/plugins/macros/findmacrohandler.cpp +++ b/src/plugins/macros/findmacrohandler.cpp @@ -55,8 +55,8 @@ static const quint8 RESET = 5; FindMacroHandler::FindMacroHandler(): IMacroHandler() { - connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), - this, SLOT(changeEditor(Core::IEditor*))); + connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, + this, &FindMacroHandler::changeEditor); } bool FindMacroHandler::canExecuteEvent(const MacroEvent ¯oEvent) diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h index 78eb338a47..b36d8f9eb3 100644 --- a/src/plugins/macros/findmacrohandler.h +++ b/src/plugins/macros/findmacrohandler.h @@ -46,7 +46,6 @@ public: bool canExecuteEvent(const MacroEvent ¯oEvent); bool executeEvent(const MacroEvent ¯oEvent); -public slots: void findIncremental(const QString &txt, Core::FindFlags findFlags); void findStep(const QString &txt, Core::FindFlags findFlags); void replace(const QString &before, const QString &after, Core::FindFlags findFlags); @@ -54,7 +53,7 @@ public slots: void replaceAll(const QString &before, const QString &after, Core::FindFlags findFlags); void resetIncrementalSearch(); -private slots: +private: void changeEditor(Core::IEditor *editor); }; diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 9a15ebe312..ac2f23f3c2 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -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; diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h index 2d1c8b6596..efc3bac605 100644 --- a/src/plugins/macros/macromanager.h +++ b/src/plugins/macros/macromanager.h @@ -52,13 +52,14 @@ public: static QString macrosDirectory(); -public slots: void startMacro(); - void endMacro(); void executeLastMacro(); void saveLastMacro(); bool executeMacro(const QString &name); +public slots: + void endMacro(); + protected: friend class Internal::MacroOptionsWidget; diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index 135d01b858..95a7e07fd0 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -52,14 +52,12 @@ public: void apply(); -private slots: +private: void remove(); void changeCurrentItem(QTreeWidgetItem *current); -private: void createTable(); -private slots: void changeDescription(const QString &description); private: diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index ad6808d6f7..6626f103f4 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -56,11 +56,11 @@ static quint8 COUNT = 5; TextEditorMacroHandler::TextEditorMacroHandler(): IMacroHandler() { - const QObject *editorManager = Core::EditorManager::instance(); - connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)), - this, SLOT(changeEditor(Core::IEditor*))); - connect(editorManager, SIGNAL(editorAboutToClose(Core::IEditor*)), - this, SLOT(closeEditor(Core::IEditor*))); + Core::EditorManager *editorManager = Core::EditorManager::instance(); + connect(editorManager, &Core::EditorManager::currentEditorChanged, + this, &TextEditorMacroHandler::changeEditor); + connect(editorManager, &Core::EditorManager::editorAboutToClose, + this, &TextEditorMacroHandler::closeEditor); } void TextEditorMacroHandler::startRecording(Macro *macro) diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h index a213425a35..1c4cda35ac 100644 --- a/src/plugins/macros/texteditormacrohandler.h +++ b/src/plugins/macros/texteditormacrohandler.h @@ -49,7 +49,6 @@ public: bool eventFilter(QObject *watched, QEvent *event); -public slots: void changeEditor(Core::IEditor *editor); void closeEditor(Core::IEditor *editor); |