From 25db62ce1534cbd8b93b4284869229e4bd7de54d Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sat, 5 Feb 2022 12:35:39 -0500
Subject: general: Rename NewUUID to UUID, and remove the previous UUID impl

This completes the removal of the old UUID implementation.
---
 src/common/input.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/common/input.h')

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{};
 };
-- 
cgit v1.2.3