diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-08-02 09:08:15 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2022-08-02 07:33:42 +0000 |
| commit | 810517d9c9996b26adbdebf02bb963cfdd9c93ea (patch) | |
| tree | 2ef262918cc2e49573c770eb2c1cc1303c9b1084 /plugins/fossil/fossilplugin.cpp | |
| parent | 91a82da6b730fb0ae2f7af421a4993a713a1d6a7 (diff) | |
Adapt to upstream changes
Change-Id: Iae091f1dedb3ea944c4e65ad6a2d67c2f327a939
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'plugins/fossil/fossilplugin.cpp')
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index d99ab08..c4281e4 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -56,7 +56,6 @@ #include <utils/commandline.h> #include <utils/parameteraction.h> #include <utils/qtcassert.h> -#include <utils/shellcommand.h> #include <vcsbase/basevcseditorfactory.h> #include <vcsbase/basevcssubmiteditorfactory.h> @@ -64,6 +63,7 @@ #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbasesubmiteditor.h> +#include <vcsbase/vcscommand.h> #include <vcsbase/vcsoutputwindow.h> #include <QtPlugin> @@ -166,10 +166,10 @@ public: void vcsAnnotate(const FilePath &file, int line) final; void vcsDescribe(const FilePath &source, const QString &id) final; - Utils::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 updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override; bool submitEditorAboutToClose() override; @@ -996,10 +996,10 @@ void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) { m_client.view(source.toString(), id); } -Utils::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, - const FilePath &baseDirectory, - const QString &localName, - const QStringList &extraArgs) +VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, + const FilePath &baseDirectory, + const QString &localName, + const QStringList &extraArgs) { QMap<QString, QString> options; FossilJsExtension::parseArgOptions(extraArgs, options); |