summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2025-03-02 15:42:26 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2025-03-02 15:42:26 -0600
commite217d6c939900688588f5214ea188f0f505d8a09 (patch)
tree7a30de7829be97cfe9ac8e268cbe8739011a95cf /Source/Core/InputCommon
parent65726b7b5f005ce90dd38a20fe3c06c4b1338b10 (diff)
InputCommon: Use Clock from CommonTypes.
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/CoreDevice.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp3
-rw-r--r--Source/Core/InputCommon/ControllerInterface/MappingCommon.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
index 92f53df9fa..54d7b46110 100644
--- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
@@ -210,8 +210,6 @@ public:
class DeviceContainer
{
public:
- using Clock = std::chrono::steady_clock;
-
struct InputDetection
{
std::shared_ptr<Device> device;
diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
index 3765ef24a6..10ebe9a984 100644
--- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
@@ -147,8 +147,7 @@ void RemoveSpuriousTriggerCombinations(Core::InputDetector::Results* detections)
std::erase_if(*detections, is_spurious);
}
-void RemoveDetectionsAfterTimePoint(Core::InputDetector::Results* results,
- Core::DeviceContainer::Clock::time_point after)
+void RemoveDetectionsAfterTimePoint(Core::InputDetector::Results* results, Clock::time_point after)
{
const auto is_after_time = [&](const Core::InputDetector::Detection& detection) {
return detection.release_time.value_or(after) >= after;
diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.h b/Source/Core/InputCommon/ControllerInterface/MappingCommon.h
index f58813a50c..62c1a8f281 100644
--- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.h
+++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.h
@@ -4,7 +4,6 @@
#pragma once
#include <string>
-#include <vector>
#include "InputCommon/ControllerInterface/CoreDevice.h"
@@ -25,8 +24,7 @@ std::string BuildExpression(const Core::InputDetector::Results&,
const Core::DeviceQualifier& default_device, Quote quote);
void RemoveSpuriousTriggerCombinations(Core::InputDetector::Results*);
-void RemoveDetectionsAfterTimePoint(Core::InputDetector::Results*,
- Core::DeviceContainer::Clock::time_point after);
+void RemoveDetectionsAfterTimePoint(Core::InputDetector::Results*, Clock::time_point after);
bool ContainsCompleteDetection(const Core::InputDetector::Results&);
} // namespace ciface::MappingCommon