diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-10-02 12:39:55 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-10-02 12:39:55 +0200 |
| commit | 64b2cf0d2168a75e793d1e45d7518ae6c2997e89 (patch) | |
| tree | bbad5126993fe4b504170713b255c3e634c45743 | |
| parent | 0ba06d371cd775ce26806bca958ef1d2b95a12ac (diff) | |
| parent | 03a692c88fd086d8bb2ad3fa4dbddb898bfd9bff (diff) | |
| download | ayatana-indicator-display-64b2cf0d2168a75e793d1e45d7518ae6c2997e89.tar.gz ayatana-indicator-display-64b2cf0d2168a75e793d1e45d7518ae6c2997e89.tar.bz2 ayatana-indicator-display-64b2cf0d2168a75e793d1e45d7518ae6c2997e89.zip | |
Merge branch 'tari01-pr/fix-cppcheck'
Attributes GH PR #60: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/60
| -rw-r--r-- | src/exporter.cpp | 4 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/unit/adbd-client-test.cpp | 4 | ||||
| -rw-r--r-- | tests/unit/usb-snap-test.cpp | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/exporter.cpp b/src/exporter.cpp index b3d586b..2db9a01 100644 --- a/src/exporter.cpp +++ b/src/exporter.cpp @@ -1,5 +1,6 @@ /* * Copyright 2014 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <src/exporter.h> @@ -81,7 +83,7 @@ private: export_actions(m_indicator); - for (auto& profile : m_indicator->profiles()) + for (const auto& profile : m_indicator->profiles()) export_profile(m_indicator, profile); } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4c1b9b8..33684d6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,7 +29,7 @@ endif() add_compile_options(${CXX_WARNING_ARGS}) -add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --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) +add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --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=unusedFunction) add_subdirectory(integration) add_subdirectory(unit) diff --git a/tests/unit/adbd-client-test.cpp b/tests/unit/adbd-client-test.cpp index b9e7a49..8e318d4 100644 --- a/tests/unit/adbd-client-test.cpp +++ b/tests/unit/adbd-client-test.cpp @@ -1,5 +1,6 @@ /* * Copyright 2016 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <tests/utils/test-dbus-fixture.h> @@ -56,7 +58,7 @@ TEST_F(AdbdClientFixture, SocketPlumbing) const std::string expected_pk; AdbdClient::PKResponse response; const std::string expected_response; - } tests[] = { + } const tests[] = { { "PKHelloWorld", "HelloWorld", AdbdClient::PKResponse::ALLOW, "OK" }, { "PKHelloWorld", "HelloWorld", AdbdClient::PKResponse::DENY, "NO" }, { "PKFooBar", "FooBar", AdbdClient::PKResponse::ALLOW, "OK" }, diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp index 05c797d..80b3929 100644 --- a/tests/unit/usb-snap-test.cpp +++ b/tests/unit/usb-snap-test.cpp @@ -1,5 +1,6 @@ /* * Copyright 2016 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <tests/utils/qt-fixture.h> @@ -68,7 +70,7 @@ TEST_F(UsbSnapFixture, TestRoundTrip) const char* fingerprint; const char* action_to_invoke; const AdbdClient::PKResponse expected_response; - } tests[] = { + } const tests[] = { { "Fingerprint", "allow", AdbdClient::PKResponse::ALLOW }, { "Fingerprint", "deny", AdbdClient::PKResponse::DENY } }; |