Changeset 5671 in orxonox.OLD for trunk/src/util

Timestamp:

Nov 21, 2005, 3:50:41 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: renamed class LoadParam to CLoadParam and Macro LoadParamNew to LoadParam

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (4 diffs)
• load_param.h (modified) (3 diffs)
• load_param_description.h (modified) (1 diff)

trunk/src/util/loading/load_param.cc

@@ -32 +32 @@
  * @param executor the Executor, that executes the loading procedure.
  */
-LoadParam::LoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle)
+CLoadParam::CLoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle)
 {
   this->paramName = paramName;
@@ -63 +63 @@
  * Execution-Conditions are met, they are executed here.
  */
-LoadParam::~LoadParam()
+CLoadParam::~CLoadParam()
 {
   if (likely(this->executor != NULL))
@@ -84 +84 @@
  * @param ... the default values !! must be at least count parameters!!
  */
-LoadParam* LoadParam::defaultValues(unsigned int count, ...)
+CLoadParam* CLoadParam::defaultValues(unsigned int count, ...)
 {
   if (this == NULL)
@@ -104 +104 @@
  * @returns a pointer to itself.
 */
-LoadParam* LoadParam::describe(const char* descriptionText)
+CLoadParam* CLoadParam::describe(const char* descriptionText)
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())

trunk/src/util/loading/load_param.h

@@ -45 +45 @@
  * @param FUNCTION The function of Class to Load (if you want to call &CLASS::FUNCTION write FUNCTION here).
  */
-#define LoadParamNEW(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), false)
+#define LoadParam(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
+         CLoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), false)
 
 #define LoadParam_CYCLE(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), true)
+         CLoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), true)
 
 #define LoadParamXML(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), false)
+         CLoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), false)
 
 #define LoadParamXML_CYCLE(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), true)
+         CLoadParam(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), true)
 
 
@@ -85 +85 @@
 **************************/
 //! abstract Base class for a Loadable parameter
-class LoadParam : public BaseObject
+class CLoadParam : public BaseObject
 {
   public:
-    LoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle = false);
-    ~LoadParam();
+    CLoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle = false);
+    ~CLoadParam();
 
-    LoadParam* describe(const char* descriptionText);
-    LoadParam* defaultValues(unsigned int count, ...);
+    CLoadParam* describe(const char* descriptionText);
+    CLoadParam* defaultValues(unsigned int count, ...);
 
 
@@ -101 +101 @@
     const char*              paramName;
 
-    LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this LoadParameter
+    LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this CLoadParameter
     LoadParamDescription*    paramDesc;            //!< The LoadParameterDescription of this LoadParameter
     const char*              loadString;           //!< The string loaded by this LoadParam

trunk/src/util/loading/load_param_description.h

@@ -56 +56 @@
 class LoadClassDescription
 {
-  friend class LoadParam;
+  friend class CLoadParam;
  public:
   LoadClassDescription(const char* className);