diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-07-10 14:17:20 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-07-11 16:49:14 +0200 |
| commit | 4e4dad70dd8ee562fbfe177dda8a844377518260 (patch) | |
| tree | 16fbd06640c97f4989aa77fa9e3418863b579b12 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | f82bcf22047903a65f236eb0b1100dad7d963a10 (diff) | |
| download | qt-creator-4e4dad70dd8ee562fbfe177dda8a844377518260.tar.gz | |
QtVersion: Move string constants to QtSupport::Constants
As I need them in two different places
Change-Id: Ic782253916615f43cc43016bbd3d52cfae5ec407
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index e2062e2145..1e256c5c37 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -63,8 +63,6 @@ using namespace QtSupport; using namespace QtSupport::Internal; using namespace Utils; -static const char QTVERSIONID[] = "Id"; -static const char QTVERSIONNAME[] = "Name"; static const char QTVERSIONAUTODETECTED[] = "isAutodetected"; static const char QTVERSIONAUTODETECTIONSOURCE []= "autodetectionSource"; static const char QTVERSIONQMAKEPATH[] = "QMakePath"; @@ -380,10 +378,10 @@ void BaseQtVersion::setId(int id) void BaseQtVersion::fromMap(const QVariantMap &map) { - m_id = map.value(QLatin1String(QTVERSIONID)).toInt(); + m_id = map.value(QLatin1String(Constants::QTVERSIONID)).toInt(); if (m_id == -1) // this happens on adding from installer, see updateFromInstaller => get a new unique id m_id = QtVersionManager::instance()->getUniqueId(); - m_displayName = map.value(QLatin1String(QTVERSIONNAME)).toString(); + m_displayName = map.value(QLatin1String(Constants::QTVERSIONNAME)).toString(); m_isAutodetected = map.value(QLatin1String(QTVERSIONAUTODETECTED)).toBool(); if (m_isAutodetected) m_autodetectionSource = map.value(QLatin1String(QTVERSIONAUTODETECTIONSOURCE)).toString(); @@ -396,8 +394,8 @@ void BaseQtVersion::fromMap(const QVariantMap &map) QVariantMap BaseQtVersion::toMap() const { QVariantMap result; - result.insert(QLatin1String(QTVERSIONID), uniqueId()); - result.insert(QLatin1String(QTVERSIONNAME), displayName()); + result.insert(QLatin1String(Constants::QTVERSIONID), uniqueId()); + result.insert(QLatin1String(Constants::QTVERSIONNAME), displayName()); result.insert(QLatin1String(QTVERSIONAUTODETECTED), isAutodetected()); if (isAutodetected()) result.insert(QLatin1String(QTVERSIONAUTODETECTIONSOURCE), autodetectionSource()); |