From 2acc80dfeb29adcfc46287cc367b3f07aadd102d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 27 Nov 2013 15:57:51 +0100 Subject: [PATCH] VcsManager: Make instance() method return VcsManager * again This is more convenient as that fixes the code completion for slots and does allow for calling slots on the singleton without casting. Change-Id: I1233f449d2b9c9276a29f35d8f8c91c40ec5b352 Reviewed-by: Tobias Hunger --- src/plugins/coreplugin/vcsmanager.cpp | 2 +- src/plugins/coreplugin/vcsmanager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 870666919ee..239145c57f0 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -196,7 +196,7 @@ VcsManager::~VcsManager() delete d; } -QObject *VcsManager::instance() +VcsManager *VcsManager::instance() { return m_instance; } diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index e025041a7b3..f346ac76382 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -58,7 +58,7 @@ class CORE_EXPORT VcsManager : public QObject Q_OBJECT public: - static QObject *instance(); + static VcsManager *instance(); static void extensionsInitialized();