Changes in src/Actions/Action_impl_pre.hpp [e4afb4:b4fa106]

File:

• src/Actions/Action_impl_pre.hpp (modified) (8 diffs)

src/Actions/Action_impl_pre.hpp

@@ -42 +42 @@
 #include <boost/preprocessor/seq/transform.hpp>
 
-// some derived names: if CATEGORY is not given, we don't prefix with it
-#ifdef CATEGORY
+// some derived names
 #define ACTION BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Action))
 #define COMMAND BOOST_PP_CAT(CATEGORY, ACTIONNAME)
 #define STATE BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, State))
 #define PARAMS BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
-#else
-#define ACTION BOOST_PP_CAT(ACTIONNAME, Action)
-#define COMMAND ACTIONNAME
-#define STATE BOOST_PP_CAT(ACTIONNAME, State)
-#define PARAMS BOOST_PP_CAT(ACTIONNAME, Parameters)
-#endif
-#define INSTANCE BOOST_PP_CAT(this_, BOOST_PP_CAT(ACTIONNAME, _instance))
 
 // check if no lists given
@@ -69 +61 @@
 
 // check user has given name and category
+#ifndef CATEGORY
+ERROR: No "CATEGORY" defined in: __FILE__
+#endif
+
 #ifndef ACTIONNAME
 ERROR: No "ACTIONNAME" defined in: __FILE__
@@ -114 +110 @@
   >(\
   BOOST_PP_SEQ_ELEM(n, paramtokens)\
-  , Traits.getDescription()\
-  );
+  , ValueStorage::getInstance().getDescription(\
+  BOOST_PP_SEQ_ELEM(n, paramtokens)\
+  ));
 
 // prints set/queryCurrentValue (command) for paramreferences and paramtokens
@@ -128 +125 @@
 #include "Actions/ActionRegistry.hpp"
 #include "UIElements/Dialog.hpp"
-
-#ifdef paramtokens
-#define statenecessary 1
-#endif
-#ifndef statetokens
-#define statenecessary 1
-#endif
+#include "Actions/ValueStorage.hpp"
+
 
 // =========== memento to remember the state when undoing ===========
-#ifdef statenecessary
 class STATE : public ActionState {
 public:
@@ -163 +154 @@
   ACTION::PARAMS params;
 };
-#endif /* statenecessary */
-
-// (const) prototype to be placed into the ActionRegistry (must be deleted by registry itself)
-const ACTION INSTANCE;
+
+// =========== name of action ===========
+const char ACTION::NAME[] = TOKEN;
 
 // =========== constructor ===========
 ACTION::ACTION () :
-  Action(ActionTrait<ACTION>())
+  Action(NAME)
 {}
 
 // =========== destructor ===========
 ACTION::~ACTION ()
-{
-  //std::cout << "Action ACTION is being destroyed." << std::endl;
-}
+{}
 
 // =========== fill a dialog ===========
@@ -183 +171 @@
         ASSERT(dialog,"No Dialog given when filling actionname's dialog");
 #if BOOST_PP_EQUAL(MAXPARAMTYPES,0)
-        dialog->queryEmpty(TOKEN, Traits.getDescription());
+        dialog->queryEmpty(NAME, ValueStorage::getInstance().getDescription(NAME));
 #else
 #define BOOST_PP_LOCAL_MACRO(n) dialog_print(~, n, ~)
@@ -204 +192 @@
 {
   ACTION::PARAMS params;
-  Action *ToCall = ActionRegistry::getInstance().getActionByName( TOKEN ); //->clone(params);
+  Action *ToCall = ActionRegistry::getInstance().getActionByName( ACTION::NAME ); //->clone(params);
 #if BOOST_PP_NOT_EQUAL(MAXPARAMTYPES,0)
 #define BOOST_PP_LOCAL_MACRO(n) value_print(~, n, setCurrentValue, )
@@ -235 +223 @@
 #undef PARAMS
 #undef STATE
-#undef INSTANCE
 
 #undef ACTIONNAME