Changeset 9767 in orxonox.OLD for branches/new_class_id/src

Timestamp:

Sep 19, 2006, 5:58:08 PM (18 years ago)

Author:

bensch

Message:

compiles again for real… this time it is true

Location:

branches/new_class_id/src

Files:

• lib/util/loading/load_param_class_description.h (modified) (2 diffs)
• lib/util/loading/load_param_description.cc (modified) (4 diffs)
• lib/util/loading/load_param_description.h (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

branches/new_class_id/src/lib/util/loading/load_param_class_description.h

@@ -35 +35 @@
   ~LoadParamClassDescription();
 
-  bool operator==(const std::string& className) const { return this->className == className; };
-  bool operator==(const LoadParamClassDescription& classDescr) const { return this->className == classDescr.className; };
-  bool operator<(const LoadParamClassDescription& classDescr) const { return this->className < classDescr.className; }
-
-  static LoadParamClassDescription* addClass(const std::string& className);
-  LoadParamDescription* addParam(const std::string& paramName);
+  bool operator==(const std::string& className) const { return this->_className == className; };
+  bool operator==(const LoadParamClassDescription& classDescr) const { return this->_className == classDescr._className; };
+  bool operator<(const LoadParamClassDescription& classDescr) const { return this->_className < classDescr._className; }
 
   static void deleteAllDescriptions();
+
+
 
   static void printAll(const std::string& fileName = "");
@@ -52 +51 @@
   typedef std::set<LoadParamDescription>       ParamDescriptionSet;
 
-  static bool                                  parametersDescription;  //!< if parameter-description should be enabled.
-  static ClassDescriptionSet*                  classList;              //!< a list, that stores all the loadable classes. (after one instance has been loaded)
-  std::string                                  className;              //!< name of the class
+  static bool                                  _parametersDescription;  //!< if parameter-description should be enabled globally.
 
-  ParamDescriptionSet                          parameters;              //!< List of parameters this class knows.
+  static ClassDescriptionSet*                  _classList;              //!< a list, that stores all the loadable classes. (after one instance has been loaded)
+
+private:
+  std::string                                  _className;              //!< name of the class
+  ParamDescriptionSet                          _parameters;              //!< List of parameters this class knows.
 };
 

branches/new_class_id/src/lib/util/loading/load_param_description.cc

@@ -23 +23 @@
  */
 LoadParamDescription::LoadParamDescription(const std::string& paramName)
-  : name(paramName)
+  : _name(paramName)
 { }
 
@@ -38 +38 @@
 void LoadParamDescription::setDescription(const std::string& descriptionText)
 {
-  this->description = descriptionText;
+  this->_description = descriptionText;
 }
 
@@ -46 +46 @@
 void LoadParamDescription::print() const
 {
-  PRINT(3)(" <%s>", this->name.c_str());
-  for (unsigned int i = 0; i < this->parameterCount; i++)
+  PRINT(3)(" <%s>", this->_name.c_str());
+  for (unsigned int i = 0; i < this->_parameterCount; i++)
   {
     if (i > 0)
@@ -83 +83 @@
 //     }
   }
-  PRINT(3)("</%s>", this->name.c_str());
-  if (!this->description.empty())
-    PRINT(3)(" -- %s", this->description.c_str());
+  PRINT(3)("</%s>", this->_name.c_str());
+  if (!this->_description.empty())
+    PRINT(3)(" -- %s", this->_description.c_str());
   // default values
-  if (this->parameterCount > 0)
+  if (this->_parameterCount > 0)
   {
     PRINT(3)(" (Default: ");
-    for (unsigned int i = 0; i < this->parameterCount; i++)
+    for (unsigned int i = 0; i < this->_parameterCount; i++)
     {
       if (i > 0)
         PRINT(3)(", ");
-      if (this->types[i] == "string")
+      if (this->_types[i] == "string")
       { // leave brackets !!
-        PRINT(3)("\"%s\"", this->defaultValues[i].c_str());
+        PRINT(3)("\"%s\"", this->_defaultValues[i].c_str());
       }
       else
       {
-        PRINT(3)("%s", this->defaultValues[i].c_str());
+        PRINT(3)("%s", this->_defaultValues[i].c_str());
       }
     }

branches/new_class_id/src/lib/util/loading/load_param_description.h

@@ -38 +38 @@
   ~LoadParamDescription();
 
-  bool operator==(const std::string& paramName) const { return this->name == paramName; };
-  bool operator==(const LoadParamDescription& paramDescr) const { return this->name == paramDescr.name; };
-  bool operator<(const LoadParamDescription& paramDescr) const { return this->name < paramDescr.name; };
+  bool operator==(const std::string& paramName) const { return this->_name == paramName; };
+  bool operator==(const LoadParamDescription& paramDescr) const { return this->_name == paramDescr._name; };
+  bool operator<(const LoadParamDescription& paramDescr) const { return this->_name < paramDescr._name; };
 
   void setDescription(const std::string& descriptionText);
   /** @returns the descriptionString */
-  const std::string& getDescription() { return this->description; };
+  const std::string& description() { return this->_description; };
 
   void print() const;
 
 private:
-  const std::string          name;                  //!< The Name of the Parameter.
-  unsigned int               parameterCount;        //!< The Count of parameters.
-  std::string                description;           //!< A longer description about this function.
+  const std::string          _name;                  //!< The Name of the Parameter.
+  unsigned int               _parameterCount;        //!< The Count of parameters.
+  std::string                _description;           //!< A longer description about this function.
 
-  std::vector<std::string>   types;
-  std::vector<std::string>   defaultValues;
-
+  std::vector<std::string>   _types;
+  std::vector<std::string>   _defaultValues;
 };
 

branches/new_class_id/src/orxonox.cc

@@ -53 +53 @@
 #include "shell_buffer.h"
 
-#include "util/loading/load_param_description.h"
+#include "util/loading/load_param_class_description.h"
 
 #include "network_manager.h"
@@ -129 +129 @@
   OrxShell::ShellCommandClass::unregisterAllCommands();
 
-  LoadClassDescription::deleteAllDescriptions();
+  LoadParamClassDescription::deleteAllDescriptions();
 
   // handlers