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

DiffEditor: Use DiffSide enum inside FileData

Browse Source 
Change-Id: I4c18c52a9737cc46c3faeadf0abd5c4771463e0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-26 15:28:00 +02:00
parent 6dc412e255
commit f3a7299761
8 changed files with 88 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -311,8 +311,8 @@ void DiffEditor::documentHasChanged()
m_entriesComboBox->clear();
for (const FileData &diffFile : diffFileList) {
const DiffFileInfo &leftEntry = diffFile.leftFileInfo;
const DiffFileInfo &rightEntry = diffFile.rightFileInfo;
const DiffFileInfo &leftEntry = diffFile.fileInfo[LeftSide];
const DiffFileInfo &rightEntry = diffFile.fileInfo[RightSide];
const QString leftShortFileName = Utils::FilePath::fromString(leftEntry.fileName).fileName();
const QString rightShortFileName = Utils::FilePath::fromString(rightEntry.fileName).fileName();
QString itemText;
@@ -445,8 +445,8 @@ void DiffEditor::reloadHasFinished(bool success)
const int count = diffFileList.count();
for (int i = 0; i < count; i++) {
const FileData &diffFile = diffFileList.at(i);
const DiffFileInfo &leftEntry = diffFile.leftFileInfo;
const DiffFileInfo &rightEntry = diffFile.rightFileInfo;
const DiffFileInfo &leftEntry = diffFile.fileInfo[LeftSide];
const DiffFileInfo &rightEntry = diffFile.fileInfo[RightSide];
if ((m_currentFileChunk.first.isEmpty()
&& m_currentFileChunk.second.isEmpty()
&& startupFile.endsWith(rightEntry.fileName))