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

PatchTool: Introduce PatchAction enum

Browse Source 
Add static PatchTool::confirmPatching() and reuse it
in two places.

Use Tr::tr() inside PatchTool.

Change-Id: I70779619dbb58ab6e46a585bbeff51588ccb2f53
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-29 15:31:27 +02:00
parent 2d360db2c3
commit b67c868f75
14 changed files with 140 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/diffeditor/diffeditordocument.h
View File

@@ -5,6 +5,7 @@
#include "diffutils.h"
#include <coreplugin/patchtool.h>
#include <coreplugin/textdocument.h>
QT_FORWARD_DECLARE_CLASS(QMenu)
@@ -31,10 +32,10 @@ public:
LoadFailed
};
static ChunkData filterChunk(const ChunkData &data,
const ChunkSelection &selection, bool revert);
static ChunkData filterChunk(const ChunkData &data, const ChunkSelection &selection,
Core::PatchAction patchAction);
QString makePatch(int fileIndex, int chunkIndex, const ChunkSelection &selection,
bool revert, bool addPrefix = false,
Core::PatchAction patchAction, bool addPrefix = false,
const QString &overriddenFileName = {}) const;
void setDiffFiles(const QList<FileData> &data, const Utils::FilePath &directory,