diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b2dabade..97586f807 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ build_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 - - CLAZY_CHECKS="qstring-arg" ninja + - CLAZY_CHECKS="qstring-arg,incorrect-emit,qhash-namespace" ninja # Fix the poppler header, remove when debian:unstable ships poppler 0.82 or later - sed -i "N;N;N;N; s#class MediaRendition\;\nclass MovieAnnotation\;\nclass ScreenAnnotation;#class MediaRendition\;#g" /usr/include/poppler/qt5/poppler-link.h - "run-clang-tidy -header-filter='.*/okular/.*' -checks='-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-loop-convert,modernize-use-nullptr,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-bugprone-branch-clone,-bugprone-incorrect-roundings' -config=\"{WarningsAsErrors: '*'}\"" diff --git a/core/area.cpp b/core/area.cpp index 08b19723c..11803e447 100644 --- a/core/area.cpp +++ b/core/area.cpp @@ -258,9 +258,9 @@ void NormalizedRect::transform( const QTransform &matrix ) bottom = rect.bottom(); } -uint qHash( const NormalizedRect& r, uint seed ) +uint Okular::qHash( const NormalizedRect& r, uint seed ) { - return qHash(r.bottom, qHash(r.right, qHash(r.top, qHash(r.left, seed)))); + return ::qHash(r.bottom, ::qHash(r.right, ::qHash(r.top, ::qHash(r.left, seed)))); } QDebug operator<<( QDebug str, const Okular::NormalizedRect& r ) diff --git a/core/area.h b/core/area.h index ba09c1cb8..0746acdff 100644 --- a/core/area.h +++ b/core/area.h @@ -980,9 +980,9 @@ class HighlightAreaRect : public RegularAreaRect QColor color; }; +uint qHash(const Okular::NormalizedRect& r, uint seed = 0); } -uint qHash(const Okular::NormalizedRect& r, uint seed = 0); #ifndef QT_NO_DEBUG_STREAM /**