1 files changed, 4 insertions, 9 deletions
diff --git a/include/Handler.hpp b/include/Handler.hpp
index 1ae84d1..c22abe5 100644
--- a/include/Handler.hpp
+++ b/include/Handler.hpp
@@ -14,20 +14,15 @@ namespace Handler {
     typedef std::function<std::vector<json>()> description_function;
 
     struct CommandHandler {
-        CommandHandler(std::string command, handler_function *func, description_function *desc, void *payload = nullptr);
+        CommandHandler(std::string command, handler_function func, description_function desc, void *payload = nullptr);
 
-        CommandHandler(CommandHandler &&o) noexcept {
-            command = std::move(o.command);
-            func = std::move(o.func);
-            get_description = std::move(get_description);
-            payload = o.payload;
-        };
+        CommandHandler(CommandHandler &&o) noexcept;
 
         [[nodiscard]] json exec(std::string const &arguments, std::string const &session) const;
 
         std::string command;
-        handler_function *func{nullptr};
-        description_function *get_description{nullptr};
+        handler_function func{nullptr};
+        description_function get_description{nullptr};
         void *payload{nullptr};
     };