Changeset 377 for bdm/user_info.h

Timestamp:

06/15/09 18:27:16 (15 years ago)

Author:

mido

Message:

1) globalni prejmenovani Setting &root na Setting &set
2) smazani par zastaralych adresaru
3) oprava warningu v doc\local
4) prejmenovani SettingsResolver? na SettingResolver? a drobne vylepseni funkcnosti
5) odstranena duplikace kodu v user_info.cpp

Files:

• bdm/user_info.h (modified) (6 diffs)

bdm/user_info.h

@@ -137 +137 @@
         template<class T> static void from_setting( T* &instance, const Setting &element )
         {                       
-                const SettingsResolver link_expander( element );
-                const Setting &root = link_expander.root();
-
-                ASSERT_UITYPE(root,TypeGroup);
+                const SettingResolver link( element );
+
+                ASSERT_UITYPE(link.result,TypeGroup);
 
                 // we get a velue stored in the "class" attribute 
                 string class_name;
-                if( !root.lookupValue( "class", class_name ) )
-                        ui_error( "the obligatory ""class"" identifier is missing", root );
+                if( !link.result.lookupValue( "class", class_name ) )
+                        ui_error( "the obligatory ""class"" identifier is missing", link.result );
         
                 // and finally we find a UserInfo related to this type
@@ -164 +163 @@
                 try
                 {
-                        instance->from_setting( root );
+                        instance->from_setting( link.result );
                 }
                 catch(SettingException xcptn)
@@ -177 +176 @@
         template<class T> static void from_setting( Array<T> &array_to_load, const Setting &element )
         {
-                const SettingsResolver link_expander( element );
-                const Setting &root = link_expander.root();
-
-                ASSERT_UITYPE(root,TypeList);
-
-                int len = root.getLength();
+                const SettingResolver link( element );
+
+                ASSERT_UITYPE(link.result,TypeList);
+
+                int len = link.result.getLength();
                 array_to_load.set_length( len );
                 if( len == 0 ) return;
                 
                 for( int i=0; i < len; i++ ) 
-                        from_setting( array_to_load(i), root[i] ); 
+                        from_setting( array_to_load(i), link.result[i] ); 
         }
 
@@ -212 +210 @@
         // 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  
+        class SettingResolver   
         {
         private:
                 UI_File *file;
-                const Setting *result;
+
+                const Setting &initialize_reference( UI_File* &file, const Setting &potential_link);
 
         public:
-
-                SettingsResolver( const Setting &potential_link );
+                const Setting &result;
+
+                SettingResolver( const Setting &potential_link );
                 
-                ~SettingsResolver();
-                
-                const Setting& root() const;
+                ~SettingResolver();             
         };
 
@@ -270 +268 @@
         template< class T> static void save( const T * const instance, Setting &element, const string &name = "")
         {
-                Setting &root = (name == "") ? element.add( Setting::TypeGroup )                                                        
+                Setting &set = (name == "") ? element.add( Setting::TypeGroup )                                                 
                                                                          : element.add( name, Setting::TypeGroup );             
 
@@ -276 +274 @@
                         
                 // add attribute "class" 
-                Setting &type = root.add( "class", Setting::TypeString );
+                Setting &type = set.add( "class", Setting::TypeString );
                 type = class_name;
 
                 try
                 {
-                        instance->to_setting( root );
+                        instance->to_setting( set );
                 }
                 catch(SettingException xcptn)