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

Core: Make parent argument last in ProgressTimer ctor

Browse Source 
Change-Id: Id6513c46c72f0f4729783136ba0e9d779af7d147
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-09 11:02:17 +02:00
committed by Orgad Shaneh
parent 9d7efda496
commit c554dae687
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,7 +763,7 @@ FutureProgress *ProgressManager::addTimedTask(const QFutureInterface<void> &futu
{
QFutureInterface<void> dummy(futureInterface); // Need mutable to access .future()
FutureProgress *fp = m_instance->doAddTask(dummy.future(), title, type, flags);
(void) new ProgressTimer(fp, futureInterface, expectedSeconds);
(void) new ProgressTimer(futureInterface, expectedSeconds, fp);
return fp;
}
@@ -779,9 +779,9 @@ void ProgressManager::cancelTasks(Id type)
}
ProgressTimer::ProgressTimer(QObject *parent,
const QFutureInterfaceBase &futureInterface,
int expectedSeconds)
ProgressTimer::ProgressTimer(const QFutureInterfaceBase &futureInterface,
int expectedSeconds,
QObject *parent)
: QObject(parent),
m_futureInterface(futureInterface),
m_expectedTime(expectedSeconds),