[glibmm] DBusConnection: Use _ suffixes on member variables.

[Murray Cumming <murrayc src gnome org>]

commit cbfd801d52a56cadc098ce2e0f7ba3a06570c3c9
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 7 14:10:13 2011 +0100

    DBusConnection: Use _ suffixes on member variables.
    
    * gio/src/dbusconnection.[hg|ccg]: Use a _ suffix on member variables to
    avoid confusion with method parameters of the same name, though this does not
    seem to be what is causing bug #637587.

 ChangeLog                  |    8 ++++++++
 gio/src/dbusconnection.ccg |   36 ++++++++++++++++++------------------
 gio/src/dbusconnection.hg  |   16 ++++++++--------
 3 files changed, 34 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dc7d096..fe936f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-07  Murray Cumming  <murrayc murrayc com>
+
+	DBusConnection: Use _ suffixes on member variables.
+
+	* gio/src/dbusconnection.[hg|ccg]: Use a _ suffix on member variables to 
+	avoid confusion with method parameters of the same name, though this does not 
+	seem to be what is causing bug #637587.
+
 2011-01-06  José Alburquerque  <jaalburqu svn gnome org>
 
 	DBusConnection: Add [register|unregister]_subtree() methods.
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 4f82cfa..fd7b112 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -1011,9 +1011,9 @@ DBusInterfaceVTable::DBusInterfaceVTable(
   const SlotInterfaceGetProperty& slot_get_property,
   const SlotInterfaceSetProperty& slot_set_property
 )
-: slot_method_call(new SlotInterfaceMethodCall(slot_method_call)),
-  slot_get_property(new SlotInterfaceGetProperty(slot_get_property)),
-  slot_set_property(new SlotInterfaceSetProperty(slot_set_property))
+: slot_method_call_(new SlotInterfaceMethodCall(slot_method_call)),
+  slot_get_property_(new SlotInterfaceGetProperty(slot_get_property)),
+  slot_set_property_(new SlotInterfaceSetProperty(slot_set_property))
 {
   gobject_.method_call = &DBusInterfaceVTable_MethodCall_giomm_callback;
   gobject_.get_property = &DBusInterfaceVTable_GetProperty_giomm_callback;
@@ -1022,27 +1022,27 @@ DBusInterfaceVTable::DBusInterfaceVTable(
 
 DBusInterfaceVTable::~DBusInterfaceVTable()
 {
-  delete slot_method_call;
-  delete slot_get_property;
-  delete slot_set_property;
+  delete slot_method_call_;
+  delete slot_get_property_;
+  delete slot_set_property_;
 }
 
 DBusInterfaceVTable::SlotInterfaceMethodCall*
   DBusInterfaceVTable::get_slot_method_call() const
 {
-  return slot_method_call;
+  return slot_method_call_;
 }
 
 DBusInterfaceVTable::SlotInterfaceGetProperty*
   DBusInterfaceVTable::get_slot_get_property() const
 {
-  return slot_get_property;
+  return slot_get_property_;
 }
 
 DBusInterfaceVTable::SlotInterfaceSetProperty*
   DBusInterfaceVTable::get_slot_set_property() const
 {
-  return slot_set_property;
+  return slot_set_property_;
 }
 
 DBusSubtreeVTable::DBusSubtreeVTable(
@@ -1050,9 +1050,9 @@ DBusSubtreeVTable::DBusSubtreeVTable(
   const SlotSubtreeIntrospect& slot_introspect,
   const SlotSubtreeDispatch& slot_dispatch
 )
-: slot_enumerate(new SlotSubtreeEnumerate(slot_enumerate)),
-  slot_introspect(new SlotSubtreeIntrospect(slot_introspect)),
-  slot_dispatch(new SlotSubtreeDispatch(slot_dispatch))
+: slot_enumerate_(new SlotSubtreeEnumerate(slot_enumerate)),
+  slot_introspect_(new SlotSubtreeIntrospect(slot_introspect)),
+  slot_dispatch_(new SlotSubtreeDispatch(slot_dispatch))
 {
   gobject_.enumerate = &DBusSubtreeVTable_Enumerate_giomm_callback;
   gobject_.introspect = &DBusSubtreeVTable_Introspect_giomm_callback;
@@ -1061,27 +1061,27 @@ DBusSubtreeVTable::DBusSubtreeVTable(
 
 DBusSubtreeVTable::~DBusSubtreeVTable()
 {
-  delete slot_enumerate;
-  delete slot_introspect;
-  delete slot_dispatch;
+  delete slot_enumerate_;
+  delete slot_introspect_;
+  delete slot_dispatch_;
 }
 
 DBusSubtreeVTable::SlotSubtreeEnumerate*
   DBusSubtreeVTable::get_slot_enumerate() const
 {
-  return slot_enumerate;
+  return slot_enumerate_;
 }
 
 DBusSubtreeVTable::SlotSubtreeIntrospect*
   DBusSubtreeVTable::get_slot_introspect() const
 {
-  return slot_introspect;
+  return slot_introspect_;
 }
 
 DBusSubtreeVTable::SlotSubtreeDispatch*
   DBusSubtreeVTable::get_slot_dispatch() const
 {
-  return slot_dispatch;
+  return slot_dispatch_;
 }
 
 } // namespace Gio
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 24694bf..ff3576a 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -1019,7 +1019,7 @@ public:
    * @param slot_get_property The slot for getting a property.
    * @param slot_set_property The slot for setting a property.
    */
-  DBusInterfaceVTable(
+  explicit DBusInterfaceVTable(
    const SlotInterfaceMethodCall& slot_method_call,
    const SlotInterfaceGetProperty& slot_get_property = SlotInterfaceGetProperty(),
    const SlotInterfaceSetProperty& slot_set_property = SlotInterfaceSetProperty()
@@ -1057,9 +1057,9 @@ protected:
   GDBusInterfaceVTable          gobject_;
 
   // Pointers to copies of the slots used to create an instance.
-  SlotInterfaceMethodCall*      slot_method_call;
-  SlotInterfaceGetProperty*     slot_get_property;
-  SlotInterfaceSetProperty*     slot_set_property;
+  SlotInterfaceMethodCall*      slot_method_call_;
+  SlotInterfaceGetProperty*     slot_get_property_;
+  SlotInterfaceSetProperty*     slot_set_property_;
 };
 
 /** DBusSubtreeVTable - A class used to represent a virtual table for
@@ -1161,7 +1161,7 @@ public:
    * @param slot_introspect The slot for getting a property.
    * @param slot_dispatch The slot for setting a property.
    */
-  DBusSubtreeVTable(
+  explicit DBusSubtreeVTable(
    const SlotSubtreeEnumerate& slot_enumerate,
    const SlotSubtreeIntrospect& slot_introspect = SlotSubtreeIntrospect(),
    const SlotSubtreeDispatch& slot_dispatch = SlotSubtreeDispatch()
@@ -1199,9 +1199,9 @@ protected:
   GDBusSubtreeVTable          gobject_;
 
   // Pointers to copies of the slots used to create an instance.
-  SlotSubtreeEnumerate*         slot_enumerate;
-  SlotSubtreeIntrospect*        slot_introspect;
-  SlotSubtreeDispatch*          slot_dispatch;
+  SlotSubtreeEnumerate*         slot_enumerate_;
+  SlotSubtreeIntrospect*        slot_introspect_;
+  SlotSubtreeDispatch*          slot_dispatch_;
 };
 
 } // namespace Gio