From 3af705b3d7ee90572528951de6ed48bc9e120c5f Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 19 Feb 2020 17:31:11 +0100 Subject: [PATCH] CI: Enable clazy qdeleteall --- .gitlab-ci.yml | 2 +- core/form.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bd26991b..e7fb14567 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,incorrect-emit,qhash-namespace,detaching-temporary,range-loop" ninja + - CLAZY_CHECKS="qstring-arg,incorrect-emit,qhash-namespace,detaching-temporary,range-loop,qdeleteall"" 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/form.cpp b/core/form.cpp index d10dd968f..b1ebb29a6 100644 --- a/core/form.cpp +++ b/core/form.cpp @@ -25,8 +25,8 @@ FormFieldPrivate::FormFieldPrivate( FormField::FieldType type ) FormFieldPrivate::~FormFieldPrivate() { delete m_activateAction; - qDeleteAll( m_additionalActions.values() ); - qDeleteAll( m_additionalAnnotActions.values() ); + qDeleteAll( m_additionalActions ); + qDeleteAll( m_additionalAnnotActions ); } void FormFieldPrivate::setDefault()