summaryrefslogtreecommitdiffstats
path: root/src/sp-object.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-01-09 16:47:29 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-01-09 16:47:29 +0000
commit13abf3e6f87b4bc85708bfd8d8fe93deb76facdc (patch)
tree8f5021ba5ae6123d242f5740c45611266a317071 /src/sp-object.cpp
parentFix a bug whith oposite handles on node move,and a little cleanup (diff)
parentFix for bug #1266113 (xcf export only allows 90 dpi). (diff)
downloadinkscape-13abf3e6f87b4bc85708bfd8d8fe93deb76facdc.tar.gz
inkscape-13abf3e6f87b4bc85708bfd8d8fe93deb76facdc.zip
update to trunk
(bzr r11950.1.233)
Diffstat (limited to 'src/sp-object.cpp')
-rw-r--r--src/sp-object.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 4a32c9470..0e6eef6ae 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -119,7 +119,7 @@ SPObject::SPObject()
_successor(NULL), _collection_policy(SPObject::COLLECT_WITH_PARENT),
_label(NULL), _default_label(NULL)
{
- debug("id=%x, typename=%s",this, g_type_name_from_instance((GTypeInstance*)object));
+ debug("id=%p, typename=%s",this, g_type_name_from_instance((GTypeInstance*)this));
//used XML Tree here.
this->getRepr(); // TODO check why this call is made
@@ -607,14 +607,14 @@ void SPObject::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
void SPObject::release() {
SPObject* object = this;
- debug("id=%x, typename=%s", object, g_type_name_from_instance((GTypeInstance*)object));
+ debug("id=%p, typename=%s", object, g_type_name_from_instance((GTypeInstance*)object));
while (object->children) {
object->detach(object->children);
}
}
void SPObject::remove_child(Inkscape::XML::Node* child) {
- debug("id=%x, typename=%s", this, g_type_name_from_instance((GTypeInstance*)this));
+ debug("id=%p, typename=%s", this, g_type_name_from_instance((GTypeInstance*)this));
SPObject *ochild = this->get_child_by_repr(child);
@@ -638,7 +638,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
SPObject* object = this;
/* Nothing specific here */
- debug("id=%x, typename=%s", object, g_type_name_from_instance((GTypeInstance*)object));
+ debug("id=%p, typename=%s", object, g_type_name_from_instance((GTypeInstance*)object));
object->readAttr("xml:space");
object->readAttr("inkscape:label");
@@ -665,7 +665,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
void SPObject::invoke_build(SPDocument *document, Inkscape::XML::Node *repr, unsigned int cloned)
{
- debug("id=%x, typename=%s", this, g_type_name_from_instance((GTypeInstance*)this));
+ debug("id=%p, typename=%s", this, g_type_name_from_instance((GTypeInstance*)this));
//g_assert(object != NULL);
//g_assert(SP_IS_OBJECT(object));