Make it possible to cancel async diff calculation

Change-Id: I38fe86159daab794d060860de6ee5ab30fb395eb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jarek Kobus
2017-06-30 16:06:36 +02:00
parent 4bea049c45
commit 6509753e86
3 changed files with 33 additions and 10 deletions

View File

@@ -30,6 +30,10 @@
#include <QString>
#include <QMap>
QT_BEGIN_NAMESPACE
class QFutureInterfaceBase;
QT_END_NAMESPACE
namespace TextEditor { class FontSettings; }
namespace DiffEditor {
@@ -150,7 +154,8 @@ public:
static QString makePatch(const QList<FileData> &fileDataList,
unsigned formatFlags = 0);
static QList<FileData> readPatch(const QString &patch,
bool *ok = 0);
bool *ok = 0,
QFutureInterfaceBase *jobController = nullptr);
};
} // namespace DiffEditor