diff options
56 files changed, 106 insertions, 106 deletions
diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp index 33fdfab99b..532c3835bd 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 ac3f62fb12..94a09124ba 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 d65ba90e70..710ebd772a 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 ea04e98e91..bc7607338e 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 c29c1b00a8..e8b13aa592 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 26a9b2358f..c2f51385ae 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 d9f6b08e3c..57d42e7de6 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 f62428a565..28e6661a67 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 2b64c52263..2f8e79588b 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 180191e9b0..a382163a16 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 5cc9b5ee82..06833f146f 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 61288794b0..89c4dd4f7f 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 18a5dd1b27..8ad171ddf8 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; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 67fde1bef3..f117c4c9e7 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1250,7 +1250,7 @@ void AndroidConfigurations::load() int major = -1; int minor = -1; foreach (const QString &version, allVersions) { - QStringList parts = version.split(QLatin1String(".")); + QStringList parts = version.split(QLatin1Char('.')); if (parts.size() != 2) // not interested in 1.7.0_u21 continue; bool okMajor, okMinor; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 6ae985ffe0..363d1b1a76 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -260,7 +260,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode) m_ndkState = Error; m_ndkErrorMessage = tr("\"%1\" does not seem to be an Android NDK top folder.") .arg(m_androidConfig.ndkLocation().toUserOutput()); - } else if (platformPath.toString().contains(QLatin1String(" "))) { + } else if (platformPath.toString().contains(QLatin1Char(' '))) { m_ndkState = Error; m_ndkErrorMessage = tr("The Android NDK cannot be installed into a path with spaces."); } else { diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp index 1e2e98dbfe..b9962c8833 100644 --- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp +++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp @@ -102,7 +102,7 @@ DebuggerStartParameters BareMetalRunControlFactory::startParameters(const BareMe if (device->sshParameters().host.startsWith(QLatin1Char('|'))) //gdb pipe mode enabled params.remoteChannel = device->sshParameters().host; else - params.remoteChannel = device->sshParameters().host + QLatin1String(":") + QString::number(device->sshParameters().port); + params.remoteChannel = device->sshParameters().host + QLatin1Char(':') + QString::number(device->sshParameters().port); params.remoteSetupNeeded = false; // qml stuff, not needed params.commandsAfterConnect = device->gdbInitCommands().toLatin1(); params.commandsForReset = device->gdbResetCommands().toLatin1(); diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index ac46abd6cd..a2b9cfd713 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -138,7 +138,7 @@ Command ClangFormat::command(int offset, int length) const } else { command.addOption(QLatin1String("-style={") + m_settings->style(m_settings->customStyle()).remove(QLatin1Char('\n')) - + QLatin1String("}")); + + QLatin1Char('}')); } if (offset != -1) { diff --git a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp index 37229ba103..199f3116c0 100644 --- a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp +++ b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp @@ -383,7 +383,7 @@ void CompletionProposalsBuilder::concatChunksForObjectiveCMessage(const CXComple } const QString text = Internal::getQString(clang_getCompletionChunkText(cxString, index), false); if (chunkKind == CXCompletionChunk_ResultType) { - hintPrefix += QLatin1String("("); + hintPrefix += QLatin1Char('('); hintPrefix += text.toHtmlEscaped(); hintPrefix += QLatin1String(") "); indentBonus += 3 + text.length(); diff --git a/src/plugins/clangcodemodel/cxprettyprinter.cpp b/src/plugins/clangcodemodel/cxprettyprinter.cpp index 60157f0df1..5d3cd81791 100644 --- a/src/plugins/clangcodemodel/cxprettyprinter.cpp +++ b/src/plugins/clangcodemodel/cxprettyprinter.cpp @@ -294,7 +294,7 @@ void CXPrettyPrinter::writeCompletionContexts(CXCodeCompleteResults *results) foreach (const QString &line, lines) { writeLineEnd(); - m_printed += line + QLatin1String(","); + m_printed += line + QLatin1Char(','); } } @@ -381,7 +381,7 @@ void CXPrettyPrinter::writeCompletionAnnotationJson(const CXCompletionString &st void CXPrettyPrinter::writeDiagnosticJson(const CXDiagnostic &diag) { - m_printed += QLatin1String("{"); + m_printed += QLatin1Char('{'); m_indent += 4; writeLineEnd(); @@ -410,7 +410,7 @@ void CXPrettyPrinter::writeDiagnosticJson(const CXDiagnostic &diag) writeFixItJson(diag, i); writeLineEnd(); } - m_printed += QLatin1String("]"); + m_printed += QLatin1Char(']'); writeLineEnd(); } @@ -448,7 +448,7 @@ void CXPrettyPrinter::writeDiagnosticJson(const CXDiagnostic &diag) } m_indent -= 4; writeLineEnd(); - m_printed += QLatin1String("]"); + m_printed += QLatin1Char(']'); } // children @@ -465,12 +465,12 @@ void CXPrettyPrinter::writeDiagnosticJson(const CXDiagnostic &diag) } m_indent -= 4; writeLineEnd(); - m_printed += QLatin1String("]"); + m_printed += QLatin1Char(']'); } m_indent -= 4; writeLineEnd(); - m_printed += QLatin1String("}"); + m_printed += QLatin1Char('}'); } void CXPrettyPrinter::writeFixItJson(const CXDiagnostic &diag, unsigned i) @@ -483,7 +483,7 @@ void CXPrettyPrinter::writeFixItJson(const CXDiagnostic &diag, unsigned i) m_printed += text; m_printed += QLatin1String("\', range: "); writeRangeJson(range); - m_printed += QLatin1String("}"); + m_printed += QLatin1Char('}'); } void CXPrettyPrinter::writeRangeJson(const CXSourceRange &range) @@ -531,7 +531,7 @@ void CXPrettyPrinter::writeLocationJson(const CXSourceLocation &location) m_printed += QLatin1String("line: "); m_printed += QString::number(loc.line()); - m_printed += QLatin1String(","); + m_printed += QLatin1Char(','); writeLineEnd(); m_printed += QLatin1String("column: "); @@ -539,7 +539,7 @@ void CXPrettyPrinter::writeLocationJson(const CXSourceLocation &location) m_indent -= 4; writeLineEnd(); - m_printed += QLatin1String("}"); + m_printed += QLatin1Char('}'); } void CXPrettyPrinter::writeLineEnd() diff --git a/src/plugins/classview/classviewtreeitemmodel.cpp b/src/plugins/classview/classviewtreeitemmodel.cpp index d0918caf05..32b5f21143 100644 --- a/src/plugins/classview/classviewtreeitemmodel.cpp +++ b/src/plugins/classview/classviewtreeitemmodel.cpp @@ -96,7 +96,7 @@ QVariant TreeItemModel::data(const QModelIndex &index, int role) const QString name(inf.name()); if (!inf.type().isEmpty()) - name += QLatin1String(" ") + inf.type(); + name += QLatin1Char(' ') + inf.type(); return name; } diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index e1250b17c5..a5cc881e72 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -403,7 +403,7 @@ QString ClearCasePlugin::ccViewRoot(const QString &directory) const if (HostOsInfo::isWindowsHost()) root = getDriveLetterOfPath(directory); else - root = QLatin1String("/"); + root = QLatin1Char('/'); } return QDir::fromNativeSeparators(root); diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index 83e2ce7104..578a54841f 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -100,7 +100,7 @@ bool PatchTool::runPatch(const QByteArray &input, const QString &workingDirector args << QLatin1String("-R"); MessageManager::write(QApplication::translate("Core::PatchTool", "Executing in %1: %2 %3"). arg(QDir::toNativeSeparators(workingDirectory), - QDir::toNativeSeparators(patch), args.join(QLatin1String(" ")))); + QDir::toNativeSeparators(patch), args.join(QLatin1Char(' ')))); patchProcess.start(patch, args); if (!patchProcess.waitForStarted()) { MessageManager::write(QApplication::translate("Core::PatchTool", "Unable to launch \"%1\": %2").arg(patch, patchProcess.errorString())); diff --git a/src/plugins/coreplugin/testdatadir.cpp b/src/plugins/coreplugin/testdatadir.cpp index 5bbc946f88..78da242b07 100644 --- a/src/plugins/coreplugin/testdatadir.cpp +++ b/src/plugins/coreplugin/testdatadir.cpp @@ -62,7 +62,7 @@ QString TestDataDir::directory(const QString &subdir, bool clean) const { QString path = m_directory; if (!subdir.isEmpty()) - path += QLatin1String("/") + subdir; + path += QLatin1Char('/') + subdir; if (clean) path = QDir::cleanPath(path); maybeAppendSlash(&path); diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index da5d1f4f77..930badc9d7 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -71,7 +71,7 @@ static QString getUserFilePath(const QString &proposalFileName) if (!resourceDir.exists(QLatin1String("externaltools"))) resourceDir.mkpath(QLatin1String("externaltools")); const QFileInfo fi(proposalFileName); - const QString &suffix = QLatin1String(".") + fi.completeSuffix(); + const QString &suffix = QLatin1Char('.') + fi.completeSuffix(); const QString &newFilePath = ICore::userResourcePath() + QLatin1String("/externaltools/") + fi.baseName(); int count = 0; diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp index 12819f7e35..0532213415 100644 --- a/src/plugins/coreplugin/variablechooser.cpp +++ b/src/plugins/coreplugin/variablechooser.cpp @@ -319,7 +319,7 @@ void VariableChooserPrivate::handleItemActivated(QListWidgetItem *item) */ void VariableChooserPrivate::insertVariable(const QString &variable) { - const QString &text = QLatin1String("%{") + variable + QLatin1String("}"); + const QString &text = QLatin1String("%{") + variable + QLatin1Char('}'); if (m_lineEdit) { m_lineEdit->insert(text); m_lineEdit->activateWindow(); diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 97a646173d..8a22994e8a 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -247,7 +247,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input // Make sure we an absolute path: QString directory = QDir(inputDirectory).absolutePath(); #ifdef WITH_TESTS - if (directory[0].isLetter() && directory.indexOf(QLatin1String(":") + QLatin1String(TEST_PREFIX)) == 1) + if (directory[0].isLetter() && directory.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1) directory = directory.mid(2); #endif VcsManagerPrivate::VcsInfo *cachedData = d->findInCache(directory); @@ -634,7 +634,7 @@ void CorePlugin::testVcsManager() foreach (const QString &result, results) { // qDebug() << "Expecting:" << result; - QStringList split = result.split(QLatin1String(":")); + QStringList split = result.split(QLatin1Char(':')); QCOMPARE(split.count(), 4); QVERIFY(split.at(3) == QLatin1String("*") || split.at(3) == QLatin1String("-")); diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index a30778151a..62e8c5ad41 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -3165,7 +3165,7 @@ public: if (m_funcReturn) { funcDef.append(QLatin1String("\nreturn ") + m_relevantDecls.at(0).first - + QLatin1String(";")); + + QLatin1Char(';')); funcCall.prepend(m_relevantDecls.at(0).second + QLatin1String(" = ")); } funcDef.append(QLatin1String("\n}\n\n")); @@ -4537,7 +4537,7 @@ public: } else { QString textFuncDecl = fromFile->textOf(m_funcDef); textFuncDecl.truncate(startPosition - fromFile->startOf(m_funcDef)); - textFuncDecl = textFuncDecl.trimmed() + QLatin1String(";"); + textFuncDecl = textFuncDecl.trimmed() + QLatin1Char(';'); headerTarget.replace(fromFile->range(m_funcDef), textFuncDecl); } fromFile->setChangeSet(headerTarget); diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp index b648d53deb..255ebb6d92 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp @@ -162,7 +162,7 @@ QString CdbSymbolPathListEditor::symbolPath(const QString &cacheDir, return QLatin1String(symbolCachePrefixC) + QDir::toNativeSeparators(cacheDir); QString s = QLatin1String(symbolServerPrefixC); if (!cacheDir.isEmpty()) - s += QDir::toNativeSeparators(cacheDir) + QLatin1String("*"); + s += QDir::toNativeSeparators(cacheDir) + QLatin1Char('*'); s += QLatin1String(symbolServerPostfixC); return s; } diff --git a/src/plugins/debugger/stackframe.cpp b/src/plugins/debugger/stackframe.cpp index deda27431b..4411b77720 100644 --- a/src/plugins/debugger/stackframe.cpp +++ b/src/plugins/debugger/stackframe.cpp @@ -123,7 +123,7 @@ QString StackFrame::toToolTip() const showDistributionNote = true; } if (!Utils::HostOsInfo::isWindowsHost() && showDistributionNote) { - str << QLatin1String(" ") << + str << QLatin1Char(' ') << tr("Note that most distributions ship debug information " "in separate packages."); } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 463c1f65a5..57dcbc73a1 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -185,7 +185,7 @@ bool GenericProject::addFiles(const QStringList &filePaths) foreach (const QString &path, toAdd) { QString relative = dir.relativeFilePath(path); if (relative.isEmpty()) - relative = QLatin1String("."); + relative = QLatin1Char('.'); m_rawProjectIncludePaths.append(relative); } diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 81c4a130f7..7953414aae 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -169,7 +169,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w, if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty()) { QString relative = dir.relativeFilePath(path); if (relative.isEmpty()) - relative = QLatin1String("."); + relative = QLatin1Char('.'); includePaths.append(relative); } } diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 65dd23dd8a..8b25ff0c11 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -193,7 +193,7 @@ void BranchDialog::checkout() const QString currentBranch = m_model->fullName(m_model->currentBranch()); const QString nextBranch = m_model->fullName(idx); const QString popMessageStart = QCoreApplication::applicationName() + - QLatin1String(" ") + nextBranch + QLatin1String("-AutoStash "); + QLatin1Char(' ') + nextBranch + QLatin1String("-AutoStash "); BranchCheckoutDialog branchCheckoutDialog(this, currentBranch, nextBranch); GitClient *gitClient = GitPlugin::instance()->gitClient(); diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp index d871fd0da2..07caf83712 100644 --- a/src/plugins/git/gerrit/gerritparameters.cpp +++ b/src/plugins/git/gerrit/gerritparameters.cpp @@ -145,7 +145,7 @@ void GerritParameters::fromSettings(const QSettings *s) port = s->value(rootKey + QLatin1String(portKeyC), QVariant(int(defaultPort))).toInt(); portFlag = s->value(rootKey + QLatin1String(portFlagKeyC), QLatin1String(defaultPortFlag)).toString(); savedQueries = s->value(rootKey + QLatin1String(savedQueriesKeyC), QString()).toString() - .split(QLatin1String(",")); + .split(QLatin1Char(',')); https = s->value(rootKey + QLatin1String(httpsKeyC), QVariant(true)).toBool(); if (ssh.isEmpty()) ssh = detectSsh(); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 9e9ff0f18a..2595a7a9d6 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -526,7 +526,7 @@ QString GerritPlugin::findLocalRepository(QString project, const QString &branch QScopedPointer<QRegExp> branchRegexp; if (!branch.isEmpty() && branch != QLatin1String("master")) { QString branchPattern = branch; - branchPattern.replace(QLatin1String("."), QLatin1String("[\\.-_]?")); + branchPattern.replace(QLatin1Char('.'), QLatin1String("[\\.-_]?")); const QString pattern = QLatin1Char('^') + project + QLatin1String("[-_]?") + branchPattern + QLatin1Char('$'); diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp index ff27a4cc3e..1d57572911 100644 --- a/src/plugins/help/remotehelpfilter.cpp +++ b/src/plugins/help/remotehelpfilter.cpp @@ -138,7 +138,7 @@ bool RemoteHelpFilter::restoreState(const QByteArray &state) QString value; in >> value; - m_remoteUrls = value.split(QLatin1String("^"), QString::SkipEmptyParts); + m_remoteUrls = value.split(QLatin1Char('^'), QString::SkipEmptyParts); QString shortcut; in >> shortcut; diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 370e8ed523..81cacee523 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -165,7 +165,7 @@ void IosConfigurations::updateAutomaticKitList() } } if (unique) break; - displayName = baseDisplayName + QLatin1String("-") + QString::number(iVers); + displayName = baseDisplayName + QLatin1Char('-') + QString::number(iVers); } toolchain->setDisplayName(displayName); toolchain->setPlatformCodeGenFlags(p.backendFlags); @@ -306,7 +306,7 @@ void IosConfigurations::updateAutomaticKitList() } } if (unique) break; - displayName = baseDisplayName + QLatin1String("-") + QString::number(iVers); + displayName = baseDisplayName + QLatin1Char('-') + QString::number(iVers); } kitAtt->setUnexpandedDisplayName(displayName); } diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 0be2fa1063..52ec401457 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -320,7 +320,7 @@ QString IosRunConfiguration::disabledReason() const IDevice::ConstPtr availDev = dm->deviceAt(idev); if (!availDev.isNull() && availDev->type() == Constants::IOS_DEVICE_TYPE) { if (availDev->deviceState() == IDevice::DeviceReadyToUse) { - validDevName += QLatin1String(" "); + validDevName += QLatin1Char(' '); validDevName += availDev->displayName(); } else if (availDev->deviceState() == IDevice::DeviceConnected) { hasConncetedDev = true; diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp index 83bb2459bd..ce10b771ec 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -48,7 +48,7 @@ static const char * const FILE_PATTERN = "(<command line>|([A-Za-z]:)?[^:]+\\.[^ ClangParser::ClangParser() : m_commandRegExp(QLatin1String("^clang(\\+\\+)?: +(fatal +)?(warning|error|note): (.*)$")), m_inLineRegExp(QLatin1String("^In (.*) included from (.*):(\\d+):$")), - m_messageRegExp(QLatin1String("^") + QLatin1String(FILE_PATTERN) + QLatin1String("(:(\\d+):\\d+|\\((\\d+)\\) *): +(fatal +)?(error|warning|note): (.*)$")), + m_messageRegExp(QLatin1Char('^') + QLatin1String(FILE_PATTERN) + QLatin1String("(:(\\d+):\\d+|\\((\\d+)\\) *): +(fatal +)?(error|warning|note): (.*)$")), m_summaryRegExp(QLatin1String("^\\d+ (warnings?|errors?)( and \\d (warnings?|errors?))? generated.$")), m_codesignRegExp(QLatin1String("^Code ?Sign error: (.*)$")), m_expectSnippet(false) diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 1dd7ce490e..ad04b4c4a8 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -78,7 +78,7 @@ QVariantMap DeployConfiguration::toMap() const { QVariantMap map(ProjectConfiguration::toMap()); map.insert(QLatin1String(BUILD_STEP_LIST_COUNT), 1); - map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1String("0"), m_stepList->toMap()); + map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1Char('0'), m_stepList->toMap()); return map; } @@ -105,7 +105,7 @@ bool DeployConfiguration::fromMap(const QVariantMap &map) int maxI = map.value(QLatin1String(BUILD_STEP_LIST_COUNT), 0).toInt(); if (maxI != 1) return false; - QVariantMap data = map.value(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1String("0")).toMap(); + QVariantMap data = map.value(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1Char('0')).toMap(); if (!data.isEmpty()) { delete m_stepList; m_stepList = new BuildStepList(this, data); diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 01033a5415..6b343b50fc 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -513,7 +513,7 @@ void ProjectExplorerPlugin::testDeviceManager() dev3->setDisplayName(dev->displayName()); mgr->addDevice(dev3); QCOMPARE(mgr->deviceAt(mgr->deviceCount() - 1)->displayName(), - QString(dev3->displayName() + QLatin1String("2"))); + QString(dev3->displayName() + QLatin1Char('2'))); QCOMPARE(deviceAddedSpy.count(), 1); QCOMPARE(deviceRemovedSpy.count(), 0); QCOMPARE(deviceUpdatedSpy.count(), 0); diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp index 4d267e6810..c44d506d3d 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.cpp +++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp @@ -75,7 +75,7 @@ void SelectableFilesModel::startParsing(const QString &baseDir) m_baseDir = baseDir; // Build a tree in a future m_rootForFuture = new Tree; - m_rootForFuture->name = QLatin1String("/"); + m_rootForFuture->name = QLatin1Char('/'); m_rootForFuture->parent = 0; m_rootForFuture->fullPath = baseDir; m_rootForFuture->isDir = true; diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 10b62f3c48..d4c87826ef 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -56,7 +56,7 @@ static QString generateSuffix(const QString &alt1, const QString &alt2) if (suffix.isEmpty()) suffix = alt2; suffix.replace(QRegExp(QLatin1String("[^a-zA-Z0-9_.-]")), QString(QLatin1Char('_'))); // replace fishy characters: - if (!suffix.startsWith(QLatin1String("."))) + if (!suffix.startsWith(QLatin1Char('.'))) suffix.prepend(QLatin1Char('.')); return suffix; } @@ -924,7 +924,7 @@ QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const const Utils::FileName baseName = project()->projectFilePath(); QFileInfo fi = baseName.toFileInfo(); QDir dir = QDir(fi.absolutePath()); - QString filter = fi.fileName() + suffix + QLatin1String("*"); + QString filter = fi.fileName() + suffix + QLatin1Char('*'); QFileInfoList list = dir.entryInfoList(QStringList() << filter, QDir::Files); @@ -966,14 +966,14 @@ Utils::FileName SettingsAccessor::backupName(const QVariantMap &data) const QString backupName = defaultFileName(m_userSuffix); const QByteArray oldEnvironmentId = environmentIdFromMap(data); if (!oldEnvironmentId.isEmpty() && oldEnvironmentId != creatorId()) - backupName += QLatin1String(".") + QString::fromLatin1(oldEnvironmentId).mid(1, 7); + backupName += QLatin1Char('.') + QString::fromLatin1(oldEnvironmentId).mid(1, 7); const int oldVersion = versionFromMap(data); if (oldVersion != currentVersion()) { VersionUpgrader *upgrader = d->upgrader(oldVersion); if (upgrader) - backupName += QLatin1String(".") + upgrader->backupExtension(); + backupName += QLatin1Char('.') + upgrader->backupExtension(); else - backupName += QLatin1String(".") + QString::number(oldVersion); + backupName += QLatin1Char('.') + QString::number(oldVersion); } return Utils::FileName::fromString(backupName); } diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 718b52308c..925dee8981 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -80,7 +80,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c if (targetAbi.wordWidth() == 64) { switch (targetAbi.architecture()) { case ProjectExplorer::Abi::X86Architecture: - architecture.append(QLatin1String("_")); + architecture.append(QLatin1Char('_')); // fall through case ProjectExplorer::Abi::ArmArchitecture: case ProjectExplorer::Abi::MipsArchitecture: diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 00ed509aa9..8aeb92c7d9 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -481,7 +481,7 @@ void QbsBuildStepConfigWidget::updateState() QString command = QLatin1String("qbs build "); command += QString::fromLatin1("--settings-dir ") - + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1String(" "); + + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1Char(' '); if (m_step->dryRun()) command += QLatin1String("--dry-run "); if (m_step->keepGoing()) diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index f68582ed14..50304a0355 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -312,7 +312,7 @@ void QbsInstallStepConfigWidget::updateState() QString command = QLatin1String("qbs install "); command += QString::fromLatin1("--settings-dir ") - + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1String(" "); + + QDir::toNativeSeparators(Core::ICore::userResourcePath()) + QLatin1Char(' '); if (m_step->dryRun()) command += QLatin1String("--dry-run "); if (m_step->keepGoing()) diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp index 24a15efa41..7ba5e78a59 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp @@ -157,7 +157,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara if (wo.sourceType == PluginOptions::WidgetOptions::LinkLibrary) widgetLibraries.insert(QLatin1String("-l") + wo.widgetLibrary); else - widgetProjects.insert(QLatin1String("include(") + wo.widgetProjectFile + QLatin1String(")")); + widgetProjects.insert(QLatin1String("include(") + wo.widgetProjectFile + QLatin1Char(')')); pluginIncludes += QLatin1String("#include \"") + wo.pluginHeaderFile + QLatin1String("\"\n"); pluginAdditions += QLatin1String(" m_widgets.append(new ") + wo.pluginClassName + QLatin1String("(this));\n"); diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.cpp index 7179fc6307..c6cae30df1 100644 --- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.cpp @@ -52,7 +52,7 @@ AbstractGeneratedFileInfo::AbstractGeneratedFileInfo() } const QString AbstractMobileApp::CFileComment(QLatin1String("//")); -const QString AbstractMobileApp::ProFileComment(QLatin1String("#")); +const QString AbstractMobileApp::ProFileComment(QLatin1Char('#')); const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri")); const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum")); const QString AbstractMobileApp::FileStubVersion(QLatin1String("version")); diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp index 473c8ae3b5..3fe1f468ba 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp @@ -135,7 +135,7 @@ void BlackBerryDeviceConfigurationWizardSetupPage::onDeviceDetected( { QString displayName(deviceName); if (displayName != hostName) - displayName.append(QLatin1String(" (")).append(hostName).append(QLatin1String(")")); + displayName.append(QLatin1String(" (")).append(hostName).append(QLatin1Char(')')); QListWidgetItem *device = createDeviceListItem(displayName, Autodetected); device->setData(DeviceNameRole, displayName); diff --git a/src/plugins/qnx/blackberrydevicelistdetector.cpp b/src/plugins/qnx/blackberrydevicelistdetector.cpp index e5392d200a..505ffaee65 100644 --- a/src/plugins/qnx/blackberrydevicelistdetector.cpp +++ b/src/plugins/qnx/blackberrydevicelistdetector.cpp @@ -90,7 +90,7 @@ const QString BlackBerryDeviceListDetector::readProcessLine() void BlackBerryDeviceListDetector::processData(const QString &line) { // line format is: deviceName,deviceHostNameOrIP,deviceType,versionIfSimulator - QStringList list = line.split(QLatin1String(",")); + QStringList list = line.split(QLatin1Char(',')); if (list.count() == 4) emit deviceDetected (list[0], list[1], QLatin1String("Simulator") == list[2]); } diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index aea6099880..e69973274f 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -254,7 +254,7 @@ ProjectExplorer::FolderNode::AddNewInformation ResourceTopLevelNode::addNewInfor { QString name = tr("%1 Prefix: %2") .arg(QFileInfo(path()).fileName()) - .arg(QLatin1String("/")); + .arg(QLatin1Char('/')); int p = -1; if (priority(files)) { // images/* and qml/js mimetypes diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp index 4f51d73416..d2c9a95db0 100644 --- a/src/plugins/texteditor/autocompleter.cpp +++ b/src/plugins/texteditor/autocompleter.cpp @@ -110,7 +110,7 @@ QString AutoCompleter::autoComplete(QTextCursor &cursor, const QString &textToIn if (m_surroundWithEnabled && cursor.hasSelection()) { if (textToInsert == QLatin1String("(")) - return cursor.selectedText() + QLatin1String(")"); + return cursor.selectedText() + QLatin1Char(')'); if (textToInsert == QLatin1String("{")) { //If the text span multiple lines, insert on different lines QString str = cursor.selectedText(); @@ -119,20 +119,20 @@ QString AutoCompleter::autoComplete(QTextCursor &cursor, const QString &textToIn str = (str.startsWith(QChar::ParagraphSeparator) ? QString() : QString(QChar::ParagraphSeparator)) + str; if (str.endsWith(QChar::ParagraphSeparator)) - str += QLatin1String("}") + QString(QChar::ParagraphSeparator); + str += QLatin1Char('}') + QString(QChar::ParagraphSeparator); else - str += QString(QChar::ParagraphSeparator) + QLatin1String("}"); + str += QString(QChar::ParagraphSeparator) + QLatin1Char('}'); } else { - str += QLatin1String("}"); + str += QLatin1Char('}'); } return str; } if (textToInsert == QLatin1String("[")) - return cursor.selectedText() + QLatin1String("]"); + return cursor.selectedText() + QLatin1Char(']'); if (textToInsert == QLatin1String("\"")) - return cursor.selectedText() + QLatin1String("\""); + return cursor.selectedText() + QLatin1Char('"'); if (textToInsert == QLatin1String("'")) - return cursor.selectedText() + QLatin1String("'"); + return cursor.selectedText() + QLatin1Char('\''); } if (!m_autoParenthesesEnabled) diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 99bb3ab4c9..f323b46ce2 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -84,7 +84,7 @@ bool ValgrindRunControl::startEngine() const AnalyzerStartParameters &sp = startParameters(); #if VALGRIND_DEBUG_OUTPUT - emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1String(" "))), DebugFormat); + emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1Char(' '))), DebugFormat); emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat); emit outputReceived(tr("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat); #endif diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp index 9e42f7077c..f369dc8740 100644 --- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp +++ b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp @@ -103,7 +103,7 @@ SystemPreprocessor::SystemPreprocessor(bool verbose) = Utils::Environment::systemEnvironment().searchInPath(i.key()); if (!executablePath.isEmpty()) { m_compiler = i.key(); - m_compilerArguments = i.value().split(QLatin1String(" "), QString::SkipEmptyParts); + m_compilerArguments = i.value().split(QLatin1Char(' '), QString::SkipEmptyParts); m_compilerArguments << QDir::toNativeSeparators(QLatin1String(PATH_PREPROCESSOR_CONFIG)); break; diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp index 254a73f905..87262919d9 100644 --- a/src/tools/sdktool/adddebuggeroperation.cpp +++ b/src/tools/sdktool/adddebuggeroperation.cpp @@ -124,7 +124,7 @@ bool AddDebuggerOperation::setArguments(const QStringList &args) if (next.isNull()) return false; ++i; // skip next - m_abis = next.split(QLatin1String(",")); + m_abis = next.split(QLatin1Char(',')); continue; } } diff --git a/src/tools/sdktool/findkeyoperation.cpp b/src/tools/sdktool/findkeyoperation.cpp index 8f37936745..906c90c2fa 100644 --- a/src/tools/sdktool/findkeyoperation.cpp +++ b/src/tools/sdktool/findkeyoperation.cpp @@ -153,7 +153,7 @@ QStringList FindKeyOperation::findKey(const QVariant &in, const QString &key, co } else if (in.type() == QVariant::List) { QVariantList list = in.toList(); for (int pos = 0; pos < list.count(); ++pos) { - QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1String("]"); + QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1Char(']'); result.append(findKey(list.at(pos), key, pfx)); } } diff --git a/src/tools/sdktool/findvalueoperation.cpp b/src/tools/sdktool/findvalueoperation.cpp index 9c4c1c9774..7b671361d9 100644 --- a/src/tools/sdktool/findvalueoperation.cpp +++ b/src/tools/sdktool/findvalueoperation.cpp @@ -162,7 +162,7 @@ QStringList FindValueOperation::findValue(const QVariant &in, const QVariant &va } else if (in.type() == QVariant::List) { QVariantList list = in.toList(); for (int pos = 0; pos < list.count(); ++pos) { - QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1String("]"); + QString pfx = prefix + QLatin1Char('[') + QString::number(pos) + QLatin1Char(']'); result.append(findValue(list.at(pos), value, pfx)); } } |