diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-08-04 17:07:28 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-08-04 17:07:28 +0000 |
| commit | db7a8fdb0e8141c84886129ff2344c1959a26c49 (patch) | |
| tree | 1eac547caa1c41b336ccf546de5a7901144952b1 /src | |
| parent | Update to trunk r13489 (diff) | |
| download | inkscape-db7a8fdb0e8141c84886129ff2344c1959a26c49.tar.gz inkscape-db7a8fdb0e8141c84886129ff2344c1959a26c49.zip | |
Warnings cleanup.
(bzr r13341.1.117)
Diffstat (limited to 'src')
| -rw-r--r-- | src/style-internal.h | 2 | ||||
| -rw-r--r-- | src/style.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/style-internal.h b/src/style-internal.h index e76f9faaf..b549bb8ef 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -340,7 +340,7 @@ class SPIEnum : public SPIBase { public: SPIEnum() : SPIBase( "anonymous_enum" ), enums( NULL ), value(0), computed(0) {}; - SPIEnum( Glib::ustring name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) : + SPIEnum( Glib::ustring const name, SPStyleEnum const *enums, unsigned value = 0, bool inherits = true ) : SPIBase( name, inherits ), enums( enums ), value(value), computed(value), value_default(value), computed_default(value) {}; // Following is needed for font-weight diff --git a/src/style.cpp b/src/style.cpp index a91611d89..66672e949 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -121,10 +121,6 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : // Text related properties text_indent( "text-indent", 0.0 ), // SPILength text_align( "text-align", enum_text_align, SP_CSS_TEXT_ALIGN_START ), - text_decoration(), - text_decoration_line(), - text_decoration_style(), - text_decoration_color( "text-decoration-color" ), // SPIColor letter_spacing( "letter-spacing", 0.0 ), // SPILengthOrNormal word_spacing( "word-spacing", 0.0 ), // SPILengthOrNormal @@ -137,6 +133,11 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : text_anchor( "text-anchor", enum_text_anchor, SP_CSS_TEXT_ANCHOR_START ), white_space( "white-space", enum_white_space, SP_CSS_WHITE_SPACE_NORMAL ), + text_decoration(), + text_decoration_line(), + text_decoration_style(), + text_decoration_color( "text-decoration-color" ), // SPIColor + // General visual properties clip_rule( "clip-rule", enum_clip_rule, SP_WIND_RULE_NONZERO ), display( "display", enum_display, SP_CSS_DISPLAY_INLINE, false ), @@ -190,7 +191,6 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : image_rendering( "image-rendering", enum_image_rendering, SP_CSS_IMAGE_RENDERING_AUTO), shape_rendering( "shape-rendering", enum_shape_rendering, SP_CSS_SHAPE_RENDERING_AUTO), text_rendering( "text-rendering", enum_text_rendering, SP_CSS_TEXT_RENDERING_AUTO ) - { // std::cout << "SPStyle::SPStyle( SPDocument ): Entrance: (" << _count << ")" << std::endl; // std::cout << " Document: " << (document_in?"present":"null") << std::endl; |