whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QStringList::join(QChar) overload where applicable [tools] 

This is an automated change performing the following replacements:
                    join\("(.)"\) -> join('\1')
  join\(QLatin1String\("(.)"\)\)  -> join(QLatin1Char('\1'))
  join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))

Change-Id: Ia087beb886bbaec1a0976cd924440d8904044879
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
bb10
Marc Mutz 2012-05-18 20:00:23 +02:00 committed by The Qt Project
parent c00bd8d677
commit 06c89ae026
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qdoc/config.cpp
View File

@ -229,7 +229,7 @@ void Config::unload(const QString& fileName)
*/
void Config::setStringList(const QString& var, const QStringList& values)
{
stringValueMap[var] = values.join(QLatin1String(" "));
stringValueMap[var] = values.join(QLatin1Char(' '));
stringListValueMap[var] = values;
}

2
src/tools/qdoc/cppcodemarker.cpp
View File

@ -220,7 +220,7 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
bracketed += "slot";
}
if (!bracketed.isEmpty())
extra += " [" + bracketed.join(" ") + QLatin1Char(']');
extra += " [" + bracketed.join(' ') + QLatin1Char(']');
}
break;
case Node::Enum:

4
src/tools/qdoc/cppcodeparser.cpp
View File

@ -104,7 +104,7 @@ void CppCodeParser::initializeParser(const Config &config)
CONFIG_EXAMPLES + Config::dot + CONFIG_FILEEXTENSIONS);
if (!exampleFilePatterns.isEmpty())
exampleNameFilter = exampleFilePatterns.join(" ");
exampleNameFilter = exampleFilePatterns.join(' ');
else
exampleNameFilter = "*.cpp *.h *.js *.xq *.svg *.xml *.dita *.ui";
@ -112,7 +112,7 @@ void CppCodeParser::initializeParser(const Config &config)
CONFIG_EXAMPLES + Config::dot + CONFIG_IMAGEEXTENSIONS);
if (!exampleImagePatterns.isEmpty())
exampleImageFilter = exampleImagePatterns.join(" ");
exampleImageFilter = exampleImagePatterns.join(' ');
else
exampleImageFilter = "*.png";
}

2
src/tools/qdoc/ditaxmlgenerator.cpp
View File

@ -1754,7 +1754,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
if (pieces.size() >= 2) {
columnText = pieces.at(0);
pieces.pop_front();
QString path = pieces.join(" ").trimmed();
QString path = pieces.join(' ').trimmed();
node = qdb_->findNodeForTarget(path, relative, atom);
if (!node)
relative->doc().location().warning(tr("Cannot link to '%1'").arg(path));

2
src/tools/qdoc/doc.cpp
View File

@ -2954,7 +2954,7 @@ Text Doc::trimmedBriefText(const QString &className) const
w.removeFirst();
}
whats = w.join(" ");
whats = w.join(' ');
if (whats.endsWith(QLatin1Char('.')))
whats.truncate(whats.length() - 1);

2
src/tools/qdoc/generator.cpp
View File

@ -1083,7 +1083,7 @@ void Generator::generateSince(const Node *node, CodeMarker *marker)
text << " " << since[0];
} else {
// Reconstruct the <project> <version> string.
text << " " << since.join(" ");
text << " " << since.join(' ');
}
text << "." << Atom::ParaRight;

2
src/tools/qdoc/node.cpp
View File

@ -2004,7 +2004,7 @@ QString FunctionNode::signature(bool values) const
void FunctionNode::debug() const
{
qDebug("QML METHOD %s rt %s pp %s",
qPrintable(name()), qPrintable(rt), qPrintable(pp.join(" ")));
qPrintable(name()), qPrintable(rt), qPrintable(pp.join(' ')));
}
/*!

2
src/tools/qdoc/qmlvisitor.cpp
View File

@ -364,7 +364,7 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::AST::SourceLocation,
node->setStatus(Node::Preliminary);
}
else if (command == COMMAND_SINCE) {
QString arg = args[0].first; //.join(" ");
QString arg = args[0].first; //.join(' ');
node->setSince(arg);
}
else {

4
src/tools/qdoc/tokenizer.cpp
View File

@ -502,8 +502,8 @@ void Tokenizer::initialize(const Config &config)
QStringList d = config.getStringList(CONFIG_DEFINES);
d += "qdoc";
defines = new QRegExp(d.join("|"));
falsehoods = new QRegExp(config.getStringList(CONFIG_FALSEHOODS).join("|"));
defines = new QRegExp(d.join('|'));
falsehoods = new QRegExp(config.getStringList(CONFIG_FALSEHOODS).join('|'));
memset(kwordHashTable, 0, sizeof(kwordHashTable));
for (int i = 0; i < Tok_LastKeyword - Tok_FirstKeyword + 1; i++)

2
src/tools/qdoc/tree.cpp
View File

@ -1485,7 +1485,7 @@ bool Tree::generateIndexSection(QXmlStreamWriter& writer,
ClassNode* baseClassNode = related.node;
baseStrings.insert(baseClassNode->name());
}
writer.writeAttribute("bases", QStringList(baseStrings.toList()).join(","));
writer.writeAttribute("bases", QStringList(baseStrings.toList()).join(','));
writer.writeAttribute("module", node->moduleName());
}
break;

24
tools/configure/configureapp.cpp
View File

@ -2439,7 +2439,7 @@ void Configure::generateOutputVars()
if (dictionary[ "SHARED" ] == "yes") {
QString version = dictionary[ "VERSION" ];
if (!version.isEmpty()) {
qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf("."));
qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf('.'));
version.remove(QLatin1Char('.'));
}
dictionary[ "QMAKE_OUTDIR" ] += "_shared";
@ -2560,7 +2560,7 @@ void Configure::generateOutputVars()
qmakeVars += QString("RCC_DIR = ") + formatPath("tmp/rcc/" + dictionary["QMAKE_OUTDIR"]);
if (!qmakeDefines.isEmpty())
qmakeVars += QString("DEFINES += ") + qmakeDefines.join(" ");
qmakeVars += QString("DEFINES += ") + qmakeDefines.join(' ');
if (!qmakeIncludes.isEmpty())
qmakeVars += QString("INCLUDEPATH += ") + formatPaths(qmakeIncludes);
if (!opensslLibs.isEmpty())
@ -2595,17 +2595,17 @@ void Configure::generateOutputVars()
if (!sybaseLibs.isEmpty())
lflagsTDS += sybaseLibs.section("=", 1);
if (!lflagsTDS.isEmpty())
qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" ");
qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(' ');
}
if (!qmakeSql.isEmpty())
qmakeVars += QString("sql-drivers += ") + qmakeSql.join(" ");
qmakeVars += QString("sql-drivers += ") + qmakeSql.join(' ');
if (!qmakeSqlPlugins.isEmpty())
qmakeVars += QString("sql-plugins += ") + qmakeSqlPlugins.join(" ");
qmakeVars += QString("sql-plugins += ") + qmakeSqlPlugins.join(' ');
if (!qmakeStyles.isEmpty())
qmakeVars += QString("styles += ") + qmakeStyles.join(" ");
qmakeVars += QString("styles += ") + qmakeStyles.join(' ');
if (!qmakeStylePlugins.isEmpty())
qmakeVars += QString("style-plugins += ") + qmakeStylePlugins.join(" ");
qmakeVars += QString("style-plugins += ") + qmakeStylePlugins.join(' ');
if (dictionary["QMAKESPEC"].endsWith("-g++")) {
QString includepath = qgetenv("INCLUDE");
@ -2650,7 +2650,7 @@ void Configure::generateCachefile()
for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
cacheStream << (*var) << endl;
}
cacheStream << "CONFIG += " << qmakeConfig.join(" ") << "no_private_qt_headers_warning QTDIR_build" << endl;
cacheStream << "CONFIG += " << qmakeConfig.join(' ') << "no_private_qt_headers_warning QTDIR_build" << endl;
cacheStream.flush();
cacheFile.close();
@ -2664,7 +2664,7 @@ void Configure::generateCachefile()
moduleStream << "#paths" << endl;
moduleStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl;
moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
moduleStream << "QT_BUILD_PARTS += " << buildParts.join(" ") << endl << endl;
moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl << endl;
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
@ -2915,7 +2915,7 @@ void Configure::generateQConfigPri()
configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
else
configStream << "QT_EDITION = " << dictionary["EDITION"] << endl;
configStream << "QT_CONFIG += " << qtConfig.join(" ") << endl;
configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
configStream << "#versioning " << endl
<< "QT_VERSION = " << dictionary["VERSION"] << endl
@ -3757,11 +3757,11 @@ void Configure::generateMakefiles()
}
QTextStream txt(&file);
txt << "all:\n";
txt << "\t" << args.join(" ") << "\n";
txt << "\t" << args.join(' ') << "\n";
txt << "\t$(MAKE) -$(MAKEFLAGS) -f " << it->target << "\n";
txt << "first: all\n";
txt << "qmake: FORCE\n";
txt << "\t" << args.join(" ") << "\n";
txt << "\t" << args.join(' ') << "\n";
txt << "FORCE:\n";
}
}