diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2026-06-11 23:22:14 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2026-06-11 23:22:14 +0200 |
| commit | 7818a6654c05edafed3b22510c5789c2107bd047 (patch) | |
| tree | 207ff74f185281ae42043d4cf4ce15ac2c4d1248 | |
| parent | b76877dc3e7131f8ef18ab0e2fe413f4aaf5a74c (diff) | |
| parent | ce6e21c94ee66318a99c0748f6b4dcbf4cb44957 (diff) | |
| download | ayatana-indicator-display-7818a6654c05edafed3b22510c5789c2107bd047.tar.gz ayatana-indicator-display-7818a6654c05edafed3b22510c5789c2107bd047.tar.bz2 ayatana-indicator-display-7818a6654c05edafed3b22510c5789c2107bd047.zip | |
Merge branch 'jbicha-personal/jbicha/fix-cppcheck-failure'
Attributes GH PR #107: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/107
| -rw-r--r-- | src/service.cpp | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/ayatana.cfg | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/service.cpp b/src/service.cpp index d6b4ed7..ced370c 100644 --- a/src/service.cpp +++ b/src/service.cpp @@ -1058,7 +1058,7 @@ private: static_cast<Impl*>(gself)->update_phone_header(); } - GMenuModel* create_phone_menu() + static GMenuModel* create_phone_menu() { GMenu* menu; GMenu* section; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bdc074f..97d6be0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,7 +28,7 @@ endif() add_compile_options(${CXX_WARNING_ARGS}) -add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride) +add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride) add_subdirectory (unit) diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg new file mode 100644 index 0000000..035020a --- /dev/null +++ b/tests/ayatana.cfg @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<def format="2"> + <!-- cppcheck override copied from gtk.cfg --> + <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/> +</def> |