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/branchmodel.cpp
View File

@@ -414,7 +414,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
}
using namespace Tasking;
const Process topRevisionProc =
const ProcessTask topRevisionProc =
d->client->topRevision(workingDirectory,
[=](const QString &ref, const QDateTime &dateTime) {
d->currentSha = ref;
@@ -471,7 +471,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
const Group root {
topRevisionProc,
Process(setupForEachRef, forEachRefDone, forEachRefError),
ProcessTask(setupForEachRef, forEachRefDone, forEachRefError),
OnGroupDone(finalize),
OnGroupError(finalize)
};

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)

20
src/plugins/git/gitclient.cpp
View File

@@ -176,7 +176,7 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document,
const Group root {
Storage(diffInputStorage),
Process(setupDiff, onDiffDone),
ProcessTask(setupDiff, onDiffDone),
postProcessTask()
};
setReloadRecipe(root);
@@ -267,8 +267,8 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
Group {
parallel,
continueOnDone,
Process(setupStaged, onStagedDone),
Process(setupUnstaged, onUnstagedDone),
ProcessTask(setupStaged, onStagedDone),
ProcessTask(setupUnstaged, onUnstagedDone),
OnGroupDone(onStagingDone)
},
postProcessTask()
@@ -442,7 +442,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
using namespace std::placeholders;
QList<TaskItem> tasks {parallel, continueOnDone, OnGroupError(onFollowsError)};
for (int i = 0, total = parents.size(); i < total; ++i) {
tasks.append(Process(std::bind(setupFollow, _1, parents.at(i)),
tasks.append(ProcessTask(std::bind(setupFollow, _1, parents.at(i)),
std::bind(onFollowDone, _1, i)));
}
taskTree.setupRoot(tasks);
@@ -465,18 +465,18 @@ ShowController::ShowController(IDocument *document, const QString &id)
OnGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }),
Group {
optional,
Process(setupDescription, onDescriptionDone),
ProcessTask(setupDescription, onDescriptionDone),
Group {
parallel,
optional,
OnGroupSetup(desciptionDetailsSetup),
Process(setupBranches, onBranchesDone, onBranchesError),
Process(setupPrecedes, onPrecedesDone, onPrecedesError),
ProcessTask(setupBranches, onBranchesDone, onBranchesError),
ProcessTask(setupPrecedes, onPrecedesDone, onPrecedesError),
Tree(setupFollows)
}
},
Group {
Process(setupDiff, onDiffDone),
ProcessTask(setupDiff, onDiffDone),
postProcessTask()
}
};
@@ -1730,7 +1730,7 @@ bool GitClient::synchronousRevParseCmd(const FilePath &workingDirectory, const Q
}
// Retrieve head revision
Utils::Tasking::Process GitClient::topRevision(
Utils::Tasking::ProcessTask GitClient::topRevision(
const FilePath &workingDirectory,
const std::function<void(const QString &, const QDateTime &)> &callback)
{
@@ -1751,7 +1751,7 @@ Utils::Tasking::Process GitClient::topRevision(
callback(output.first(), dateTime);
};
return Process(setupProcess, onProcessDone);
return ProcessTask(setupProcess, onProcessDone);
}
bool GitClient::isRemoteCommit(const FilePath &workingDirectory, const QString &commit)

2
src/plugins/git/gitclient.h
View File

@@ -242,7 +242,7 @@ public:
QString synchronousTopic(const Utils::FilePath &workingDirectory) const;
bool synchronousRevParseCmd(const Utils::FilePath &workingDirectory, const QString &ref,
QString *output, QString *errorMessage = nullptr) const;
Utils::Tasking::Process topRevision(
Utils::Tasking::ProcessTask topRevision(
const Utils::FilePath &workingDirectory,
const std::function<void(const QString &, const QDateTime &)> &callback);
bool isRemoteCommit(const Utils::FilePath &workingDirectory, const QString &commit);