glibmm r708 - in trunk: . glib/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Aug  6 06:26:26 2008
New Revision: 708
URL: http://svn.gnome.org/viewvc/glibmm?rev=708&view=rev

Log:
2008-08-06  Murray Cumming  <murrayc murrayc com>

* glib/src/nodetree.hg: Make gobject_ and data_ private, 
to remove them from protected API. Patch from SzilÃrd Pfeiffer.
Bug #546485.
Make gobj() inline.

Modified:
   trunk/ChangeLog
   trunk/glib/src/nodetree.hg

Modified: trunk/glib/src/nodetree.hg
==============================================================================
--- trunk/glib/src/nodetree.hg	(original)
+++ trunk/glib/src/nodetree.hg	Wed Aug  6 06:26:26 2008
@@ -100,6 +100,17 @@
   };
   _IGNORE(g_node_destroy)
 
+  /// Provides access to the underlying C GObject.
+  inline GNode* gobj()
+  {
+    return gobject_;
+  }
+
+  /// Provides access to the underlying C GObject.
+  inline const GNode* gobj() const
+  {
+    return gobject_;
+  }
 
   /** Inserts a NodeTree beneath the parent at the given position.
    *
@@ -624,28 +635,16 @@
     return wrap(gobj()->parent);
   }
 
-
-  /// Provides access to the underlying C GObject.
-  GNode* gobj()
-  {
-    return gobject_;
-  }
-
-  /// Provides access to the underlying C GObject.
-  const GNode* gobj() const
-  {
-    return gobject_;
-  }
-
   // Leaving these unimplemented for now
   _IGNORE(g_node_copy)
   _IGNORE(g_node_copy_deep)
 
-protected:
+
+private:
+
   GNode* gobject_;
   T& data_;
 
-private:
   /// Wrapper for invoking a TraverseFunc.
   static gboolean c_callback_traverse(GNode* node, gpointer slot)
   {