From c81f31c72fe6cc7cd1e47810effc9401a63abdb0 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Oct 2014 22:36:38 +0200 Subject: [PATCH] ModeManager: Make instance return a ModeManager * again Better for Qt5-style connects. Change-Id: I37353c4b7697c8bb32f0cf13e2721ba78da904cd Reviewed-by: hjk --- src/plugins/coreplugin/modemanager.cpp | 2 +- src/plugins/coreplugin/modemanager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index d7de921ed0b..6b9f15f23bf 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -321,7 +321,7 @@ bool ModeManager::isModeSelectorVisible() return d->m_modeSelectorVisible; } -QObject *ModeManager::instance() +ModeManager *ModeManager::instance() { return m_instance; } diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 93f25b9f92b..f2d5173ed65 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -53,7 +53,7 @@ class CORE_EXPORT ModeManager : public QObject Q_OBJECT public: - static QObject *instance(); + static ModeManager *instance(); static IMode *currentMode(); static IMode *mode(Id id);