From d44056f9d861b0f3794a1b593c89c92f3b8bbffb Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 13 Jul 2022 01:10:07 +0200
Subject: [PATCH] Adapt to upstream changes

Change-Id: Idbe054570ef3af558d1c9cb2a18a1824502fe265
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 plugins/fossil/fossilplugin.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index cdb20b73430..17a26582ec0 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);