From 55e45ff3e0fe661cc80172984f81f7f403f8c075 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 19 Mar 2013 12:35:08 +0100
Subject: [PATCH] RunConfigurations: Avoid some direct QString use with
 Core::Id

Change-Id: Ic67c34837f01ab478f107dc05c4fe1470dcfa36c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/projectexplorer/projectconfiguration.cpp       | 2 +-
 src/plugins/projectexplorer/session.cpp                    | 7 ++-----
 src/plugins/qnx/blackberryrunconfigurationfactory.cpp      | 2 +-
 src/plugins/qnx/qnxrunconfigurationfactory.cpp             | 2 +-
 src/plugins/qt4projectmanager/externaleditors.cpp          | 2 +-
 .../qt4projectmanager/qt-desktop/qt4runconfiguration.cpp   | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index fd61dff1fc..ad317c4352 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -111,7 +111,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
 
 Core::Id ProjectExplorer::idFromMap(const QVariantMap &map)
 {
-    return Core::Id(map.value(QLatin1String(CONFIGURATION_ID_KEY), QString()).toString());
+    return Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
 }
 
 QString ProjectExplorer::displayNameFromMap(const QVariantMap &map)
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index a52c948f9c..a8241515f8 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -894,12 +894,9 @@ bool SessionManager::loadSession(const QString &session)
         m_future = QFutureInterface<void>();
 
         // restore the active mode
-        QString modeIdentifier = value(QLatin1String("ActiveMode")).toString();
-        Id modeId;
-        if (modeIdentifier.isEmpty())
+        Id modeId = Id::fromSetting(value(QLatin1String("ActiveMode")));
+        if (!modeId.isValid())
             modeId = Id(Core::Constants::MODE_EDIT);
-        else
-            modeId = Id(modeIdentifier);
 
         ModeManager::activateMode(modeId);
         ModeManager::setFocusToCurrentMode();
diff --git a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
index 4937fad124..ed573681fb 100644
--- a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
@@ -69,7 +69,7 @@ QList<Core::Id> BlackBerryRunConfigurationFactory::availableCreationIds(ProjectE
 
     QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_BB_RUNCONFIGURATION_PREFIX));
     foreach (const QString &pf, proFiles)
-        ids << Core::Id(pf);
+        ids << Core::Id::fromString(pf);
 
     return ids;
 }
diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.cpp b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
index f8482a130e..37f997628a 100644
--- a/src/plugins/qnx/qnxrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
@@ -70,7 +70,7 @@ QList<Core::Id> QnxRunConfigurationFactory::availableCreationIds(ProjectExplorer
 
     QStringList proFiles = qt4Project->applicationProFilePathes(QLatin1String(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX));
     foreach (const QString &pf, proFiles)
-        ids << Core::Id(pf);
+        ids << Core::Id::fromString(pf);
     return ids;
 }
 
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index f4e44cd900..b17a82ed16 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -112,7 +112,7 @@ ExternalQtEditor::ExternalQtEditor(const QString &id,
                                    QObject *parent) :
     Core::IExternalEditor(parent),
     m_mimeTypes(mimetype),
-    m_id(id),
+    m_id(Core::Id::fromString(id)),
     m_displayName(displayName)
 {
 }
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index f1fd6015c9..2562dd0ff6 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -813,7 +813,7 @@ QList<Core::Id> Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer
     Qt4Project *project = static_cast<Qt4Project *>(parent->project());
     QStringList proFiles = project->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX));
     foreach (const QString &pf, proFiles)
-        result << Core::Id(pf);
+        result << Core::Id::fromString(pf);
     return result;
 }
 
-- 
GitLab