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

Tasking::Process: Rename Process into ProcessTask

Browse Source 
Rename QtcProcessAdapter into ProcessTaskAdapter.

Task-number: QTCREATORBUG-29102
Change-Id: I1902c7176da75db60d70125f505084a2ea5ba774
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-03 14:06:15 +02:00
parent 6d805195f6
commit 1d69f943aa
23 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/branchview.cpp
View File

@@ -549,7 +549,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
storage->mergeBase = process.cleanedStdOut().trimmed();
};
const Process topRevisionProc = client->topRevision(
const ProcessTask topRevisionProc = client->topRevision(
m_repository,
[storage](const QString &revision, const QDateTime &) {
storage->topRevision = revision;
@@ -558,7 +558,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
const Group root {
Storage(storage),
parallel,
Process(setupMergeBase, onMergeBaseDone),
ProcessTask(setupMergeBase, onMergeBaseDone),
topRevisionProc,
OnGroupDone([storage, callback] {
if (storage->mergeBase == storage->topRevision)