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

ProgressManager: Handle QFutureInterface by value in addTimedTask

Browse Source 
QFutureInterface acts by a shared pointer itself, so use that to
guards against the QFutureInterface object being destroyed while
the timer is running.

This feels awkward as QFutureInterfaceBase::future() is non-const
for unknown reason.

Change-Id: I1d43abe0c27183af2f01cf269e2a94d2fcaba46e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-05-30 14:25:58 +02:00
parent 212836d56b
commit 54cac66c72
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,10 +749,11 @@ FutureProgress *ProgressManager::addTask(const QFuture<void> &future, const QStr
\sa addTask
*/
FutureProgress *ProgressManager::addTimedTask(QFutureInterface<void> *futureInterface, const QString &title,
FutureProgress *ProgressManager::addTimedTask(const QFutureInterface<void> &futureInterface, const QString &title,
Id type, int expectedSeconds, ProgressFlags flags)
{
FutureProgress *fp = m_instance->doAddTask(futureInterface->future(), title, type, flags);
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);
return fp;
}
@@ -770,17 +771,17 @@ void ProgressManager::cancelTasks(const Id type)
ProgressTimer::ProgressTimer(QObject *parent,
QFutureInterface<void> *futureInterface,
const QFutureInterface<void> &futureInterface,
int expectedSeconds)
: QTimer(parent),
m_futureInterface(futureInterface),
m_expectedTime(expectedSeconds),
m_currentTime(0)
{
m_futureWatcher.setFuture(futureInterface->future());
m_futureWatcher.setFuture(m_futureInterface.future());
m_futureInterface->setProgressRange(0, 100);
m_futureInterface->setProgressValue(0);
m_futureInterface.setProgressRange(0, 100);
m_futureInterface.setProgressValue(0);
setInterval(1000); // 1 second
connect(this, SIGNAL(timeout()), this, SLOT(handleTimeout()));
@@ -796,6 +797,6 @@ void ProgressTimer::handleTimeout()
// future finishes. That's not bad for a random choice.
const double mapped = atan2(double(m_currentTime), double(m_expectedTime));
const double progress = 100 * 2 * mapped / 3.14;
m_futureInterface->setProgressValue(int(progress));
m_futureInterface.setProgressValue(int(progress));
}

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

@@ -55,7 +55,7 @@ public:
static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
Core::Id type, ProgressFlags flags = 0);
static FutureProgress *addTimedTask(QFutureInterface<void> *fi, const QString &title,
static FutureProgress *addTimedTask(const QFutureInterface<void> &fi, const QString &title,
Core::Id type, int expectedSeconds, ProgressFlags flags = 0);
static void setApplicationLabel(const QString &text);

4
src/plugins/coreplugin/progressmanager/progressmanager_p.h
View File

@@ -132,13 +132,13 @@ class ProgressTimer : public QTimer
Q_OBJECT
public:
ProgressTimer(QObject *parent, QFutureInterface<void> *futureInterface, int expectedSeconds);
ProgressTimer(QObject *parent, const QFutureInterface<void> &futureInterface, int expectedSeconds);
private slots:
void handleTimeout();
private:
QFutureInterface<void> *m_futureInterface;
QFutureInterface<void> m_futureInterface;
QFutureWatcher<void> m_futureWatcher;
int m_expectedTime;
int m_currentTime;