From 3943b637e8c464b1e545626e871b2394ad9c0bd2 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 4 Apr 2020 16:10:04 +0200 Subject: clang-tidy: Fix 'readability-redundant-control-flow' warnings Also, treat those as errors Change-Id: I7f27e6d19d7208dcb1ab083091e01f41017fb8bf Reviewed-by: Christian Kandeler --- .clang-tidy | 3 ++- src/lib/corelib/jsextensions/domxml.cpp | 1 - src/lib/corelib/language/moduleloader.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 098606b46..26a74d247 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -67,7 +67,8 @@ WarningsAsErrors: > modernize-use-emplace, modernize-use-equals-default, modernize-use-override, - performance-* + performance-*, + readability-redundant-control-flow HeaderFilterRegex: '' AnalyzeTemporaryDtors: false diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp index 1318f4f28..86e1574c6 100644 --- a/src/lib/corelib/jsextensions/domxml.cpp +++ b/src/lib/corelib/jsextensions/domxml.cpp @@ -314,7 +314,6 @@ void XmlDomNode::setData(const QString &v) const if (m_domNode.isCharacterData()) return m_domNode.toCharacterData().setData(v); context()->throwError(QStringLiteral("Node '%1' is not a character data node").arg(m_domNode.nodeName())); - return; } void XmlDomNode::clear() diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index eb06f50ff..56fbc198e 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1362,7 +1362,6 @@ void ModuleLoader::createSortedModuleList(const Item::Module &parentModule, Item for (const Item::Module &dep : parentModule.item->modules()) createSortedModuleList(dep, modules); modules.push_back(parentModule); - return; } Item::Modules ModuleLoader::modulesSortedByDependency(const Item *productItem) -- cgit v1.2.3