From cef9a471e64cb9bac4d88923ca4a96c84f0f92ca Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 7 Jul 2020 11:47:13 +0200
Subject: Fix build after upstream change

Use Utils::Id. The upstream files no longer automatically include
the Core::Id wrapper.

Change-Id: I7b4d6ef865df44b47e07248bb653a913ba68c494
Reviewed-by: hjk <hjk@qt.io>
---
 plugins/fossil/fossilclient.cpp             | 12 ++++++------
 plugins/fossil/fossilclient.h               |  2 +-
 plugins/fossil/fossilplugin.cpp             |  6 +++---
 plugins/fossil/wizard/fossiljsextension.cpp |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp
index ead861d..f52a06f 100644
--- a/plugins/fossil/fossilclient.cpp
+++ b/plugins/fossil/fossilclient.cpp
@@ -772,7 +772,7 @@ VcsBase::VcsBaseEditorWidget *FossilClient::annotate(
     // annotate shows line numbers
 
     QString vcsCmdString = vcsCommandString(AnnotateCommand);
-    const Core::Id kind = vcsEditorKind(AnnotateCommand);
+    const Id kind = vcsEditorKind(AnnotateCommand);
     const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision);
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, file);
@@ -924,7 +924,7 @@ void FossilClient::view(const QString &source, const QString &id, const QStringL
          << "-v"
          << extraOptions;
 
-    const Core::Id kind = vcsEditorKind(DiffCommand);
+    const Id kind = vcsEditorKind(DiffCommand);
     const QString title = vcsEditorTitle(vcsCommandString(DiffCommand), id);
 
     VcsBase::VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
@@ -995,7 +995,7 @@ void FossilClient::log(const QString &workingDir, const QStringList &files,
     }
 
     const QString vcsCmdString = vcsCommandString(LogCommand);
-    const Core::Id kind = vcsEditorKind(LogCommand);
+    const Id kind = vcsEditorKind(LogCommand);
     const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, files);
@@ -1047,7 +1047,7 @@ void FossilClient::logCurrentFile(const QString &workingDir, const QStringList &
     }
 
     const QString vcsCmdString = "finfo";
-    const Core::Id kind = vcsEditorKind(LogCommand);
+    const Id kind = vcsEditorKind(LogCommand);
     const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, files);
@@ -1157,7 +1157,7 @@ QString FossilClient::vcsCommandString(VcsCommandTag cmd) const
     }
 }
 
-Core::Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
+Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
 {
     switch (cmd) {
     case AnnotateCommand:
@@ -1167,7 +1167,7 @@ Core::Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
     case LogCommand:
         return Constants::FILELOG_ID;
     default:
-        return Core::Id();
+        return Id();
     }
 }
 
diff --git a/plugins/fossil/fossilclient.h b/plugins/fossil/fossilclient.h
index 20f3214..8cc64ae 100644
--- a/plugins/fossil/fossilclient.h
+++ b/plugins/fossil/fossilclient.h
@@ -122,7 +122,7 @@ private:
 
     QString sanitizeFossilOutput(const QString &output) const;
     QString vcsCommandString(VcsCommandTag cmd) const final;
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const final;
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const final;
     QStringList revisionSpec(const QString &revision) const final;
     StatusItem parseStatusLine(const QString &line) const final;
     VcsBase::VcsBaseEditorConfig *createAnnotateEditor(VcsBase::VcsBaseEditorWidget *editor);
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index ac68ec1..a1fc230 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -148,7 +148,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -896,9 +896,9 @@ QString FossilPluginPrivate::displayName() const
     return tr("Fossil");
 }
 
-Core::Id FossilPluginPrivate::id() const
+Id FossilPluginPrivate::id() const
 {
-    return Core::Id(Constants::VCS_ID_FOSSIL);
+    return Id(Constants::VCS_ID_FOSSIL);
 }
 
 bool FossilPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &filePath) const
diff --git a/plugins/fossil/wizard/fossiljsextension.cpp b/plugins/fossil/wizard/fossiljsextension.cpp
index 0908278..a0281f8 100644
--- a/plugins/fossil/wizard/fossiljsextension.cpp
+++ b/plugins/fossil/wizard/fossiljsextension.cpp
@@ -47,7 +47,7 @@ public:
     {
     }
 
-    Core::Id m_vscId;
+    Utils::Id m_vscId;
     VcsBase::VcsBaseClientSettings *m_settings;
 };
 
-- 
cgit v1.2.3