1 files changed, 4 insertions, 62 deletions
diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h
index fc912da1b0..dbf790593d 100644
--- a/src/plugins/coreplugin/id.h
+++ b/src/plugins/coreplugin/id.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
@@ -25,68 +25,10 @@
 
 #pragma once
 
-#include "core_global.h"
-
-#include <QMetaType>
-#include <QString>
-
-QT_BEGIN_NAMESPACE
-class QDataStream;
-class QVariant;
-QT_END_NAMESPACE
+#include <utils/id.h>
 
 namespace Core {
 
-class CORE_EXPORT Id
-{
-public:
-    Id() = default;
-    Id(const char *name); // Good to use.
-    Id(const QLatin1String &) = delete;
-
-    Id withSuffix(int suffix) const;
-    Id withSuffix(const char *suffix) const;
-    Id withSuffix(const QString &suffix) const;
-    Id withPrefix(const char *prefix) const;
-
-    QByteArray name() const;
-    QString toString() const; // Avoid.
-    QVariant toSetting() const; // Good to use.
-    QString suffixAfter(Id baseId) const;
-    bool isValid() const { return m_id; }
-    bool operator==(Id id) const { return m_id == id.m_id; }
-    bool operator==(const char *name) const;
-    bool operator!=(Id id) const { return m_id != id.m_id; }
-    bool operator!=(const char *name) const { return !operator==(name); }
-    bool operator<(Id id) const { return m_id < id.m_id; }
-    bool operator>(Id id) const { return m_id > id.m_id; }
-    bool alphabeticallyBefore(Id other) const;
-
-    quintptr uniqueIdentifier() const { return m_id; } // Avoid.
-    static Id fromString(const QString &str); // FIXME: avoid.
-    static Id fromName(const QByteArray &ba); // FIXME: avoid.
-    static Id fromSetting(const QVariant &variant); // Good to use.
-
-    static Id versionedId(const QByteArray &prefix, int major, int minor = -1);
-
-    static QSet<Id> fromStringList(const QStringList &list);
-    static QStringList toStringList(const QSet<Id> &ids);
-
-private:
-    explicit Id(quintptr uid) : m_id(uid) {}
-
-    quintptr m_id = 0;
-};
-
-inline uint qHash(Id id) { return static_cast<uint>(id.uniqueIdentifier()); }
-
-} // namespace Core
-
-Q_DECLARE_METATYPE(Core::Id)
-Q_DECLARE_METATYPE(QList<Core::Id>)
+using Id = Utils::Id;
 
-QT_BEGIN_NAMESPACE
-QDataStream &operator<<(QDataStream &ds, Core::Id id);
-QDataStream &operator>>(QDataStream &ds, Core::Id &id);
-CORE_EXPORT QDebug operator<<(QDebug dbg, const Core::Id &id);
-QT_END_NAMESPACE
+} // Core