[gconfmm] Fix compiler warnings.



commit cb4ada9fcb05da3a9928d94adfdcf6b204555833
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jun 3 21:48:40 2010 +0200

    Fix compiler warnings.
    
    * gconf/gconfmm/callback.cc:
    * gconf/src/changeset.ccg: Comment out unused method parameters.
    * gconf/src/entry.hg: Use gconf_entry_unref() instead of gconf_entry_free(),
    which is deprecated, though one just calls the other, and neither are really
    documented. It's still not a registered boxed type.

 ChangeLog                 |   10 ++++++++++
 gconf/gconfmm/callback.cc |    2 +-
 gconf/src/changeset.ccg   |    2 +-
 gconf/src/entry.hg        |    4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index da63c27..5d3f808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-06-03  Murray Cumming  <murrayc murrayc com>
 
+	Fix compiler warnings.
+
+	* gconf/gconfmm/callback.cc:
+	* gconf/src/changeset.ccg: Comment out unused method parameters.
+	* gconf/src/entry.hg: Use gconf_entry_unref() instead of gconf_entry_free(), 
+	which is deprecated, though one just calls the other, and neither are really 
+	documented. It's still not a registered boxed type.
+
+2010-06-03  Murray Cumming  <murrayc murrayc com>
+
 	Build the documentation.
 
 	* docs/Makefile.am: Make this like the other mm-common-using modules 
diff --git a/gconf/gconfmm/callback.cc b/gconf/gconfmm/callback.cc
index 2f49dd9..79dd4b5 100644
--- a/gconf/gconfmm/callback.cc
+++ b/gconf/gconfmm/callback.cc
@@ -48,7 +48,7 @@ void CallbackHolder::destroy(void* data)
   delete (CallbackHolder*)data;
 }
 
-void CallbackHolder::call(GConfClient* client, guint i, GConfEntry* pEntry, void* data)
+void CallbackHolder::call(GConfClient* /* client */, guint i, GConfEntry* pEntry, void* data)
 {
   if(data)
     ((CallbackHolder*)data)->m_Slot (i, Entry (pEntry, true));
diff --git a/gconf/src/changeset.ccg b/gconf/src/changeset.ccg
index 56b1467..a768078 100644
--- a/gconf/src/changeset.ccg
+++ b/gconf/src/changeset.ccg
@@ -92,7 +92,7 @@ GConfChangeSet* ChangeSet::do_ref(GConfChangeSet* cs)
     return cs;
 }
 
-static void for_each_helper(GConfChangeSet *cs,
+static void for_each_helper(GConfChangeSet * /* cs */,
   const gchar *key,
   GConfValue *value,
   gpointer user_data)
diff --git a/gconf/src/entry.hg b/gconf/src/entry.hg
index 48e1621..d220526 100644
--- a/gconf/src/entry.hg
+++ b/gconf/src/entry.hg
@@ -42,8 +42,8 @@ namespace Conf
  */
 class Entry
 {
-  _CLASS_OPAQUE_COPYABLE(Entry,GConfEntry,NONE,entry_copy,gconf_entry_free)
-  _IGNORE(gconf_entry_free, gconf_entry_new, gconf_entry_new_nocopy)
+  _CLASS_OPAQUE_COPYABLE(Entry,GConfEntry,NONE,entry_copy,gconf_entry_unref)
+  _IGNORE(gconf_entry_free, gconf_entry_unref, gconf_entry_new, gconf_entry_new_nocopy)
   _IGNORE(gconf_entry_equal, gconf_entry_set_value_nocopy)
   _IGNORE(gconf_entry_steal_value)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]