diff options
author | Jochen Becher <jochen_becher@gmx.de> | 2016-07-11 09:32:59 +0200 |
---|---|---|
committer | Jochen Becher <jochen_becher@gmx.de> | 2017-07-21 11:54:23 +0000 |
commit | 91dec7fe7a74d5109489fb9fc146b4e5121f3b36 (patch) | |
tree | 3160ada42f5d60fc013f0ce3dc56ea383dce40d8 /src/plugins/cppeditor/cppquickfixes.cpp | |
parent | 1feb5c604d6dea4501279c22a2be51d0d900dd61 (diff) |
CppEditor: Minor refactoring quickfix
Change-Id: I978d79f081749cef58ca9be7387892dbca71683c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cppquickfixes.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 640fa794ef0..1b8a49356ee 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -2934,8 +2934,6 @@ public: updateDescriptionAndPriority(); } - void determineGetterSetterNames(); - // Clones "other" in order to prevent all the initial detection made in the ctor. GenerateGetterSetterOperation(const CppQuickFixInterface &interface, GenerateGetterSetterOperation *other, OperationType type) @@ -2968,6 +2966,28 @@ public: return (m_type == GetterSetterType || m_type == SetterType); } + void determineGetterSetterNames() + { + m_baseName = memberBaseName(m_variableString); + if (m_baseName.isEmpty()) + m_baseName = QLatin1String("value"); + + // Getter Name + const CppCodeStyleSettings settings = CppCodeStyleSettings::currentProjectCodeStyle(); + const bool hasValidBaseName = m_baseName != m_variableString; + const bool getPrefixIsAlreadyUsed = hasClassMemberWithGetPrefix(m_classSpecifier->symbol); + if (settings.preferGetterNameWithoutGetPrefix && hasValidBaseName && !getPrefixIsAlreadyUsed) { + m_getterName = m_baseName; + } else { + const QString baseNameWithCapital = m_baseName.left(1).toUpper() + m_baseName.mid(1); + m_getterName = QLatin1String("get") + baseNameWithCapital; + } + + // Setter Name + const QString baseNameWithCapital = m_baseName.left(1).toUpper() + m_baseName.mid(1); + m_setterName = QLatin1String("set") + baseNameWithCapital; + } + void updateDescriptionAndPriority() { switch (m_type) { @@ -6018,27 +6038,7 @@ void ExtraRefactoringOperations::match(const CppQuickFixInterface &interface, } } -void GenerateGetterSetterOperation::determineGetterSetterNames() -{ - m_baseName = memberBaseName(m_variableString); - if (m_baseName.isEmpty()) - m_baseName = QLatin1String("value"); - - // Getter Name - const CppCodeStyleSettings settings = CppCodeStyleSettings::currentProjectCodeStyle(); - const bool hasValidBaseName = m_baseName != m_variableString; - const bool getPrefixIsAlreadyUsed = hasClassMemberWithGetPrefix(m_classSpecifier->symbol); - if (settings.preferGetterNameWithoutGetPrefix && hasValidBaseName && !getPrefixIsAlreadyUsed) { - m_getterName = m_baseName; - } else { - const QString baseNameWithCapital = m_baseName.left(1).toUpper() + m_baseName.mid(1); - m_getterName = QLatin1String("get") + baseNameWithCapital; - } - // Setter Name - const QString baseNameWithCapital = m_baseName.left(1).toUpper() + m_baseName.mid(1); - m_setterName = QLatin1String("set") + baseNameWithCapital; -} } // namespace Internal } // namespace CppEditor |