napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back to QFutureWatcher, but we allocate/destroy it ourselves.

Browse Source 
This reverts commit c64eef54f6584b26f14933f0c8e600d5ad2dacbb.
This commit is contained in:
Teo Mrnjavac 2015-12-24 12:09:47 +01:00
parent 496d917d94
commit fbb293c15a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -49,7 +49,8 @@
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QDir> #include <QDir>
#include <QProcess> #include <QProcess>
#include <QTimer> #include <QFutureWatcher>
#include <QtConcurrent/QtConcurrent>
static bool static bool
hasRootPartition( Device* device ) hasRootPartition( Device* device )
@ -531,11 +532,16 @@ PartitionCoreModule::revertDevice( Device* dev )
void void
PartitionCoreModule::asyncRevertDevice( Device* dev, std::function< void() > callback ) PartitionCoreModule::asyncRevertDevice( Device* dev, std::function< void() > callback )
{ {
QTimer::singleShot( 0, this, [=] QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
connect( watcher, &QFutureWatcher< void >::finished,
this, [ watcher, callback ]
{ {
revertDevice( dev ); callback();
QTimer::singleShot( 0, callback ); watcher->deleteLater();
} ); } );
QFuture< void > future = QtConcurrent::run( this, &PartitionCoreModule::revertDevice, dev );
watcher->setFuture( future );
} }