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

ActionManager: Convert to Qt5 style connects

Browse Source 
Change-Id: I058a8530a6c329314d60d77506ca25c6c87d7b88
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-09-16 14:52:57 +02:00
parent 8380436ce5
commit d2d883ce29
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -204,7 +204,7 @@ ActionContainer *ActionManager::createMenu(Id id)
MenuActionContainer *mc = new MenuActionContainer(id); MenuActionContainer *mc = new MenuActionContainer(id);
d->m_idContainerMap.insert(id, mc); d->m_idContainerMap.insert(id, mc);
connect(mc, SIGNAL(destroyed()), d, SLOT(containerDestroyed())); connect(mc, &QObject::destroyed, d, &ActionManagerPrivate::containerDestroyed);
return mc; return mc;
} }
@@ -229,7 +229,7 @@ ActionContainer *ActionManager::createMenuBar(Id id)
mbc->setMenuBar(mb); mbc->setMenuBar(mb);
d->m_idContainerMap.insert(id, mbc); d->m_idContainerMap.insert(id, mbc);
connect(mbc, SIGNAL(destroyed()), d, SLOT(containerDestroyed())); connect(mbc, &QObject::destroyed, d, &ActionManagerPrivate::containerDestroyed);
return mbc; return mbc;
} }
@@ -350,9 +350,9 @@ void ActionManager::setPresentationModeEnabled(bool enabled)
foreach (Command *c, commands()) { foreach (Command *c, commands()) {
if (c->action()) { if (c->action()) {
if (enabled) if (enabled)
connect(c->action(), SIGNAL(triggered()), d, SLOT(actionTriggered())); connect(c->action(), &QAction::triggered, d, &ActionManagerPrivate::actionTriggered);
else 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 // first delete containers to avoid them reacting to command deletion
foreach (ActionContainerPrivate *container, m_idContainerMap) foreach (ActionContainerPrivate *container, m_idContainerMap)
disconnect(container, SIGNAL(destroyed()), this, SLOT(containerDestroyed())); disconnect(container, &QObject::destroyed, this, &ActionManagerPrivate::containerDestroyed);
qDeleteAll(m_idContainerMap); qDeleteAll(m_idContainerMap);
qDeleteAll(m_idCmdMap); qDeleteAll(m_idCmdMap);
} }
@@ -467,7 +467,7 @@ Action *ActionManagerPrivate::overridableAction(Id id)
a->setCurrentContext(m_context); a->setCurrentContext(m_context);
if (ActionManager::isPresentationModeEnabled()) if (ActionManager::isPresentationModeEnabled())
connect(a->action(), SIGNAL(triggered()), this, SLOT(actionTriggered())); connect(a->action(), &QAction::triggered, this, &ActionManagerPrivate::actionTriggered);
} }
return a; return a;