ButtonComboApi: Use C++ APIs where possible

This commit is contained in:
Maschell
2025-01-01 15:04:42 +01:00
parent 232f51ae68
commit 2db2247806
6 changed files with 59 additions and 75 deletions

View File

@@ -182,9 +182,10 @@ namespace ButtonComboUtils::API {
if (outStatus == nullptr) {
return WUPS_BUTTON_COMBO_ERROR_INVALID_ARGS;
}
// CheckComboAvailable is a static function, but we still want to make sure the identifier is valid
return ExecuteForIdentifierLocked(identifier,
[&](ButtonComboManager &manager) {
return manager.CheckComboAvailable(*options, *outStatus);
[&](ButtonComboManager &) {
return ButtonComboManager::CheckComboAvailable(*options, *outStatus);
});
}
WUPSButtonCombo_Error DetectButtonCombo_Blocking(void *identifier,
@@ -193,9 +194,10 @@ namespace ButtonComboUtils::API {
if (options == nullptr || outButtonCombo == nullptr) {
return WUPS_BUTTON_COMBO_ERROR_INVALID_ARGS;
}
// DetectButtonCombo_Blocking is a static function, but we still want to make sure the identifier is valid
return ExecuteForIdentifierLocked(identifier,
[&](ButtonComboManager &manager) {
return manager.DetectButtonCombo_Blocking(*options, *outButtonCombo);
[&](ButtonComboManager &) {
return ButtonComboManager::DetectButtonCombo_Blocking(*options, *outButtonCombo);
});
}
} // namespace ButtonComboUtils::API

View File

@@ -1,6 +1,6 @@
#pragma once
#include <wups/button_combo.h>
#include <wups/button_combo/defines.h>
#include <cstdint>