diff options
| author | Jabiertxof <jtx@jtx> | 2017-01-21 23:33:24 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-01-21 23:33:24 +0000 |
| commit | eeb5405c1b2734322ca9ed506e8a8e16a87c2a4f (patch) | |
| tree | 5f98cdb1ee5633b69ec1f5c21d0d5e69f8770ad2 /src/style-internal.cpp | |
| parent | Organize doeffect function (diff) | |
| parent | Fix "swap fill and stroke" for multiple objects in selection (diff) | |
| download | inkscape-eeb5405c1b2734322ca9ed506e8a8e16a87c2a4f.tar.gz inkscape-eeb5405c1b2734322ca9ed506e8a8e16a87c2a4f.zip | |
Update to trunk
(bzr r13645.1.165)
Diffstat (limited to 'src/style-internal.cpp')
| -rw-r--r-- | src/style-internal.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 62b0de52d..5a2a2f913 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -23,16 +23,14 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "style-internal.h" -#include "style-enums.h" #include "style.h" #include "svg/svg.h" #include "svg/svg-color.h" -#include "svg/svg-icc-color.h" #include "streq.h" #include "strneq.h" @@ -42,9 +40,6 @@ #include "svg/css-ostringstream.h" #include "util/units.h" -#include <sigc++/functors/ptr_fun.h> -#include <sigc++/adaptors/bind.h> - #include <glibmm/regex.h> // TODO REMOVE OR MAKE MEMBER FUNCTIONS @@ -1560,7 +1555,7 @@ SPIPaintOrder::write( guint const flags, SPIBase const *const base) const { css << "inherit"; } else { for( unsigned i = 0; i < PAINT_ORDER_LAYERS; ++i ) { - if( this->layer_set[i] == true ) { + if( layer_set[i] ) { switch (this->layer[i]) { case SP_CSS_PAINT_ORDER_NORMAL: css << "normal"; @@ -2792,7 +2787,7 @@ SPITextDecoration::read( gchar const *str ) { } // If we set text_decoration_line, then update style_td (for CSS2 text-decoration) - if( style->text_decoration_line.set == true ) { + if( style->text_decoration_line.set ) { style_td = style; } } |