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

GitClient: Some minor corrections

Browse Source 
Use GroupItem instead of ProcessTask inside topRevision().
Replace some [=] captures with more explicit ones.

Change-Id: I2e321f7121f80fd2689ecf57cd9735ba56a7962e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-10-31 20:32:57 +01:00
parent 3d0832cd4a
commit 7bec91c53e
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/git/branchmodel.cpp
View File

@@ -391,7 +391,7 @@ void BranchModel::clear()
d->rootNode->children.takeLast();
d->currentSha.clear();
d->currentDateTime = QDateTime();
d->currentDateTime = {};
d->currentBranch = nullptr;
d->headNode = nullptr;
d->obsoleteLocalBranches.clear();
@@ -410,14 +410,13 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
return;
}
const ProcessTask topRevisionProc =
gitClient().topRevision(workingDirectory,
[=](const QString &ref, const QDateTime &dateTime) {
d->currentSha = ref;
d->currentDateTime = dateTime;
});
const GroupItem topRevisionProc = gitClient().topRevision(workingDirectory,
[this](const QString &ref, const QDateTime &dateTime) {
d->currentSha = ref;
d->currentDateTime = dateTime;
});
const auto setupForEachRef = [=](Process &process) {
const auto setupForEachRef = [this, workingDirectory](Process &process) {
d->workingDirectory = workingDirectory;
QStringList args = {"for-each-ref",
"--format=%(objectname)\t%(refname)\t%(upstream:short)\t"
@@ -429,7 +428,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
gitClient().setupCommand(process, workingDirectory, args);
};
const auto forEachRefDone = [=](const Process &process) {
const auto forEachRefDone = [this](const Process &process) {
const QString output = process.stdOut();
const QStringList lines = output.split('\n');
for (const QString &l : lines)
@@ -450,7 +449,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
}
};
const auto forEachRefError = [=](const Process &process) {
const auto forEachRefError = [workingDirectory, showError](const Process &process) {
if (showError == ShowError::No)
return;
const QString message = Tr::tr("Cannot run \"%1\" in \"%2\": %3")