From 233da494b276dbb212031babec8be37e4afb35b0 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 16 Feb 2015 15:49:05 +0100 Subject: [PATCH] ProgressManager: Return ProgressManager* from instance Works better with Qt5-style connects. Change-Id: I7916369762fa51f24664149f85208b1eb5c7a62e Reviewed-by: Daniel Teske Reviewed-by: Eike Ziller --- src/plugins/coreplugin/progressmanager/progressmanager.cpp | 2 +- src/plugins/coreplugin/progressmanager/progressmanager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 06c197c8eca..50cf7bc6ab5 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -737,7 +737,7 @@ ProgressManager::~ProgressManager() { } -QObject *ProgressManager::instance() +ProgressManager *ProgressManager::instance() { return m_instance; } diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index f39ca6fe0fc..258e58a49ce 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -52,7 +52,7 @@ public: }; Q_DECLARE_FLAGS(ProgressFlags, ProgressFlag) - static QObject *instance(); + static ProgressManager *instance(); static FutureProgress *addTask(const QFuture &future, const QString &title, Id type, ProgressFlags flags = 0);