Changes in src/Actions/Action.hpp [10fa1d:e4afb4]

File:

• src/Actions/Action.hpp (modified) (6 diffs)

src/Actions/Action.hpp

@@ -11 +11 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
+
+/** Used in .def files in paramdefaults define to set that no default value exists.
+ * We define NODEFAULT here, as it is used in .def files and needs to be present
+ * before these are included.
+ */
+#define NODEFAULT std::string()
 
 // forward declaration
@@ -17 +23 @@
 class ActionSequence;
 class Dialog;
+
+#include "Actions/ActionTraits.hpp"
 
 /**
@@ -294 +302 @@
  */
 
+
 /**
  * Base class for all actions.
@@ -319 +328 @@
    * be registered with the ActionRegistry. If the Action is registered the name of the
    * Action needs to be unique for all Actions that are registered.
-   */
-  Action(std::string _name,bool _doRegister=true);
+   *
+   * \note NO reference for \a _Traits as we do have to copy it, otherwise _Traits would have
+   * to be present throughout the program's run.
+   *
+   * \param Traits information class to this action
+   * \param _doRegister whether to register with ActionRegistry
+   */
+  Action(const ActionTraits &_Traits, bool _doRegister=true);
   virtual ~Action();
 
@@ -363 +378 @@
    * Returns the name of the Action.
    */
-  virtual const std::string getName();
+  const std::string getName();
+
+  /**
+   * Traits resemble all necessary information that "surrounds" an action, such as
+   * its name (for ActionRegistry and as ref from string to instance and vice versa),
+   * which menu, which position, what parameters, their types, if it is itself a
+   * parameter and so on ...
+   *
+   * Note that is important that we do not use a reference here. We want to copy the
+   * information in the Action's constructor and have it contained herein. Hence, we
+   * also have our own copy constructor for ActionTraits. Information should be
+   * encapsulated in the Action, no more references to the outside than absolutely
+   * necessary.
+   */
+  const ActionTraits Traits;
 
 protected:
@@ -440 +469 @@
    */
   virtual state_ptr performRedo(state_ptr)=0;
-
-  std::string name;
 };