fix: Merging tool result

This commit is contained in:
Petr Mironychev
2026-06-29 13:28:26 +02:00
parent 86c537477d
commit d66c714a28
11 changed files with 93 additions and 27 deletions

View File

@@ -26,7 +26,7 @@ public:
QString lineContent;
};
enum FileEditStatus { Pending, Applied, Rejected, Archived };
enum FileEditStatus : int { Pending, Applied, Rejected, Archived };
struct DiffHunk
{

View File

@@ -59,7 +59,7 @@ public:
int lineNumber, int cursorPosition, const Settings::CodeCompletionSettings &settings) const;
private:
TextEditor::TextDocument *m_textDocument;
TextEditor::TextDocument *m_textDocument = nullptr;
QTextDocument *m_document;
QString m_mimeType;
QString m_filePath;