diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b3f9944e..031a46e01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ 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 - - CLAZY_CHECKS="qstring-arg,incorrect-emit,qhash-namespace,detaching-temporary,range-loop,qdeleteall,connect-not-normalized,inefficient-qlist-soft,strict-iterators,lambda-in-connect" ninja + - CLAZY_CHECKS="qstring-arg,incorrect-emit,qhash-namespace,detaching-temporary,range-loop,qdeleteall,connect-not-normalized,inefficient-qlist-soft,strict-iterators,lambda-in-connect,fully-qualified-moc-types" 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/document.h b/core/document.h index b74219c68..8c3f494e0 100644 --- a/core/document.h +++ b/core/document.h @@ -994,7 +994,7 @@ class OKULARCORE_EXPORT Document : public QObject * This slot is called whenever the user changes the page @p size * of the document. */ - void setPageSize( const PageSize &size ); + void setPageSize( const Okular::PageSize &size ); /** * Cancels the current search diff --git a/core/textdocumentgenerator.h b/core/textdocumentgenerator.h index fcdd09bdd..c9d11cd3d 100644 --- a/core/textdocumentgenerator.h +++ b/core/textdocumentgenerator.h @@ -66,13 +66,13 @@ class OKULARCORE_EXPORT TextDocumentConverter : public QObject * Adds a new link object which is located between cursorBegin and * cursorEnd to the generator. */ - void addAction( Action *link, int cursorBegin, int cursorEnd ); + void addAction( Okular::Action *link, int cursorBegin, int cursorEnd ); /** * Adds a new annotation object which is located between cursorBegin and * cursorEnd to the generator. */ - void addAnnotation( Annotation *annotation, int cursorBegin, int cursorEnd ); + void addAnnotation( Okular::Annotation *annotation, int cursorBegin, int cursorEnd ); /** * Adds a new title at the given level which is located as position to the generator.