diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-03-14 11:42:39 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-03-14 11:42:39 +0000 |
| commit | a0a8d020201e0e38a63d9aa3dce228d7d9e6fb35 (patch) | |
| tree | 15eb1db63b425cb0a902cd259401ea2b556028d5 /src | |
| parent | Added some virtual pad calls to SPObject. (diff) | |
| download | inkscape-a0a8d020201e0e38a63d9aa3dce228d7d9e6fb35.tar.gz inkscape-a0a8d020201e0e38a63d9aa3dce228d7d9e6fb35.zip | |
Various changes.
(bzr r11608.1.48)
Diffstat (limited to 'src')
71 files changed, 216 insertions, 181 deletions
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp index b42bd6811..c82344d46 100644 --- a/src/box3d-side.cpp +++ b/src/box3d-side.cpp @@ -68,7 +68,7 @@ static void box3d_side_class_init(Box3DSideClass *klass) parent_class = (SPShapeClass *)g_type_class_ref (SP_TYPE_SHAPE); - sp_object_class->build = box3d_side_build; + //sp_object_class->build = box3d_side_build; sp_object_class->write = box3d_side_write; sp_object_class->set = box3d_side_set; sp_object_class->update = box3d_side_update; diff --git a/src/box3d.cpp b/src/box3d.cpp index 1aea69313..d41e3757e 100644 --- a/src/box3d.cpp +++ b/src/box3d.cpp @@ -90,7 +90,7 @@ box3d_class_init(SPBox3DClass *klass) parent_class = (SPGroupClass *) g_type_class_ref(SP_TYPE_GROUP); - sp_object_class->build = box3d_build; + //sp_object_class->build = box3d_build; sp_object_class->release = box3d_release; sp_object_class->set = box3d_set; sp_object_class->write = box3d_write; diff --git a/src/color-profile.cpp b/src/color-profile.cpp index a1e9dd0f1..c9af64723 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -219,7 +219,7 @@ void ColorProfile::classInit( ColorProfileClass *klass ) cprof_parent_class = static_cast<SPObjectClass*>(g_type_class_ref(SP_TYPE_OBJECT)); sp_object_class->release = ColorProfile::release; - sp_object_class->build = ColorProfile::build; + //sp_object_class->build = ColorProfile::build; sp_object_class->set = ColorProfile::set; sp_object_class->write = ColorProfile::write; } @@ -312,9 +312,11 @@ void ColorProfile::build( SPObject *object, SPDocument *document, Inkscape::XML: g_assert(cprof->name == 0); g_assert(cprof->intentStr == 0); - if (cprof_parent_class->build) { - (* cprof_parent_class->build)(object, document, repr); - } +// if (cprof_parent_class->build) { +// (* cprof_parent_class->build)(object, document, repr); +// } + // CPPIFY: todo + object->readAttr( "xlink:href" ); object->readAttr( "local" ); object->readAttr( "name" ); diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp index 809bd6c00..968cba001 100644 --- a/src/filters/blend.cpp +++ b/src/filters/blend.cpp @@ -73,7 +73,7 @@ sp_feBlend_class_init(SPFeBlendClass *klass) feBlend_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feBlend_build; + //sp_object_class->build = sp_feBlend_build; sp_object_class->release = sp_feBlend_release; sp_object_class->write = sp_feBlend_write; sp_object_class->set = sp_feBlend_set; @@ -98,9 +98,10 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re { SPFeBlend *blend = SP_FEBLEND(object); - if (((SPObjectClass *) feBlend_parent_class)->build) { - ((SPObjectClass *) feBlend_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feBlend_parent_class)->build) { +// ((SPObjectClass *) feBlend_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "mode" ); diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp index b88b84037..1563beb57 100644 --- a/src/filters/colormatrix.cpp +++ b/src/filters/colormatrix.cpp @@ -72,7 +72,7 @@ sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass) feColorMatrix_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feColorMatrix_build; + //sp_object_class->build = sp_feColorMatrix_build; sp_object_class->release = sp_feColorMatrix_release; sp_object_class->write = sp_feColorMatrix_write; sp_object_class->set = sp_feColorMatrix_set; @@ -93,9 +93,10 @@ sp_feColorMatrix_init(SPFeColorMatrix */*feColorMatrix*/) static void sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feColorMatrix_parent_class)->build) { - ((SPObjectClass *) feColorMatrix_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feColorMatrix_parent_class)->build) { +// ((SPObjectClass *) feColorMatrix_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "type" ); diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp index 446009e1d..1a46ef01e 100644 --- a/src/filters/componenttransfer-funcnode.cpp +++ b/src/filters/componenttransfer-funcnode.cpp @@ -135,7 +135,7 @@ sp_fefuncnode_class_init(SPFeFuncNodeClass *klass) feFuncNode_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_fefuncnode_build; + //sp_object_class->build = sp_fefuncnode_build; sp_object_class->release = sp_fefuncnode_release; sp_object_class->write = sp_fefuncnode_write; sp_object_class->set = sp_fefuncnode_set; @@ -162,9 +162,10 @@ sp_fefuncnode_init(SPFeFuncNode *fefuncnode) static void sp_fefuncnode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feFuncNode_parent_class)->build) { - ((SPObjectClass *) feFuncNode_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feFuncNode_parent_class)->build) { +// ((SPObjectClass *) feFuncNode_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo //Read values of key attributes from XML nodes into object. object->readAttr( "type" ); diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp index 99d8616f4..650aa99ff 100644 --- a/src/filters/componenttransfer.cpp +++ b/src/filters/componenttransfer.cpp @@ -70,7 +70,7 @@ sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass) SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass; feComponentTransfer_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feComponentTransfer_build; + //sp_object_class->build = sp_feComponentTransfer_build; sp_object_class->release = sp_feComponentTransfer_release; sp_object_class->write = sp_feComponentTransfer_write; sp_object_class->set = sp_feComponentTransfer_set; @@ -93,9 +93,10 @@ sp_feComponentTransfer_init(SPFeComponentTransfer */*feComponentTransfer*/) static void sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feComponentTransfer_parent_class)->build) { - ((SPObjectClass *) feComponentTransfer_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feComponentTransfer_parent_class)->build) { +// ((SPObjectClass *) feComponentTransfer_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp index 66e8e3415..1548fe57e 100644 --- a/src/filters/composite.cpp +++ b/src/filters/composite.cpp @@ -68,7 +68,7 @@ sp_feComposite_class_init(SPFeCompositeClass *klass) feComposite_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feComposite_build; + //sp_object_class->build = sp_feComposite_build; sp_object_class->release = sp_feComposite_release; sp_object_class->write = sp_feComposite_write; sp_object_class->set = sp_feComposite_set; @@ -96,9 +96,10 @@ sp_feComposite_init(SPFeComposite *feComposite) static void sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feComposite_parent_class)->build) { - ((SPObjectClass *) feComposite_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feComposite_parent_class)->build) { +// ((SPObjectClass *) feComposite_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo SPFeComposite *comp = SP_FECOMPOSITE(object); diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp index 470bfb64a..f1c1dfced 100644 --- a/src/filters/convolvematrix.cpp +++ b/src/filters/convolvematrix.cpp @@ -71,7 +71,7 @@ sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass) feConvolveMatrix_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feConvolveMatrix_build; + //sp_object_class->build = sp_feConvolveMatrix_build; sp_object_class->release = sp_feConvolveMatrix_release; sp_object_class->write = sp_feConvolveMatrix_write; sp_object_class->set = sp_feConvolveMatrix_set; @@ -104,9 +104,10 @@ sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix) static void sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feConvolveMatrix_parent_class)->build) { - ((SPObjectClass *) feConvolveMatrix_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feConvolveMatrix_parent_class)->build) { +// ((SPObjectClass *) feConvolveMatrix_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "order" ); diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp index 0f2f29d67..b0c091ebb 100644 --- a/src/filters/diffuselighting.cpp +++ b/src/filters/diffuselighting.cpp @@ -82,7 +82,7 @@ sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass) SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass; feDiffuseLighting_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feDiffuseLighting_build; + //sp_object_class->build = sp_feDiffuseLighting_build; sp_object_class->release = sp_feDiffuseLighting_release; sp_object_class->write = sp_feDiffuseLighting_write; sp_object_class->set = sp_feDiffuseLighting_set; @@ -116,9 +116,10 @@ sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting) static void sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feDiffuseLighting_parent_class)->build) { - ((SPObjectClass *) feDiffuseLighting_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feDiffuseLighting_parent_class)->build) { +// ((SPObjectClass *) feDiffuseLighting_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "surfaceScale" ); diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp index 69a678c26..fb2e64299 100644 --- a/src/filters/displacementmap.cpp +++ b/src/filters/displacementmap.cpp @@ -68,7 +68,7 @@ sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass) feDisplacementMap_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feDisplacementMap_build; + //sp_object_class->build = sp_feDisplacementMap_build; sp_object_class->release = sp_feDisplacementMap_release; sp_object_class->write = sp_feDisplacementMap_write; sp_object_class->set = sp_feDisplacementMap_set; @@ -93,9 +93,10 @@ sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap) static void sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feDisplacementMap_parent_class)->build) { - ((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feDisplacementMap_parent_class)->build) { +// ((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "scale" ); diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp index 891049415..585afacf5 100644 --- a/src/filters/distantlight.cpp +++ b/src/filters/distantlight.cpp @@ -71,7 +71,7 @@ sp_fedistantlight_class_init(SPFeDistantLightClass *klass) feDistantLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_fedistantlight_build; + //sp_object_class->build = sp_fedistantlight_build; sp_object_class->release = sp_fedistantlight_release; sp_object_class->write = sp_fedistantlight_write; sp_object_class->set = sp_fedistantlight_set; @@ -95,9 +95,10 @@ sp_fedistantlight_init(SPFeDistantLight *fedistantlight) static void sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feDistantLight_parent_class)->build) { - ((SPObjectClass *) feDistantLight_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feDistantLight_parent_class)->build) { +// ((SPObjectClass *) feDistantLight_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo //Read values of key attributes from XML nodes into object. object->readAttr( "azimuth" ); diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp index 170bed767..2f6bea315 100644 --- a/src/filters/flood.cpp +++ b/src/filters/flood.cpp @@ -68,7 +68,7 @@ static void sp_feFlood_class_init(SPFeFloodClass *klass) feFlood_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feFlood_build; + //sp_object_class->build = sp_feFlood_build; sp_object_class->release = sp_feFlood_release; sp_object_class->write = sp_feFlood_write; sp_object_class->set = sp_feFlood_set; @@ -90,9 +90,10 @@ static void sp_feFlood_init(SPFeFlood *feFlood) static void sp_feFlood_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feFlood_parent_class)->build) { - ((SPObjectClass *) feFlood_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feFlood_parent_class)->build) { +// ((SPObjectClass *) feFlood_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "flood-opacity" ); diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp index ee1af8904..1d20b2fee 100644 --- a/src/filters/gaussian-blur.cpp +++ b/src/filters/gaussian-blur.cpp @@ -73,7 +73,7 @@ sp_gaussianBlur_class_init(SPGaussianBlurClass *klass) gaussianBlur_parent_class = (SPFilterPrimitiveClass *)g_type_class_peek_parent(klass); - sp_object_class->build = sp_gaussianBlur_build; + //sp_object_class->build = sp_gaussianBlur_build; sp_object_class->release = sp_gaussianBlur_release; sp_object_class->write = sp_gaussianBlur_write; sp_object_class->set = sp_gaussianBlur_set; @@ -95,9 +95,10 @@ sp_gaussianBlur_init(SPGaussianBlur */*gaussianBlur*/) static void sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) gaussianBlur_parent_class)->build) { - ((SPObjectClass *) gaussianBlur_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) gaussianBlur_parent_class)->build) { +// ((SPObjectClass *) gaussianBlur_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "stdDeviation" ); diff --git a/src/filters/image.cpp b/src/filters/image.cpp index f6ef310f7..178fa9bc1 100644 --- a/src/filters/image.cpp +++ b/src/filters/image.cpp @@ -70,7 +70,7 @@ static void sp_feImage_class_init(SPFeImageClass *klass) feImage_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feImage_build; + //sp_object_class->build = sp_feImage_build; sp_object_class->release = sp_feImage_release; sp_object_class->write = sp_feImage_write; sp_object_class->set = sp_feImage_set; @@ -96,9 +96,10 @@ static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::X SPFeImage *feImage = SP_FEIMAGE(object); feImage->document = document; - if (((SPObjectClass *) feImage_parent_class)->build) { - ((SPObjectClass *) feImage_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feImage_parent_class)->build) { +// ((SPObjectClass *) feImage_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp index b5a6d7dad..ba6506fe9 100644 --- a/src/filters/merge.cpp +++ b/src/filters/merge.cpp @@ -67,7 +67,7 @@ sp_feMerge_class_init(SPFeMergeClass *klass) feMerge_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feMerge_build; + //sp_object_class->build = sp_feMerge_build; sp_object_class->release = sp_feMerge_release; sp_object_class->write = sp_feMerge_write; sp_object_class->set = sp_feMerge_set; @@ -89,9 +89,10 @@ sp_feMerge_init(SPFeMerge */*feMerge*/) static void sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feMerge_parent_class)->build) { - ((SPObjectClass *) feMerge_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feMerge_parent_class)->build) { +// ((SPObjectClass *) feMerge_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ } diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp index 639928305..1f57218c2 100644 --- a/src/filters/mergenode.cpp +++ b/src/filters/mergenode.cpp @@ -63,7 +63,7 @@ sp_feMergeNode_class_init(SPFeMergeNodeClass *klass) feMergeNode_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feMergeNode_build; + //sp_object_class->build = sp_feMergeNode_build; sp_object_class->release = sp_feMergeNode_release; sp_object_class->write = sp_feMergeNode_write; sp_object_class->set = sp_feMergeNode_set; diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp index 42327d59f..b84c6e5f1 100644 --- a/src/filters/morphology.cpp +++ b/src/filters/morphology.cpp @@ -69,7 +69,7 @@ sp_feMorphology_class_init(SPFeMorphologyClass *klass) feMorphology_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feMorphology_build; + //sp_object_class->build = sp_feMorphology_build; sp_object_class->release = sp_feMorphology_release; sp_object_class->write = sp_feMorphology_write; sp_object_class->set = sp_feMorphology_set; @@ -92,9 +92,10 @@ sp_feMorphology_init(SPFeMorphology *feMorphology) static void sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feMorphology_parent_class)->build) { - ((SPObjectClass *) feMorphology_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feMorphology_parent_class)->build) { +// ((SPObjectClass *) feMorphology_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "operator" ); diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp index f45169aba..b1b9bdf5f 100644 --- a/src/filters/offset.cpp +++ b/src/filters/offset.cpp @@ -68,7 +68,7 @@ sp_feOffset_class_init(SPFeOffsetClass *klass) feOffset_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feOffset_build; + //sp_object_class->build = sp_feOffset_build; sp_object_class->release = sp_feOffset_release; sp_object_class->write = sp_feOffset_write; sp_object_class->set = sp_feOffset_set; @@ -92,9 +92,10 @@ sp_feOffset_init(SPFeOffset *feOffset) static void sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feOffset_parent_class)->build) { - ((SPObjectClass *) feOffset_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feOffset_parent_class)->build) { +// ((SPObjectClass *) feOffset_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "dx" ); object->readAttr( "dy" ); diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp index ee6824d00..df513b393 100644 --- a/src/filters/pointlight.cpp +++ b/src/filters/pointlight.cpp @@ -71,7 +71,7 @@ sp_fepointlight_class_init(SPFePointLightClass *klass) fePointLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_fepointlight_build; + //sp_object_class->build = sp_fepointlight_build; sp_object_class->release = sp_fepointlight_release; sp_object_class->write = sp_fepointlight_write; sp_object_class->set = sp_fepointlight_set; @@ -98,9 +98,10 @@ sp_fepointlight_init(SPFePointLight *fepointlight) static void sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) fePointLight_parent_class)->build) { - ((SPObjectClass *) fePointLight_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) fePointLight_parent_class)->build) { +// ((SPObjectClass *) fePointLight_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo //Read values of key attributes from XML nodes into object. object->readAttr( "x" ); diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp index 71a705c94..4ffecea8a 100644 --- a/src/filters/specularlighting.cpp +++ b/src/filters/specularlighting.cpp @@ -82,7 +82,7 @@ sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass) SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass; feSpecularLighting_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feSpecularLighting_build; + //sp_object_class->build = sp_feSpecularLighting_build; sp_object_class->release = sp_feSpecularLighting_release; sp_object_class->write = sp_feSpecularLighting_write; sp_object_class->set = sp_feSpecularLighting_set; @@ -118,9 +118,10 @@ sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting) static void sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feSpecularLighting_parent_class)->build) { - ((SPObjectClass *) feSpecularLighting_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feSpecularLighting_parent_class)->build) { +// ((SPObjectClass *) feSpecularLighting_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "surfaceScale" ); diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp index 7be83ed00..7ea4a0e7b 100644 --- a/src/filters/spotlight.cpp +++ b/src/filters/spotlight.cpp @@ -71,7 +71,7 @@ sp_fespotlight_class_init(SPFeSpotLightClass *klass) feSpotLight_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_fespotlight_build; + //sp_object_class->build = sp_fespotlight_build; sp_object_class->release = sp_fespotlight_release; sp_object_class->write = sp_fespotlight_write; sp_object_class->set = sp_fespotlight_set; @@ -108,9 +108,10 @@ sp_fespotlight_init(SPFeSpotLight *fespotlight) static void sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feSpotLight_parent_class)->build) { - ((SPObjectClass *) feSpotLight_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feSpotLight_parent_class)->build) { +// ((SPObjectClass *) feSpotLight_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo //Read values of key attributes from XML nodes into object. object->readAttr( "x" ); diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp index 42a59ede8..19c1c5e58 100644 --- a/src/filters/tile.cpp +++ b/src/filters/tile.cpp @@ -65,7 +65,7 @@ sp_feTile_class_init(SPFeTileClass *klass) feTile_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feTile_build; + //sp_object_class->build = sp_feTile_build; sp_object_class->release = sp_feTile_release; sp_object_class->write = sp_feTile_write; sp_object_class->set = sp_feTile_set; @@ -86,9 +86,10 @@ sp_feTile_init(SPFeTile */*feTile*/) static void sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feTile_parent_class)->build) { - ((SPObjectClass *) feTile_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feTile_parent_class)->build) { +// ((SPObjectClass *) feTile_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ } diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp index 9d1448c70..8d1041bab 100644 --- a/src/filters/turbulence.cpp +++ b/src/filters/turbulence.cpp @@ -71,7 +71,7 @@ sp_feTurbulence_class_init(SPFeTurbulenceClass *klass) feTurbulence_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_feTurbulence_build; + //sp_object_class->build = sp_feTurbulence_build; sp_object_class->release = sp_feTurbulence_release; sp_object_class->write = sp_feTurbulence_write; sp_object_class->set = sp_feTurbulence_set; @@ -94,9 +94,10 @@ sp_feTurbulence_init(SPFeTurbulence *feTurbulence) static void sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) feTurbulence_parent_class)->build) { - ((SPObjectClass *) feTurbulence_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) feTurbulence_parent_class)->build) { +// ((SPObjectClass *) feTurbulence_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo /*LOAD ATTRIBUTES FROM REPR HERE*/ object->readAttr( "baseFrequency" ); diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp index 3e4e40198..052202e44 100644 --- a/src/live_effects/lpeobject.cpp +++ b/src/live_effects/lpeobject.cpp @@ -66,7 +66,7 @@ LivePathEffectObject::livepatheffect_class_init(LivePathEffectObjectClass *klass livepatheffect_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = livepatheffect_build; + //sp_object_class->build = livepatheffect_build; sp_object_class->release = livepatheffect_release; sp_object_class->set = livepatheffect_set; @@ -100,8 +100,9 @@ LivePathEffectObject::livepatheffect_build(SPObject *object, SPDocument *documen g_assert(object != NULL); g_assert(SP_IS_OBJECT(object)); - if (((SPObjectClass *) livepatheffect_parent_class)->build) - (* ((SPObjectClass *) livepatheffect_parent_class)->build)(object, document, repr); +// if (((SPObjectClass *) livepatheffect_parent_class)->build) +// (* ((SPObjectClass *) livepatheffect_parent_class)->build)(object, document, repr); +// CPPIFY: todo object->readAttr( "effect" ); diff --git a/src/marker.cpp b/src/marker.cpp index 50426a2cd..8ee4813c6 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -86,7 +86,7 @@ static void sp_marker_class_init(SPMarkerClass *klass) parent_class = reinterpret_cast<SPGroupClass *>(g_type_class_ref(SP_TYPE_GROUP)); - sp_object_class->build = sp_marker_build; + //sp_object_class->build = sp_marker_build; sp_object_class->release = sp_marker_release; sp_object_class->set = sp_marker_set; sp_object_class->update = sp_marker_update; diff --git a/src/persp3d.cpp b/src/persp3d.cpp index a20537d95..1e348bf35 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -94,7 +94,7 @@ static void persp3d_class_init(Persp3DClass *klass) persp3d_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = persp3d_build; + //sp_object_class->build = persp3d_build; sp_object_class->release = persp3d_release; sp_object_class->set = persp3d_set; sp_object_class->update = persp3d_update; @@ -115,8 +115,9 @@ persp3d_init(Persp3D *persp) */ static void persp3d_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) persp3d_parent_class)->build) - (* ((SPObjectClass *) persp3d_parent_class)->build)(object, document, repr); +// if (((SPObjectClass *) persp3d_parent_class)->build) +// (* ((SPObjectClass *) persp3d_parent_class)->build)(object, document, repr); + // CPPIFY: todo /* calls sp_object_set for the respective attributes */ // The transformation matrix is updated according to the values we read for the VPs diff --git a/src/sp-anchor.cpp b/src/sp-anchor.cpp index 84804bfc8..6659712c6 100644 --- a/src/sp-anchor.cpp +++ b/src/sp-anchor.cpp @@ -68,7 +68,7 @@ static void sp_anchor_class_init(SPAnchorClass *ac) parent_class = (SPGroupClass *) g_type_class_ref(SP_TYPE_GROUP); - sp_object_class->build = sp_anchor_build; + //sp_object_class->build = sp_anchor_build; sp_object_class->release = sp_anchor_release; sp_object_class->set = sp_anchor_set; sp_object_class->write = sp_anchor_write; diff --git a/src/sp-animation.cpp b/src/sp-animation.cpp index 2951a76fd..ba8fd85c5 100644 --- a/src/sp-animation.cpp +++ b/src/sp-animation.cpp @@ -68,7 +68,7 @@ static void sp_animation_class_init(SPAnimationClass *klass) animation_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_animation_build; + //sp_object_class->build = sp_animation_build; sp_object_class->release = sp_animation_release; sp_object_class->set = sp_animation_set; } @@ -80,8 +80,9 @@ static void sp_animation_init(SPAnimation */*animation*/) static void sp_animation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) animation_parent_class)->build) - ((SPObjectClass *) animation_parent_class)->build(object, document, repr); +// if (((SPObjectClass *) animation_parent_class)->build) +// ((SPObjectClass *) animation_parent_class)->build(object, document, repr); + // CPPIFY: todo object->readAttr( "xlink:href" ); object->readAttr( "attributeName" ); @@ -149,7 +150,7 @@ static void sp_ianimation_class_init(SPIAnimationClass *klass) ianimation_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_ianimation_build; + //sp_object_class->build = sp_ianimation_build; sp_object_class->release = sp_ianimation_release; sp_object_class->set = sp_ianimation_set; } @@ -161,8 +162,9 @@ static void sp_ianimation_init(SPIAnimation */*animation*/) static void sp_ianimation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) ianimation_parent_class)->build) - ((SPObjectClass *) ianimation_parent_class)->build(object, document, repr); +// if (((SPObjectClass *) ianimation_parent_class)->build) +// ((SPObjectClass *) ianimation_parent_class)->build(object, document, repr); + // CPPIFY: todo object->readAttr( "calcMode" ); object->readAttr( "values" ); @@ -227,7 +229,7 @@ static void sp_animate_class_init(SPAnimateClass *klass) animate_parent_class = (SPIAnimationClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_animate_build; + //sp_object_class->build = sp_animate_build; sp_object_class->release = sp_animate_release; sp_object_class->set = sp_animate_set; } @@ -239,8 +241,9 @@ static void sp_animate_init(SPAnimate */*animate*/) static void sp_animate_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) animate_parent_class)->build) - ((SPObjectClass *) animate_parent_class)->build(object, document, repr); +// if (((SPObjectClass *) animate_parent_class)->build) +// ((SPObjectClass *) animate_parent_class)->build(object, document, repr); + // CPPIFY: todo } static void sp_animate_release(SPObject */*object*/) diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp index 02dc53481..da4e2c0d1 100644 --- a/src/sp-clippath.cpp +++ b/src/sp-clippath.cpp @@ -68,7 +68,7 @@ void SPClipPathClass::sp_clippath_class_init(SPClipPathClass *klass) static_parent_class = (SPObjectGroupClass*)g_type_class_ref(SP_TYPE_OBJECTGROUP); - sp_object_class->build = SPClipPath::build; + //sp_object_class->build = SPClipPath::build; sp_object_class->release = SPClipPath::release; sp_object_class->set = SPClipPath::set; sp_object_class->child_added = SPClipPath::childAdded; diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp index 0a0e37434..f5c0c160c 100644 --- a/src/sp-ellipse.cpp +++ b/src/sp-ellipse.cpp @@ -461,7 +461,7 @@ static void sp_ellipse_class_init(SPEllipseClass *klass) ellipse_parent_class = (SPGenericEllipseClass*) g_type_class_ref(SP_TYPE_GENERICELLIPSE); - sp_object_class->build = sp_ellipse_build; + //sp_object_class->build = sp_ellipse_build; sp_object_class->write = sp_ellipse_write; sp_object_class->set = sp_ellipse_set; @@ -636,7 +636,7 @@ sp_circle_class_init(SPCircleClass *klass) circle_parent_class = (SPGenericEllipseClass*) g_type_class_ref(SP_TYPE_GENERICELLIPSE); - sp_object_class->build = sp_circle_build; + //sp_object_class->build = sp_circle_build; sp_object_class->write = sp_circle_write; sp_object_class->set = sp_circle_set; @@ -788,7 +788,7 @@ sp_arc_class_init(SPArcClass *klass) arc_parent_class = (SPGenericEllipseClass*) g_type_class_ref(SP_TYPE_GENERICELLIPSE); - sp_object_class->build = sp_arc_build; + //sp_object_class->build = sp_arc_build; sp_object_class->write = sp_arc_write; sp_object_class->set = sp_arc_set; sp_object_class->modified = sp_arc_modified; diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp index b63a05b4b..6d36aaa45 100644 --- a/src/sp-filter-primitive.cpp +++ b/src/sp-filter-primitive.cpp @@ -65,7 +65,7 @@ static void sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass) filter_primitive_parent_class = static_cast<SPObjectClass *>(g_type_class_peek_parent(klass)); - sp_object_class->build = sp_filter_primitive_build; + // sp_object_class->build = sp_filter_primitive_build; sp_object_class->release = sp_filter_primitive_release; sp_object_class->write = sp_filter_primitive_write; sp_object_class->set = sp_filter_primitive_set; @@ -100,9 +100,10 @@ static void sp_filter_primitive_init(SPFilterPrimitive *filter_primitive) static void sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->build) { - (static_cast<SPObjectClass *>(filter_primitive_parent_class))->build(object, document, repr); - } +// if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->build) { +// (static_cast<SPObjectClass *>(filter_primitive_parent_class))->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "in" ); object->readAttr( "result" ); diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp index a20856f53..85a898958 100644 --- a/src/sp-filter.cpp +++ b/src/sp-filter.cpp @@ -86,7 +86,7 @@ sp_filter_class_init(SPFilterClass *klass) filter_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_filter_build; + //sp_object_class->build = sp_filter_build; sp_object_class->release = sp_filter_release; sp_object_class->write = sp_filter_write; sp_object_class->set = sp_filter_set; @@ -130,9 +130,10 @@ sp_filter_init(SPFilter *filter) static void sp_filter_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) filter_parent_class)->build) { - ((SPObjectClass *) filter_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) filter_parent_class)->build) { +// ((SPObjectClass *) filter_parent_class)->build(object, document, repr); +// } + // CPPIFY: todo //Read values of key attributes from XML nodes into object. object->readAttr( "filterUnits" ); diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp index 976746770..556abfdf0 100644 --- a/src/sp-flowdiv.cpp +++ b/src/sp-flowdiv.cpp @@ -86,7 +86,7 @@ static void sp_flowdiv_class_init(SPFlowdivClass *klass) flowdiv_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM)); - sp_object_class->build = sp_flowdiv_build; + //sp_object_class->build = sp_flowdiv_build; sp_object_class->set = sp_flowdiv_set; sp_object_class->release = sp_flowdiv_release; sp_object_class->write = sp_flowdiv_write; @@ -297,7 +297,7 @@ static void sp_flowtspan_class_init(SPFlowtspanClass *klass) flowtspan_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM)); - sp_object_class->build = sp_flowtspan_build; + //sp_object_class->build = sp_flowtspan_build; sp_object_class->set = sp_flowtspan_set; sp_object_class->release = sp_flowtspan_release; sp_object_class->write = sp_flowtspan_write; @@ -508,7 +508,7 @@ static void sp_flowpara_class_init(SPFlowparaClass *klass) flowpara_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM)); - sp_object_class->build = sp_flowpara_build; + //sp_object_class->build = sp_flowpara_build; sp_object_class->set = sp_flowpara_set; sp_object_class->release = sp_flowpara_release; sp_object_class->write = sp_flowpara_write; diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index 3779a19b5..b4d80e11d 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -93,7 +93,7 @@ sp_flowtext_class_init(SPFlowtextClass *klass) sp_object_class->update = sp_flowtext_update; sp_object_class->modified = sp_flowtext_modified; sp_object_class->write = sp_flowtext_write; - sp_object_class->build = sp_flowtext_build; + //sp_object_class->build = sp_flowtext_build; sp_object_class->set = sp_flowtext_set; // item_class->bbox = sp_flowtext_bbox; diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp index e9faabdc6..6ca8f850c 100644 --- a/src/sp-font-face.cpp +++ b/src/sp-font-face.cpp @@ -304,7 +304,7 @@ static void sp_fontface_class_init(SPFontFaceClass *fc) parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_fontface_build; + //sp_object_class->build = sp_fontface_build; sp_object_class->release = sp_fontface_release; sp_object_class->set = sp_fontface_set; sp_object_class->write = sp_fontface_write; @@ -369,9 +369,10 @@ static void sp_fontface_init(SPFontFace *face) static void sp_fontface_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) (parent_class))->build) { - ((SPObjectClass *) (parent_class))->build(object, document, repr); - } +// if (((SPObjectClass *) (parent_class))->build) { +// ((SPObjectClass *) (parent_class))->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "font-family" ); object->readAttr( "font-style" ); diff --git a/src/sp-font.cpp b/src/sp-font.cpp index 852e6ba5d..c91abdaba 100644 --- a/src/sp-font.cpp +++ b/src/sp-font.cpp @@ -70,7 +70,7 @@ static void sp_font_class_init(SPFontClass *fc) parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_font_build; + //sp_object_class->build = sp_font_build; sp_object_class->release = sp_font_release; sp_object_class->set = sp_font_set; sp_object_class->write = sp_font_write; @@ -98,9 +98,11 @@ static void sp_font_init(SPFont *font) static void sp_font_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) (parent_class))->build) { - ((SPObjectClass *) (parent_class))->build(object, document, repr); - } +// if (((SPObjectClass *) (parent_class))->build) { +// ((SPObjectClass *) (parent_class))->build(object, document, repr); +// } + // CPPIFY: todo + object->readAttr( "horiz-origin-x" ); object->readAttr( "horiz-origin-y" ); diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp index 652d965bb..b94591e9d 100644 --- a/src/sp-glyph-kerning.cpp +++ b/src/sp-glyph-kerning.cpp @@ -89,7 +89,7 @@ static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc) parent_class = (SPObjectClass*)g_type_class_peek_parent(gc); - sp_object_class->build = sp_glyph_kerning_build; + //sp_object_class->build = sp_glyph_kerning_build; sp_object_class->release = sp_glyph_kerning_release; sp_object_class->set = sp_glyph_kerning_set; sp_object_class->write = sp_glyph_kerning_write; @@ -108,9 +108,10 @@ static void sp_glyph_kerning_init(SPGlyphKerning *glyph) static void sp_glyph_kerning_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) (parent_class))->build) { - ((SPObjectClass *) (parent_class))->build(object, document, repr); - } +// if (((SPObjectClass *) (parent_class))->build) { +// ((SPObjectClass *) (parent_class))->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "u1" ); object->readAttr( "g1" ); diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp index 719375688..15b718fd0 100644 --- a/src/sp-glyph.cpp +++ b/src/sp-glyph.cpp @@ -63,7 +63,7 @@ static void sp_glyph_class_init(SPGlyphClass *gc) parent_class = (SPObjectClass*)g_type_class_peek_parent(gc); - sp_object_class->build = sp_glyph_build; + //sp_object_class->build = sp_glyph_build; sp_object_class->release = sp_glyph_release; sp_object_class->set = sp_glyph_set; sp_object_class->write = sp_glyph_write; @@ -88,9 +88,10 @@ static void sp_glyph_init(SPGlyph *glyph) static void sp_glyph_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) (parent_class))->build) { - ((SPObjectClass *) (parent_class))->build(object, document, repr); - } +// if (((SPObjectClass *) (parent_class))->build) { +// ((SPObjectClass *) (parent_class))->build(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "unicode" ); object->readAttr( "glyph-name" ); diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 778d6e52e..f33d67e3f 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -127,7 +127,7 @@ static void sp_stop_class_init(SPStopClass *klass) stop_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_stop_build; + //sp_object_class->build = sp_stop_build; sp_object_class->set = sp_stop_set; sp_object_class->write = sp_stop_write; } @@ -409,7 +409,7 @@ static void sp_meshrow_class_init(SPMeshRowClass *klass) meshrow_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_meshrow_build; + //sp_object_class->build = sp_meshrow_build; sp_object_class->set = sp_meshrow_set; sp_object_class->write = sp_meshrow_write; } @@ -509,7 +509,7 @@ static void sp_meshpatch_class_init(SPMeshPatchClass *klass) meshpatch_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_meshpatch_build; + //sp_object_class->build = sp_meshpatch_build; sp_object_class->set = sp_meshpatch_set; sp_object_class->write = sp_meshpatch_write; } @@ -642,7 +642,7 @@ void CGradient::classInit(SPGradientClass *klass) gradient_parent_class = (SPPaintServerClass *)g_type_class_ref(SP_TYPE_PAINT_SERVER); - sp_object_class->build = spgradient_on_build; + //sp_object_class->build = spgradient_on_build; sp_object_class->release = spgradient_on_release; sp_object_class->set = spgradient_set; sp_object_class->child_added = spgradient_child_added; @@ -1586,7 +1586,7 @@ static void sp_lineargradient_class_init(SPLinearGradientClass *klass) lg_parent_class = (SPGradientClass*)g_type_class_ref(SP_TYPE_GRADIENT); - sp_object_class->build = sp_lineargradient_build; + //sp_object_class->build = sp_lineargradient_build; sp_object_class->set = sp_lineargradient_set; sp_object_class->write = sp_lineargradient_write; @@ -1776,7 +1776,7 @@ static void sp_radialgradient_class_init(SPRadialGradientClass *klass) rg_parent_class = (SPGradientClass*)g_type_class_ref(SP_TYPE_GRADIENT); - sp_object_class->build = sp_radialgradient_build; + //sp_object_class->build = sp_radialgradient_build; sp_object_class->set = sp_radialgradient_set; sp_object_class->write = sp_radialgradient_write; @@ -1992,7 +1992,7 @@ static void sp_meshgradient_class_init(SPMeshGradientClass *klass) mg_parent_class = (SPGradientClass*)g_type_class_ref(SP_TYPE_GRADIENT); - sp_object_class->build = sp_meshgradient_build; + //sp_object_class->build = sp_meshgradient_build; sp_object_class->set = sp_meshgradient_set; sp_object_class->write = sp_meshgradient_write; diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index 6a71cf4f0..9fc0a4c7d 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -95,7 +95,7 @@ static void sp_guide_class_init(SPGuideClass *gc) gobject_class->set_property = sp_guide_set_property; gobject_class->get_property = sp_guide_get_property; - sp_object_class->build = sp_guide_build; + //sp_object_class->build = sp_guide_build; sp_object_class->release = sp_guide_release; sp_object_class->set = sp_guide_set; @@ -158,9 +158,10 @@ static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, static void sp_guide_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) (parent_class))->build) { - (* ((SPObjectClass *) (parent_class))->build)(object, document, repr); - } +// if (((SPObjectClass *) (parent_class))->build) { +// (* ((SPObjectClass *) (parent_class))->build)(object, document, repr); +// } + // CPPIFY: todo object->readAttr( "inkscape:label" ); object->readAttr( "orientation" ); diff --git a/src/sp-image.cpp b/src/sp-image.cpp index 3d5a9a08b..df2947e9a 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -587,7 +587,7 @@ static void sp_image_class_init( SPImageClass * klass ) parent_class = reinterpret_cast<SPItemClass*>(g_type_class_ref(SPItem::getType())); - sp_object_class->build = sp_image_build; + //sp_object_class->build = sp_image_build; sp_object_class->release = sp_image_release; sp_object_class->set = sp_image_set; sp_object_class->update = sp_image_update; diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index e3b48d4cf..105ec03a7 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -126,7 +126,7 @@ sp_group_class_init (SPGroupClass *klass) sp_object_class->set = sp_group_set; sp_object_class->write = sp_group_write; sp_object_class->release = sp_group_release; - sp_object_class->build = sp_group_build; + //sp_object_class->build = sp_group_build; // item_class->bbox = sp_group_bbox; // item_class->print = sp_group_print; diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 3058d8974..ebbe04f03 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -110,7 +110,7 @@ SPItemClass::sp_item_class_init(SPItemClass *klass) static_parent_class = (SPObjectClass *)g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = SPItem::sp_item_build; + //sp_object_class->build = SPItem::sp_item_build; sp_object_class->release = SPItem::sp_item_release; sp_object_class->set = SPItem::sp_item_set; sp_object_class->update = SPItem::sp_item_update; diff --git a/src/sp-line.cpp b/src/sp-line.cpp index 4d017cf49..b172d24a9 100644 --- a/src/sp-line.cpp +++ b/src/sp-line.cpp @@ -53,7 +53,7 @@ void SPLineClass::sp_line_class_init(SPLineClass *klass) SPLineClass::static_parent_class = (SPShapeClass *) g_type_class_ref(SP_TYPE_SHAPE); SPObjectClass *sp_object_class = (SPObjectClass *) klass; - sp_object_class->build = SPLine::build; + //sp_object_class->build = SPLine::build; sp_object_class->set = SPLine::set; sp_object_class->write = SPLine::write; diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index b013a8b06..20660b67a 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -99,7 +99,7 @@ sp_lpe_item_class_init(SPLPEItemClass *klass) gobject_class->finalize = sp_lpe_item_finalize; - sp_object_class->build = sp_lpe_item_build; + //sp_object_class->build = sp_lpe_item_build; sp_object_class->release = sp_lpe_item_release; sp_object_class->set = sp_lpe_item_set; sp_object_class->update = sp_lpe_item_update; diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp index 8e92afb6e..eb39ebf3d 100644 --- a/src/sp-mask.cpp +++ b/src/sp-mask.cpp @@ -76,7 +76,7 @@ sp_mask_class_init (SPMaskClass *klass) parent_class = (SPObjectGroupClass*) g_type_class_ref (SP_TYPE_OBJECTGROUP); SPObjectClass *sp_object_class = (SPObjectClass *) klass; - sp_object_class->build = sp_mask_build; + //sp_object_class->build = sp_mask_build; sp_object_class->release = sp_mask_release; sp_object_class->set = sp_mask_set; sp_object_class->child_added = sp_mask_child_added; diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp index 7f0503ce2..f75943f78 100644 --- a/src/sp-metadata.cpp +++ b/src/sp-metadata.cpp @@ -73,7 +73,7 @@ sp_metadata_class_init (SPMetadataClass *klass) metadata_parent_class = (SPObjectClass*)g_type_class_peek_parent (klass); - sp_object_class->build = sp_metadata_build; + //sp_object_class->build = sp_metadata_build; sp_object_class->release = sp_metadata_release; sp_object_class->write = sp_metadata_write; sp_object_class->set = sp_metadata_set; diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp index 778a9945a..284f9d092 100644 --- a/src/sp-missing-glyph.cpp +++ b/src/sp-missing-glyph.cpp @@ -60,7 +60,7 @@ static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc) parent_class = (SPObjectClass*)g_type_class_peek_parent(gc); - sp_object_class->build = sp_missing_glyph_build; + //sp_object_class->build = sp_missing_glyph_build; sp_object_class->release = sp_missing_glyph_release; sp_object_class->set = sp_missing_glyph_set; sp_object_class->write = sp_missing_glyph_write; diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index e85b1fc5a..2e36bd082 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -95,7 +95,7 @@ static void sp_namedview_class_init(SPNamedViewClass * klass) parent_class = reinterpret_cast<SPObjectGroupClass *>(g_type_class_ref(SP_TYPE_OBJECTGROUP)); - sp_object_class->build = sp_namedview_build; + //sp_object_class->build = sp_namedview_build; sp_object_class->release = sp_namedview_release; sp_object_class->set = sp_namedview_set; sp_object_class->child_added = sp_namedview_child_added; diff --git a/src/sp-object.cpp b/src/sp-object.cpp index dec99fcc0..933bfceda 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -139,7 +139,7 @@ void SPObjectClass::sp_object_class_init(SPObjectClass *klass) klass->release = SPObject::sp_object_release; - klass->build = SPObject::sp_object_build; + //klass->build = SPObject::sp_object_build; klass->set = SPObject::sp_object_private_set; klass->write = SPObject::sp_object_private_write; diff --git a/src/sp-object.h b/src/sp-object.h index 9ff772870..3daadec59 100644 --- a/src/sp-object.h +++ b/src/sp-object.h @@ -920,7 +920,7 @@ class SPObjectClass { public: GObjectClass parent_class; - void (* build) (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr); + //void (* build) (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr); void (* release) (SPObject *object); /* Virtual handlers of repr signals */ diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp index 652f4fdb7..d1efb97f3 100644 --- a/src/sp-offset.cpp +++ b/src/sp-offset.cpp @@ -150,7 +150,7 @@ sp_offset_class_init(SPOffsetClass *klass) gobject_class->finalize = sp_offset_finalize; - sp_object_class->build = sp_offset_build; + //sp_object_class->build = sp_offset_build; sp_object_class->write = sp_offset_write; sp_object_class->set = sp_offset_set; sp_object_class->update = sp_offset_update; diff --git a/src/sp-path.cpp b/src/sp-path.cpp index f96e516b7..fd726c9fe 100644 --- a/src/sp-path.cpp +++ b/src/sp-path.cpp @@ -110,7 +110,7 @@ sp_path_class_init(SPPathClass * klass) gobject_class->finalize = sp_path_finalize; - sp_object_class->build = sp_path_build; + //sp_object_class->build = sp_path_build; sp_object_class->release = sp_path_release; sp_object_class->set = sp_path_set; sp_object_class->write = sp_path_write; diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 5e55cbe34..729a68dfc 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -90,7 +90,7 @@ sp_pattern_class_init (SPPatternClass *klass) pattern_parent_class = (SPPaintServerClass*)g_type_class_ref (SP_TYPE_PAINT_SERVER); - sp_object_class->build = sp_pattern_build; + //sp_object_class->build = sp_pattern_build; sp_object_class->release = sp_pattern_release; sp_object_class->set = sp_pattern_set; sp_object_class->update = sp_pattern_update; diff --git a/src/sp-polygon.cpp b/src/sp-polygon.cpp index ee930c691..28eea4ff3 100644 --- a/src/sp-polygon.cpp +++ b/src/sp-polygon.cpp @@ -65,7 +65,7 @@ static void sp_polygon_class_init(SPPolygonClass *pc) parent_class = (SPShapeClass *) g_type_class_ref(SP_TYPE_SHAPE); - sp_object_class->build = sp_polygon_build; + //sp_object_class->build = sp_polygon_build; sp_object_class->write = sp_polygon_write; sp_object_class->set = sp_polygon_set; diff --git a/src/sp-polyline.cpp b/src/sp-polyline.cpp index 111bca390..319aad41f 100644 --- a/src/sp-polyline.cpp +++ b/src/sp-polyline.cpp @@ -52,7 +52,7 @@ void SPPolyLineClass::sp_polyline_class_init(SPPolyLineClass *klass) static_parent_class = (SPShapeClass *)g_type_class_ref(SP_TYPE_SHAPE); - sp_object_class->build = SPPolyLine::build; + //sp_object_class->build = SPPolyLine::build; sp_object_class->set = SPPolyLine::set; sp_object_class->write = SPPolyLine::write; diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp index f0363d9a8..bc85edac4 100644 --- a/src/sp-rect.cpp +++ b/src/sp-rect.cpp @@ -80,7 +80,7 @@ sp_rect_class_init(SPRectClass *klass) parent_class = (SPShapeClass *)g_type_class_ref(SP_TYPE_SHAPE); - sp_object_class->build = sp_rect_build; + //sp_object_class->build = sp_rect_build; sp_object_class->write = sp_rect_write; sp_object_class->set = sp_rect_set; sp_object_class->update = sp_rect_update; diff --git a/src/sp-root.cpp b/src/sp-root.cpp index 96b9f4ef9..2d6cf0fc4 100644 --- a/src/sp-root.cpp +++ b/src/sp-root.cpp @@ -83,7 +83,7 @@ static void sp_root_class_init(SPRootClass *klass) parent_class = reinterpret_cast<SPGroupClass *>(g_type_class_ref(SP_TYPE_GROUP)); - sp_object_class->build = sp_root_build; + //sp_object_class->build = sp_root_build; sp_object_class->release = sp_root_release; sp_object_class->set = sp_root_set; sp_object_class->child_added = sp_root_child_added; diff --git a/src/sp-script.cpp b/src/sp-script.cpp index 307e7ad3d..c875cfc0f 100644 --- a/src/sp-script.cpp +++ b/src/sp-script.cpp @@ -56,7 +56,7 @@ static void sp_script_class_init(SPScriptClass *sc) parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT); SPObjectClass *sp_object_class = (SPObjectClass *) sc; - sp_object_class->build = sp_script_build; + //sp_object_class->build = sp_script_build; sp_object_class->release = sp_script_release; sp_object_class->update = sp_script_update; sp_object_class->modified = sp_script_modified; diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp index 9fa338f8f..cfb5239b1 100644 --- a/src/sp-shape.cpp +++ b/src/sp-shape.cpp @@ -94,7 +94,7 @@ void SPShapeClass::sp_shape_class_init(SPShapeClass *klass) gobject_class->finalize = SPShape::sp_shape_finalize; - sp_object_class->build = SPShape::sp_shape_build; + //sp_object_class->build = SPShape::sp_shape_build; sp_object_class->release = SPShape::sp_shape_release; sp_object_class->set = SPShape::sp_shape_set; sp_object_class->update = SPShape::sp_shape_update; diff --git a/src/sp-skeleton.cpp b/src/sp-skeleton.cpp index 8910613f3..ceb01350a 100644 --- a/src/sp-skeleton.cpp +++ b/src/sp-skeleton.cpp @@ -80,7 +80,7 @@ sp_skeleton_class_init(SPSkeletonClass *klass) skeleton_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_skeleton_build; + //sp_object_class->build = sp_skeleton_build; sp_object_class->release = sp_skeleton_release; sp_object_class->write = sp_skeleton_write; sp_object_class->set = sp_skeleton_set; @@ -102,9 +102,9 @@ static void sp_skeleton_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { debug("0x%p",object); - if (((SPObjectClass *) skeleton_parent_class)->build) { - ((SPObjectClass *) skeleton_parent_class)->build(object, document, repr); - } +// if (((SPObjectClass *) skeleton_parent_class)->build) { +// ((SPObjectClass *) skeleton_parent_class)->build(object, document, repr); +// } /* Pay attention to certain settings here diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp index f6663ca12..f31ce5f90 100644 --- a/src/sp-spiral.cpp +++ b/src/sp-spiral.cpp @@ -84,7 +84,7 @@ static void sp_spiral_class_init(SPSpiralClass *klass) parent_class = reinterpret_cast<SPShapeClass *>(g_type_class_ref(SP_TYPE_SHAPE)); - sp_object_class->build = sp_spiral_build; + //sp_object_class->build = sp_spiral_build; sp_object_class->write = sp_spiral_write; sp_object_class->set = sp_spiral_set; sp_object_class->update = sp_spiral_update; diff --git a/src/sp-star.cpp b/src/sp-star.cpp index cbc4d4520..489702167 100644 --- a/src/sp-star.cpp +++ b/src/sp-star.cpp @@ -78,7 +78,7 @@ static void sp_star_class_init(SPStarClass *klass) parent_class = reinterpret_cast<SPShapeClass *>(g_type_class_ref(SP_TYPE_SHAPE)); - sp_object_class->build = sp_star_build; + //sp_object_class->build = sp_star_build; sp_object_class->write = sp_star_write; sp_object_class->set = sp_star_set; sp_object_class->update = sp_star_update; diff --git a/src/sp-string.cpp b/src/sp-string.cpp index 45bf98ea6..eb0b7a9f0 100644 --- a/src/sp-string.cpp +++ b/src/sp-string.cpp @@ -78,7 +78,7 @@ sp_string_class_init(SPStringClass *classname) string_parent_class = (SPObjectClass*)g_type_class_ref(SP_TYPE_OBJECT); - sp_object_class->build = sp_string_build; + //sp_object_class->build = sp_string_build; sp_object_class->release = sp_string_release; sp_object_class->read_content = sp_string_read_content; sp_object_class->update = sp_string_update; diff --git a/src/sp-style-elem.cpp b/src/sp-style-elem.cpp index 71eb87b8c..c7b4800b2 100644 --- a/src/sp-style-elem.cpp +++ b/src/sp-style-elem.cpp @@ -45,7 +45,7 @@ sp_style_elem_class_init(SPStyleElemClass *klass) parent_class = (SPObjectClass *)g_type_class_ref(SP_TYPE_OBJECT); /* FIXME */ - klass->build = sp_style_elem_build; + //klass->build = sp_style_elem_build; klass->set = sp_style_elem_set; klass->read_content = sp_style_elem_read_content; klass->write = sp_style_elem_write; diff --git a/src/sp-symbol.cpp b/src/sp-symbol.cpp index 11c14bc4e..62b306078 100644 --- a/src/sp-symbol.cpp +++ b/src/sp-symbol.cpp @@ -71,7 +71,7 @@ static void sp_symbol_class_init(SPSymbolClass *klass) parent_class = (SPGroupClass *)g_type_class_ref (SP_TYPE_GROUP); - sp_object_class->build = sp_symbol_build; + //sp_object_class->build = sp_symbol_build; sp_object_class->release = sp_symbol_release; sp_object_class->set = sp_symbol_set; sp_object_class->child_added = sp_symbol_child_added; diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 56b76a94f..0f3ea87dd 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -115,7 +115,7 @@ sp_text_class_init (SPTextClass *classname) text_parent_class = (SPItemClass*)g_type_class_ref (SP_TYPE_ITEM); sp_object_class->release = sp_text_release; - sp_object_class->build = sp_text_build; + //sp_object_class->build = sp_text_build; sp_object_class->set = sp_text_set; sp_object_class->child_added = sp_text_child_added; sp_object_class->remove_child = sp_text_remove_child; diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 4296fd416..0ec0c3ebc 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -100,7 +100,7 @@ sp_tref_class_init(SPTRefClass *tref_class) tref_parent_class = (SPObjectClass*)g_type_class_peek_parent(tref_class); - sp_object_class->build = sp_tref_build; + //sp_object_class->build = sp_tref_build; sp_object_class->release = sp_tref_release; sp_object_class->write = sp_tref_write; sp_object_class->set = sp_tref_set; diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp index e94733dee..d79177135 100644 --- a/src/sp-tspan.cpp +++ b/src/sp-tspan.cpp @@ -98,7 +98,7 @@ sp_tspan_class_init(SPTSpanClass *classname) tspan_parent_class = (SPItemClass*)g_type_class_ref(SP_TYPE_ITEM); - sp_object_class->build = sp_tspan_build; + //sp_object_class->build = sp_tspan_build; sp_object_class->release = sp_tspan_release; sp_object_class->set = sp_tspan_set; sp_object_class->update = sp_tspan_update; @@ -395,7 +395,7 @@ static void sp_textpath_class_init(SPTextPathClass *classname) gobject_class->finalize = sp_textpath_finalize; - sp_object_class->build = sp_textpath_build; + //sp_object_class->build = sp_textpath_build; sp_object_class->release = sp_textpath_release; sp_object_class->set = sp_textpath_set; sp_object_class->update = sp_textpath_update; diff --git a/src/sp-use.cpp b/src/sp-use.cpp index a7e3a7b36..c85029089 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -98,7 +98,7 @@ sp_use_class_init(SPUseClass *classname) gobject_class->finalize = sp_use_finalize; - sp_object_class->build = sp_use_build; + //sp_object_class->build = sp_use_build; sp_object_class->release = sp_use_release; sp_object_class->set = sp_use_set; sp_object_class->write = sp_use_write; |
