diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-08-01 10:49:13 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-08-01 14:33:06 +0000 |
commit | 60302debd7f571d63c52bf75a1279dca14575869 (patch) | |
tree | 42053e0ead614d5ca395e29358fa633763650efe /src/plugins/git/gitplugin.cpp | |
parent | 61adea0cfdd68e95970c976aebbd39f773300300 (diff) | |
download | qt-creator-60302debd7f571d63c52bf75a1279dca14575869.tar.gz |
Move ShellCommand into VcsBase plugin
Rename it to VcsCommand. Move also ShellCommandPage into
VcsBase plugin.
Change-Id: I335ac47e3090f2be497643ebcda0eaad2987ac81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
-rw-r--r-- | src/plugins/git/gitplugin.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 2fe82c984b..0f0cce545c 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -66,18 +66,18 @@ #include <utils/pathchooser.h> #include <utils/qtcassert.h> #include <utils/runextensions.h> -#include <utils/shellcommand.h> #include <utils/stringutils.h> #include <utils/utilsicons.h> #include <vcsbase/basevcseditorfactory.h> -#include <vcsbase/submitfilemodel.h> -#include <vcsbase/vcsbaseeditor.h> -#include <vcsbase/vcsbaseconstants.h> #include <vcsbase/basevcssubmiteditorfactory.h> -#include <vcsbase/vcsoutputwindow.h> #include <vcsbase/cleandialog.h> +#include <vcsbase/submitfilemodel.h> +#include <vcsbase/vcsbaseconstants.h> +#include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbaseplugin.h> +#include <vcsbase/vcscommand.h> +#include <vcsbase/vcsoutputwindow.h> #include <QDebug> #include <QDir> @@ -255,10 +255,10 @@ public: void vcsDescribe(const FilePath &source, const QString &id) final { m_gitClient.show(source.toString(), id); }; QString vcsTopic(const FilePath &directory) final; - ShellCommand *createInitialCheckoutCommand(const QString &url, - const Utils::FilePath &baseDirectory, - const QString &localName, - const QStringList &extraArgs) final; + VcsCommand *createInitialCheckoutCommand(const QString &url, + const Utils::FilePath &baseDirectory, + const QString &localName, + const QStringList &extraArgs) final; void fillLinkContextMenu(QMenu *menu, const FilePath &workingDirectory, @@ -1880,16 +1880,16 @@ QString GitPluginPrivate::vcsTopic(const FilePath &directory) return topic; } -ShellCommand *GitPluginPrivate::createInitialCheckoutCommand(const QString &url, - const Utils::FilePath &baseDirectory, - const QString &localName, - const QStringList &extraArgs) +VcsCommand *GitPluginPrivate::createInitialCheckoutCommand(const QString &url, + const Utils::FilePath &baseDirectory, + const QString &localName, + const QStringList &extraArgs) { QStringList args = {"clone", "--progress"}; args << extraArgs << url << localName; auto command = VcsBaseClient::createVcsCommand(baseDirectory, m_gitClient.processEnvironment()); - command->addFlags(ShellCommand::SuppressStdErr); + command->addFlags(VcsCommand::SuppressStdErr); command->addJob({m_gitClient.vcsBinary(), args}, -1); return command; } |