refactor(sonar): fix cpp:S112#260

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

refactor(sonar): fix cpp:S112 #260

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
m_filepath {std::move(filepath)} {
if (m_filepath.empty()) {
throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/common/include/display_device/detail/json_serializer_details.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
// system includes
#include <nlohmann/json.hpp>
#include <stdexcept>

// Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
#define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
const auto &map {getEnumMap(T {})};
auto it {std::find_if(std::begin(map), std::end(map), predicate)};
if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
}
return it;
}
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
if (!found) {
const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
throw std::runtime_error(error);
throw std::invalid_argument(error);
}
}
};
Expand Down
11 changes: 6 additions & 5 deletions src/common/include/display_device/retry_scheduler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
* @param iface Interface to be passed around to the executor functions.
*/
explicit RetryScheduler(std::unique_ptr<T> iface):
m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
m_thread {[this]() {
std::unique_lock lock {m_mutex};
while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
*/
void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
if (!exec_fn) {
throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
}

if (options.m_sleep_durations.empty()) {
throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
}

if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
return duration == std::chrono::milliseconds::zero();
})) {
throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
}

std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

if constexpr (detail::OptionalFunction<FunctionT>) {
if (!exec_fn) {
throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
}
}

Expand Down
12 changes: 11 additions & 1 deletion src/windows/persistent_state.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
namespace {
class PersistentStateLoadException final: public std::runtime_error {
public:
using std::runtime_error::runtime_error;
};
} // namespace

PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
m_settings_persistence_api {std::move(settings_persistence_api)} {
if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

if (!error_message.empty()) {
if (throw_on_load_error) {
throw std::runtime_error {error_message};
throw PersistentStateLoadException {error_message};
}

DD_LOG(error) << error_message;
Expand Down
7 changes: 5 additions & 2 deletions src/windows/settings_manager_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
m_persistence_state {std::move(persistent_state)},
m_workarounds {std::move(workarounds)} {
if (!m_dd_api) {
throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
}

if (!m_audio_context_api) {
m_audio_context_api = std::make_shared<NoopAudioContext>();
}

if (!m_persistence_state) {
throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
}

DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down
5 changes: 4 additions & 1 deletion src/windows/win_display_device_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
m_w_api {std::move(w_api)} {
if (!m_w_api) {
throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
}
}

Expand Down
3 changes: 2 additions & 1 deletion tests/unit/general/test_file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
EXPECT_THAT([]() {
const display_device::FileSettingsPersistence persistence {{}};
},
ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/general/test_retry_scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
EXPECT_THAT([]() {
const display_device::RetryScheduler<TestIface> scheduler(nullptr);
},
ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
EXPECT_THAT([&]() {
m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
},
ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
},
{.m_sleep_durations = {}});
},
ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
},
{.m_sleep_durations = {0ms}});
},
ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

EXPECT_TRUE(m_impl.isScheduled());
m_impl.schedule([](auto, auto &) {
throw std::runtime_error("Get rekt!");
throw SchedulerStopTokenTestException {};
},
{.m_sleep_durations = {1ms}});
EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
EXPECT_EQ(output, "");
m_impl.schedule([&first_call](auto, auto &) {
if (!first_call) {
throw std::runtime_error("Get rekt!");
throw SchedulerStopTokenTestException {};
}
first_call = false;
},
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
auto &non_const_impl {m_impl};
non_const_impl.execute(std::function<void(TestIface &)> {});
},
ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
auto &const_impl {m_impl};
const_impl.execute(std::function<void(TestIface &)> {});
},
ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down
7 changes: 5 additions & 2 deletions tests/unit/windows/test_settings_manager_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
EXPECT_THAT([]() {
const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
},
ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
EXPECT_THAT([this]() {
const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
},
ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/windows/test_win_display_device_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
EXPECT_THAT([]() {
const auto win_dd {display_device::WinDisplayDevice {nullptr}};
},
ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down
, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down

, '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:S112#260

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jun 9, 2026
 Merged


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

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <algorithm>
#include <fstream>
#include <iterator>
#include <stdexcept>

// local includes
#include "display_device/logging.h"
Expand All@@ -17,7 +18,7 @@ namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
 m_filepath {std::move(filepath)} {
 if (m_filepath.empty()) {
 throw std::runtime_error {"Empty filename provided for FileSettingsPersistence!"};
 throw std::invalid_argument {"Empty filename provided for FileSettingsPersistence!"};
 }
 }

Expand Down

5 changes: 3 additions & 2 deletions
src/common/include/display_device/detail/json_serializer_details.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
#ifdef DD_JSON_DETAIL
 // system includes
 #include <nlohmann/json.hpp>
 #include <stdexcept>

 // Special versions of the NLOHMANN definitions to remove the "m_" prefix in string form ('cause I like it that way ;P)
 #define DD_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.m_##v1;
Expand DownExpand Up@@ -85,7 +86,7 @@ namespace display_device {
 const auto &map {getEnumMap(T {})};
 auto it {std::find_if(std::begin(map), std::end(map), predicate)};
 if (it == std::end(map)) { // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::runtime_error(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 throw std::out_of_range(error_msg); // GCOVR_EXCL_BR_LINE for fallthrough branch
 }
 return it;
 }
Expand DownExpand Up@@ -131,7 +132,7 @@ namespace nlohmann {
 const bool found {(display_device::detail::variantFromJson<Ts>(nlohmann_json_j, nlohmann_json_t) || ...)};
 if (!found) {
 const std::string error {"Could not parse variant from type " + nlohmann_json_j.at("type").get<std::string>() + "!"};
 throw std::runtime_error(error);
 throw std::invalid_argument(error);
 }
 }
 };
Expand Down

11 changes: 6 additions & 5 deletions
src/common/include/display_device/retry_scheduler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#include <condition_variable>
#include <functional>
#include <memory>
#include <stdexcept>
#include <thread>

// local includes
Expand DownExpand Up@@ -147,7 +148,7 @@ namespace display_device {
 * @param iface Interface to be passed around to the executor functions.
 */
 explicit RetryScheduler(std::unique_ptr<T> iface):
 m_iface {iface ? std::move(iface) : throw std::logic_error {"Nullptr interface provided in RetryScheduler!"}},
 m_iface {iface ? std::move(iface) : throw std::invalid_argument {"Nullptr interface provided in RetryScheduler!"}},
 m_thread {[this]() {
 std::unique_lock lock {m_mutex};
 while (m_keep_alive) {
Expand DownExpand Up@@ -218,17 +219,17 @@ namespace display_device {
 */
 void schedule(std::function<void(T &, SchedulerStopToken &stop_token)> exec_fn, const SchedulerOptions &options) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::schedule!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::schedule!"};
 }

 if (options.m_sleep_durations.empty()) {
 throw std::logic_error {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 throw std::invalid_argument {"At least 1 sleep duration must be specified in RetryScheduler::schedule!"};
 }

 if (std::ranges::any_of(options.m_sleep_durations, [&](const auto &duration) {
 return duration == std::chrono::milliseconds::zero();
 })) {
 throw std::logic_error {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 throw std::invalid_argument {"All of the durations specified in RetryScheduler::schedule must be larger than a 0!"};
 }

 std::lock_guard lock {m_mutex};
Expand DownExpand Up@@ -348,7 +349,7 @@ namespace display_device {

 if constexpr (detail::OptionalFunction<FunctionT>) {
 if (!exec_fn) {
 throw std::logic_error {"Empty callback function provided in RetryScheduler::execute!"};
 throw std::invalid_argument {"Empty callback function provided in RetryScheduler::execute!"};
 }
 }

Expand Down

12 changes: 11 additions & 1 deletion
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,22 @@
// class header include
#include "display_device/windows/persistent_state.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 namespace {
 class PersistentStateLoadException final: public std::runtime_error {
 public:
 using std::runtime_error::runtime_error;
 };
 } // namespace

 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const bool throw_on_load_error):
 m_settings_persistence_api {std::move(settings_persistence_api)} {
 if (!m_settings_persistence_api) {
Expand All@@ -31,7 +41,7 @@ namespace display_device {

 if (!error_message.empty()) {
 if (throw_on_load_error) {
 throw std::runtime_error {error_message};
 throw PersistentStateLoadException {error_message};
 }

 DD_LOG(error) << error_message;
Expand Down

7 changes: 5 additions & 2 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/settings_manager.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"
Expand All@@ -22,15 +25,15 @@ namespace display_device {
 m_persistence_state {std::move(persistent_state)},
 m_workarounds {std::move(workarounds)} {
 if (!m_dd_api) {
 throw std::logic_error {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for WinDisplayDeviceInterface in SettingsManager!"};
 }

 if (!m_audio_context_api) {
 m_audio_context_api = std::make_shared<NoopAudioContext>();
 }

 if (!m_persistence_state) {
 throw std::logic_error {"Nullptr provided for PersistentState in SettingsManager!"};
 throw std::invalid_argument {"Nullptr provided for PersistentState in SettingsManager!"};
 }

 DD_LOG(info) << "Provided workaround settings for SettingsManager:\n"
Expand Down

5 changes: 4 additions & 1 deletion
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
// class header include
#include "display_device/windows/win_display_device.h"

// system includes
#include <stdexcept>

// local includes
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"
Expand All@@ -13,7 +16,7 @@ namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
 m_w_api {std::move(w_api)} {
 if (!m_w_api) {
 throw std::logic_error {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 throw std::invalid_argument {"Nullptr provided for WinApiLayerInterface in WinDisplayDevice!"};
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/general/test_file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// system includes
#include <fstream>
#include <gmock/gmock.h>
#include <stdexcept>

// local includes
#include "display_device/file_settings_persistence.h"
Expand DownExpand Up@@ -39,7 +40,7 @@ TEST_F_S(EmptyFilenameProvided) {
 EXPECT_THAT([]() {
 const display_device::FileSettingsPersistence persistence {{}};
 },
 ThrowsMessage<std::runtime_error>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty filename provided for FileSettingsPersistence!")));
}

TEST_F_S(Store, NewFileCreated) {
Expand Down

16 changes: 8 additions & 8 deletions
tests/unit/general/test_retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,14 +51,14 @@ TEST_F_S(NullptrInterfaceProvided) {
 EXPECT_THAT([]() {
 const display_device::RetryScheduler<TestIface> scheduler(nullptr);
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr interface provided in RetryScheduler!")));
}

TEST_F_S(Schedule, NullptrCallbackProvided) {
 EXPECT_THAT([&]() {
 m_impl.schedule(nullptr, {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, NoDurations) {
Expand All@@ -67,7 +67,7 @@ TEST_F_S(Schedule, NoDurations) {
 },
 {.m_sleep_durations = {}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("At least 1 sleep duration must be specified in RetryScheduler::schedule!")));
}

TEST_F_S(Schedule, ZeroDuration) {
Expand All@@ -76,7 +76,7 @@ TEST_F_S(Schedule, ZeroDuration) {
 },
 {.m_sleep_durations = {0ms}});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("All of the durations specified in RetryScheduler::schedule must be larger than a 0!")));
}

TEST_F_S(Schedule, SchedulingDurations) {
Expand DownExpand Up@@ -305,7 +305,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringImmediateCall) {

 EXPECT_TRUE(m_impl.isScheduled());
 m_impl.schedule([](auto, auto &) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 },
 {.m_sleep_durations = {1ms}});
 EXPECT_FALSE(m_impl.isScheduled());
Expand DownExpand Up@@ -337,7 +337,7 @@ TEST_F_S(Schedule, ExceptionThrown, DuringScheduledCall) {
 EXPECT_EQ(output, "");
 m_impl.schedule([&first_call](auto, auto &) {
 if (!first_call) {
 throw std::runtime_error("Get rekt!");
 throw SchedulerStopTokenTestException {};
 }
 first_call = false;
 },
Expand DownExpand Up@@ -367,7 +367,7 @@ TEST_F_S(Execute, NonConst, NullptrCallbackProvided) {
 auto &non_const_impl {m_impl};
 non_const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, Const, NullptrCallbackProvided) {
Expand All@@ -376,7 +376,7 @@ TEST_F_S(Execute, Const, NullptrCallbackProvided) {
 auto &const_impl {m_impl};
 const_impl.execute(std::function<void(TestIface &)> {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Empty callback function provided in RetryScheduler::execute!")));
}

TEST_F_S(Execute, SchedulerNotStopped) {
Expand Down

7 changes: 5 additions & 2 deletions
tests/unit/windows/test_settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
// system includes
#include <stdexcept>

// local includes
#include "display_device/noop_audio_context.h"
#include "display_device/noop_settings_persistence.h"
Expand DownExpand Up@@ -44,7 +47,7 @@ TEST_F_S_MOCKED(NullptrDisplayDeviceApiProvided) {
 EXPECT_THAT([]() {
 const display_device::SettingsManager settings_manager(nullptr, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinDisplayDeviceInterface in SettingsManager!")));
}

TEST_F_S_MOCKED(NoopAudioContext) {
Expand All@@ -62,7 +65,7 @@ TEST_F_S_MOCKED(NullptrPersistentStateProvided) {
 EXPECT_THAT([this]() {
 const display_device::SettingsManager settings_manager(m_dd_api, nullptr, nullptr, {});
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for PersistentState in SettingsManager!")));
}

TEST_F_S_MOCKED(EnumAvailableDevices) {
Expand Down

3 changes: 2 additions & 1 deletion
tests/unit/windows/test_win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
// system includes
#include <format>
#include <stdexcept>

// local includes
#include "display_device/windows/settings_utils.h"
Expand DownExpand Up@@ -44,7 +45,7 @@ TEST_F_S(NullptrLayerProvided) {
 EXPECT_THAT([]() {
 const auto win_dd {display_device::WinDisplayDevice {nullptr}};
 },
 ThrowsMessage<std::logic_error>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
 ThrowsMessage<std::invalid_argument>(HasSubstr("Nullptr provided for WinApiLayerInterface in WinDisplayDevice!")));
}

TEST_F_S(IsApiAccessAvailable) {
Expand Down