refactor(sonar): fix cpp:S5817#253

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 2 commits into from
Jun 9, 2026
Merged

refactor(sonar): fix cpp:S5817 #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02d4165
refactor(sonar): fix cpp:S5817
ReenigneArcher Jun 9, 2026
6d66d20
Fix const correctness in unit tests
ReenigneArcher Jun 9, 2026
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/common/include/display_device/logging.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
* Logger::get().write(Logger::LogLevel::Info, "Hello World!");
* @examples_end
*/
void write(LogLevel log_level, std::string value);
void write(LogLevel log_level, std::string value) const;

/**
* @brief A deleted copy constructor for singleton pattern.
Expand Down
2 changes: 1 addition & 1 deletion src/common/logging.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
m_custom_callback = std::move(callback);
}

void Logger::write(const LogLevel log_level, std::string value) {
void Logger::write(const LogLevel log_level, std::string value) const {
if (!isLogLevelEnabled(log_level)) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/include/fixtures/json_converter_test.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
template<class T>
void executeTestCase(const T &input, const std::string &expected_string) {
void executeTestCase(const T &input, const std::string &expected_string) const {
bool success {false};
const auto json_string {display_device::toJson(input, std::nullopt, &success)};
EXPECT_TRUE(success);
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/general/test_retry_scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
struct TestIface {
std::vector<int> m_durations;

void nonConstMethod() { /* noop */ }
void nonConstMethod() {
m_durations.clear();
}

void constMethod() const { /* noop */ }
};
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/windows/test_settings_manager_apply.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
return *m_impl;
}

void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
EXPECT_CALL(*m_settings_persistence_api, load())
.Times(1)
.WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
EXPECT_CALL(*m_audio_context_api, isCaptured())
.Times(1)
.WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
.RetiresOnSaturation();
}

void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
EXPECT_CALL(*m_dd_api, enumAvailableDevices())
.Times(1)
.WillOnce(Return(devices))
.RetiresOnSaturation();
}

void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
.Times(1)
.WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
}
}

void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
EXPECT_CALL(*m_dd_api, isPrimary(device_id))
.Times(1)
.WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
.Times(1)
.WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
.Times(1)
.WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
// Using the "failure" path, to keep it simple
EXPECT_CALL(*m_dd_api, getCurrentTopology())
.Times(1)
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/windows/test_settings_manager_revert.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
return *m_impl;
}

void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
EXPECT_CALL(*m_settings_persistence_api, load())
.Times(1)
.WillOnce(Return(serializeState(state)))
.RetiresOnSaturation();
expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
}

void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
.Times(1)
.WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
.Times(1)
.WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
.Times(1)
.WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
.Times(1)
.WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
.RetiresOnSaturation();
}

void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
// Using the "failure" path, to keep it simple
EXPECT_CALL(*m_dd_api, getCurrentTopology())
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_api_utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
// Test fixture(s) for this file
class WinApiUtilsMocked: public BaseTest {
public:
void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= number_of_calls; ++i) {
EXPECT_CALL(m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_hdr.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

class WinDisplayDeviceHdrMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/windows/test_win_display_device_modes.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

class WinDisplayDeviceModesMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
}
}

void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
.Times(1)
.WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
}
}

void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
.Times(1)
.WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_primary.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

class WinDisplayDevicePrimaryMocked: public BaseTest {
public:
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
for (int i = 1; i <= id_number; ++i) {
EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
.Times(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/windows/test_win_display_device_topology.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

class WinDisplayDeviceTopologyMocked: public BaseTest {
public:
void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
.Times(1)
.WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor(sonar): fix cpp:S5817#253

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 2 commits into

from

Jun 9, 2026
 Merged


refactor(sonar): fix cpp:S5817
#253
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
02d4165

refactor(sonar): fix cpp:S5817


ReenigneArcher Jun 9, 2026
6d66d20

Fix const correctness in unit tests


ReenigneArcher Jun 9, 2026

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/common/include/display_device/logging.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ namespace display_device {
 * Logger::get().write(Logger::LogLevel::Info, "Hello World!");
 * @examples_end
 */
 void write(LogLevel log_level, std::string value);
 void write(LogLevel log_level, std::string value) const;

 /**
 * @brief A deleted copy constructor for singleton pattern.
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ namespace display_device {
 m_custom_callback = std::move(callback);
 }

 void Logger::write(const LogLevel log_level, std::string value) {
 void Logger::write(const LogLevel log_level, std::string value) const {
 if (!isLogLevelEnabled(log_level)) {
 return;
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/fixtures/include/fixtures/json_converter_test.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
class JsonConverterTest: public BaseTest {
public:
 template<class T>
 void executeTestCase(const T &input, const std::string &expected_string) {
 void executeTestCase(const T &input, const std::string &expected_string) const {
 bool success {false};
 const auto json_string {display_device::toJson(input, std::nullopt, &success)};
 EXPECT_TRUE(success);
Expand Down

4 changes: 3 additions & 1 deletion
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,9 @@ namespace {
 struct TestIface {
 std::vector<int> m_durations;

 void nonConstMethod() { /* noop */ }
 void nonConstMethod() {
 m_durations.clear();
 }

 void constMethod() const { /* noop */ }
 };
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/windows/test_settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) {
 void expectedDefaultCallsUntilTopologyPrep(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &topology = DEFAULT_CURRENT_TOPOLOGY, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_EMPTY) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
Expand All@@ -73,7 +73,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) {
 void expectedIsCapturedCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const bool is_captured) const {
 EXPECT_CALL(*m_audio_context_api, isCaptured())
 .Times(1)
 .WillOnce(Return(is_captured))
Expand All@@ -100,14 +100,14 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) {
 void expectedDeviceEnumCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::EnumeratedDeviceList &devices = DEFAULT_DEVICES) const {
 EXPECT_CALL(*m_dd_api, enumAvailableDevices())
 .Times(1)
 .WillOnce(Return(devices))
 .RetiresOnSaturation();
 }

 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) {
 void expectedIsTopologyTheSameCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const display_device::ActiveTopology &lhs, const display_device::ActiveTopology &rhs) const {
 EXPECT_CALL(*m_dd_api, isTopologyTheSame(lhs, rhs))
 .Times(1)
 .WillOnce(Return(lhs == rhs))
Expand DownExpand Up@@ -141,7 +141,7 @@ namespace {
 }
 }

 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) {
 void expectedIsPrimaryCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::string &device_id, const bool success = true) const {
 EXPECT_CALL(*m_dd_api, isPrimary(device_id))
 .Times(1)
 .WillOnce(Return(success))
Expand DownExpand Up@@ -169,7 +169,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) {
 void expectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::DeviceDisplayModeMap &modes) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(devices))
 .Times(1)
 .WillOnce(Return(modes))
Expand All@@ -190,7 +190,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) {
 void expectedGetCurrentHdrStatesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::set<std::string> &devices, const display_device::HdrStateMap &states) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(devices))
 .Times(1)
 .WillOnce(Return(states))
Expand All@@ -204,7 +204,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/windows/test_settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,15 +51,15 @@ namespace {
 return *m_impl;
 }

 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) {
 void expectedDefaultCallsUntilModifiedSettings(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::SingleDisplayConfigState> &state = ut_consts::SDCS_FULL) const {
 EXPECT_CALL(*m_settings_persistence_api, load())
 .Times(1)
 .WillOnce(Return(serializeState(state)))
 .RetiresOnSaturation();
 expectedDefaultCallsUntilModifiedSettingsNoPersistence(sequence);
 }

 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultCallsUntilModifiedSettingsNoPersistence(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isApiAccessAvailable())
 .Times(1)
 .WillOnce(Return(true))
Expand DownExpand Up@@ -89,7 +89,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultHdrStateGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentHdrStates(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_HDR_STATES))
Expand All@@ -103,7 +103,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultDisplayModeGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, getCurrentDisplayModes(display_device::win_utils::flattenTopology(ut_consts::SDCS_FULL->m_modified.m_topology)))
 .Times(1)
 .WillOnce(Return(CURRENT_MODIFIED_DISPLAY_MODES))
Expand All@@ -117,7 +117,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) {
 void expectedDefaultPrimaryDeviceGuardInitCall(InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_dd_api, isPrimary("DeviceId1"))
 .Times(1)
 .WillOnce(Return(false))
Expand DownExpand Up@@ -231,7 +231,7 @@ namespace {
 .RetiresOnSaturation();
 }

 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) {
 void expectedHdrWorkaroundCalls(InSequence &sequence /* To ensure that sequence is created outside this scope */) const {
 // Using the "failure" path, to keep it simple
 EXPECT_CALL(*m_dd_api, getCurrentTopology())
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ namespace {
 // Test fixture(s) for this file
 class WinApiUtilsMocked: public BaseTest {
 public:
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallForValidPaths(int number_of_calls, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= number_of_calls; ++i) {
 EXPECT_CALL(m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ namespace {

 class WinDisplayDeviceHdrMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

6 changes: 3 additions & 3 deletions
tests/unit/windows/test_win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ namespace {

 class WinDisplayDeviceModesMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand All@@ -49,7 +49,7 @@ namespace {
 }
 }

 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) {
 void setupExpectedGetCurrentDisplayModesCall(InSequence &sequence /* To ensure that sequence is created outside this scope */, const std::optional<display_device::PathAndModeData> &pam = ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(pam))
Expand All@@ -60,7 +60,7 @@ namespace {
 }
 }

 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) {
 void setupExpectedGetAllDeviceIdsCall(InSequence & /* To ensure that sequence is created outside this scope */, const std::set<int> &entries = {1, 2, 3, 4}) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(display_device::QueryType::Active))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_4_ACTIVE_WITH_2_DUPLICATES))
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_primary.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDevicePrimaryMocked: public BaseTest {
 public:
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectedGetActivePathCall(int id_number, InSequence & /* To ensure that sequence is created outside this scope */) const {
 for (int i = 1; i <= id_number; ++i) {
 EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
 .Times(1)
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/windows/test_win_display_device_topology.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ namespace {

 class WinDisplayDeviceTopologyMocked: public BaseTest {
 public:
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) {
 void setupExpectCallFor3ActivePathsAndModes(const display_device::QueryType query_type, InSequence & /* To ensure that sequence is created outside this scope */) const {
 EXPECT_CALL(*m_layer, queryDisplayConfig(query_type))
 .Times(1)
 .WillOnce(Return(ut_consts::PAM_3_ACTIVE))
Expand Down
Loading