diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-09-09 17:10:41 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-09-12 18:46:20 +0200 |
| commit | f1f1f65f7cae7db546116a2c8bdaa84bcad69d93 (patch) | |
| tree | b68baed34f138a49fc005505c16cb06666be2e81 /src/plugins/qtsupport/qtkitinformation.cpp | |
| parent | 6e11e5629005ee14e5d80db3fc942773b575d798 (diff) | |
| download | qt-creator-f1f1f65f7cae7db546116a2c8bdaa84bcad69d93.tar.gz | |
Kits: Simplify handling of sticky kit information
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/qtsupport/qtkitinformation.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtkitinformation.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 9b0fb6ff1f..b0e087cb75 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -38,14 +38,11 @@ #include <utils/qtcassert.h> namespace QtSupport { -namespace Internal { -const char QT_INFORMATION[] = "QtSupport.QtInformation"; -} // namespace Internal QtKitInformation::QtKitInformation() { setObjectName(QLatin1String("QtKitInformation")); - setDataId(Internal::QT_INFORMATION); + setId(QtKitInformation::id()); setPriority(26000); connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()), @@ -98,7 +95,7 @@ void QtKitInformation::fix(ProjectExplorer::Kit *k) ProjectExplorer::KitConfigWidget *QtKitInformation::createConfigWidget(ProjectExplorer::Kit *k) const { - return new Internal::QtKitConfigWidget(k, isSticky(k)); + return new Internal::QtKitConfigWidget(k, this); } QString QtKitInformation::displayNamePostfix(const ProjectExplorer::Kit *k) const @@ -128,13 +125,18 @@ ProjectExplorer::IOutputParser *QtKitInformation::createOutputParser(const Proje return 0; } +Core::Id QtKitInformation::id() +{ + return "QtSupport.QtInformation"; +} + int QtKitInformation::qtVersionId(const ProjectExplorer::Kit *k) { if (!k) return -1; int id = -1; - QVariant data = k->value(Core::Id(Internal::QT_INFORMATION), -1); + QVariant data = k->value(QtKitInformation::id(), -1); if (data.type() == QVariant::Int) { bool ok; id = data.toInt(&ok); @@ -154,7 +156,7 @@ int QtKitInformation::qtVersionId(const ProjectExplorer::Kit *k) void QtKitInformation::setQtVersionId(ProjectExplorer::Kit *k, const int id) { - k->setValue(Core::Id(Internal::QT_INFORMATION), id); + k->setValue(QtKitInformation::id(), id); } BaseQtVersion *QtKitInformation::qtVersion(const ProjectExplorer::Kit *k) @@ -186,11 +188,6 @@ QStringList QtKitInformation::dumperLibraryLocations(const ProjectExplorer::Kit return QStringList(); } -void QtKitInformation::setSticky(ProjectExplorer::Kit *k, bool b) -{ - k->setSticky(Internal::QT_INFORMATION, b); -} - void QtKitInformation::qtVersionsChanged(const QList<int> &addedIds, const QList<int> &removedIds, const QList<int> &changedIds) |