diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-07-13 01:10:07 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-07-13 06:53:25 +0000 |
| commit | d44056f9d861b0f3794a1b593c89c92f3b8bbffb (patch) | |
| tree | 1da1a3242751a78b8a2433b30f895638d3d1ef90 /plugins/fossil/fossilplugin.cpp | |
| parent | b893eaa2b2ed688b949b9898c23a0bbdc8e359cb (diff) | |
Adapt to upstream changes
Change-Id: Idbe054570ef3af558d1c9cb2a18a1824502fe265
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'plugins/fossil/fossilplugin.cpp')
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index cdb20b7..17a2658 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -56,6 +56,7 @@ #include <utils/commandline.h> #include <utils/parameteraction.h> #include <utils/qtcassert.h> +#include <utils/shellcommand.h> #include <vcsbase/basevcseditorfactory.h> #include <vcsbase/basevcssubmiteditorfactory.h> @@ -165,10 +166,10 @@ public: void vcsAnnotate(const FilePath &file, int line) final; void vcsDescribe(const FilePath &source, const QString &id) final; - Core::ShellCommand *createInitialCheckoutCommand(const QString &url, - const Utils::FilePath &baseDirectory, - const QString &localName, - const QStringList &extraArgs) final; + Utils::ShellCommand *createInitialCheckoutCommand(const QString &url, + const Utils::FilePath &baseDirectory, + const QString &localName, + const QStringList &extraArgs) final; void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override; bool submitEditorAboutToClose() override; @@ -995,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); } -Core::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, - const FilePath &baseDirectory, - const QString &localName, - const QStringList &extraArgs) +Utils::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, + const FilePath &baseDirectory, + const QString &localName, + const QStringList &extraArgs) { QMap<QString, QString> options; FossilJsExtension::parseArgOptions(extraArgs, options); |