From 694275bc431633e7a7e06f04bf538cad1321fc03 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 8 May 2017 11:17:25 +0000 Subject: [PATCH] fix build of some utils with ASCII casts disabled Signed-off-by: Ivailo Monev --- util/fixnonlatin1/main.cpp | 30 +++++++++++++++--------------- util/lexgen/main.cpp | 26 +++++++++++++------------- util/qlalr/lalr.cpp | 6 +++--- util/qlalr/lalr.g | 4 ++-- util/qlalr/recognizer.cpp | 4 ++-- util/unicode/main.cpp | 34 +++++++++++++++++----------------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp index 5ac327f24..5c8972979 100644 --- a/util/fixnonlatin1/main.cpp +++ b/util/fixnonlatin1/main.cpp @@ -49,21 +49,21 @@ int main(int argc, char *argv[]) for (int i = 1; i < argc; ++i) { QString fileName = QString::fromLocal8Bit(argv[i]); - if ( fileName.endsWith(".gif") - || fileName.endsWith(".jpg") - || fileName.endsWith(".tif") - || fileName.endsWith(".tiff") - || fileName.endsWith(".png") - || fileName.endsWith(".mng") - || fileName.endsWith(".ico") - || fileName.endsWith(".zip") - || fileName.endsWith(".gz") - || fileName.endsWith(".qpf") - || fileName.endsWith(".ttf") - || fileName.endsWith(".pfb") - || fileName.endsWith(".exe") - || fileName.endsWith(".nib") - || fileName.endsWith(".o") + if ( fileName.endsWith(QLatin1String(".gif")) + || fileName.endsWith(QLatin1String(".jpg")) + || fileName.endsWith(QLatin1String(".tif")) + || fileName.endsWith(QLatin1String(".tiff")) + || fileName.endsWith(QLatin1String(".png")) + || fileName.endsWith(QLatin1String(".mng")) + || fileName.endsWith(QLatin1String(".ico")) + || fileName.endsWith(QLatin1String(".zip")) + || fileName.endsWith(QLatin1String(".gz")) + || fileName.endsWith(QLatin1String(".qpf")) + || fileName.endsWith(QLatin1String(".ttf")) + || fileName.endsWith(QLatin1String(".pfb")) + || fileName.endsWith(QLatin1String(".exe")) + || fileName.endsWith(QLatin1String(".nib")) + || fileName.endsWith(QLatin1String(".o")) ) continue; diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp index 956e9ea47..53a3159d6 100644 --- a/util/lexgen/main.cpp +++ b/util/lexgen/main.cpp @@ -144,9 +144,9 @@ static QSet determineMaxInputSet(const ConfigFile::Section §ion) } if (inputTypeName.isEmpty()) - inputTypeName = "quint8"; + inputTypeName = QLatin1String("quint8"); - if (inputTypeName == "quint8") { + if (inputTypeName == QLatin1String("quint8")) { for (int i = 1; i < 256; ++i) set.insert(i); } /* else if ### */ @@ -166,17 +166,17 @@ static bool loadConfig(const QString &ruleFile, Config *cfg) return false; } - QSet maxInputSet = determineMaxInputSet(sections.value("Options")); + QSet maxInputSet = determineMaxInputSet(sections.value(QLatin1String("Options"))); if (maxInputSet.isEmpty()) return false; Qt::CaseSensitivity cs = Qt::CaseInsensitive; - if (sections.value("Options").contains("case-sensitive")) + if (sections.value(QLatin1String("Options")).contains(QLatin1String("case-sensitive"))) cs = Qt::CaseSensitive; cfg->configSections = sections; cfg->caseSensitivity = cs; - cfg->className = sections.value("Options").value("classname", "Scanner"); + cfg->className = sections.value(QLatin1String("Options")).value(QLatin1String("classname"), QLatin1String("Scanner")); cfg->maxInputSet = maxInputSet; cfg->ruleFile = ruleFile; return true; @@ -186,7 +186,7 @@ static DFA generateMachine(const Config &cfg) { if (cfg.cache) { QFileInfo ruleInfo(cfg.ruleFile); - QFileInfo cacheInfo(ruleInfo.baseName() + ".dfa"); + QFileInfo cacheInfo(ruleInfo.baseName() + QLatin1String(".dfa")); if (cacheInfo.exists() && cacheInfo.lastModified() > ruleInfo.lastModified()) { QFile f(cacheInfo.absoluteFilePath()); @@ -199,7 +199,7 @@ static DFA generateMachine(const Config &cfg) } QMap macros; - foreach (ConfigFile::Entry e, cfg.configSections.value("Macros")) { + foreach (ConfigFile::Entry e, cfg.configSections.value(QLatin1String("Macros"))) { int errCol = 0; if (cfg.debug) qDebug() << "parsing" << e.value; @@ -211,14 +211,14 @@ static DFA generateMachine(const Config &cfg) macros.insert(e.key, nfa); } - if (!cfg.configSections.contains("Tokens")) { + if (!cfg.configSections.contains(QLatin1String("Tokens"))) { qWarning("Rule file does not contain a [Tokens] section!"); return DFA(); } QVector tokens; - foreach (ConfigFile::Entry e, cfg.configSections.value("Tokens")) { + foreach (ConfigFile::Entry e, cfg.configSections.value(QLatin1String("Tokens"))) { int errCol = 0; if (cfg.debug) qDebug() << "parsing" << e.value; @@ -241,7 +241,7 @@ static DFA generateMachine(const Config &cfg) DFA result = giganticStateMachine.toDFA().minimize(); if (cfg.cache) { QFileInfo ruleInfo(cfg.ruleFile); - QFileInfo cacheInfo(ruleInfo.baseName() + ".dfa"); + QFileInfo cacheInfo(ruleInfo.baseName() + QLatin1String(".dfa")); QFile f(cacheInfo.absoluteFilePath()); f.open(QIODevice::WriteOnly | QIODevice::Truncate); QDataStream stream(&f); @@ -258,9 +258,9 @@ int main(int argc, char **argv) Config cfg; const QStringList arguments = app.arguments().mid(1); - cfg.debug = arguments.contains("-debug"); - const bool testRules = arguments.contains("-test"); - cfg.cache = arguments.contains("-cache"); + cfg.debug = arguments.contains(QLatin1String("-debug")); + const bool testRules = arguments.contains(QLatin1String("-test")); + cfg.cache = arguments.contains(QLatin1String("-cache")); foreach (const QString &arg, arguments) if (!arg.startsWith(QLatin1Char('-'))) { diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp index 707365105..5f6d35adc 100644 --- a/util/qlalr/lalr.cpp +++ b/util/qlalr/lalr.cpp @@ -199,9 +199,9 @@ Grammar::Grammar (): table_name = QLatin1String ("parser_table"); - tk_end = intern ("$end"); + tk_end = intern (QLatin1String("$end")); terminals.insert (tk_end); - spells.insert (tk_end, "end of file"); + spells.insert (tk_end, QLatin1String("end of file")); /*tk_error= terminals.insert (intern ("error"))*/; } @@ -238,7 +238,7 @@ void Grammar::buildRuleMap () void Grammar::buildExtendedGrammar () { - accept_symbol = intern ("$accept"); + accept_symbol = intern (QLatin1String("$accept")); goal = rules.insert (rules.end (), Rule ()); goal->lhs = accept_symbol; goal->rhs.push_back (start); diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g index 9aa2f6e40..80fbb96b9 100644 --- a/util/qlalr/lalr.g +++ b/util/qlalr/lalr.g @@ -381,7 +381,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) - text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + " \"" + _M_input_file + "\"\n"; + text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); inp (); // skip ':' forever @@ -418,7 +418,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) - text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + " \"" + _M_input_file + "\"\n"; + text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); inp (); // skip ':' diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp index d9db721e1..1d9a59671 100644 --- a/util/qlalr/recognizer.cpp +++ b/util/qlalr/recognizer.cpp @@ -190,7 +190,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) - text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + " \"" + _M_input_file + "\"\n"; + text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); inp (); // skip ':' forever @@ -227,7 +227,7 @@ int Recognizer::nextToken() text.clear (); if (! _M_no_lines) - text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + " \"" + _M_input_file + "\"\n"; + text += QLatin1String ("\n#line ") + QString::number (_M_action_line) + QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n"); inp (); // skip ':' diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index a858cf4d8..73b2a0963 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -725,7 +725,7 @@ static int maxTitleCaseDiff = 0; static void readUnicodeData() { - QFile f("data/UnicodeData.txt"); + QFile f(QLatin1String("data/UnicodeData.txt")); if (!f.exists()) qFatal("Couldn't find UnicodeData.txt"); @@ -857,7 +857,7 @@ static int maxMirroredDiff = 0; static void readBidiMirroring() { - QFile f("data/BidiMirroring.txt"); + QFile f(QLatin1String("data/BidiMirroring.txt")); if (!f.exists()) qFatal("Couldn't find BidiMirroring.txt"); @@ -896,7 +896,7 @@ static void readBidiMirroring() static void readArabicShaping() { - QFile f("data/ArabicShaping.txt"); + QFile f(QLatin1String("data/ArabicShaping.txt")); if (!f.exists()) qFatal("Couldn't find ArabicShaping.txt"); @@ -947,7 +947,7 @@ static void readArabicShaping() static void readDerivedAge() { - QFile f("data/DerivedAge.txt"); + QFile f(QLatin1String("data/DerivedAge.txt")); if (!f.exists()) qFatal("Couldn't find DerivedAge.txt"); @@ -999,7 +999,7 @@ static void readDerivedAge() static void readDerivedNormalizationProps() { - QFile f("data/DerivedNormalizationProps.txt"); + QFile f(QLatin1String("data/DerivedNormalizationProps.txt")); if (!f.exists()) qFatal("Couldn't find DerivedNormalizationProps.txt"); @@ -1077,7 +1077,7 @@ struct NormalizationCorrection { static QByteArray createNormalizationCorrections() { - QFile f("data/NormalizationCorrections.txt"); + QFile f(QLatin1String("data/NormalizationCorrections.txt")); if (!f.exists()) qFatal("Couldn't find NormalizationCorrections.txt"); @@ -1127,7 +1127,7 @@ static QByteArray createNormalizationCorrections() qFatal("unknown unicode version in NormalizationCorrection.txt"); out += " { 0x" + QByteArray::number(c.codepoint, 16) + ", 0x" + QByteArray::number(c.mapped, 16) - + ", " + QString::number(c.version) + " },\n"; + + ", " + QByteArray::number(c.version) + " },\n"; ++numCorrections; } @@ -1160,7 +1160,7 @@ static void computeUniqueProperties() static void readLineBreak() { qDebug() << "Reading LineBreak.txt"; - QFile f("data/LineBreak.txt"); + QFile f(QLatin1String("data/LineBreak.txt")); if (!f.exists()) qFatal("Couldn't find LineBreak.txt"); @@ -1212,7 +1212,7 @@ static void readLineBreak() static void readSpecialCasing() { qDebug() << "Reading SpecialCasing.txt"; - QFile f("data/SpecialCasing.txt"); + QFile f(QLatin1String("data/SpecialCasing.txt")); if (!f.exists()) qFatal("Couldn't find SpecialCasing.txt"); @@ -1302,7 +1302,7 @@ static int maxCaseFoldDiff = 0; static void readCaseFolding() { qDebug() << "Reading CaseFolding.txt"; - QFile f("data/CaseFolding.txt"); + QFile f(QLatin1String("data/CaseFolding.txt")); if (!f.exists()) qFatal("Couldn't find CaseFolding.txt"); @@ -1370,7 +1370,7 @@ static void readCaseFolding() static void readGraphemeBreak() { qDebug() << "Reading GraphemeBreakProperty.txt"; - QFile f("data/GraphemeBreakProperty.txt"); + QFile f(QLatin1String("data/GraphemeBreakProperty.txt")); if (!f.exists()) qFatal("Couldn't find GraphemeBreakProperty.txt"); @@ -1421,7 +1421,7 @@ static void readGraphemeBreak() static void readWordBreak() { qDebug() << "Reading WordBreakProperty.txt"; - QFile f("data/WordBreakProperty.txt"); + QFile f(QLatin1String("data/WordBreakProperty.txt")); if (!f.exists()) qFatal("Couldn't find WordBreakProperty.txt"); @@ -1472,7 +1472,7 @@ static void readWordBreak() static void readSentenceBreak() { qDebug() << "Reading SentenceBreakProperty.txt"; - QFile f("data/SentenceBreakProperty.txt"); + QFile f(QLatin1String("data/SentenceBreakProperty.txt")); if (!f.exists()) qFatal("Couldn't find SentenceBreakProperty.txt"); @@ -1661,7 +1661,7 @@ static QList blockInfoList; static void readBlocks() { - QFile f("data/Blocks.txt"); + QFile f(QLatin1String("data/Blocks.txt")); if (!f.exists()) qFatal("Couldn't find Blocks.txt"); @@ -1733,7 +1733,7 @@ static void readScripts() enum { fileCount = sizeof(files) / sizeof(const char *) }; for (int i = 0; i < fileCount; ++i) { - QFile f(files[i]); + QFile f(QString::fromLatin1(files[i])); if (!f.exists()) qFatal("Couldn't find %s", files[i]); @@ -2700,7 +2700,7 @@ int main(int, char **) "// We mean it.\n" "//\n\n"; - QFile f("../../src/corelib/tools/qunicodetables.cpp"); + QFile f(QLatin1String("../../src/core/tools/qunicodetables.cpp")); f.open(QFile::WriteOnly|QFile::Truncate); f.write(header); f.write(note); @@ -2713,7 +2713,7 @@ int main(int, char **) f.write("QT_END_NAMESPACE\n"); f.close(); - f.setFileName("../../src/corelib/tools/qunicodetables_p.h"); + f.setFileName(QLatin1String("../../src/core/tools/qunicodetables_p.h")); f.open(QFile::WriteOnly | QFile::Truncate); f.write(header); f.write(note);