Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

name formatting: Consider 'as' a connecting word

This commit is contained in:
Martchus 2017-01-12 22:07:04 +01:00
parent 33e3d5258f
commit 28ec79bb66
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/utility.cpp
View File

@ -113,9 +113,8 @@ QString formatName(const QString &str, bool underscoreToWhitespace)
{
QString res;
bool whitespace = true;
QChar current;
for(int i = 0, size = str.size(); i < size; ++i) {
current = str.at(i);
for(int i = 0, size = str.size(); i != size; ++i) {
const QChar current = str.at(i);
if(current.isSpace() || current == QChar('(') || current == QChar('[')) {
whitespace = true;
res += current;
@ -123,9 +122,9 @@ QString formatName(const QString &str, bool underscoreToWhitespace)
whitespace = true;
res += ' ';
} else if(whitespace) {
if(i > 0) {
if(i) {
auto rest = str.midRef(i);
static const char *const connectingWords[] = {"the ", "a ", "an ", "of ", "or ", "and ", "in ", "to ", "at ", "on "};
static const char *const connectingWords[] = {"the ", "a ", "an ", "of ", "or ", "and ", "in ", "to ", "at ", "on ", "as "};
for(const char *word : connectingWords) {
if(rest.startsWith(QLatin1String(word), Qt::CaseInsensitive)) {
res += current.toLower();