From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/style-internal.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/style-internal.cpp') diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 62b0de52d..136a522f8 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -23,16 +23,14 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #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 -#include - #include // TODO REMOVE OR MAKE MEMBER FUNCTIONS -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/style-internal.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/style-internal.cpp') diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 136a522f8..62b0de52d 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -23,14 +23,16 @@ */ #ifdef HAVE_CONFIG_H -#include +# 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" @@ -40,6 +42,9 @@ #include "svg/css-ostringstream.h" #include "util/units.h" +#include +#include + #include // TODO REMOVE OR MAKE MEMBER FUNCTIONS -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/style-internal.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/style-internal.cpp') diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 62b0de52d..136a522f8 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -23,16 +23,14 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #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 -#include - #include // TODO REMOVE OR MAKE MEMBER FUNCTIONS -- cgit v1.2.3 From 0bceae549cc912f571a2c422fbb3f9764ff2cb1d Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Mon, 5 Sep 2016 12:33:37 +0300 Subject: Refactor == true (bzr r15100.1.16) --- src/style-internal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/style-internal.cpp') diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 136a522f8..5a2a2f913 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -1555,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"; @@ -2787,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; } } -- cgit v1.2.3