forked from qt-creator/qt-creator
VcsCommand: Rename execute() to start()
In order to conform to QtcProcess API. Change-Id: I71fcc03846f32cd3c2df39824ce3f6730c20ebbb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -3407,7 +3407,7 @@ VcsCommand *GitClient::vcsExecAbortable(const FilePath &workingDirectory,
|
|||||||
ConflictHandler::attachToCommand(command, workingDirectory, abortCommand);
|
ConflictHandler::attachToCommand(command, workingDirectory, abortCommand);
|
||||||
if (isRebase)
|
if (isRebase)
|
||||||
GitProgressParser::attachToCommand(command);
|
GitProgressParser::attachToCommand(command);
|
||||||
command->execute();
|
command->start();
|
||||||
|
|
||||||
return command;
|
return command;
|
||||||
}
|
}
|
||||||
|
@@ -155,7 +155,7 @@ void GitLabCloneDialog::cloneProject()
|
|||||||
m_pathChooser->setReadOnly(true);
|
m_pathChooser->setReadOnly(true);
|
||||||
m_directoryLE->setReadOnly(true);
|
m_directoryLE->setReadOnly(true);
|
||||||
m_commandRunning = true;
|
m_commandRunning = true;
|
||||||
m_command->execute();
|
m_command->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GitLabCloneDialog::cancel()
|
void GitLabCloneDialog::cancel()
|
||||||
|
@@ -92,7 +92,7 @@ void VcsBaseClientImpl::enqueueJob(VcsCommand *cmd, const QStringList &args,
|
|||||||
const ExitCodeInterpreter &interpreter) const
|
const ExitCodeInterpreter &interpreter) const
|
||||||
{
|
{
|
||||||
cmd->addJob({vcsBinary(), args}, vcsTimeoutS(), {}, interpreter);
|
cmd->addJob({vcsBinary(), args}, vcsTimeoutS(), {}, interpreter);
|
||||||
cmd->execute();
|
cmd->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
Environment VcsBaseClientImpl::processEnvironment() const
|
Environment VcsBaseClientImpl::processEnvironment() const
|
||||||
|
@@ -159,7 +159,7 @@ void VcsBaseDiffEditorController::runCommand(const QList<QStringList> &args, uns
|
|||||||
d->m_command->addJob({d->m_vcsBinary, arg}, d->m_vscTimeoutS);
|
d->m_command->addJob({d->m_vcsBinary, arg}, d->m_vscTimeoutS);
|
||||||
}
|
}
|
||||||
|
|
||||||
d->m_command->execute();
|
d->m_command->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VcsBaseDiffEditorController::processCommandOutput(const QString &output)
|
void VcsBaseDiffEditorController::processCommandOutput(const QString &output)
|
||||||
|
@@ -337,7 +337,7 @@ void VcsCommand::addJob(const CommandLine &command, int timeoutS,
|
|||||||
? workingDirectory : d->m_defaultWorkingDirectory, interpreter});
|
? workingDirectory : d->m_defaultWorkingDirectory, interpreter});
|
||||||
}
|
}
|
||||||
|
|
||||||
void VcsCommand::execute()
|
void VcsCommand::start()
|
||||||
{
|
{
|
||||||
if (d->m_jobs.empty())
|
if (d->m_jobs.empty())
|
||||||
return;
|
return;
|
||||||
|
@@ -104,7 +104,7 @@ public:
|
|||||||
void addJob(const Utils::CommandLine &command, int timeoutS,
|
void addJob(const Utils::CommandLine &command, int timeoutS,
|
||||||
const Utils::FilePath &workingDirectory = {},
|
const Utils::FilePath &workingDirectory = {},
|
||||||
const Utils::ExitCodeInterpreter &interpreter = {});
|
const Utils::ExitCodeInterpreter &interpreter = {});
|
||||||
void execute(); // Execute tasks asynchronously!
|
void start();
|
||||||
|
|
||||||
void addFlags(unsigned f);
|
void addFlags(unsigned f);
|
||||||
|
|
||||||
|
@@ -374,7 +374,7 @@ void VcsCommandPage::start(VcsCommand *command)
|
|||||||
m_statusLabel->setText(m_startedStatus);
|
m_statusLabel->setText(m_startedStatus);
|
||||||
m_statusLabel->setPalette(QPalette());
|
m_statusLabel->setPalette(QPalette());
|
||||||
m_state = Running;
|
m_state = Running;
|
||||||
command->execute();
|
command->start();
|
||||||
|
|
||||||
wizard()->button(QWizard::BackButton)->setEnabled(false);
|
wizard()->button(QWizard::BackButton)->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user