Move Action into item.h. Apply perfect forwarding in ctor.

Author: ManuelSchneid3r

CMakeLists.txt

@@ -54,7 +54,6 @@ set(TARGET_LIB lib${PROJECT_NAME})
 set(LIB_PUBLIC_HEADER
     ${PROJECT_BINARY_DIR}/include/albert/config.h  # generated
     ${PROJECT_BINARY_DIR}/include/albert/export.h  # generated
-    include/albert/action.h
     include/albert/albert.h
     include/albert/extension.h
     include/albert/extensionplugin.h
@@ -118,7 +117,6 @@ set(LIB_SRC
     src/app/triggersqueryhandler.h
     src/app/urlhandler.cpp
 
-    src/common/action.cpp
     src/common/extension.cpp
     src/common/item.cpp
     src/common/rankitem.cpp

include/albert/action.h

@@ -3,13 +3,50 @@
 
 #pragma once
 #include <QStringList>
-#include <albert/action.h>
 #include <albert/export.h>
+#include <functional>
 #include <vector>
 
 namespace albert
 {
 
+/// Action used by result items (\ref Item).
+class ALBERT_EXPORT Action final
+{
+public:
+
+    /// Constructs an \ref Action with the contents initialized with the data passed.
+    /// \param id \copybrief id
+    /// \param text \copybrief text
+    /// \param function \copybrief function
+    /// \param hideOnActivation \copybrief hide_on_activation
+    template<typename T1 = QString,
+             typename T2 = QString,
+             typename T3 = std::function<void()>>
+    Action(T1 &&id_,
+           T2 &&text_,
+           T3 &&function_,
+           bool hide_on_activation_ = true) noexcept :
+        id(std::forward<T1>(id_)),
+        text(std::forward<T2>(text_)),
+        function(std::forward<T3>(function_)),
+        hide_on_activation(hide_on_activation_)
+    {}
+
+    /// The identifier.
+    QString id;
+
+    /// The description.
+    QString text;
+
+    /// The function executed on activation.
+    std::function<void()> function;
+
+    /// The activation behavior.
+    bool hide_on_activation;
+};
+
+
 ///
 /// Result items displayed in the query results list
 ///