summaryrefslogtreecommitdiff
path: root/src/common/input.h
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 12:35:39 -0500
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 13:56:21 -0500
commit25db62ce1534cbd8b93b4284869229e4bd7de54d (patch)
treedd74d3fc6ba14a0de5e88778cad5b5c65fcba248 /src/common/input.h
parentdfe11d72e3eb14dee718b7fa67a673514d199f20 (diff)
general: Rename NewUUID to UUID, and remove the previous UUID impl
This completes the removal of the old UUID implementation.
Diffstat (limited to 'src/common/input.h')
-rw-r--r--src/common/input.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/input.h b/src/common/input.h
index 95d30497d..54fcb24b0 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -10,8 +10,8 @@
#include <unordered_map>
#include <utility>
#include "common/logging/log.h"
-#include "common/new_uuid.h"
#include "common/param_package.h"
+#include "common/uuid.h"
namespace Common::Input {
@@ -97,7 +97,7 @@ struct AnalogStatus {
// Button data
struct ButtonStatus {
- Common::NewUUID uuid{};
+ Common::UUID uuid{};
bool value{};
bool inverted{};
bool toggle{};
@@ -109,7 +109,7 @@ using BatteryStatus = BatteryLevel;
// Analog and digital joystick data
struct StickStatus {
- Common::NewUUID uuid{};
+ Common::UUID uuid{};
AnalogStatus x{};
AnalogStatus y{};
bool left{};
@@ -120,7 +120,7 @@ struct StickStatus {
// Analog and digital trigger data
struct TriggerStatus {
- Common::NewUUID uuid{};
+ Common::UUID uuid{};
AnalogStatus analog{};
ButtonStatus pressed{};
};