rename keycode, mousecode enumerations

This commit is contained in:
MihailRis
2025-04-02 17:39:31 +03:00
parent 9843a1fc27
commit 881edb7b28
22 changed files with 160 additions and 154 deletions
+2 -2
View File
@@ -31,12 +31,12 @@ namespace util {
nextid = o.nextid;
}
observer_handler add(std::function<bool(Types...)> handler) {
ObserverHandler add(std::function<bool(Types...)> handler) {
std::lock_guard lock(mutex);
int id = nextid++;
handlers[id] = std::move(handler);
order.push_back(id);
return observer_handler([this, id]() {
return ObserverHandler([this, id]() {
std::lock_guard lock(mutex);
handlers.erase(id);
order.erase(
+2 -2
View File
@@ -9,7 +9,7 @@ namespace util {
/// @brief Keeps shared pointers alive until destruction
class ObjectsKeeper {
std::vector<std::shared_ptr<void>> ptrs;
std::vector<observer_handler> handlers;
std::vector<ObserverHandler> handlers;
public:
ObjectsKeeper() = default;
@@ -29,7 +29,7 @@ namespace util {
ptrs.push_back(std::move(ptr));
}
virtual void keepAlive(observer_handler&& ptr) {
virtual void keepAlive(ObserverHandler&& ptr) {
handlers.emplace_back(std::move(ptr));
}
+2 -2
View File
@@ -26,11 +26,11 @@ namespace util {
nextid = o.nextid;
}
observer_handler add(runnable callback) {
ObserverHandler add(runnable callback) {
std::lock_guard lock(mutex);
int id = nextid++;
runnables[id] = std::move(callback);
return observer_handler(new int(id), [this](int* id) { //-V508
return ObserverHandler(new int(id), [this](int* id) { //-V508
std::lock_guard lock(mutex);
runnables.erase(*id);
delete id;
+8 -8
View File
@@ -2,21 +2,21 @@
#include <functional>
class observer_handler {
class ObserverHandler {
public:
observer_handler() = default;
ObserverHandler() = default;
observer_handler(std::function<void()> destructor)
ObserverHandler(std::function<void()> destructor)
: destructor(std::move(destructor)) {
}
observer_handler(const observer_handler&) = delete;
ObserverHandler(const ObserverHandler&) = delete;
observer_handler(observer_handler&& handler) noexcept
ObserverHandler(ObserverHandler&& handler) noexcept
: destructor(std::move(handler.destructor)) {
}
~observer_handler() {
~ObserverHandler() {
if (destructor) {
destructor();
}
@@ -26,9 +26,9 @@ public:
return destructor == nullptr;
}
observer_handler& operator=(const observer_handler& handler) = delete;
ObserverHandler& operator=(const ObserverHandler& handler) = delete;
observer_handler& operator=(observer_handler&& handler) noexcept {
ObserverHandler& operator=(ObserverHandler&& handler) noexcept {
if (destructor) {
destructor();
}