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

Beautifier: Use Utils::runAsync

Browse Source 
Gets rid of usage of global thread pool and ugly implementation.

Change-Id: If7ca1f479bb837e61fa7f57535b7b099f09800f2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-02-11 15:53:17 +01:00
parent ecdc2013cd
commit 5c0b2d1b14
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
View File

@@ -31,7 +31,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/QtConcurrentTools> #include <utils/runextensions.h>
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>
@@ -70,7 +70,7 @@ void ArtisticStyleSettings::updateVersion()
if (m_versionFuture.isRunning()) if (m_versionFuture.isRunning())
m_versionFuture.cancel(); m_versionFuture.cancel();
m_versionFuture = QtConcurrent::run(&ArtisticStyleSettings::helperUpdateVersion, this); m_versionFuture = Utils::runAsync(&ArtisticStyleSettings::helperUpdateVersion, this);
m_versionWatcher.setFuture(m_versionFuture); m_versionWatcher.setFuture(m_versionFuture);
} }

4
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -48,7 +48,7 @@
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/QtConcurrentTools> #include <utils/runextensions.h>
#include <QAction> #include <QAction>
#include <QDir> #include <QDir>
@@ -236,7 +236,7 @@ void BeautifierPlugin::formatCurrentFile(const Command &command, int startPos, i
connect(watcher, &QFutureWatcherBase::finished, m_asyncFormatMapper, connect(watcher, &QFutureWatcherBase::finished, m_asyncFormatMapper,
static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map)); static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
m_asyncFormatMapper->setMapping(watcher, watcher); m_asyncFormatMapper->setMapping(watcher, watcher);
watcher->setFuture(QtConcurrent::run(&BeautifierPlugin::formatAsync, this, task)); watcher->setFuture(Utils::runAsync(&BeautifierPlugin::formatAsync, this, task));
} }
} }
} }