Skip to content

refactor(sonar): fix cpp:S6003 #259

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 9, 2026
Merged

refactor(sonar): fix cpp:S6003 #259

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
16 changes: 2 additions & 14 deletions src/windows/win_display_device_general.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,9 @@ namespace display_device {
m_w_api->getHdrState(best_path)
};

available_devices.push_back(
{device_id,
display_name,
friendly_name,
edid,
info}
);
available_devices.emplace_back(device_id, display_name, friendly_name, edid, info);
} else {
available_devices.push_back(
{device_id,
display_name,
friendly_name,
edid,
std::nullopt}
);
available_devices.emplace_back(device_id, display_name, friendly_name, edid, std::nullopt);
}
}

Expand Down
12 changes: 6 additions & 6 deletions tests/unit/windows/test_win_api_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ namespace {
[]() {
std::vector<DISPLAYCONFIG_MODE_INFO> modes;

modes.push_back({});
modes.emplace_back();
modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_TARGET;
modes.back().targetMode = {}; // Set the union value

modes.push_back({});
modes.emplace_back();
modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
modes.back().sourceMode = {}; // Set the union value

Expand Down Expand Up @@ -201,8 +201,8 @@ TEST_F_S_MOCKED(GetSourceIndex) {
std::vector<DISPLAYCONFIG_MODE_INFO> modes;

path.sourceInfo.sourceModeInfoIdx = 1;
modes.push_back({}); // Non-empty list
modes.push_back({}); // Non-empty list
modes.emplace_back(); // Non-empty list
modes.emplace_back(); // Non-empty list

EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::make_optional<UINT32>(1));
}
Expand All @@ -212,7 +212,7 @@ TEST_F_S_MOCKED(GetSourceIndex, InvalidIndex) {
std::vector<DISPLAYCONFIG_MODE_INFO> modes;

path.sourceInfo.sourceModeInfoIdx = DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID;
modes.push_back({}); // Non-empty list
modes.emplace_back(); // Non-empty list

EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::nullopt);
}
Expand All @@ -222,7 +222,7 @@ TEST_F_S_MOCKED(GetSourceIndex, OutOfRangeIndex) {
std::vector<DISPLAYCONFIG_MODE_INFO> modes;

path.sourceInfo.sourceModeInfoIdx = 1;
modes.push_back({}); // Non-empty list
modes.emplace_back(); // Non-empty list

EXPECT_EQ(display_device::win_utils::getSourceIndex(path, modes), std::nullopt);
}
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/windows/utils/mock_win_api_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ namespace {

// 1st group (1 device)
{
data.m_paths.push_back({});
data.m_paths.emplace_back();
data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
data.m_paths.back().sourceInfo.adapterId = {1, 1};
data.m_paths.back().sourceInfo.id = 1;
data.m_paths.back().targetInfo.targetAvailable = TRUE;
data.m_paths.back().targetInfo.refreshRate = {120, 1};

data.m_modes.push_back({});
data.m_modes.emplace_back();
data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
data.m_modes.back().sourceMode = {}; // Set the union
data.m_modes.back().sourceMode.position = {0, 0};
Expand All @@ -25,31 +25,31 @@ namespace {

// 2nd group (1+ device)
{
data.m_paths.push_back({});
data.m_paths.emplace_back();
data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
data.m_paths.back().sourceInfo.adapterId = {2, 2};
data.m_paths.back().sourceInfo.id = 2;
data.m_paths.back().targetInfo.targetAvailable = TRUE;
data.m_paths.back().targetInfo.refreshRate = {119995, 1000};

data.m_modes.push_back({});
data.m_modes.emplace_back();
data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
data.m_modes.back().sourceMode = {}; // Set the union
data.m_modes.back().sourceMode.position = {1921, 0};
data.m_modes.back().sourceMode.width = 1920;
data.m_modes.back().sourceMode.height = 2160;

if (include_duplicate) {
data.m_paths.push_back({});
data.m_paths.emplace_back();
data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
data.m_paths.back().sourceInfo.adapterId = {3, 3};
data.m_paths.back().sourceInfo.id = 3;
data.m_paths.back().targetInfo.targetAvailable = TRUE;
data.m_paths.back().targetInfo.refreshRate = {60, 1};

data.m_modes.push_back({});
data.m_modes.emplace_back();
data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
data.m_modes.back().sourceMode = {}; // Set the union
data.m_modes.back().sourceMode.position = {1921, 0};
Expand All @@ -60,15 +60,15 @@ namespace {

// 3rd group (1 device)
{
data.m_paths.push_back({});
data.m_paths.emplace_back();
data.m_paths.back().flags = DISPLAYCONFIG_PATH_ACTIVE;
data.m_paths.back().sourceInfo.sourceModeInfoIdx = data.m_modes.size();
data.m_paths.back().sourceInfo.adapterId = {4, 4};
data.m_paths.back().sourceInfo.id = 4;
data.m_paths.back().targetInfo.targetAvailable = TRUE;
data.m_paths.back().targetInfo.refreshRate = {90, 1};

data.m_modes.push_back({});
data.m_modes.emplace_back();
data.m_modes.back().infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE;
data.m_modes.back().sourceMode = {}; // Set the union
data.m_modes.back().sourceMode.position = {0, 1081};
Expand Down
Loading