diff options
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 7a1ba0818a..a960a4fe04 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -67,7 +67,7 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) connect(projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); - Core::ActionManager *am = Core::ICore::instance()->actionManager(); + Core::ActionManager *am = Core::ICore::actionManager(); Core::ActionContainer *mbuild = am->actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT); @@ -252,8 +252,7 @@ CMakeSettingsPage::CMakeSettingsPage() m_pathCmake.process = 0; m_userCmake.hasCodeBlocksMsvcGenerator = false; m_pathCmake.hasCodeBlocksMsvcGenerator = false; - Core::ICore *core = Core::ICore::instance(); - QSettings * settings = core->settings(); + QSettings *settings = Core::ICore::settings(); settings->beginGroup(QLatin1String("CMakeSettings")); m_userCmake.executable = settings->value(QLatin1String("cmakeExecutable")).toString(); settings->endGroup(); @@ -404,7 +403,7 @@ void CMakeSettingsPage::updateInfo(CMakeValidator *cmakeValidator) void CMakeSettingsPage::saveSettings() const { - QSettings *settings = Core::ICore::instance()->settings(); + QSettings *settings = Core::ICore::settings(); settings->beginGroup(QLatin1String("CMakeSettings")); settings->setValue(QLatin1String("cmakeExecutable"), m_userCmake.executable); settings->endGroup(); |