Merge pull request #46 from InputActions/variablewrapper-rename

rename VariableWrapper to TypedVariable

Author: taj-ny

src/CMakeLists.txt

@@ -129,10 +129,10 @@ set(libinputactions_SRCS
     libinputactions/triggers/Trigger.cpp
     libinputactions/variables/ComputedVariable.cpp
     libinputactions/variables/StoredVariable.cpp
+    libinputactions/variables/TypedVariable.h
     libinputactions/variables/Variable.cpp
     libinputactions/variables/VariableOperations.cpp
     libinputactions/variables/VariableRegistry.cpp
-    libinputactions/variables/VariableWrapper.h
     libinputactions/globals.cpp
     libinputactions/InputActionsMain.cpp
     libinputactions/PointF.cpp

src/libinputactions/actions/WindowActivateAction.h

@@ -20,7 +20,7 @@
 
 #include "Action.h"
 #include <libinputactions/Value.h>
-#include <libinputactions/variables/VariableWrapper.h>
+#include <libinputactions/variables/TypedVariable.h>
 
 namespace InputActions
 {
@@ -35,7 +35,7 @@ class WindowActivateAction : public Action
 
 private:
     Value<QString> m_targetWindowId;
-    VariableWrapper<QString> m_previousWindowIdVariable;
+    TypedVariable<QString> m_previousWindowIdVariable;
 };
 
 }

src/libinputactions/handlers/TriggerHandler.h

@@ -20,7 +20,7 @@
 
 #include <QTimer>
 #include <libinputactions/triggers/Trigger.h>
-#include <libinputactions/variables/VariableWrapper.h>
+#include <libinputactions/variables/TypedVariable.h>
 
 namespace InputActions
 {
@@ -147,12 +147,12 @@ class TriggerHandler : public QObject
     std::vector<std::unique_ptr<Trigger>> m_triggers;
     std::vector<Trigger *> m_activeTriggers;
 
-    VariableWrapper<QString> m_windowIdVariable;
-    VariableWrapper<QString> m_windowUnderFingersIdVariable;
-    VariableWrapper<QString> m_windowUnderPointerIdVariable;
-    VariableWrapper<QString> m_initialWindowIdVariable;
-    VariableWrapper<QString> m_initialWindowUnderFingersIdVariable;
-    VariableWrapper<QString> m_initialWindowUnderPointerIdVariable;
+    TypedVariable<QString> m_windowIdVariable;
+    TypedVariable<QString> m_windowUnderFingersIdVariable;
+    TypedVariable<QString> m_windowUnderPointerIdVariable;
+    TypedVariable<QString> m_initialWindowIdVariable;
+    TypedVariable<QString> m_initialWindowUnderFingersIdVariable;
+    TypedVariable<QString> m_initialWindowUnderPointerIdVariable;
 
     friend class MockInputTriggerHandler;
     friend class MockKeyboardTriggerHandler;

src/libinputactions/input/backends/InputBackend.h

@@ -182,12 +182,12 @@ private slots:
 
     std::vector<InputDeviceRule> m_deviceRules;
     VariableRegistry m_deviceRulesVariableRegistry;
-    VariableWrapper<QString> m_deviceNameVariable;
-    VariableWrapper<InputDeviceTypes> m_deviceTypesVariable;
-    VariableWrapper<bool> m_deviceKeyboardVariable;
-    VariableWrapper<bool> m_deviceMouseVariable;
-    VariableWrapper<bool> m_deviceTouchpadVariable;
-    VariableWrapper<bool> m_deviceTouchscreenVariable;
+    TypedVariable<QString> m_deviceNameVariable;
+    TypedVariable<InputDeviceTypes> m_deviceTypesVariable;
+    TypedVariable<bool> m_deviceKeyboardVariable;
+    TypedVariable<bool> m_deviceMouseVariable;
+    TypedVariable<bool> m_deviceTouchpadVariable;
+    TypedVariable<bool> m_deviceTouchscreenVariable;
 
     std::unique_ptr<KeyboardTriggerHandler> m_keyboardTriggerHandler;
     std::unique_ptr<MouseTriggerHandler> m_mouseTriggerHandler;

…inputactions/variables/VariableWrapper.h …ibinputactions/variables/TypedVariable.hsrc/libinputactions/variables/VariableWrapper.h renamed to src/libinputactions/variables/TypedVariable.h src/libinputactions/variables/VariableWrapper.h renamed to src/libinputactions/variables/TypedVariable.h

@@ -24,10 +24,10 @@ namespace InputActions
 {
 
 template<typename T>
-class VariableWrapper
+class TypedVariable
 {
 public:
-    VariableWrapper(Variable *variable)
+    TypedVariable(Variable *variable)
         : m_variable(variable)
     {
     }

src/libinputactions/variables/VariableRegistry.h

@@ -20,7 +20,7 @@
 
 #include "ComputedVariable.h"
 #include "StoredVariable.h"
-#include "VariableWrapper.h"
+#include "TypedVariable.h"
 #include <QObject>
 #include <QProcess>
 #include <QString>
@@ -82,7 +82,7 @@ class VariableRegistry : public QObject
     Q_INVOKABLE Variable *variable(const QString &name) const;
 
     template<typename T>
-    std::optional<VariableWrapper<T>> variable(const VariableInfo<T> &info) const
+    std::optional<TypedVariable<T>> variable(const VariableInfo<T> &info) const
     {
         return variable<T>(info.name);
     }
@@ -91,7 +91,7 @@ class VariableRegistry : public QObject
      * @return A statically-typed wrapper for the specified variable, nullptr if not found or type doesn't match.
      */
     template<typename T>
-    std::optional<VariableWrapper<T>> variable(const QString &name) const
+    std::optional<TypedVariable<T>> variable(const QString &name) const
     {
         auto *result = variable(name);
         if (!result) {
@@ -102,14 +102,14 @@ class VariableRegistry : public QObject
             return {};
         }
 
-        return VariableWrapper<T>(result);
+        return TypedVariable<T>(result);
     }
 
     bool contains(const QString &name) const;
 
     Variable *registerVariable(const QString &name, std::unique_ptr<Variable> variable, bool hidden = false);
     template<typename T>
-    VariableWrapper<T> registerStored(const QString &name, bool hidden = false)
+    TypedVariable<T> registerStored(const QString &name, bool hidden = false)
     {
         return {registerVariable(name, std::make_unique<StoredVariable>(QMetaType::fromType<T>()), hidden)};
     }