diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-03-31 10:53:32 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-03-31 10:53:32 +0200 |
| commit | 9dd1ed8026033eb0b4806459dc372b23909c1e4f (patch) | |
| tree | 7bb4c52b2ff6c5d81802db8d21e9b0282be2bcac | |
| parent | 95e2ef65c80f7fee88a06771abf3c1f1ac4aad0b (diff) | |
| download | glibmm-9dd1ed8026033eb0b4806459dc372b23909c1e4f.tar.gz | |
DBusProxy: Rename type_map_changed_properties to MapChangeProperties.
* gio/src/dbusproxy.[hg|ccg]: Use our normal convention for container
typedefs.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/src/dbusproxy.ccg | 2 | ||||
| -rw-r--r-- | gio/src/dbusproxy.hg | 8 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2011-03-31 Murray Cumming <murrayc@murrayc.com> + + DBusProxy: Rename type_map_changed_properties to MapChangeProperties. + + * gio/src/dbusproxy.[hg|ccg]: Use our normal convention for container + typedefs. + 2011-03-30 Murray Cumming <murrayc@murrayc.com> Use the latest mm-common. diff --git a/gio/src/dbusproxy.ccg b/gio/src/dbusproxy.ccg index e18d1a43..3d3cb453 100644 --- a/gio/src/dbusproxy.ccg +++ b/gio/src/dbusproxy.ccg @@ -30,7 +30,7 @@ namespace DBus { //Help the generate code: -typedef Proxy::type_map_changed_properties type_map_changed_properties; +typedef Proxy::MapChangedProperties MapChangedProperties; Proxy::Proxy(const Glib::RefPtr<Connection>& connection, const Glib::ustring& name, diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg index 30125b5f..1b11e0cb 100644 --- a/gio/src/dbusproxy.hg +++ b/gio/src/dbusproxy.hg @@ -330,14 +330,14 @@ public: _WRAP_PROPERTY("g-name-owner", Glib::ustring) _WRAP_PROPERTY("g-object-path", Glib::ustring) - typedef std::map<Glib::ustring, Glib::VariantBase> type_map_changed_properties; + typedef std::map<Glib::ustring, Glib::VariantBase> MapChangedProperties; // The DBus API ensures that the variant changed_properties is of type "DICT<STRING,VARIANT>" - #m4 _CONVERSION(`GVariant*', `const type_map_changed_properties&', `Glib::Variant<type_map_changed_properties>($3, true).get()') - #m4 _CONVERSION(`const type_map_changed_properties&', `GVariant*', `const_cast<GVariant*>(Glib::Variant<type_map_changed_properties>::create($3).gobj())') + #m4 _CONVERSION(`GVariant*', `const MapChangedProperties&', `Glib::Variant<MapChangedProperties>($3, true).get()') + #m4 _CONVERSION(`const MapChangedProperties&', `GVariant*', `const_cast<GVariant*>(Glib::Variant<MapChangedProperties>::create($3).gobj())') #m4 _CONVERSION(`const std::vector<Glib::ustring>&', `const gchar*const*',`Glib::ArrayHandler<Glib::ustring>::vector_to_array($3).data()') #m4 _CONVERSION(`const gchar*const*', `const std::vector<Glib::ustring>&', `Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_NONE)') - _WRAP_SIGNAL(void properties_changed(const type_map_changed_properties& changed_properties, const std::vector<Glib::ustring>& invalidated_properties), "g-properties-changed") + _WRAP_SIGNAL(void properties_changed(const MapChangedProperties& changed_properties, const std::vector<Glib::ustring>& invalidated_properties), "g-properties-changed") #m4 _CONVERSION(`GVariant*', `const Glib::VariantContainerBase&', `Glib::VariantContainerBase($3, true)') #m4 _CONVERSION(`const Glib::VariantContainerBase&', `GVariant*', `const_cast<GVariant*>(($3).gobj())') |