forked from qt-creator/qt-creator
DiffEditor: Use QtConcurrent invocation for async tasks
Change-Id: I06640837ffee830e60e8dd2a566f9388f8444010 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -6,8 +6,6 @@
|
||||
#include "diffeditorwidgetcontroller.h"
|
||||
#include "selectabletexteditorwidget.h"
|
||||
|
||||
#include <QFutureInterface>
|
||||
|
||||
namespace Core { class IContext; }
|
||||
|
||||
namespace TextEditor { class FontSettings; }
|
||||
@@ -17,6 +15,10 @@ template <typename R>
|
||||
class AsyncTask;
|
||||
}
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QFutureInterfaceBase;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace DiffEditor {
|
||||
|
||||
class ChunkData;
|
||||
@@ -31,7 +33,7 @@ class UnifiedDiffOutput;
|
||||
class UnifiedDiffData
|
||||
{
|
||||
public:
|
||||
static UnifiedDiffOutput diffOutput(QFutureInterface<void> &fi, int progressMin, int progressMax,
|
||||
static UnifiedDiffOutput diffOutput(QFutureInterfaceBase &fi, int progressMin, int progressMax,
|
||||
const DiffEditorInput &input);
|
||||
|
||||
DiffChunkInfo m_chunkInfo;
|
||||
|
||||
Reference in New Issue
Block a user