diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-21 12:48:46 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-21 16:55:16 +0200 |
| commit | 95859289b8cd48009515829c762869191d5adb92 (patch) | |
| tree | fd50c8d09144c21afc4b52854336f91db9b6dca0 /src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | |
| parent | 6ee2d554e1316e4d2e97510551c77696e65ce3d4 (diff) | |
| download | qt-creator-95859289b8cd48009515829c762869191d5adb92.tar.gz | |
KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/projectexplorer/kitmanagerconfigwidget.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp index 5afe809c74..e083bddbfd 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp @@ -101,7 +101,7 @@ KitManagerConfigWidget::~KitManagerConfigWidget() KitManager::deleteKit(m_modifiedKit); // Make sure our workingCopy did not get registered somehow: - foreach (const Kit *k, KitManager::instance()->kits()) + foreach (const Kit *k, KitManager::kits()) QTC_CHECK(k->id() != Core::Id(WORKING_COPY_KIT_ID)); } @@ -113,7 +113,6 @@ QString KitManagerConfigWidget::displayName() const void KitManagerConfigWidget::apply() { bool mustSetDefault = m_isDefaultKit; - KitManager *km = KitManager::instance(); bool mustRegister = false; if (!m_kit) { mustRegister = true; @@ -121,10 +120,10 @@ void KitManagerConfigWidget::apply() } m_kit->copyFrom(m_modifiedKit);//m_isDefaultKit is reset in discard() here. if (mustRegister) - km->registerKit(m_kit); + KitManager::registerKit(m_kit); if (mustSetDefault) - km->setDefaultKit(m_kit); + KitManager::setDefaultKit(m_kit); m_isDefaultKit = mustSetDefault; emit dirty(); @@ -134,7 +133,7 @@ void KitManagerConfigWidget::discard() { if (m_kit) { m_modifiedKit->copyFrom(m_kit); - m_isDefaultKit = (m_kit == KitManager::instance()->defaultKit()); + m_isDefaultKit = (m_kit == KitManager::defaultKit()); } else { // This branch will only ever get reached once during setup of widget for a not-yet-existing // kit. @@ -149,7 +148,7 @@ bool KitManagerConfigWidget::isDirty() const { return !m_kit || !m_kit->isEqual(m_modifiedKit) - || m_isDefaultKit != (KitManager::instance()->defaultKit() == m_kit); + || m_isDefaultKit != (KitManager::defaultKit() == m_kit); } bool KitManagerConfigWidget::isValid() const @@ -238,7 +237,7 @@ void KitManagerConfigWidget::removeKit() { if (!m_kit) return; - KitManager::instance()->deregisterKit(m_kit); + KitManager::deregisterKit(m_kit); } void KitManagerConfigWidget::setIcon() |