From d2d883ce29091a50e57ab5fa7ae8e1aa36b6de18 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 16 Sep 2015 14:52:57 +0200 Subject: [PATCH] ActionManager: Convert to Qt5 style connects Change-Id: I058a8530a6c329314d60d77506ca25c6c87d7b88 Reviewed-by: Eike Ziller --- .../coreplugin/actionmanager/actionmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 528d7b02260..7a295f6fe69 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -204,7 +204,7 @@ ActionContainer *ActionManager::createMenu(Id id) MenuActionContainer *mc = new MenuActionContainer(id); d->m_idContainerMap.insert(id, mc); - connect(mc, SIGNAL(destroyed()), d, SLOT(containerDestroyed())); + connect(mc, &QObject::destroyed, d, &ActionManagerPrivate::containerDestroyed); return mc; } @@ -229,7 +229,7 @@ ActionContainer *ActionManager::createMenuBar(Id id) mbc->setMenuBar(mb); d->m_idContainerMap.insert(id, mbc); - connect(mbc, SIGNAL(destroyed()), d, SLOT(containerDestroyed())); + connect(mbc, &QObject::destroyed, d, &ActionManagerPrivate::containerDestroyed); return mbc; } @@ -350,9 +350,9 @@ void ActionManager::setPresentationModeEnabled(bool enabled) foreach (Command *c, commands()) { if (c->action()) { if (enabled) - connect(c->action(), SIGNAL(triggered()), d, SLOT(actionTriggered())); + connect(c->action(), &QAction::triggered, d, &ActionManagerPrivate::actionTriggered); else - disconnect(c->action(), SIGNAL(triggered()), d, SLOT(actionTriggered())); + disconnect(c->action(), &QAction::triggered, d, &ActionManagerPrivate::actionTriggered); } } @@ -389,7 +389,7 @@ ActionManagerPrivate::~ActionManagerPrivate() { // first delete containers to avoid them reacting to command deletion foreach (ActionContainerPrivate *container, m_idContainerMap) - disconnect(container, SIGNAL(destroyed()), this, SLOT(containerDestroyed())); + disconnect(container, &QObject::destroyed, this, &ActionManagerPrivate::containerDestroyed); qDeleteAll(m_idContainerMap); qDeleteAll(m_idCmdMap); } @@ -467,7 +467,7 @@ Action *ActionManagerPrivate::overridableAction(Id id) a->setCurrentContext(m_context); if (ActionManager::isPresentationModeEnabled()) - connect(a->action(), SIGNAL(triggered()), this, SLOT(actionTriggered())); + connect(a->action(), &QAction::triggered, this, &ActionManagerPrivate::actionTriggered); } return a;