1 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index b1685a2791..f4c4904efb 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -70,7 +70,7 @@
  */
 
 /*!
- * \fn Core::Id ProjectExplorer::IDevice::invalidId()
+ * \fn Utils::Id ProjectExplorer::IDevice::invalidId()
  * A value that no device can ever have as its internal id.
  */
 
@@ -98,9 +98,9 @@
  */
 
 
-static Core::Id newId()
+static Utils::Id newId()
 {
-    return Core::Id::fromString(QUuid::createUuid().toString());
+    return Utils::Id::fromString(QUuid::createUuid().toString());
 }
 
 namespace ProjectExplorer {
@@ -140,9 +140,9 @@ public:
 
     Utils::DisplayName displayName;
     QString displayType;
-    Core::Id type;
+    Utils::Id type;
     IDevice::Origin origin = IDevice::AutoDetected;
-    Core::Id id;
+    Utils::Id id;
     IDevice::DeviceState deviceState = IDevice::DeviceStateUnknown;
     IDevice::MachineType machineType = IDevice::Hardware;
     Utils::OsType osType = Utils::OsTypeOther;
@@ -171,7 +171,7 @@ void IDevice::setOpenTerminal(const IDevice::OpenTerminal &openTerminal)
     d->openTerminal = openTerminal;
 }
 
-void IDevice::setupId(Origin origin, Core::Id id)
+void IDevice::setupId(Origin origin, Utils::Id id)
 {
     d->origin = origin;
     QTC_CHECK(origin == ManuallyAdded || id.isValid());
@@ -238,12 +238,12 @@ IDevice::DeviceInfo IDevice::deviceInformation() const
     \sa ProjectExplorer::IDeviceFactory
  */
 
-Core::Id IDevice::type() const
+Utils::Id IDevice::type() const
 {
     return d->type;
 }
 
-void IDevice::setType(Core::Id type)
+void IDevice::setType(Utils::Id type)
 {
     d->type = type;
 }
@@ -269,7 +269,7 @@ bool IDevice::isAutoDetected() const
     \sa ProjectExplorer::DeviceManager::findInactiveAutoDetectedDevice()
 */
 
-Core::Id IDevice::id() const
+Utils::Id IDevice::id() const
 {
     return d->id;
 }
@@ -340,14 +340,14 @@ void IDevice::setDeviceState(const IDevice::DeviceState state)
     d->deviceState = state;
 }
 
-Core::Id IDevice::typeFromMap(const QVariantMap &map)
+Utils::Id IDevice::typeFromMap(const QVariantMap &map)
 {
-    return Core::Id::fromSetting(map.value(QLatin1String(TypeKey)));
+    return Utils::Id::fromSetting(map.value(QLatin1String(TypeKey)));
 }
 
-Core::Id IDevice::idFromMap(const QVariantMap &map)
+Utils::Id IDevice::idFromMap(const QVariantMap &map)
 {
-    return Core::Id::fromSetting(map.value(QLatin1String(IdKey)));
+    return Utils::Id::fromSetting(map.value(QLatin1String(IdKey)));
 }
 
 /*!
@@ -360,7 +360,7 @@ void IDevice::fromMap(const QVariantMap &map)
 {
     d->type = typeFromMap(map);
     d->displayName.fromMap(map, DisplayNameKey);
-    d->id = Core::Id::fromSetting(map.value(QLatin1String(IdKey)));
+    d->id = Utils::Id::fromSetting(map.value(QLatin1String(IdKey)));
     if (!d->id.isValid())
         d->id = newId();
     d->origin = static_cast<Origin>(map.value(QLatin1String(OriginKey), ManuallyAdded).toInt());
@@ -514,12 +514,12 @@ void IDevice::setQmlsceneCommand(const QString &path)
     d->qmlsceneCommand = path;
 }
 
-void IDevice::setExtraData(Core::Id kind, const QVariant &data)
+void IDevice::setExtraData(Utils::Id kind, const QVariant &data)
 {
     d->extraData.insert(kind.toString(), data);
 }
 
-QVariant IDevice::extraData(Core::Id kind) const
+QVariant IDevice::extraData(Utils::Id kind) const
 {
     return d->extraData.value(kind.toString());
 }