Headeronly

f3d-app · Dec 3, 2024 · c25a76a · c25a76a
1 parent 4ea1976
commit c25a76a
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 77 deletions.
diff --git a/library/public/interactor.h b/library/public/interactor.h
@@ -36,24 +36,85 @@ struct F3D_EXPORT interaction_bind_t
    * Operator to be able to store binds in maps and other structs
    * Compare modifier and interaction
    */
-  bool operator<(const interaction_bind_t& bind) const;
+  bool operator<(const interaction_bind_t& bind) const
+  {
+    return this->mod < bind.mod || (this->mod == bind.mod && this->inter < bind.inter);
+  }
 
   /**
    * Operator to be able to store binds in maps and other structs
    * Compare modifier and interaction
    */
-  bool operator==(const interaction_bind_t& bind) const;
+  bool operator==(const interaction_bind_t& bind) const
+  {
+    return this->mod == bind.mod && this->inter == bind.inter;
+  }
 
   /**
    * Format this binding into a string
    * eg: "A", "Any+Question", "Shift+L".
    */
-  std::string format() const;
+  std::string format() const
+  {
+    switch (this->mod)
+    {
+      case ModifierKeys::CTRL_SHIFT:
+        return "Ctrl+Shift+" + this->inter;
+      case ModifierKeys::CTRL:
+        return "Ctrl+" + this->inter;
+      case ModifierKeys::SHIFT:
+        return "Shift+" + this->inter;
+      case ModifierKeys::ANY:
+        return "Any+" + this->inter;
+      default:
+        // No need to check for NONE
+        return this->inter;
+    }
+  }
 
   /**
    * Create and return an interaction bind from provided string
    */
-  static interaction_bind_t parse(const std::string& str);
+  static interaction_bind_t parse(const std::string& str)
+  {
+    interaction_bind_t bind;
+    auto plusIt = str.find_last_of('+');
+    if (plusIt == std::string::npos)
+    {
+      bind.inter = str;
+    }
+    else
+    {
+      bind.inter = str.substr(plusIt + 1);
+
+      std::string modStr = str.substr(0, plusIt);
+      if (modStr == "Ctrl+Shift")
+      {
+        bind.mod = ModifierKeys::CTRL_SHIFT;
+      }
+      else if (modStr == "Shift")
+      {
+        bind.mod = ModifierKeys::SHIFT;
+      }
+      else if (modStr == "Ctrl")
+      {
+        bind.mod = ModifierKeys::CTRL;
+      }
+      else if (modStr == "Any")
+      {
+        bind.mod = ModifierKeys::ANY;
+      }
+      else if (modStr == "None")
+      {
+        bind.mod = ModifierKeys::NONE;
+      }
+      else
+      {
+        f3d::log::warn("Invalid modifier: ", modStr, ", ignoring modifier");
+      }
+    }
+    return bind;
+  }
 };
 
 /**

diff --git a/library/src/interactor.cxx b/library/src/interactor.cxx
@@ -2,79 +2,6 @@
 
 namespace f3d
 {
-//----------------------------------------------------------------------------
-bool interaction_bind_t::operator<(const interaction_bind_t& bind) const
-{
-  return this->mod < bind.mod || (this->mod == bind.mod && this->inter < bind.inter);
-}
-
-//----------------------------------------------------------------------------
-bool interaction_bind_t::operator==(const interaction_bind_t& bind) const
-{
-  return this->mod == bind.mod && this->inter == bind.inter;
-}
-
-//----------------------------------------------------------------------------
-std::string interaction_bind_t::format() const
-{
-  switch (this->mod)
-  {
-    case ModifierKeys::CTRL_SHIFT:
-      return "Ctrl+Shift+" + this->inter;
-    case ModifierKeys::CTRL:
-      return "Ctrl+" + this->inter;
-    case ModifierKeys::SHIFT:
-      return "Shift+" + this->inter;
-    case ModifierKeys::ANY:
-      return "Any+" + this->inter;
-    default:
-      // No need to check for NONE
-      return this->inter;
-  }
-}
-
-//----------------------------------------------------------------------------
-interaction_bind_t interaction_bind_t::parse(const std::string& str)
-{
-  interaction_bind_t bind;
-  auto plusIt = str.find_last_of('+');
-  if (plusIt == std::string::npos)
-  {
-    bind.inter = str;
-  }
-  else
-  {
-    bind.inter = str.substr(plusIt + 1);
-
-    std::string modStr = str.substr(0, plusIt);
-    if (modStr == "Ctrl+Shift")
-    {
-      bind.mod = ModifierKeys::CTRL_SHIFT;
-    }
-    else if (modStr == "Shift")
-    {
-      bind.mod = ModifierKeys::SHIFT;
-    }
-    else if (modStr == "Ctrl")
-    {
-      bind.mod = ModifierKeys::CTRL;
-    }
-    else if (modStr == "Any")
-    {
-      bind.mod = ModifierKeys::ANY;
-    }
-    else if (modStr == "None")
-    {
-      bind.mod = ModifierKeys::NONE;
-    }
-    else
-    {
-      f3d::log::warn("Invalid modifier: ", modStr, ", ignoring modifier");
-    }
-  }
-  return bind;
-}
-
 //----------------------------------------------------------------------------
 interactor::already_exists_exception::already_exists_exception(const std::string& what)
   : exception(what)