summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-02-09 11:02:17 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-02-09 09:06:41 +0000
commitc554dae687b445a50f8acd817abdba411aa97e0b (patch)
tree07c5d2b0ae6fe08de0431a1a35e9fea1f3d3c141 /src
parent9d7efda49693d55fc8ac63d44ba34e16826630c1 (diff)
downloadqt-creator-c554dae687b445a50f8acd817abdba411aa97e0b.tar.gz
Core: Make parent argument last in ProgressTimer ctor
Change-Id: Id6513c46c72f0f4729783136ba0e9d779af7d147 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanager.cpp8
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanager.h3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 0de8c643ff..69fde6474b 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -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),
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 97aa920776..6653a70b1f 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -75,7 +75,8 @@ private:
class CORE_EXPORT ProgressTimer : public QObject
{
public:
- ProgressTimer(QObject *parent, const QFutureInterfaceBase &futureInterface, int expectedSeconds);
+ ProgressTimer(const QFutureInterfaceBase &futureInterface, int expectedSeconds,
+ QObject *parent = 0);
private:
void handleTimeout();