From 12461c4110cb47732b4a40dcb92d36fa8ed16ea2 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Tue, 23 Jun 2015 11:25:36 +0200
Subject: [PATCH] ModeManager: Remove one use of Id::fromUniqueIdentifier and
Co.
Change-Id: I9013d5de89e40fc60a5f021088fb7213eea3dc03
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
src/plugins/coreplugin/modemanager.cpp | 21 +++++++--------------
src/plugins/coreplugin/modemanager.h | 1 -
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index a4565c34138..a9b7e59d8fd 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -44,13 +44,11 @@
#include <utils/qtcassert.h>
+#include <QAction>
#include <QDebug>
#include <QMap>
#include <QVector>
-#include <QSignalMapper>
-#include <QAction>
-
namespace Core {
/*!
@@ -70,7 +68,6 @@ struct ModeManagerPrivate
QMap<QAction*, int> m_actions;
QVector<IMode*> m_modes;
QVector<Command*> m_modeCommands;
- QSignalMapper *m_signalMapper;
Context m_addedContexts;
int m_oldCurrent;
bool m_modeSelectorVisible;
@@ -96,7 +93,6 @@ ModeManager::ModeManager(Internal::MainWindow *mainWindow,
d = new ModeManagerPrivate();
d->m_mainWindow = mainWindow;
d->m_modeStack = modeStack;
- d->m_signalMapper = new QSignalMapper(this);
d->m_oldCurrent = -1;
d->m_actionBar = new Internal::FancyActionBar(modeStack);
d->m_modeStack->addCornerWidget(d->m_actionBar);
@@ -105,7 +101,6 @@ ModeManager::ModeManager(Internal::MainWindow *mainWindow,
connect(d->m_modeStack, SIGNAL(currentAboutToShow(int)), SLOT(currentTabAboutToChange(int)));
connect(d->m_modeStack, SIGNAL(currentChanged(int)), SLOT(currentTabChanged(int)));
- connect(d->m_signalMapper, SIGNAL(mapped(int)), this, SLOT(slotActivateMode(int)));
}
void ModeManager::init()
@@ -139,12 +134,6 @@ IMode *ModeManager::mode(Id id)
return 0;
}
-void ModeManager::slotActivateMode(int id)
-{
- m_instance->activateMode(Id::fromUniqueIdentifier(id));
- ICore::raiseWindow(d->m_modeStack);
-}
-
void ModeManager::activateMode(Id id)
{
const int index = indexOf(id);
@@ -190,8 +179,12 @@ void ModeManager::objectAdded(QObject *obj)
currentCmd->setKeySequence(currentCmd->defaultKeySequence());
}
- d->m_signalMapper->setMapping(action, mode->id().uniqueIdentifier());
- connect(action, SIGNAL(triggered()), d->m_signalMapper, SLOT(map()));
+ Id id = mode->id();
+ connect(action, &QAction::triggered, [id] {
+ m_instance->activateMode(id);
+ ICore::raiseWindow(d->m_modeStack);
+ });
+
connect(mode, SIGNAL(enabledStateChanged(bool)),
m_instance, SLOT(enabledStateChanged()));
}
diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h
index 77d2e31f6c6..4b34fab385b 100644
--- a/src/plugins/coreplugin/modemanager.h
+++ b/src/plugins/coreplugin/modemanager.h
@@ -75,7 +75,6 @@ signals:
void currentModeChanged(Core::IMode *mode, Core::IMode *oldMode = 0);
private slots:
- void slotActivateMode(int id);
void objectAdded(QObject *obj);
void aboutToRemoveObject(QObject *obj);
void currentTabAboutToChange(int index);
--
GitLab