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

CppEditor: Remove all leading/trailing "_" for a variable's base name

Browse Source 
Change-Id: Iea1aa4ca3f34d11d2e55ce56572c3b19af5743e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Lorenz Haas
2015-02-03 22:07:19 +01:00
parent a51acf42ef
commit 5b3e26ad30
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,17 +300,24 @@ bool nameIncludesOperatorName(const Name *name)
QString memberBaseName(const QString &name) QString memberBaseName(const QString &name)
{ {
QString baseName = name; QString baseName = name;
if (baseName.startsWith(QLatin1Char('_'))) {
// Remove leading and trailing "_"
while (baseName.startsWith(QLatin1Char('_')))
baseName.remove(0, 1); baseName.remove(0, 1);
} else if (baseName.endsWith(QLatin1Char('_'))) { while (baseName.endsWith(QLatin1Char('_')))
baseName.chop(1); baseName.chop(1);
} else if (baseName.startsWith(QLatin1String("m_"))) { if (baseName != name)
return baseName;
// If no leading/trailing "_": remove "m_" and "m" prefix
if (baseName.startsWith(QLatin1String("m_"))) {
baseName.remove(0, 2); baseName.remove(0, 2);
} else if (baseName.startsWith(QLatin1Char('m')) && baseName.length() > 1 } else if (baseName.startsWith(QLatin1Char('m')) && baseName.length() > 1
&& baseName.at(1).isUpper()) { && baseName.at(1).isUpper()) {
baseName.remove(0, 1); baseName.remove(0, 1);
baseName[0] = baseName.at(0).toLower(); baseName[0] = baseName.at(0).toLower();
} }
return baseName; return baseName;
} }