From 1c8127076573a338f2f66aa4fbb56588b62a1182 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 8 Jan 2012 01:00:38 -0800 Subject: Warning and uninitialized variable cleanup. (bzr r10860) --- src/sp-flowdiv.cpp | 300 +++++++++++++++++++++++++---------------------------- 1 file changed, 140 insertions(+), 160 deletions(-) (limited to 'src/sp-flowdiv.cpp') diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp index 5cb258735..7a0c5e0b8 100644 --- a/src/sp-flowdiv.cpp +++ b/src/sp-flowdiv.cpp @@ -59,8 +59,7 @@ static SPItemClass * flowpara_parent_class; static SPObjectClass * flowline_parent_class; static SPObjectClass * flowregionbreak_parent_class; -GType -sp_flowdiv_get_type (void) +GType sp_flowdiv_get_type(void) { static GType group_type = 0; if (!group_type) { @@ -81,35 +80,29 @@ sp_flowdiv_get_type (void) return group_type; } -static void -sp_flowdiv_class_init (SPFlowdivClass *klass) +static void sp_flowdiv_class_init(SPFlowdivClass *klass) { - GObjectClass * object_class; - SPObjectClass * sp_object_class; - - object_class = (GObjectClass *) klass; - sp_object_class = (SPObjectClass *) klass; + SPObjectClass *sp_object_class = reinterpret_cast(klass); - flowdiv_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM); + flowdiv_parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_ITEM)); - 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; - sp_object_class->update = sp_flowdiv_update; - sp_object_class->modified = sp_flowdiv_modified; + 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; + sp_object_class->update = sp_flowdiv_update; + sp_object_class->modified = sp_flowdiv_modified; } -static void -sp_flowdiv_init (SPFlowdiv */*group*/) +static void sp_flowdiv_init(SPFlowdiv */*group*/) { } -static void -sp_flowdiv_release (SPObject *object) +static void sp_flowdiv_release(SPObject *object) { - if (((SPObjectClass *) flowdiv_parent_class)->release) - ((SPObjectClass *) flowdiv_parent_class)->release (object); + if (reinterpret_cast(flowdiv_parent_class)->release) { + reinterpret_cast(flowdiv_parent_class)->release(object); + } } static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags) @@ -117,8 +110,8 @@ static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags) SPItemCtx *ictx = reinterpret_cast(ctx); SPItemCtx cctx = *ictx; - if (((SPObjectClass *) (flowdiv_parent_class))->update) { - ((SPObjectClass *) (flowdiv_parent_class))->update(object, ctx, flags); + if (reinterpret_cast(flowdiv_parent_class)->update) { + reinterpret_cast(flowdiv_parent_class)->update(object, ctx, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -149,10 +142,10 @@ static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags) } } -static void sp_flowdiv_modified (SPObject *object, guint flags) +static void sp_flowdiv_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) (flowdiv_parent_class))->modified) { - ((SPObjectClass *) (flowdiv_parent_class))->modified(object, flags); + if (reinterpret_cast(flowdiv_parent_class)->modified) { + reinterpret_cast(flowdiv_parent_class)->modified(object, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -176,19 +169,19 @@ static void sp_flowdiv_modified (SPObject *object, guint flags) } } -static void -sp_flowdiv_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) +static void sp_flowdiv_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) { - object->_requireSVGVersion(Inkscape::Version(1, 2)); + object->_requireSVGVersion(Inkscape::Version(1, 2)); - if (((SPObjectClass *) flowdiv_parent_class)->build) - ((SPObjectClass *) flowdiv_parent_class)->build (object, doc, repr); + if (reinterpret_cast(flowdiv_parent_class)->build) { + reinterpret_cast(flowdiv_parent_class)->build(object, doc, repr); + } } static void sp_flowdiv_set(SPObject *object, unsigned int key, const gchar *value) { - if (((SPObjectClass *) flowdiv_parent_class)->set) { - (((SPObjectClass *) flowdiv_parent_class)->set)(object, key, value); + if (reinterpret_cast(flowdiv_parent_class)->set) { + reinterpret_cast(flowdiv_parent_class)->set(object, key, value); } } @@ -263,34 +256,28 @@ sp_flowtspan_get_type (void) return group_type; } -static void -sp_flowtspan_class_init (SPFlowtspanClass *klass) +static void sp_flowtspan_class_init(SPFlowtspanClass *klass) { - GObjectClass * object_class; - SPObjectClass * sp_object_class; - - object_class = (GObjectClass *) klass; - sp_object_class = (SPObjectClass *) klass; + SPObjectClass *sp_object_class = reinterpret_cast(klass); - flowtspan_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM); + flowtspan_parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_ITEM)); - 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; - sp_object_class->update = sp_flowtspan_update; - sp_object_class->modified = sp_flowtspan_modified; + 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; + sp_object_class->update = sp_flowtspan_update; + sp_object_class->modified = sp_flowtspan_modified; } -static void -sp_flowtspan_init (SPFlowtspan */*group*/) +static void sp_flowtspan_init(SPFlowtspan */*group*/) { } static void sp_flowtspan_release(SPObject *object) { - if (((SPObjectClass *) flowtspan_parent_class)->release) { - ((SPObjectClass *) flowtspan_parent_class)->release(object); + if (reinterpret_cast(flowtspan_parent_class)->release) { + reinterpret_cast(flowtspan_parent_class)->release(object); } } @@ -299,8 +286,8 @@ static void sp_flowtspan_update(SPObject *object, SPCtx *ctx, unsigned int flags SPItemCtx *ictx = reinterpret_cast(ctx); SPItemCtx cctx = *ictx; - if (((SPObjectClass *) (flowtspan_parent_class))->update) { - ((SPObjectClass *) (flowtspan_parent_class))->update(object, ctx, flags); + if (reinterpret_cast(flowtspan_parent_class)->update) { + reinterpret_cast(flowtspan_parent_class)->update(object, ctx, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -333,8 +320,8 @@ static void sp_flowtspan_update(SPObject *object, SPCtx *ctx, unsigned int flags static void sp_flowtspan_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) (flowtspan_parent_class))->modified) { - ((SPObjectClass *) (flowtspan_parent_class))->modified(object, flags); + if (reinterpret_cast(flowtspan_parent_class)->modified) { + reinterpret_cast(flowtspan_parent_class)->modified(object, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -360,15 +347,15 @@ static void sp_flowtspan_modified(SPObject *object, guint flags) static void sp_flowtspan_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) flowtspan_parent_class)->build) { - ((SPObjectClass *) flowtspan_parent_class)->build(object, doc, repr); + if (reinterpret_cast(flowtspan_parent_class)->build) { + reinterpret_cast(flowtspan_parent_class)->build(object, doc, repr); } } static void sp_flowtspan_set(SPObject *object, unsigned int key, const gchar *value) { - if (((SPObjectClass *) flowtspan_parent_class)->set) { - (((SPObjectClass *) flowtspan_parent_class)->set)(object, key, value); + if (reinterpret_cast(flowtspan_parent_class)->set) { + reinterpret_cast(flowtspan_parent_class)->set(object, key, value); } } @@ -444,34 +431,29 @@ sp_flowpara_get_type (void) return group_type; } -static void -sp_flowpara_class_init (SPFlowparaClass *klass) +static void sp_flowpara_class_init(SPFlowparaClass *klass) { - GObjectClass * object_class; - SPObjectClass * sp_object_class; - - object_class = (GObjectClass *) klass; - sp_object_class = (SPObjectClass *) klass; + SPObjectClass *sp_object_class = reinterpret_cast(klass); - flowpara_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM); + flowpara_parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_ITEM)); - 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; - sp_object_class->update = sp_flowpara_update; - sp_object_class->modified = sp_flowpara_modified; + 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; + sp_object_class->update = sp_flowpara_update; + sp_object_class->modified = sp_flowpara_modified; } -static void -sp_flowpara_init (SPFlowpara */*group*/) +static void sp_flowpara_init (SPFlowpara */*group*/) { } -static void -sp_flowpara_release (SPObject *object) + +static void sp_flowpara_release(SPObject *object) { - if (((SPObjectClass *) flowpara_parent_class)->release) - ((SPObjectClass *) flowpara_parent_class)->release (object); + if (reinterpret_cast(flowpara_parent_class)->release) { + reinterpret_cast(flowpara_parent_class)->release(object); + } } static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags) @@ -479,8 +461,8 @@ static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags) SPItemCtx *ictx = reinterpret_cast(ctx); SPItemCtx cctx = *ictx; - if (((SPObjectClass *) (flowpara_parent_class))->update) { - ((SPObjectClass *) (flowpara_parent_class))->update(object, ctx, flags); + if (reinterpret_cast(flowpara_parent_class)->update) { + reinterpret_cast(flowpara_parent_class)->update(object, ctx, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -513,8 +495,8 @@ static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags) static void sp_flowpara_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) (flowpara_parent_class))->modified) { - ((SPObjectClass *) (flowpara_parent_class))->modified(object, flags); + if (reinterpret_cast(flowpara_parent_class)->modified) { + reinterpret_cast(flowpara_parent_class)->modified(object, flags); } if (flags & SP_OBJECT_MODIFIED_FLAG) { @@ -538,18 +520,18 @@ static void sp_flowpara_modified(SPObject *object, guint flags) } } -static void -sp_flowpara_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) +static void sp_flowpara_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) flowpara_parent_class)->build) - ((SPObjectClass *) flowpara_parent_class)->build (object, doc, repr); + if (reinterpret_cast(flowpara_parent_class)->build) { + reinterpret_cast(flowpara_parent_class)->build(object, doc, repr); + } } -static void -sp_flowpara_set (SPObject *object, unsigned int key, const gchar *value) +static void sp_flowpara_set(SPObject *object, unsigned int key, const gchar *value) { - if (((SPObjectClass *) flowpara_parent_class)->set) - (((SPObjectClass *) flowpara_parent_class)->set) (object, key, value); + if (reinterpret_cast(flowpara_parent_class)->set) { + reinterpret_cast(flowpara_parent_class)->set(object, key, value); + } } static Inkscape::XML::Node *sp_flowpara_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) @@ -598,8 +580,7 @@ static Inkscape::XML::Node *sp_flowpara_write(SPObject *object, Inkscape::XML::D * */ -GType -sp_flowline_get_type (void) +GType sp_flowline_get_type(void) { static GType group_type = 0; if (!group_type) { @@ -620,62 +601,61 @@ sp_flowline_get_type (void) return group_type; } -static void -sp_flowline_class_init (SPFlowlineClass *klass) +static void sp_flowline_class_init(SPFlowlineClass *klass) { - GObjectClass * object_class; - SPObjectClass * sp_object_class; - - object_class = (GObjectClass *) klass; - sp_object_class = (SPObjectClass *) klass; + SPObjectClass *sp_object_class = reinterpret_cast(klass); - flowline_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT); + flowline_parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_OBJECT)); - sp_object_class->release = sp_flowline_release; - sp_object_class->write = sp_flowline_write; - sp_object_class->modified = sp_flowline_modified; + sp_object_class->release = sp_flowline_release; + sp_object_class->write = sp_flowline_write; + sp_object_class->modified = sp_flowline_modified; } -static void -sp_flowline_init (SPFlowline */*group*/) +static void sp_flowline_init(SPFlowline */*group*/) { } -static void -sp_flowline_release (SPObject *object) + +static void sp_flowline_release(SPObject *object) { - if (((SPObjectClass *) flowline_parent_class)->release) - ((SPObjectClass *) flowline_parent_class)->release (object); + if (reinterpret_cast(flowline_parent_class)->release) { + reinterpret_cast(flowline_parent_class)->release(object); + } } -static void -sp_flowline_modified (SPObject *object, guint flags) +static void sp_flowline_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) (flowline_parent_class))->modified) - ((SPObjectClass *) (flowline_parent_class))->modified (object, flags); + if (reinterpret_cast(flowline_parent_class)->modified) { + reinterpret_cast(flowline_parent_class)->modified(object, flags); + } - if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; - flags &= SP_OBJECT_MODIFIED_CASCADE; + if (flags & SP_OBJECT_MODIFIED_FLAG) { + flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } + flags &= SP_OBJECT_MODIFIED_CASCADE; } -static Inkscape::XML::Node * -sp_flowline_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) + +static Inkscape::XML::Node *sp_flowline_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { - if ( flags&SP_OBJECT_WRITE_BUILD ) { - if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine"); - } else { - } + if ( flags & SP_OBJECT_WRITE_BUILD ) { + if ( repr == NULL ) { + repr = xml_doc->createElement("svg:flowLine"); + } + } else { + } - if (((SPObjectClass *) (flowline_parent_class))->write) - ((SPObjectClass *) (flowline_parent_class))->write (object, xml_doc, repr, flags); + if (reinterpret_cast(flowline_parent_class)->write) { + reinterpret_cast(flowline_parent_class)->write(object, xml_doc, repr, flags); + } - return repr; + return repr; } /* * */ -GType -sp_flowregionbreak_get_type (void) +GType sp_flowregionbreak_get_type(void) { static GType group_type = 0; if (!group_type) { @@ -696,54 +676,54 @@ sp_flowregionbreak_get_type (void) return group_type; } -static void -sp_flowregionbreak_class_init (SPFlowregionbreakClass *klass) +static void sp_flowregionbreak_class_init(SPFlowregionbreakClass *klass) { - GObjectClass * object_class; - SPObjectClass * sp_object_class; + SPObjectClass *sp_object_class = reinterpret_cast(klass); - object_class = (GObjectClass *) klass; - sp_object_class = (SPObjectClass *) klass; + flowregionbreak_parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_OBJECT)); - flowregionbreak_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT); - - sp_object_class->release = sp_flowregionbreak_release; - sp_object_class->write = sp_flowregionbreak_write; - sp_object_class->modified = sp_flowregionbreak_modified; + sp_object_class->release = sp_flowregionbreak_release; + sp_object_class->write = sp_flowregionbreak_write; + sp_object_class->modified = sp_flowregionbreak_modified; } -static void -sp_flowregionbreak_init (SPFlowregionbreak */*group*/) +static void sp_flowregionbreak_init(SPFlowregionbreak */*group*/) { } -static void -sp_flowregionbreak_release (SPObject *object) + +static void sp_flowregionbreak_release(SPObject *object) { - if (((SPObjectClass *) flowregionbreak_parent_class)->release) - ((SPObjectClass *) flowregionbreak_parent_class)->release (object); + if (reinterpret_cast(flowregionbreak_parent_class)->release) { + reinterpret_cast(flowregionbreak_parent_class)->release(object); + } } -static void -sp_flowregionbreak_modified (SPObject *object, guint flags) +static void sp_flowregionbreak_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) (flowregionbreak_parent_class))->modified) - ((SPObjectClass *) (flowregionbreak_parent_class))->modified (object, flags); + if (reinterpret_cast(flowregionbreak_parent_class)->modified) { + reinterpret_cast(flowregionbreak_parent_class)->modified(object, flags); + } - if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; - flags &= SP_OBJECT_MODIFIED_CASCADE; + if (flags & SP_OBJECT_MODIFIED_FLAG) { + flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } + flags &= SP_OBJECT_MODIFIED_CASCADE; } -static Inkscape::XML::Node * -sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) + +static Inkscape::XML::Node *sp_flowregionbreak_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { - if ( flags&SP_OBJECT_WRITE_BUILD ) { - if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine"); - } else { - } + if ( flags & SP_OBJECT_WRITE_BUILD ) { + if ( repr == NULL ) { + repr = xml_doc->createElement("svg:flowLine"); + } + } else { + } - if (((SPObjectClass *) (flowregionbreak_parent_class))->write) - ((SPObjectClass *) (flowregionbreak_parent_class))->write (object, xml_doc, repr, flags); + if (reinterpret_cast(flowregionbreak_parent_class)->write) { + reinterpret_cast(flowregionbreak_parent_class)->write(object, xml_doc, repr, flags); + } - return repr; + return repr; } /* -- cgit v1.2.3