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

DiffEditor: Don't use QFutureInterfaceBase::get()

Browse Source 
It's available only since Qt 6.3.

Amends 5ff073df19

Change-Id: I38c8c3b0bc3c94612dee15614f00e83ebc86db04
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-03-10 08:54:25 +01:00
parent 0613a492f3
commit 40b0f670e1
4 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/diffeditor/unifieddiffeditorwidget.h
View File

@@ -33,9 +33,6 @@ class UnifiedDiffOutput;
class UnifiedDiffData
{
public:
static UnifiedDiffOutput diffOutput(QFutureInterfaceBase &fi, int progressMin, int progressMax,
const DiffEditorInput &input);
DiffChunkInfo m_chunkInfo;
// block number, visual line number.
QMap<int, DiffFileInfoArray> m_fileInfo;
@@ -47,10 +44,10 @@ public:
int blockNumberForFileIndex(int fileIndex) const;
int fileIndexForBlockNumber(int blockNumber) const;
private:
void setLineNumber(DiffSide side, int blockNumber, int lineNumber, int rowNumberInChunk);
QString setChunk(const DiffEditorInput &input, const ChunkData &chunkData,
bool lastChunk, int *blockNumber, DiffSelections *selections);
private:
void setLineNumber(DiffSide side, int blockNumber, int lineNumber, int rowNumberInChunk);
};
class UnifiedDiffOutput
@@ -65,6 +62,14 @@ public:
DiffSelections selections;
};
class UnifiedShowResult
{
public:
QSharedPointer<TextEditor::TextDocument> textDocument;
UnifiedDiffData diffData;
DiffSelections selections;
};
class UnifiedDiffEditorWidget final : public SelectableTextEditorWidget
{
Q_OBJECT
@@ -107,14 +112,7 @@ private:
DiffEditorWidgetController m_controller;
QByteArray m_state;
struct ShowResult
{
QSharedPointer<TextEditor::TextDocument> textDocument;
UnifiedDiffData diffData;
DiffSelections selections;
};
std::unique_ptr<Utils::AsyncTask<ShowResult>> m_asyncTask;
std::unique_ptr<Utils::AsyncTask<UnifiedShowResult>> m_asyncTask;
};
} // namespace Internal