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

Core: Export and de-templatize ProgressTimer

Browse Source 
* Enable usage with QFutureInterface of non-void types
* Remove watcher. Instead, start the timer immediately
* Replace inheritance with aggregation of QTimer

Change-Id: I4a7d8e2b8c885fd7a84a0134be3e41220952c185
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-06 21:57:14 +02:00
committed by Orgad Shaneh
parent 9a248913c8
commit 9d7efda496
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -780,21 +780,20 @@ void ProgressManager::cancelTasks(Id type)
ProgressTimer::ProgressTimer(QObject *parent,
const QFutureInterface<void> &futureInterface,
const QFutureInterfaceBase &futureInterface,
int expectedSeconds)
: QTimer(parent),
: QObject(parent),
m_futureInterface(futureInterface),
m_expectedTime(expectedSeconds),
m_currentTime(0)
{
m_futureWatcher.setFuture(m_futureInterface.future());
m_futureInterface.setProgressRange(0, 100);
m_futureInterface.setProgressValue(0);
setInterval(1000); // 1 second
connect(this, &QTimer::timeout, this, &ProgressTimer::handleTimeout);
connect(&m_futureWatcher, &QFutureWatcherBase::started, this, [this]() { start(); });
m_timer = new QTimer(this);
m_timer->setInterval(1000); // 1 second
connect(m_timer, &QTimer::timeout, this, &ProgressTimer::handleTimeout);
m_timer->start();
}
void ProgressTimer::handleTimeout()