logic: use c++14-style in-line initializers

1 files changed, 11 insertions, 1 deletions

diff --git a/logic/mappings.hpp b/logic/mappings.hpp
index 4b71e9c5..834e969e 100644
--- a/logic/mappings.hpp
+++ b/logic/mappings.hpp
@@ -30,7 +30,17 @@ class OTR_LOGIC_EXPORT Mappings final
 private:
     Map axes[6];
 public:
-    Mappings(std::vector<axis_opts*> opts);
+    template<typename t>
+    Mappings(t& opts) :
+        axes {
+            { "spline-X", "alt-spline-X", *opts[TX] },
+            { "spline-Y", "alt-spline-Y", *opts[TY] },
+            { "spline-Z", "alt-spline-Z", *opts[TZ] },
+            { "spline-yaw", "alt-spline-yaw", *opts[Yaw] },
+            { "spline-pitch", "alt-spline-pitch", *opts[Pitch] },
+            { "spline-roll", "alt-spline-roll", *opts[Roll] }
+        }
+    {}
 
     Map& operator()(int i) { return axes[i]; }
     const Map& operator()(int i) const { return axes[i]; }