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

VcsCommand: Limit the usage of setCookie()

Browse Source 
Use lambda capture instead.

Change-Id: I43ff080c4909ecf12fd330c8db9a1f0bfb497011
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-08-02 10:03:44 +02:00
parent 09fb9f3973
commit 6e160b2088
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -340,7 +340,7 @@ bool VcsBaseClient::synchronousPull(const FilePath &workingDir,
const bool ok = vcsSynchronousExec(workingDir, args, flags).result()
== ProcessResult::FinishedWithSuccess;
if (ok)
emit changed(QVariant(workingDir.toString()));
emit changed(workingDir.toString());
return ok;
}
@@ -467,10 +467,10 @@ void VcsBaseClient::revertFile(const FilePath &workingDir,
args << revisionSpec(revision) << extraOptions << file;
// Indicate repository change or file list
VcsCommand *cmd = createCommand(workingDir);
cmd->setCookie(QStringList(workingDir.pathAppended(file).toString()));
connect(cmd, &VcsCommand::finished, this, [this](bool success, const QVariant &cookie) {
const QStringList files = QStringList(workingDir.pathAppended(file).toString());
connect(cmd, &VcsCommand::finished, this, [this, files](bool success) {
if (success)
emit changed(cookie);
emit changed(files);
}, Qt::QueuedConnection);
enqueueJob(cmd, args);
}
@@ -483,10 +483,10 @@ void VcsBaseClient::revertAll(const FilePath &workingDir,
args << revisionSpec(revision) << extraOptions;
// Indicate repository change or file list
VcsCommand *cmd = createCommand(workingDir);
cmd->setCookie(QStringList(workingDir.toString()));
connect(cmd, &VcsCommand::finished, this, [this](bool success, const QVariant &cookie) {
const QStringList files = QStringList(workingDir.toString());
connect(cmd, &VcsCommand::finished, this, [this, files](bool success) {
if (success)
emit changed(cookie);
emit changed(files);
}, Qt::QueuedConnection);
enqueueJob(createCommand(workingDir), args);
}
@@ -584,10 +584,9 @@ void VcsBaseClient::update(const FilePath &repositoryRoot, const QString &revisi
QStringList args(vcsCommandString(UpdateCommand));
args << revisionSpec(revision) << extraOptions;
VcsCommand *cmd = createCommand(repositoryRoot);
cmd->setCookie(repositoryRoot.toString());
connect(cmd, &VcsCommand::finished, this, [this](bool success, const QVariant &cookie) {
connect(cmd, &VcsCommand::finished, this, [this, repositoryRoot](bool success) {
if (success)
emit changed(cookie);
emit changed(repositoryRoot.toString());
}, Qt::QueuedConnection);
enqueueJob(cmd, args);
}