From 0a571b84df7e599382ed808262459abb9450652d Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 2 Aug 2022 23:01:32 +0200 Subject: [PATCH] clang-tidy-14 --- .gitlab-ci.yml | 4 ++-- generators/chm/lib/helper_search_index.cpp | 2 +- generators/epub/epubdocument.cpp | 2 +- generators/xps/generator_xps.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94101b0fb..0f26cd6a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,13 +42,13 @@ build_clazy_clang_tidy: script: - srcdir=`pwd` && mkdir -p /tmp/okular_build && cd /tmp/okular_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && cat compile_commands.aux.json | jq '[.[] | select(.file | contains("/synctex/")| not)]' > compile_commands.json && cp "$srcdir/.clang-tidy" . - CLAZY_IGNORE_DIRS="settings_core.[cpp|h]|settings.[cpp.h]|pdfsettings.h|gssettings.h" CLAZY_CHECKS="level0,level1,level2,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch" ninja - - run-clang-tidy-13 + - run-clang-tidy-14 - rm -rf * - echo "Now compiling the mobile UI" - cd "$CI_PROJECT_DIR" - srcdir=`pwd` && mkdir -p /tmp/okular_build && cd /tmp/okular_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DOKULAR_UI=mobile -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && cat compile_commands.aux.json | jq '[.[] | select(.file | contains("/synctex/")| not)]' > compile_commands.json && cp "$srcdir/.clang-tidy" . - CLAZY_IGNORE_DIRS="settings_mobile.[cpp|h]|settings.[cpp.h]|pdfsettings.h|gssettings.h" CLAZY_CHECKS="level0,level1,level2,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch" ninja - - run-clang-tidy-13 + - run-clang-tidy-14 clang_format: stage: build diff --git a/generators/chm/lib/helper_search_index.cpp b/generators/chm/lib/helper_search_index.cpp index c433c0b7b..25a72221f 100644 --- a/generators/chm/lib/helper_search_index.cpp +++ b/generators/chm/lib/helper_search_index.cpp @@ -96,7 +96,7 @@ bool Index::makeIndex(const QList &docs, EBook *chmFile) return false; } - QUrl filename = *it; + const QUrl &filename = *it; QStringList terms; if (parseDocumentToStringlist(chmFile, filename, terms)) { diff --git a/generators/epub/epubdocument.cpp b/generators/epub/epubdocument.cpp index 03691bde9..fa1129e4a 100644 --- a/generators/epub/epubdocument.cpp +++ b/generators/epub/epubdocument.cpp @@ -79,7 +79,7 @@ QString EpubDocument::checkCSS(const QString &c) std::size_t i = 0; const QRegularExpression re(QStringLiteral("(([0-9]+)(\\.[0-9]+)?)r?em(.*)")); while (i < cssArrayCount) { - auto item = cssArray[i]; + const auto &item = cssArray[i]; QRegularExpressionMatch match = re.match(item); if (match.hasMatch()) { double em = match.captured(1).toDouble(); diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp index 87630559f..d7874f6aa 100644 --- a/generators/xps/generator_xps.cpp +++ b/generators/xps/generator_xps.cpp @@ -1434,13 +1434,13 @@ QFont XpsFile::getFontByName(const QString &absoluteFileName, float size) qCWarning(OkularXpsDebug) << "The unexpected has happened. No font family for a known font:" << absoluteFileName << index; return QFont(); } - const QString fontFamily = fontFamilies[0]; + const QString &fontFamily = fontFamilies[0]; const QStringList fontStyles = m_fontDatabase.styles(fontFamily); if (fontStyles.isEmpty()) { qCWarning(OkularXpsDebug) << "The unexpected has happened. No font style for a known font family:" << absoluteFileName << index << fontFamily; return QFont(); } - const QString fontStyle = fontStyles[0]; + const QString &fontStyle = fontStyles[0]; return m_fontDatabase.font(fontFamily, fontStyle, qRound(size)); }