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

GitPlugin: Limit the usage of qMakePair

Browse Source 
Change-Id: I9a164d951c43a9fc30bbdfffada22d9876d35e3f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 12:11:43 +02:00
parent 34dc092642
commit 8a645e8a1d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/commitdata.cpp
View File

@@ -95,7 +95,7 @@ bool CommitData::checkLine(const QString &stateInfo, const QString &file)
QTC_ASSERT(stateInfo.count() == 2, return false); QTC_ASSERT(stateInfo.count() == 2, return false);
if (stateInfo == "??") { if (stateInfo == "??") {
files.append(qMakePair(FileStates(UntrackedFile), file)); files.push_back({FileStates(UntrackedFile), file});
return true; return true;
} }
@@ -110,22 +110,22 @@ bool CommitData::checkLine(const QString &stateInfo, const QString &file)
if (xState == yState) { if (xState == yState) {
if (xState == UnmergedFile) if (xState == UnmergedFile)
xState = ModifiedFile; xState = ModifiedFile;
files.append(qMakePair(xState | UnmergedFile | UnmergedUs | UnmergedThem, file)); files.push_back({xState | UnmergedFile | UnmergedUs | UnmergedThem, file});
} else if (xState == UnmergedFile) { } else if (xState == UnmergedFile) {
files.append(qMakePair(yState | UnmergedFile | UnmergedThem, file)); files.push_back({yState | UnmergedFile | UnmergedThem, file});
} else { } else {
files.append(qMakePair(xState | UnmergedFile | UnmergedUs, file)); files.push_back({xState | UnmergedFile | UnmergedUs, file});
} }
} else { } else {
if (xState != EmptyFileState) if (xState != EmptyFileState)
files.append(qMakePair(xState | StagedFile, file)); files.push_back({xState | StagedFile, file});
if (yState != EmptyFileState) { if (yState != EmptyFileState) {
QString newFile = file; QString newFile = file;
if (xState & (RenamedFile | CopiedFile)) if (xState & (RenamedFile | CopiedFile))
newFile = file.mid(file.indexOf(" -> ") + 4); newFile = file.mid(file.indexOf(" -> ") + 4);
files.append(qMakePair(yState, newFile)); files.push_back({yState, newFile});
} }
} }
Utils::sort(files); Utils::sort(files);