feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
This commit is contained in:
Eike Ziller
2018-11-19 09:48:28 +01:00
parent 40ad7ec995 e164717108
commit 3d1d9aae2e
110 changed files with 2004 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -2988,7 +2988,10 @@ public:
m_baseName = QLatin1String("value");
// Getter Name
const CppCodeStyleSettings settings = CppCodeStyleSettings::currentProjectCodeStyle();
const Utils::optional<CppCodeStyleSettings> codeStyleSettings
= CppCodeStyleSettings::currentProjectCodeStyle();
const CppCodeStyleSettings settings
= codeStyleSettings.value_or(CppCodeStyleSettings::currentGlobalCodeStyle());
const bool hasValidBaseName = m_baseName != m_variableString;
const bool getPrefixIsAlreadyUsed = hasClassMemberWithGetPrefix(m_classSpecifier->symbol);
if (settings.preferGetterNameWithoutGetPrefix && hasValidBaseName && !getPrefixIsAlreadyUsed) {