Replaced calls to g_object_(un)ref with sp_object_(un)ref.

(bzr r11608.1.65)

11 files changed, 46 insertions, 46 deletions

diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index f4503386c..3263bbb58 100644
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -162,7 +162,7 @@ void CClipPath::update(SPCtx* ctx, unsigned int flags) {
     SPObjectGroup *og = SP_OBJECTGROUP(object);
     GSList *l = NULL;
     for ( SPObject *child = og->firstChild(); child; child = child->getNext()) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -172,7 +172,7 @@ void CClipPath::update(SPCtx* ctx, unsigned int flags) {
         if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->updateDisplay(ctx, flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 
     SPClipPath *cp = SP_CLIPPATH(object);
@@ -200,7 +200,7 @@ void CClipPath::modified(unsigned int flags) {
     SPObjectGroup *og = SP_OBJECTGROUP(object);
     GSList *l = NULL;
     for (SPObject *child = og->firstChild(); child; child = child->getNext()) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -210,7 +210,7 @@ void CClipPath::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index 0a8bdb3cb..3957084a6 100644
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
@@ -68,7 +68,7 @@ void CDefs::update(SPCtx *ctx, guint flags) {
         if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->updateDisplay(ctx, flags);
         }
-        g_object_unref (G_OBJECT (child));
+        sp_object_unref(child);
     }
 }
 
@@ -83,7 +83,7 @@ void CDefs::modified(unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
 
@@ -95,7 +95,7 @@ void CDefs::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp
index ee387e88f..f9520c8e6 100644
--- a/src/sp-flowdiv.cpp
+++ b/src/sp-flowdiv.cpp
@@ -62,7 +62,7 @@ void CFlowdiv::update(SPCtx *ctx, unsigned int flags) {
 
     GSList* l = NULL;
     for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -79,7 +79,7 @@ void CFlowdiv::update(SPCtx *ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -95,7 +95,7 @@ void CFlowdiv::modified(unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -105,7 +105,7 @@ void CFlowdiv::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -212,7 +212,7 @@ void CFlowtspan::update(SPCtx *ctx, unsigned int flags) {
 
     GSList* l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -229,7 +229,7 @@ void CFlowtspan::update(SPCtx *ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -245,7 +245,7 @@ void CFlowtspan::modified(unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -255,7 +255,7 @@ void CFlowtspan::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -363,7 +363,7 @@ void CFlowpara::update(SPCtx *ctx, unsigned int flags)
 
     GSList* l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -380,7 +380,7 @@ void CFlowpara::update(SPCtx *ctx, unsigned int flags)
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -396,7 +396,7 @@ void CFlowpara::modified(unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -406,7 +406,7 @@ void CFlowpara::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index 3c4bc84a1..0c99d6f9a 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -108,7 +108,7 @@ void CFlowregion::update(SPCtx *ctx, unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -125,7 +125,7 @@ void CFlowregion::update(SPCtx *ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref (G_OBJECT(child));
+        sp_object_unref(child);
     }
 
     group->UpdateComputed();
@@ -155,7 +155,7 @@ void CFlowregion::modified(guint flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -165,7 +165,7 @@ void CFlowregion::modified(guint flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
@@ -291,7 +291,7 @@ void CFlowregionExclude::update(SPCtx *ctx, unsigned int flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -308,7 +308,7 @@ void CFlowregionExclude::update(SPCtx *ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 
     group->UpdateComputed();
@@ -337,7 +337,7 @@ void CFlowregionExclude::modified(guint flags) {
 
     GSList *l = NULL;
     for ( SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref( G_OBJECT(child) );
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse (l);
@@ -347,7 +347,7 @@ void CFlowregionExclude::modified(guint flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref( G_OBJECT(child) );
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 7a695d68d..0afd91379 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -106,7 +106,7 @@ void CFlowtext::update(SPCtx* ctx, unsigned int flags) {
 
     GSList *l = NULL;
     for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -123,7 +123,7 @@ void CFlowtext::update(SPCtx* ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 
     group->rebuildLayout();
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 889151cf8..b0a0ae816 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -829,7 +829,7 @@ void CGradient::modified(guint flags)
     // FIXME: climb up the ladder of hrefs
     GSList *l = NULL;
     for (SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -839,7 +839,7 @@ void CGradient::modified(guint flags)
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index a95b347cf..cc617c9c4 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -217,7 +217,7 @@ void CGroup::update(SPCtx *ctx, unsigned int flags) {
                 child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref (G_OBJECT (child));
+        sp_object_unref(child);
     }
 }
 
@@ -244,7 +244,7 @@ void CGroup::modified(guint flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref (G_OBJECT (child));
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index 8c7fbe53e..4029d03aa 100644
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -171,7 +171,7 @@ void CMask::update(SPCtx* ctx, unsigned int flags) {
     SPObjectGroup *og = SP_OBJECTGROUP(object);
     GSList *l = NULL;
     for (SPObject *child = og->firstChild(); child; child = child->getNext()) {
-        g_object_ref(G_OBJECT (child));
+        sp_object_ref(child);
         l = g_slist_prepend (l, child);
     }
     l = g_slist_reverse (l);
@@ -181,7 +181,7 @@ void CMask::update(SPCtx* ctx, unsigned int flags) {
         if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->updateDisplay(ctx, flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 
     SPMask *mask = SP_MASK(object);
@@ -209,7 +209,7 @@ void CMask::modified(unsigned int flags) {
     SPObjectGroup *og = SP_OBJECTGROUP(object);
     GSList *l = NULL;
     for (SPObject *child = og->firstChild(); child; child = child->getNext()) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         l = g_slist_prepend(l, child);
     }
     l = g_slist_reverse(l);
@@ -219,7 +219,7 @@ void CMask::modified(unsigned int flags) {
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 82f3f1c81..0ba74990e 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -416,7 +416,7 @@ GSList *SPObject::childList(bool add_ref, Action) {
     GSList *l = NULL;
     for ( SPObject *child = firstChild() ; child; child = child->getNext() ) {
         if (add_ref) {
-            g_object_ref (G_OBJECT (child));
+            sp_object_ref (child);
         }
 
         l = g_slist_prepend (l, child);
@@ -1230,12 +1230,12 @@ void SPObject::emitModified(unsigned int flags)
      * themselves. */
     this->mflags = 0;
 
-    g_object_ref(G_OBJECT(this));
+    sp_object_ref(this);
 
     this->cobject->modified(flags);
 
     _modified_signal.emit(this, flags);
-    g_object_unref(G_OBJECT(this));
+    sp_object_unref(this);
 }
 
 gchar const *SPObject::getTagName(SPException *ex) const
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index 6eee54450..398304e4c 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -216,11 +216,11 @@ void CTRef::modified(unsigned int flags) {
 
     SPObject *child = tref_obj->stringChild;
     if (child) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         if (flags || (child->mflags & SP_OBJECT_MODIFIED_FLAG)) {
             child->emitModified(flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 }
 
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index c195b34e9..64a167014 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -554,7 +554,7 @@ void CUse::update(SPCtx *ctx, unsigned flags) {
     flags&=~SP_OBJECT_USER_MODIFIED_FLAG_B;
 
     if (use->child) {
-        g_object_ref(G_OBJECT(use->child));
+        sp_object_ref(use->child);
         if (flags || (use->child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             if (SP_IS_ITEM(use->child)) {
                 SPItem const &chi = *SP_ITEM(use->child);
@@ -565,7 +565,7 @@ void CUse::update(SPCtx *ctx, unsigned flags) {
                 use->child->updateDisplay(ctx, flags);
             }
         }
-        g_object_unref(G_OBJECT(use->child));
+        sp_object_unref(use->child);
     }
 
     /* As last step set additional transform of arena group */
@@ -595,11 +595,11 @@ void CUse::modified(unsigned int flags) {
 
     SPObject *child = use_obj->child;
     if (child) {
-        g_object_ref(G_OBJECT(child));
+        sp_object_ref(child);
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->emitModified(flags);
         }
-        g_object_unref(G_OBJECT(child));
+        sp_object_unref(child);
     }
 }