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

DiffEditorPlugin: Introduce DiffFileInfoArray

Browse Source 
Change-Id: I884d72e6c500e41969f379d969bcf1f46be8fd5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-29 17:49:32 +02:00
parent 835b278c00
commit daa942393a
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffutils.h
View File

@@ -11,6 +11,8 @@
#include <QMap>
#include <QString>
#include <array>
QT_BEGIN_NAMESPACE
class QFutureInterfaceBase;
QT_END_NAMESPACE
@@ -34,6 +36,8 @@ public:
PatchBehaviour patchBehaviour = PatchFile;
};
using DiffFileInfoArray = std::array<DiffFileInfo, SideCount>;
class DIFFEDITOR_EXPORT TextLineData {
public:
enum TextLineType {
@@ -98,7 +102,7 @@ public:
FileData() = default;
FileData(const ChunkData &chunkData) { chunks.append(chunkData); }
QList<ChunkData> chunks;
std::array<DiffFileInfo, SideCount> fileInfo{};
DiffFileInfoArray fileInfo{};
FileOperation fileOperation = ChangeFile;
bool binaryFiles = false;
bool lastChunkAtTheEndOfFile = false;