Changeset 377 for tests

Timestamp:

06/15/09 18:27:16 (16 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:

• tests/testUI.cpp (modified) (5 diffs)

tests/testUI.cpp

@@ -24 +24 @@
   }
 
-  virtual void from_setting(const Setting &root) {
-    root.lookupValue("name", name);
-  }
-
-  virtual void to_setting(Setting &root) const {
-    Setting &name_setting = root.add("name", Setting::TypeString);
+  virtual void from_setting(const Setting &set) {
+    set.lookupValue("name", name);
+  }
+
+  virtual void to_setting(Setting &set) const {
+    Setting &name_setting = set.add("name", Setting::TypeString);
     name_setting = name;
   }
@@ -50 +50 @@
   }
 
-  virtual void from_setting(const Setting &root) {
-    root.lookupValue("number", number);
-        if( root.exists( "software" ) )
-                UI::get(software, root, "software");
-  }
-
-  virtual void to_setting(Setting &root) const {
-    Setting &number_setting = root.add("number", Setting::TypeInt);
+  virtual void from_setting(const Setting &set) {
+    set.lookupValue("number", number);
+        if( set.exists( "software" ) )
+                UI::get(software, set, "software");
+  }
+
+  virtual void to_setting(Setting &set) const {
+    Setting &number_setting = set.add("number", Setting::TypeInt);
     number_setting = number;
 
-    UI::save(software, root, "software");
+    UI::save(software, set, "software");
   }
 
@@ -89 +89 @@
   }
 
-  virtual void from_setting(const Setting &root) {
-    root.lookupValue("year", year);
-    root.lookupValue("manufacturer", manufacturer);
-  }
-
-  virtual void to_setting(Setting &root) const {
-    Setting &year_setting = root.add("year", Setting::TypeInt);
+  virtual void from_setting(const Setting &set) {
+    set.lookupValue("year", year);
+    set.lookupValue("manufacturer", manufacturer);
+  }
+
+  virtual void to_setting(Setting &set) const {
+    Setting &year_setting = set.add("year", Setting::TypeInt);
     year_setting = year;
 
-    Setting &manufacturer_setting = root.add("manufacturer", Setting::TypeString);
+    Setting &manufacturer_setting = set.add("manufacturer", Setting::TypeString);
     manufacturer_setting = manufacturer;
   }
@@ -118 +118 @@
   }
 
-  virtual void from_setting(const Setting &root) {
-    Transport::from_setting(root);
-
-    root.lookupValue("kilometers", kilometers);
-
-        if( root.exists( "passengers" ) )
-            UI::get(passengers, root, "passengers");
-  }
-
-  virtual void to_setting(Setting &root) const {
-    Transport::to_setting(root);
-
-    Setting &kilometers_setting = root.add("kilometers", Setting::TypeInt);
+  virtual void from_setting(const Setting &set) {
+    Transport::from_setting(set);
+
+    set.lookupValue("kilometers", kilometers);
+
+        if( set.exists( "passengers" ) )
+            UI::get(passengers, set, "passengers");
+  }
+
+  virtual void to_setting(Setting &set) const {
+    Transport::to_setting(set);
+
+    Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt);
     kilometers_setting = kilometers;
 
-    UI::save(passengers, root, "passengers");
+    UI::save(passengers, set, "passengers");
   }
 
@@ -167 +167 @@
   }
 
-  void from_setting(const Setting &root) {
-    Transport::from_setting(root);
-
-    root.lookupValue("electricLights", electricLights);
-
-        UI::get(matr, root, "matr");
-  }
-
-  void to_setting(Setting &root) const {
-    Transport::to_setting(root);
-
-    Setting &electricLights_setting = root.add("electricLights", Setting::TypeBoolean);
+  void from_setting(const Setting &set) {
+    Transport::from_setting(set);
+
+    set.lookupValue("electricLights", electricLights);
+
+        UI::get(matr, set, "matr");
+  }
+
+  void to_setting(Setting &set) const {
+    Transport::to_setting(set);
+
+    Setting &electricLights_setting = set.add("electricLights", Setting::TypeBoolean);
     electricLights_setting = electricLights;
 
-    UI::save(matr, root, "matr");
+    UI::save(matr, set, "matr");
   }