Skip to content

refactor(sonar): fix cpp:S6197 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
Jun 20, 2026
Merged

refactor(sonar): fix cpp:S6197 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/platform/linux/uhid_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@ namespace lvh::detail {
}

for (auto slot = 0; slot < touch_max_contacts; ++slot) {
const auto used = std::any_of(contacts_.begin(), contacts_.end(), [slot](const auto &entry) {
const auto used = std::ranges::any_of(contacts_, [slot](const auto &entry) {
return entry.second == slot;
});
if (!used) {
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/test_linux_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,16 @@ TEST_F(LinuxBackendTest, CoversLinuxDiscoveryAndIdentityHelpers) {
input_root.string(),
hidraw_root.string()
);
EXPECT_TRUE(std::any_of(nodes.begin(), nodes.end(), [](const auto &node) {
EXPECT_TRUE(std::ranges::any_of(nodes, [](const auto &node) {
return node.kind == lvh::DeviceNodeKind::input_event && node.path == "/dev/input/event0";
}));
EXPECT_TRUE(std::any_of(nodes.begin(), nodes.end(), [](const auto &node) {
EXPECT_TRUE(std::ranges::any_of(nodes, [](const auto &node) {
return node.kind == lvh::DeviceNodeKind::joystick && node.path == "/dev/input/js0";
}));
EXPECT_TRUE(std::any_of(nodes.begin(), nodes.end(), [](const auto &node) {
EXPECT_TRUE(std::ranges::any_of(nodes, [](const auto &node) {
return node.kind == lvh::DeviceNodeKind::hidraw && node.path == "/dev/hidraw0";
}));
EXPECT_TRUE(std::any_of(nodes.begin(), nodes.end(), [sysfs_root](const auto &node) {
EXPECT_TRUE(std::ranges::any_of(nodes, [sysfs_root](const auto &node) {
return node.kind == lvh::DeviceNodeKind::sysfs && node.path.starts_with(sysfs_root.string());
}));

Expand Down Expand Up @@ -453,10 +453,10 @@ TEST_F(LinuxBackendTest, PipeBackedUinputTouchDevicesEmitEvents) {

result = lvh::detail::test::linux_uinput_trackpad_contact_pipe(contact);
ASSERT_TRUE(result.status.ok()) << result.status.message();
const auto saw_left_button = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_left_button = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_LEFT && event.value == 1;
});
const auto saw_finger_tool = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_finger_tool = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_FINGER && event.value == 1;
});
EXPECT_TRUE(saw_left_button);
Expand All @@ -473,13 +473,13 @@ TEST_F(LinuxBackendTest, PipeBackedUinputTouchDevicesEmitEvents) {
};
result = lvh::detail::test::linux_uinput_pen_tablet_tool_pipe(tool);
ASSERT_TRUE(result.status.ok()) << result.status.message();
const auto saw_pen_tool = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_pen_tool = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_PEN && event.value == 1;
});
const auto saw_pressure = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_pressure = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_ABS && event.code == ABS_PRESSURE && event.value > 0;
});
const auto saw_stylus = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_stylus = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_STYLUS && event.value == 1;
});
EXPECT_TRUE(saw_pen_tool);
Expand All @@ -490,16 +490,16 @@ TEST_F(LinuxBackendTest, PipeBackedUinputTouchDevicesEmitEvents) {
TEST_F(LinuxBackendTest, PipeBackedUinputTouchDevicesCoverStateTransitions) {
auto result = lvh::detail::test::linux_uinput_trackpad_multi_contact_pipe();
ASSERT_TRUE(result.status.ok()) << result.status.message();
const auto saw_doubletap = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_doubletap = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_DOUBLETAP && event.value == 1;
});
const auto saw_tripletap = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_tripletap = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_TRIPLETAP && event.value == 1;
});
const auto saw_quadtap = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_quadtap = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_QUADTAP && event.value == 1;
});
const auto saw_quinttap = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_quinttap = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_QUINTTAP && event.value == 1;
});
EXPECT_TRUE(saw_doubletap);
Expand All @@ -511,16 +511,16 @@ TEST_F(LinuxBackendTest, PipeBackedUinputTouchDevicesCoverStateTransitions) {

result = lvh::detail::test::linux_uinput_pen_tablet_transition_pipe();
ASSERT_TRUE(result.status.ok()) << result.status.message();
const auto saw_rubber = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_rubber = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_RUBBER && event.value == 1;
});
const auto saw_pen_release = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_pen_release = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_TOOL_PEN && event.value == 0;
});
const auto saw_distance = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_distance = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_ABS && event.code == ABS_DISTANCE && event.value > 0;
});
const auto saw_secondary_button = std::any_of(result.events.begin(), result.events.end(), [](const auto &event) {
const auto saw_secondary_button = std::ranges::any_of(result.events, [](const auto &event) {
return event.type == EV_KEY && event.code == BTN_STYLUS2 && event.value == 1;
});
EXPECT_TRUE(saw_rubber);
Expand Down Expand Up @@ -651,13 +651,13 @@ TEST_F(LinuxBackendTest, FakeUhidSyscallsCoverFailureBranches) {

TEST_F(LinuxBackendTest, FakeUinputConstructionCoversCapabilitiesAndFailureBranches) {
const auto has_type = [](const lvh::detail::test::LinuxLibevdevCreationResult &result, std::uint32_t type) {
return std::find(result.event_types.begin(), result.event_types.end(), type) != result.event_types.end();
return std::ranges::find(result.event_types, type) != result.event_types.end();
};
const auto has_property = [](const lvh::detail::test::LinuxLibevdevCreationResult &result, std::uint32_t property) {
return std::find(result.properties.begin(), result.properties.end(), property) != result.properties.end();
return std::ranges::find(result.properties, property) != result.properties.end();
};
const auto find_code = [](const lvh::detail::test::LinuxLibevdevCreationResult &result, std::uint32_t type, std::uint32_t code) {
const auto it = std::find_if(result.event_codes.begin(), result.event_codes.end(), [type, code](const auto &event_code) {
const auto it = std::ranges::find_if(result.event_codes, [type, code](const auto &event_code) {
return event_code.type == type && event_code.code == code;
});
return it == result.event_codes.end() ? nullptr : &(*it);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_linux_consumers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ namespace {
while (auto *raw_event = libinput_get_event(context)) {
LibinputEvent event {raw_event, destroy_libinput_event};
const auto event_type = libinput_event_get_type(event.get());
if (std::find(expected_types.begin(), expected_types.end(), event_type) != expected_types.end()) {
if (std::ranges::find(expected_types, event_type) != expected_types.end()) {
return event;
}

Expand Down