aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorKai Koehne <[email protected]>2014-08-29 14:00:18 +0200
committerhjk <[email protected]>2014-09-04 14:50:00 +0200
commite2584f69d446a846fa712081322f2988ac3d5bc8 (patch)
tree9f601f99959b71384890beaf361844afcd7486cc /src/libs
parentd4a7505a181d0147b0151a18eca266ed35e26c4e (diff)
Replace QLatin1String("x") with QLatin1Char('x') where possible
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/cplusplus/NamePrettyPrinter.cpp28
-rw-r--r--src/libs/cplusplus/TypePrettyPrinter.cpp4
-rw-r--r--src/libs/languageutils/fakemetaobject.cpp24
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp2
-rw-r--r--src/libs/qmljs/qmljsindenter.cpp2
-rw-r--r--src/libs/qmljs/qmljsinterpreter.cpp8
-rw-r--r--src/libs/qmljs/qmljslineinfo.cpp2
-rw-r--r--src/libs/qmljs/qmljsplugindumper.cpp2
-rw-r--r--src/libs/qmljs/qmljsqrcparser.cpp2
-rw-r--r--src/libs/ssh/sftpfilesystemmodel.cpp2
-rw-r--r--src/libs/utils/filenamevalidatinglineedit.cpp2
-rw-r--r--src/libs/utils/newclasswidget.cpp2
-rw-r--r--src/libs/utils/uncommentselection.cpp2
13 files changed, 41 insertions, 41 deletions
diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp
index 33fdfab99be..532c3835bdf 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.cpp
+++ b/src/libs/cplusplus/NamePrettyPrinter.cpp
@@ -125,43 +125,43 @@ void NamePrettyPrinter::visit(const OperatorNameId *name)
_name += QLatin1String("delete[]");
break;
case OperatorNameId::PlusOp:
- _name += QLatin1String("+");
+ _name += QLatin1Char('+');
break;
case OperatorNameId::MinusOp:
- _name += QLatin1String("-");
+ _name += QLatin1Char('-');
break;
case OperatorNameId::StarOp:
- _name += QLatin1String("*");
+ _name += QLatin1Char('*');
break;
case OperatorNameId::SlashOp:
- _name += QLatin1String("/");
+ _name += QLatin1Char('/');
break;
case OperatorNameId::PercentOp:
- _name += QLatin1String("%");
+ _name += QLatin1Char('%');
break;
case OperatorNameId::CaretOp:
- _name += QLatin1String("^");
+ _name += QLatin1Char('^');
break;
case OperatorNameId::AmpOp:
- _name += QLatin1String("&");
+ _name += QLatin1Char('&');
break;
case OperatorNameId::PipeOp:
- _name += QLatin1String("|");
+ _name += QLatin1Char('|');
break;
case OperatorNameId::TildeOp:
- _name += QLatin1String("~");
+ _name += QLatin1Char('~');
break;
case OperatorNameId::ExclaimOp:
- _name += QLatin1String("!");
+ _name += QLatin1Char('!');
break;
case OperatorNameId::EqualOp:
- _name += QLatin1String("=");
+ _name += QLatin1Char('=');
break;
case OperatorNameId::LessOp:
- _name += QLatin1String("<");
+ _name += QLatin1Char('<');
break;
case OperatorNameId::GreaterOp:
- _name += QLatin1String(">");
+ _name += QLatin1Char('>');
break;
case OperatorNameId::PlusEqualOp:
_name += QLatin1String("+=");
@@ -224,7 +224,7 @@ void NamePrettyPrinter::visit(const OperatorNameId *name)
_name += QLatin1String("--");
break;
case OperatorNameId::CommaOp:
- _name += QLatin1String(",");
+ _name += QLatin1Char(',');
break;
case OperatorNameId::ArrowStarOp:
_name += QLatin1String("->*");
diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index ac3f62fb122..94a09124ba6 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -320,7 +320,7 @@ void TypePrettyPrinter::prependSpaceBeforeIndirection(const FullySpecifiedType &
const bool elementIsConstPointerOrReference = elementTypeIsPointerOrReference && type.isConst();
const bool shouldBindToLeftSpecifier = _overview->starBindFlags & Overview::BindToLeftSpecifier;
if (elementIsConstPointerOrReference && ! shouldBindToLeftSpecifier)
- _text.prepend(QLatin1String(" "));
+ _text.prepend(QLatin1Char(' '));
}
void TypePrettyPrinter::prependSpaceAfterIndirection(bool hasName)
@@ -340,7 +340,7 @@ void TypePrettyPrinter::prependSpaceAfterIndirection(bool hasName)
const bool case3 = ! hasCvSpecifier && ! shouldBindToIdentifier
&& ! _isIndirectionToArrayOrFunction && _text.size() && _text.at(0).isLetter();
if (case1 || case2 || case3)
- _text.prepend(QLatin1String(" "));
+ _text.prepend(QLatin1Char(' '));
}
void TypePrettyPrinter::visit(PointerType *type)
diff --git a/src/libs/languageutils/fakemetaobject.cpp b/src/libs/languageutils/fakemetaobject.cpp
index d65ba90e708..710ebd772ad 100644
--- a/src/libs/languageutils/fakemetaobject.cpp
+++ b/src/libs/languageutils/fakemetaobject.cpp
@@ -95,7 +95,7 @@ QString FakeMetaEnum::describe(int baseIndent) const
res += QString::number(m_values.value(i, -1));
}
res += newLine;
- res += QLatin1String("}");
+ res += QLatin1Char('}');
return res;
}
@@ -195,7 +195,7 @@ QString FakeMetaMethod::describe(int baseIndent) const
res += QLatin1String(" ");
res += pName;
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += newLine;
res += QLatin1String(" parameterTypes:[");
foreach (const QString &pType, parameterTypes()) {
@@ -203,9 +203,9 @@ QString FakeMetaMethod::describe(int baseIndent) const
res += QLatin1String(" ");
res += pType;
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += newLine;
- res += QLatin1String("}");
+ res += QLatin1Char('}');
return res;
}
@@ -281,7 +281,7 @@ QString FakeMetaProperty::describe(int baseIndent) const
res += QLatin1String(" isWritable:");
res += isWritable();
res += newLine;
- res += QLatin1String("}");
+ res += QLatin1Char('}');
return res;
}
@@ -485,7 +485,7 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const
if (!printDetails)
return res;
QString newLine = QString::fromLatin1("\n") + QString::fromLatin1(" ").repeated(baseIndent);
- res += QLatin1String("{");
+ res += QLatin1Char('{');
res += newLine;
res += QLatin1String("className:");
res += className();
@@ -518,7 +518,7 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const
res += QLatin1String(" ");
res += e.describe(baseIndent + 2);
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += newLine;
res += QLatin1String("enums:[");
@@ -528,7 +528,7 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const
res += QLatin1String(" ");
res += e.describe(baseIndent + 2);
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += newLine;
res += QLatin1String("properties:[");
@@ -538,7 +538,7 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const
res += QLatin1String(" ");
res += prop.describe(baseIndent + 2);
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += QLatin1String("methods:[");
for (int iMethod = 0; iMethod < methodOffset() ; ++ iMethod) {
FakeMetaMethod m = method(methodOffset() + iMethod);
@@ -546,9 +546,9 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const
res += QLatin1String(" ");
m.describe(baseIndent + 2);
}
- res += QLatin1String("]");
+ res += QLatin1Char(']');
res += newLine;
- res += QLatin1String("}");
+ res += QLatin1Char('}');
return res;
}
@@ -590,7 +590,7 @@ QString FakeMetaObject::Export::describe(int baseIndent) const
res += QLatin1String(" isValid:");
res += QString::number(isValid());
res += newLine;
- res += QLatin1String("}");
+ res += QLatin1Char('}');
return res;
}
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
index ea04e98e911..bc7607338ef 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
@@ -266,7 +266,7 @@ void ContextPaneWidgetRectangle::timerEvent(QTimerEvent *event)
str += QLatin1String("color: ") + QLatin1String("\"") + stop.second.name() + QLatin1String("\";\n");
str += QLatin1String("}\n");
}
- str += QLatin1String("}");
+ str += QLatin1Char('}');
emit propertyChanged(QLatin1String("gradient"), str);
}
}
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index c29c1b00a86..e8b13aa5922 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -379,7 +379,7 @@ int QmlJSIndenter::indentForContinuationLine()
*/
if (!isContinuationLine())
return indentOfLine(*yyLine);
- } else if (isContinuationLine() || yyLine->endsWith(QLatin1String(","))) {
+ } else if (isContinuationLine() || yyLine->endsWith(QLatin1Char(','))) {
/*
We have
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 26a9b2358fa..c2f51385ae0 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -200,25 +200,25 @@ QString PropertyInfo::toString() const
}
if (isWriteable()) {
if (join)
- res += QLatin1String("|");
+ res += QLatin1Char('|');
res += QLatin1String("Writeable");
join = true;
}
if (isList()) {
if (join)
- res += QLatin1String("|");
+ res += QLatin1Char('|');
res += QLatin1String("ListType");
join = true;
}
if (canBePointer()) {
if (join)
- res += QLatin1String("|");
+ res += QLatin1Char('|');
res += QLatin1String("Pointer");
join = true;
}
if (canBeValue()) {
if (join)
- res += QLatin1String("|");
+ res += QLatin1Char('|');
res += QLatin1String("Value");
join = true;
}
diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp
index d9f6b08e3c6..57d42e7de6d 100644
--- a/src/libs/qmljs/qmljslineinfo.cpp
+++ b/src/libs/qmljs/qmljslineinfo.cpp
@@ -563,7 +563,7 @@ bool LineInfo::isUnfinishedLine()
unf = true;
// ### This only checks one line back.
- } else if (readLine() && yyLine->endsWith(QLatin1String(";")) && hasUnclosedParenOrBracket()) {
+ } else if (readLine() && yyLine->endsWith(QLatin1Char(';')) && hasUnclosedParenOrBracket()) {
/*
Exception:
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index f62428a565d..28e6661a674 100644
--- a/src/libs/qmljs/qmljsplugindumper.cpp
+++ b/src/libs/qmljs/qmljsplugindumper.cpp
@@ -324,7 +324,7 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode)
CppQmlTypesLoader::BuiltinObjects objectsList;
QList<ModuleApiInfo> moduleApis;
CppQmlTypesLoader::parseQmlTypeDescriptions(output, &objectsList, &moduleApis, &error, &warning,
- QLatin1String("<dump of ") + libraryPath + QLatin1String(">"));
+ QLatin1String("<dump of ") + libraryPath + QLatin1Char('>'));
if (exitCode == 0) {
if (!error.isEmpty()) {
libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError,
diff --git a/src/libs/qmljs/qmljsqrcparser.cpp b/src/libs/qmljs/qmljsqrcparser.cpp
index 2b64c522631..2f8e79588b1 100644
--- a/src/libs/qmljs/qmljsqrcparser.cpp
+++ b/src/libs/qmljs/qmljsqrcparser.cpp
@@ -119,7 +119,7 @@ QString QrcParser::normalizedQrcFilePath(const QString &path) {
while (endPrefix + 1 < path.size() && path.at(endPrefix+1) == QLatin1Char('/'))
++endPrefix;
normPath = path.right(path.size()-endPrefix);
- if (!normPath.startsWith(QLatin1String("/")))
+ if (!normPath.startsWith(QLatin1Char('/')))
normPath.insert(0, QLatin1Char('/'));
return normPath;
}
diff --git a/src/libs/ssh/sftpfilesystemmodel.cpp b/src/libs/ssh/sftpfilesystemmodel.cpp
index 180191e9b09..a382163a167 100644
--- a/src/libs/ssh/sftpfilesystemmodel.cpp
+++ b/src/libs/ssh/sftpfilesystemmodel.cpp
@@ -99,7 +99,7 @@ SftpFileSystemModel::SftpFileSystemModel(QObject *parent)
: QAbstractItemModel(parent), d(new SftpFileSystemModelPrivate)
{
d->sshConnection = 0;
- d->rootDirectory = QLatin1String("/");
+ d->rootDirectory = QLatin1Char('/');
d->rootNode = 0;
d->statJobId = SftpInvalidJob;
}
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index 5cc9b5ee82c..06833f146fa 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -172,7 +172,7 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa
// file extension
if (!requiredExtensions.isEmpty()) {
foreach (const QString &requiredExtension, requiredExtensions) {
- QString extension = QLatin1String(".") + requiredExtension;
+ QString extension = QLatin1Char('.') + requiredExtension;
if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count())
return true;
}
diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp
index 61288794b02..89c4dd4f7f3 100644
--- a/src/libs/utils/newclasswidget.cpp
+++ b/src/libs/utils/newclasswidget.cpp
@@ -70,7 +70,7 @@ struct NewClassWidgetPrivate {
};
NewClassWidgetPrivate:: NewClassWidgetPrivate() :
- m_headerExtension(QLatin1String("h")),
+ m_headerExtension(QLatin1Char('h')),
m_sourceExtension(QLatin1String("cpp")),
m_formExtension(QLatin1String("ui")),
m_valid(false),
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index 18a5dd1b27b..8ad171ddf82 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -46,7 +46,7 @@ void CommentDefinition::setStyle(Style style)
multiLineEnd = QLatin1String("*/");
break;
case HashStyle:
- singleLine = QLatin1String("#");
+ singleLine = QLatin1Char('#');
multiLineStart.clear();
multiLineEnd.clear();
break;