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

ProgressManager: Return ProgressManager* from instance

Browse Source 
Works better with Qt5-style connects.

Change-Id: I7916369762fa51f24664149f85208b1eb5c7a62e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2015-02-16 15:49:05 +01:00
parent f5fcb3dd92
commit 233da494b2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -737,7 +737,7 @@ ProgressManager::~ProgressManager()
{ {
} }
QObject *ProgressManager::instance() ProgressManager *ProgressManager::instance()
{ {
return m_instance; return m_instance;
} }

2
src/plugins/coreplugin/progressmanager/progressmanager.h
View File

@@ -52,7 +52,7 @@ public:
}; };
Q_DECLARE_FLAGS(ProgressFlags, ProgressFlag) Q_DECLARE_FLAGS(ProgressFlags, ProgressFlag)
static QObject *instance(); static ProgressManager *instance();
static FutureProgress *addTask(const QFuture<void> &future, const QString &title, static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
Id type, ProgressFlags flags = 0); Id type, ProgressFlags flags = 0);