diff options
Diffstat (limited to 'src/libs/utils/differ.h')
| -rw-r--r-- | src/libs/utils/differ.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/utils/differ.h b/src/libs/utils/differ.h index 62b8bc7ec4..dc6d74f30d 100644 --- a/src/libs/utils/differ.h +++ b/src/libs/utils/differ.h @@ -5,12 +5,14 @@ #include "utils_global.h" +#include <QFuture> #include <QString> +#include <optional> + QT_BEGIN_NAMESPACE template <class K, class T> class QMap; -class QFutureInterfaceBase; QT_END_NAMESPACE namespace Utils { @@ -42,7 +44,7 @@ public: WordMode, LineMode }; - Differ(QFutureInterfaceBase *jobController = nullptr); + Differ(const std::optional<QFuture<void>> &future = {}); QList<Diff> diff(const QString &text1, const QString &text2); QList<Diff> unifiedDiff(const QString &text1, const QString &text2); void setDiffMode(DiffMode mode); @@ -90,7 +92,7 @@ private: int subTextStart); DiffMode m_diffMode = Differ::LineMode; DiffMode m_currentDiffMode = Differ::LineMode; - QFutureInterfaceBase *m_jobController = nullptr; + std::optional<QFuture<void>> m_future; }; } // namespace Utils |