* Reverting hu.po to previous version, as my latest commit really clashed some strin...

[inkscape.git] / src / sp-object.cpp

diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index f76e70a51cbc9460fc7645c917d809d9001b4369..99d73970061b9389ebdca9848c2bb8b5814991ac 100644 (file)
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -31,6 +31,8 @@
  * dictionary and so on. Source: doc/architecture.txt
  */
 
+#include <cstring>
+#include <string>
 
 #include "helper/sp-marshal.h"
 #include "xml/node-event-vector.h"
@@ -304,7 +306,7 @@ sp_object_unref(SPObject *object, SPObject *owner)
  * \pre object points to real object
  */
 SPObject *
-sp_object_href(SPObject *object, gpointer owner)
+sp_object_href(SPObject *object, gpointer /*owner*/)
 {
     g_return_val_if_fail(object != NULL, NULL);
     g_return_val_if_fail(SP_IS_OBJECT(object), NULL);
@@ -325,7 +327,7 @@ sp_object_href(SPObject *object, gpointer owner)
  * \pre object points to real object and hrefcount>0
  */
 SPObject *
-sp_object_hunref(SPObject *object, gpointer owner)
+sp_object_hunref(SPObject *object, gpointer /*owner*/)
 {
     g_return_val_if_fail(object != NULL, NULL);
     g_return_val_if_fail(SP_IS_OBJECT(object), NULL);
@@ -753,7 +755,7 @@ sp_object_remove_child(SPObject *object, Inkscape::XML::Node *child)
  * Invoked whenever the given mutation event happens in the XML tree.
  * \param old_ref Ignored
  */
-static void sp_object_order_changed(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref,
+static void sp_object_order_changed(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node */*old_ref*/,
                                     Inkscape::XML::Node *new_ref)
 {
     SPObject *ochild = sp_object_get_child_by_repr(object, child);
@@ -900,7 +902,7 @@ void SPObject::releaseReferences() {
  * Callback for child_added node event.
  */
 static void
-sp_object_repr_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data)
+sp_object_repr_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
 
@@ -912,7 +914,7 @@ sp_object_repr_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child
  * Callback for remove_child node event.
  */
 static void
-sp_object_repr_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, gpointer data)
+sp_object_repr_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node *child, Inkscape::XML::Node */*ref*/, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
 
@@ -927,7 +929,7 @@ sp_object_repr_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *chi
  * \todo fixme:
  */
 static void
-sp_object_repr_order_changed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *old, Inkscape::XML::Node *newer, gpointer data)
+sp_object_repr_order_changed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node *child, Inkscape::XML::Node *old, Inkscape::XML::Node *newer, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
 
@@ -1064,7 +1066,7 @@ sp_object_read_attr(SPObject *object, gchar const *key)
  * Callback for attr_changed node event.
  */
 static void
-sp_object_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive, gpointer data)
+sp_object_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const */*oldval*/, gchar const */*newval*/, bool is_interactive, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
 
@@ -1081,7 +1083,7 @@ sp_object_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar c
  * Callback for content_changed node event.
  */
 static void
-sp_object_repr_content_changed(Inkscape::XML::Node *repr, gchar const *oldcontent, gchar const *newcontent, gpointer data)
+sp_object_repr_content_changed(Inkscape::XML::Node */*repr*/, gchar const */*oldcontent*/, gchar const */*newcontent*/, gpointer data)
 {
     SPObject *object = SP_OBJECT(data);
 
@@ -1367,25 +1369,25 @@ SPObject::emitModified(unsigned int flags)
  */
 
 gchar const *
-sp_object_title_get(SPObject *object)
+sp_object_title_get(SPObject */*object*/)
 {
     return NULL;
 }
 
 gchar const *
-sp_object_description_get(SPObject *object)
+sp_object_description_get(SPObject */*object*/)
 {
     return NULL;
 }
 
 unsigned int
-sp_object_title_set(SPObject *object, gchar const *title)
+sp_object_title_set(SPObject */*object*/, gchar const */*title*/)
 {
     return FALSE;
 }
 
 unsigned int
-sp_object_description_set(SPObject *object, gchar const *desc)
+sp_object_description_set(SPObject */*object*/, gchar const */*desc*/)
 {
     return FALSE;
 }