From 98a7521e321961ef37bf7da90fd7ed5a0b89323d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 28 Nov 2018 15:45:44 +0100 Subject: Qt Linguist: Fix gcc 7.2 warnings about ambiguous else Add some missing braces to fix some ambiguous else clause warnings (introduced by foreach): shared/translatormessage.cpp: In member function 'void TranslatorMessage::addReferenceUniq(const QString&, int)': shared/translatormessage.cpp:76:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translatormessage.cpp: In member function 'void TranslatorMessage::addReferenceUniq(const QString&, int)': shared/translatormessage.cpp:76:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translatormessage.cpp: In member function 'void TranslatorMessage::addReferenceUniq(const QString&, int)': shared/translatormessage.cpp:76:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] cpp.cpp: In function 'void loadCPP(Translator&, const QStringList&, ConversionData&)': cpp.cpp:2330:16: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translator.cpp: In member function 'int Translator::find(const QString&, const QString&, const References&) const': shared/translator.cpp:387:16: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translator.cpp: In member function 'int Translator::find(const QString&, const QString&, const References&) const': shared/translator.cpp:387:16: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translatormessage.cpp: In member function 'void TranslatorMessage::addReferenceUniq(const QString&, int)': shared/translatormessage.cpp:76:12: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translator.cpp: In member function 'int Translator::find(const QString&, const QString&, const References&) const': shared/translator.cpp:387:16: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] shared/translator.cpp: In member function 'int Translator::find(const QString&, const QString&, const References&) const': shared/translator.cpp:387:16: warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else] Change-Id: I3ecf5f03514c25851a56cf66ced257c5aedd17d4 Reviewed-by: Oswald Buddenhagen --- src/linguist/lupdate/cpp.cpp | 9 ++++++--- src/linguist/shared/translator.cpp | 9 ++++++--- src/linguist/shared/translatormessage.cpp | 6 ++++-- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src/linguist') diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp index cd02de34f..3836bfcfd 100644 --- a/src/linguist/lupdate/cpp.cpp +++ b/src/linguist/lupdate/cpp.cpp @@ -2325,11 +2325,14 @@ void loadCPP(Translator &translator, const QStringList &filenames, ConversionDat parser.recordResults(isHeader(filename)); } - foreach (const QString &filename, filenames) - if (!CppFiles::isBlacklisted(filename)) - if (const Translator *tor = CppFiles::getTranslator(filename)) + foreach (const QString &filename, filenames) { + if (!CppFiles::isBlacklisted(filename)) { + if (const Translator *tor = CppFiles::getTranslator(filename)) { foreach (const TranslatorMessage &msg, tor->messages()) translator.extend(msg, cd); + } + } + } } QT_END_NAMESPACE diff --git a/src/linguist/shared/translator.cpp b/src/linguist/shared/translator.cpp index 5b0538d4e..af669e235 100644 --- a/src/linguist/shared/translator.cpp +++ b/src/linguist/shared/translator.cpp @@ -384,11 +384,14 @@ int Translator::find(const QString &context, { if (!refs.isEmpty()) { for (TMM::ConstIterator it = m_messages.constBegin(); it != m_messages.constEnd(); ++it) { - if (it->context() == context && it->comment() == comment) - foreach (const TranslatorMessage::Reference &itref, it->allReferences()) - foreach (const TranslatorMessage::Reference &ref, refs) + if (it->context() == context && it->comment() == comment) { + foreach (const TranslatorMessage::Reference &itref, it->allReferences()) { + foreach (const TranslatorMessage::Reference &ref, refs) { if (itref == ref) return it - m_messages.constBegin(); + } + } + } } } return -1; diff --git a/src/linguist/shared/translatormessage.cpp b/src/linguist/shared/translatormessage.cpp index f9048de70..0cc17f1de 100644 --- a/src/linguist/shared/translatormessage.cpp +++ b/src/linguist/shared/translatormessage.cpp @@ -73,10 +73,12 @@ void TranslatorMessage::addReferenceUniq(const QString &fileName, int lineNumber } else { if (fileName == m_fileName && lineNumber == m_lineNumber) return; - if (!m_extraRefs.isEmpty()) // Rather common case, so special-case it - foreach (const Reference &ref, m_extraRefs) + if (!m_extraRefs.isEmpty()) { // Rather common case, so special-case it + foreach (const Reference &ref, m_extraRefs) { if (fileName == ref.fileName() && lineNumber == ref.lineNumber()) return; + } + } m_extraRefs.append(Reference(fileName, lineNumber)); } } -- cgit v1.2.3