diff options
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettingspage.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpptoolssettings.cpp | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 8203321355..01a0589eb5 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -590,18 +590,15 @@ void CppCodeStyleSettingsPage::apply() CppCodeStylePreferences *originalCppCodeStylePreferences = CppToolsSettings::instance()->cppCodeStyle(); if (originalCppCodeStylePreferences->codeStyleSettings() != m_pageCppCodeStylePreferences->codeStyleSettings()) { originalCppCodeStylePreferences->setCodeStyleSettings(m_pageCppCodeStylePreferences->codeStyleSettings()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->tabSettings() != m_pageCppCodeStylePreferences->tabSettings()) { originalCppCodeStylePreferences->setTabSettings(m_pageCppCodeStylePreferences->tabSettings()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->currentDelegate() != m_pageCppCodeStylePreferences->currentDelegate()) { originalCppCodeStylePreferences->setCurrentDelegate(m_pageCppCodeStylePreferences->currentDelegate()); - if (s) - originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } } } diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp index 0de4f6e425..c6b535d98d 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.cpp +++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp @@ -79,25 +79,25 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc, ToolChain::CompilerFlags c = (cxxflags == cflags) ? cxx : tc->compilerFlags(cflags); - if (c | ToolChain::StandardC11) + if (c & ToolChain::StandardC11) cVersion = C11; - else if (c | ToolChain::StandardC99) + else if (c & ToolChain::StandardC99) cVersion = C99; else cVersion = C89; - if (cxx | ToolChain::StandardCxx11) + if (cxx & ToolChain::StandardCxx11) cxxVersion = CXX11; else cxxVersion = CXX98; - if (cxx | ToolChain::BorlandExtensions) + if (cxx & ToolChain::BorlandExtensions) cxxExtensions |= BorlandExtensions; - if (cxx | ToolChain::GnuExtensions) + if (cxx & ToolChain::GnuExtensions) cxxExtensions |= GnuExtensions; - if (cxx | ToolChain::MicrosoftExtensions) + if (cxx & ToolChain::MicrosoftExtensions) cxxExtensions |= MicrosoftExtensions; - if (cxx | ToolChain::OpenMP) + if (cxx & ToolChain::OpenMP) cxxExtensions |= OpenMP; cWarningFlags = tc->warningFlags(cflags); diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp index 605487ffcb..2f034bac91 100644 --- a/src/plugins/cpptools/cpptoolssettings.cpp +++ b/src/plugins/cpptools/cpptoolssettings.cpp @@ -172,7 +172,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent) // load global settings (after built-in settings are added to the pool) QSettings *s = Core::ICore::settings(); - d->m_globalCodeStyle->fromSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), Core::ICore::settings()); + d->m_globalCodeStyle->fromSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); // legacy handling start (Qt Creator Version < 2.4) const bool legacyTransformed = |