Changeset 6423

Timestamp:

Dec 27, 2009, 12:09:08 AM (14 years ago)

Author:

rgrieder

Message:

Fixed bug that caused derived classes to list the base class's config values as well.
Introduced a new "ClassByObjecType" function that accepts a 'this' pointer and returns the correct identifier (not this→getIdentifier()!).

Location:

code/trunk/src/libraries/core

Files:

• ConfigValueIncludes.h (modified) (5 diffs)
• CoreIncludes.h (modified) (1 diff)

code/trunk/src/libraries/core/ConfigValueIncludes.h

@@ -63 +63 @@
     inline ConfigValueContainer& setConfigValueGeneric(T* object, V* variable, ConfigFileType type, const std::string& sectionName, const std::string& entryName, const D& defaultValue)
     {
-        ConfigValueContainer* container = object->getIdentifier()->getConfigValueContainer(entryName);
+        ConfigValueContainer* container = ClassIdentifier<T>::getIdentifier()->getConfigValueContainer(entryName);
         if (!container)
         {
-            container = new ConfigValueContainer(type, object->getIdentifier(), sectionName, entryName, defaultValue, *variable);
-            object->getIdentifier()->addConfigValueContainer(entryName, container);
+            container = new ConfigValueContainer(type, ClassIdentifier<T>::getIdentifier(), sectionName, entryName, defaultValue, *variable);
+            ClassIdentifier<T>::getIdentifier()->addConfigValueContainer(entryName, container);
         }
         return container->getValue(variable, object);
@@ -113 +113 @@
     inline void resetConfigValueGeneric(T* object, V* variable, const std::string& entryName)
     {
-        ConfigValueContainer* container = object->getIdentifier()->getConfigValueContainer(entryName);
+        ConfigValueContainer* container = ClassIdentifier<T>::getIdentifier()->getConfigValueContainer(entryName);
         if (container)
         {
@@ -122 +122 @@
         {
             COUT(2) << "Warning: Couldn't reset config-value '" << entryName << "' in class '"
-                    << object->getIdentifier()->getName() << "', corresponding container doesn't exist." << std::endl;
+                    << ClassIdentifier<T>::getIdentifier()->getName() << "', corresponding container doesn't exist." << std::endl;
         }
     }
@@ -152 +152 @@
 */
 #define ModifyConfigValueGeneric(object, variable, entryName, modifier, ...) \
-    if (orxonox::ConfigValueContainer* container = object->getIdentifier()->getConfigValueContainer(entryName)) \
+    if (orxonox::ConfigValueContainer* container = ClassByObjectType(object)->getConfigValueContainer(entryName)) \
     { \
         container->modifier(__VA_ARGS__); \
@@ -160 +160 @@
     { \
         COUT(2) << "Warning: Couln't modify config-value '" << entryName << "' in class '" \
-                << object->getIdentifier()->getName() << "', corresponding container doesn't exist." << std::endl; \
+                << ClassByObjectType(object)->getName() << "', corresponding container doesn't exist." << std::endl; \
     }
 

code/trunk/src/libraries/core/CoreIncludes.h

@@ -125 +125 @@
         return Identifier::getIdentifierByID(id);
     }
+
+    /**
+        @brief Returns the Identifier with a given 'this' pointer.
+        @note This of course only works with OrxonoxClasses.
+              The only use is in conjunction with macros that don't know the class type.
+        @param Pointer to an OrxonoxClass
+    */
+    template <class T>
+    inline Identifier* ClassByObjectType(const T* object)
+    {
+        return ClassIdentifier<T>::getIdentifier();
+    }
 }