1 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
index 124f21259b..c563563e33 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
@@ -37,8 +37,8 @@ namespace Internal {
 
 struct Group
 {
-    Group(Id id) : id(id) {}
-    Id id;
+    Group(Utils::Id id) : id(id) {}
+    Utils::Id id;
     QList<QObject *> items; // Command * or ActionContainer *
 };
 
@@ -47,22 +47,22 @@ class ActionContainerPrivate : public ActionContainer
     Q_OBJECT
 
 public:
-    ActionContainerPrivate(Id id);
+    ActionContainerPrivate(Utils::Id id);
     ~ActionContainerPrivate() override = default;
 
     void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) override;
     ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const override;
 
-    QAction *insertLocation(Id groupId) const override;
-    void appendGroup(Id id) override;
-    void insertGroup(Id before, Id groupId) override;
-    void addAction(Command *action, Id group = Id()) override;
-    void addMenu(ActionContainer *menu, Id group = Id()) override;
+    QAction *insertLocation(Utils::Id groupId) const override;
+    void appendGroup(Utils::Id id) override;
+    void insertGroup(Utils::Id before, Utils::Id groupId) override;
+    void addAction(Command *action, Utils::Id group = {}) override;
+    void addMenu(ActionContainer *menu, Utils::Id group = {}) override;
     void addMenu(ActionContainer *before, ActionContainer *menu) override;
-    Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) override;
+    Command *addSeparator(const Context &context, Utils::Id group = {}, QAction **outSeparator = nullptr) override;
     void clear() override;
 
-    Id id() const override;
+    Utils::Id id() const override;
 
     QMenu *menu() const override;
     QMenuBar *menuBar() const override;
@@ -92,11 +92,11 @@ private:
     void update();
     void itemDestroyed();
 
-    QList<Group>::const_iterator findGroup(Id groupId) const;
+    QList<Group>::const_iterator findGroup(Utils::Id groupId) const;
     QAction *insertLocation(QList<Group>::const_iterator group) const;
 
     OnAllDisabledBehavior m_onAllDisabledBehavior;
-    Id m_id;
+    Utils::Id m_id;
     bool m_updateRequested;
 };
 
@@ -105,7 +105,7 @@ class MenuActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    explicit MenuActionContainer(Id id);
+    explicit MenuActionContainer(Utils::Id id);
     ~MenuActionContainer() override;
 
     QMenu *menu() const override;
@@ -131,7 +131,7 @@ class MenuBarActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    explicit MenuBarActionContainer(Id id);
+    explicit MenuBarActionContainer(Utils::Id id);
 
     void setMenuBar(QMenuBar *menuBar);
     QMenuBar *menuBar() const override;
@@ -157,7 +157,7 @@ class TouchBarActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    TouchBarActionContainer(Id id, const QIcon &icon, const QString &text);
+    TouchBarActionContainer(Utils::Id id, const QIcon &icon, const QString &text);
     ~TouchBarActionContainer() override;
 
     Utils::TouchBar *touchBar() const override;