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

CppEditor: Extract determineGetterSetterNames()

Browse Source 
...and make it a bit more readable since we are going to make some
changes there.

Change-Id: Ic1d0c47a36ef4547a4842508c2404e9fc12f5220
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2016-06-21 10:34:23 +02:00
parent 5a78fcb434
commit b928a1ce46
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2832,17 +2832,7 @@ public:
} }
m_variableString = QString::fromUtf8(variableId->chars(), variableId->size()); m_variableString = QString::fromUtf8(variableId->chars(), variableId->size());
m_baseName = memberBaseName(m_variableString); determineGetterSetterNames();
if (m_baseName.isEmpty())
m_baseName = QLatin1String("value");
m_getterName = !(m_baseName == m_variableString
|| hasClassMemberWithGetPrefix(m_classSpecifier->symbol))
? m_baseName
: QString::fromLatin1("get%1%2")
.arg(m_baseName.left(1).toUpper()).arg(m_baseName.mid(1));
m_setterName = QString::fromLatin1("set%1%2")
.arg(m_baseName.left(1).toUpper()).arg(m_baseName.mid(1));
// Check if the class has already a getter and/or a setter. // Check if the class has already a getter and/or a setter.
// This is only a simple check which should suffice not triggering the // This is only a simple check which should suffice not triggering the
@@ -2909,6 +2899,8 @@ public:
updateDescriptionAndPriority(); updateDescriptionAndPriority();
} }
void determineGetterSetterNames();
// Clones "other" in order to prevent all the initial detection made in the ctor. // Clones "other" in order to prevent all the initial detection made in the ctor.
GenerateGetterSetterOperation(const CppQuickFixInterface &interface, GenerateGetterSetterOperation(const CppQuickFixInterface &interface,
GenerateGetterSetterOperation *other, OperationType type) GenerateGetterSetterOperation *other, OperationType type)
@@ -5968,5 +5960,26 @@ 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 bool hasValidBaseName = m_baseName != m_variableString;
const bool getPrefixIsAlreadyUsed = hasClassMemberWithGetPrefix(m_classSpecifier->symbol);
if (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 Internal
} // namespace CppEditor } // namespace CppEditor