Commit 5bc9461d authored by hjk's avatar hjk
Browse files

Valgrind: Remove unneeded separate FutureWatcher



Change-Id: I21fde2125a4a5d653fe4209e3452dec59c783d24
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent c8fc52ba
......@@ -60,7 +60,6 @@ ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
: AnalyzerRunControl(sp, runConfiguration),
m_settings(0),
m_progress(new QFutureInterface<void>()),
m_progressWatcher(new QFutureWatcher<void>()),
m_isStopping(false)
{
if (runConfiguration)
......@@ -70,10 +69,6 @@ ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
if (!m_settings)
m_settings = ValgrindPlugin::globalSettings();
connect(m_progressWatcher, SIGNAL(canceled()),
this, SLOT(handleProgressCanceled()));
connect(m_progressWatcher, SIGNAL(finished()),
this, SLOT(handleProgressFinished()));
}
ValgrindRunControl::~ValgrindRunControl()
......@@ -88,9 +83,10 @@ bool ValgrindRunControl::startEngine()
FutureProgress *fp = ProgressManager::addTask(m_progress->future(),
progressTitle(), "valgrind");
fp->setKeepOnFinish(FutureProgress::HideOnFinish);
connect(fp, SIGNAL(canceled()), this, SLOT(handleProgressCanceled()));
connect(fp, SIGNAL(finished()), this, SLOT(handleProgressFinished()));
m_progress->setProgressRange(0, progressMaximum);
m_progress->reportStarted();
m_progressWatcher->setFuture(m_progress->future());
m_progress->setProgressValue(progressMaximum / 10);
const AnalyzerStartParameters &sp = startParameters();
......
......@@ -63,7 +63,6 @@ protected:
ValgrindBaseSettings *m_settings;
QFutureInterface<void> *m_progress;
QFutureWatcher<void> *m_progressWatcher;
private slots:
void handleProgressCanceled();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment