Changeset 6536 for code/trunk/src/libraries/core/ConfigValueContainer.h

Timestamp:

Mar 16, 2010, 11:22:36 AM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 6430-6440 from the gamestate branch to the trunk.
This adds keybindings merging functionality.

(from log of r6437)
When running development builds, the keybinder will merge the local file and the one from the data folder.
Catch: if you want to remove a binding, you'll have to write "NoBinding" (not case sensitive) to override the default command

The keybind command already does that for you though.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/ConfigValueContainer.h (modified) (6 diffs)

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

@@ -50 +50 @@
 
 #include "util/MultiType.h"
-#include "ConfigFileManager.h"
 #include "Identifier.h"
 
@@ -108 +107 @@
             */
             template <class D, class V>
-            ConfigValueContainer(ConfigFileType type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V& value)
+            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V& value)
             {
                 this->init(type, identifier, sectionname, varname);
@@ -122 +121 @@
             */
             template <class D, class V>
-            ConfigValueContainer(ConfigFileType type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>& value)
+            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>& value)
             {
                 this->init(type, identifier, sectionname, varname);
@@ -217 +216 @@
             inline const std::string& getName() const
                 { return this->varname_; }
-            /** @brief Retuns the name of the section this config value is in. */
+            /** @brief Returns the name of the section this config value is in. */
             inline const std::string& getSectionName() const
                 { return this->sectionname_; }
+            /** @brief Returns the associated identifier (can be NULL). */
+            inline Identifier* getIdentifier() const
+                { return this->identifier_; }
             /** @brief Returns true if this config-value is a vector */
             inline bool isVector() const
@@ -271 +273 @@
 
         private:
-            void init(ConfigFileType type, Identifier* identifier, const std::string& sectionname, const std::string& varname);
+            void init(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname);
             void initValue(const MultiType& defvalue);
             void initVector();
@@ -278 +280 @@
             bool                       bIsVector_;                  //!< True if the container contains a std::vector
 
-            ConfigFileType             type_;                       //!< The type of the corresponding config-file
+            ConfigFileType::Value      type_;                       //!< The type of the corresponding config-file
             Identifier*                identifier_;                 //!< The identifier of the class
             std::string                sectionname_;                //!< The name of the class the variable belongs to