Rename config::property_vector into config::properties_type

This renaming makes the code looks more consistent.

	* include/abg-ini.h (config::properties_type): Rename the typedef
	config::property_vector into this.
	(config::section::{section, get_properties, set_properties}):
	Adjust.
	* src/abg-ini.cc (config::section::priv::properties_): Adjust the
	name of its type.
	(config::section::{section, get_properties, set_properties,
	find_property}): Adjust.
	(write_section): Adjust.
	* src/abg-suppression.cc (read_function_suppression): Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/include/abg-ini.h b/include/abg-ini.h
index 6e0ed6c6f7830988ab15f74764f954db227c665e..e8ecb91d11bdc2d4e78bdcd4fcfb7e3d2d213446 100644 (file)
--- a/include/abg-ini.h
+++ b/include/abg-ini.h
@@ -357,7 +357,7 @@ public:
   typedef vector<section_sptr> sections_type;
 
   /// A convenience typedef for a vector of @ref property_sptr
-  typedef vector<property_sptr> property_vector;
+  typedef vector<property_sptr> properties_type;
 
 private:
   priv_sptr priv_;
@@ -398,16 +398,16 @@ class config::section
 public:
   section(const string& name);
 
-  section(const string& name, const property_vector& properties);
+  section(const string& name, const properties_type& properties);
 
   const string&
   get_name() const;
 
-  const property_vector&
+  const properties_type&
   get_properties() const;
 
   void
-  set_properties(const property_vector& properties);
+  set_properties(const properties_type& properties);
 
   void
   add_property(const property_sptr prop);

diff --git a/src/abg-ini.cc b/src/abg-ini.cc
index e1848762d6794c74079ca79512b4c01b22f9091f..2cae789019d1d3b308168fec59142dcbf01fdf99 100644 (file)
--- a/src/abg-ini.cc
+++ b/src/abg-ini.cc
@@ -757,7 +757,7 @@ is_tuple_property(const property_sptr p)
 class config::section::priv
 {
   string name_;
-  property_vector properties_;
+  properties_type properties_;
 
   // Forbid this;
   priv();
@@ -785,7 +785,7 @@ config::section::section(const string& name)
 ///
 /// @param properties the properties of the section.
 config::section::section(const string& name,
-                        const property_vector& properties)
+                        const properties_type& properties)
   : priv_(new priv(name))
 {set_properties(properties);}
 
@@ -799,7 +799,7 @@ config::section::get_name() const
 /// Get the properties of the section.
 ///
 /// @return a vector of the properties of the section.
-const config::property_vector&
+const config::properties_type&
 config::section::get_properties() const
 {return priv_->properties_;}
 
@@ -807,7 +807,7 @@ config::section::get_properties() const
 ///
 /// @param properties the new properties to set.
 void
-config::section::set_properties(const property_vector& properties)
+config::section::set_properties(const properties_type& properties)
 {priv_->properties_ = properties;}
 
 /// Add one property to this section.
@@ -828,7 +828,7 @@ config::section::add_property(const property_sptr prop)
 property_sptr
 config::section::find_property(const string& prop_name) const
 {
-  for (property_vector::const_iterator i = get_properties().begin();
+  for (properties_type::const_iterator i = get_properties().begin();
        i != get_properties().end();
        ++i)
     if ((*i)->get_name() == prop_name)
@@ -1582,7 +1582,7 @@ public:
     if (!skip_white_spaces_or_comments())
       return nil;
 
-    config::property_vector properties;
+    config::properties_type properties;
     while (property_sptr prop = read_property())
       {
        properties.push_back(prop);
@@ -1827,7 +1827,7 @@ write_section(const config::section& section,
              std::ostream& out)
 {
   out << "[" << section.get_name() << "]\n";
-  for (config::property_vector::const_iterator i =
+  for (config::properties_type::const_iterator i =
         section.get_properties().begin();
        i != section.get_properties().end();
        ++i)

diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index e9bee010c963465a691636bc218ffc41b97f9c53..c25c38e13cb281f62d66f8921aebee6cfb4a01c4 100644 (file)
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -3021,7 +3021,7 @@ read_function_suppression(const ini::config::section& section)
 
   function_suppression::parameter_spec_sptr parm;
   function_suppression::parameter_specs_type parms;
-  for (ini::config::property_vector::const_iterator p =
+  for (ini::config::properties_type::const_iterator p =
         section.get_properties().begin();
        p != section.get_properties().end();
        ++p)