Changeset 363

Timestamp:

06/08/09 16:56:11 (15 years ago)

Author:

mido

Message:

Link_Expander prejmenovan na SettingsResolver?

Location:

bdm

Files:

• user_info.cpp (modified) (5 diffs)
• user_info.h (modified) (4 diffs)

bdm/user_info.cpp

@@ -102 +102 @@
 ///////////////////////// INTERNAL LINK EXPANDER /////////////////////////////////////////////
 
-UI::Link_Expander::Link_Expander( const Setting &potential_link )
+UI::SettingsResolver::SettingsResolver( const Setting &potential_link )
 {
     file = NULL;
@@ -129 +129 @@
 }
 
-UI::Link_Expander::~Link_Expander()
+UI::SettingsResolver::~SettingsResolver()
 {
     if ( file ) delete file;
 }
 
-const Setting& UI::Link_Expander::root() const
+const Setting& UI::SettingsResolver::root() const
 {
     return *result;
@@ -211 +211 @@
 void UI::from_setting( mat& matrix, const Setting &element )
 {
-    const Link_Expander link_expander( element );
+    const SettingsResolver link_expander( element );
     const Setting &root = link_expander.root();
 
@@ -265 +265 @@
 void UI::from_setting( ivec &vector, const Setting &element )
 {
-    const Link_Expander link_expander( element );
+    const SettingsResolver link_expander( element );
     const Setting &root = link_expander.root();
 
@@ -329 +329 @@
 void UI::from_setting( vec &vector, const Setting &element )
 {
-    const Link_Expander link_expander( element );
+    const SettingsResolver link_expander( element );
     const Setting &root = link_expander.root();
 

bdm/user_info.h

@@ -108 +108 @@
         };
 
-        // vraci true, kdyz to byl platny link, jinak false.. v pripade chyby konci it_errorem..
-        // do elementu vrati setting prislusny po rozbaleni linku, jinak ponecha beze zmeny
-        class Link_Expander     
-        {
-        private:
-                UI_File *file;
-                const Setting *result;
-
-        public:
-
-                Link_Expander( const Setting &potential_link );
-                
-                ~Link_Expander();
-                
-                const Setting& root() const;
-        };
+
 
 
@@ -152 +137 @@
         template<class T> static void from_setting( T* &instance, const Setting &element )
         {                       
-                const Link_Expander link_expander( element );
+                const SettingsResolver link_expander( element );
                 const Setting &root = link_expander.root();
 
@@ -192 +177 @@
         template<class T> static void from_setting( Array<T> &array_to_load, const Setting &element )
         {
-                const Link_Expander link_expander( element );
+                const SettingsResolver link_expander( element );
                 const Setting &root = link_expander.root();
 
@@ -224 +209 @@
         //! according to a data stored in a DOMNode named class_name within a child nodes of the passed element.
         //! If an error occurs, it returns a NULL pointer.
+
+        // vraci true, kdyz to byl platny link, jinak false.. v pripade chyby konci it_errorem..
+        // do elementu vrati setting prislusny po rozbaleni linku, jinak ponecha beze zmeny
+        class SettingsResolver  
+        {
+        private:
+                UI_File *file;
+                const Setting *result;
+
+        public:
+
+                SettingsResolver( const Setting &potential_link );
+                
+                ~SettingsResolver();
+                
+                const Setting& root() const;
+        };
+
+
 
         //! Prototype of a UI builder. Return value is by the second argument since it type checking via \c dynamic_cast.