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/xml/node-fns.cpp | 1 - src/xml/rebase-hrefs.cpp | 3 --- src/xml/repr-css.cpp | 2 -- src/xml/repr-io.cpp | 3 +-- src/xml/repr-util.cpp | 2 -- src/xml/repr.cpp | 2 +- src/xml/simple-node.cpp | 4 +--- src/xml/simple-node.h | 1 - 8 files changed, 3 insertions(+), 15 deletions(-) (limited to 'src/xml') diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp index eb3870978..e1506e3f2 100644 --- a/src/xml/node-fns.cpp +++ b/src/xml/node-fns.cpp @@ -1,5 +1,4 @@ #ifdef HAVE_CONFIG_H -# include "config.h" #endif #include diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp index a8ac3b4cc..7e3d4fa7e 100644 --- a/src/xml/rebase-hrefs.cpp +++ b/src/xml/rebase-hrefs.cpp @@ -4,10 +4,7 @@ #include "io/sys.h" #include "sp-object.h" #include "streq.h" -#include "util/share.h" -#include "xml/attribute-record.h" #include "xml/node.h" -#include #include #include #include diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index c043904a7..9590fa97f 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -26,10 +26,8 @@ #include "xml/repr.h" #include "xml/simple-document.h" -#include "xml/simple-node.h" #include "xml/sp-css-attr.h" #include "style.h" -#include "libcroco/cr-sel-eng.h" using Inkscape::Util::List; using Inkscape::XML::AttributeRecord; diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 6977bc1e2..5f576d00f 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -39,7 +39,6 @@ #include "preferences.h" #include -#include using Inkscape::IO::Writer; using Inkscape::Util::List; diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index ce93bccab..4d093a4ea 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -17,8 +17,6 @@ #include "config.h" -#include - #if HAVE_STRING_H # include #endif diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp index 0a384c9c1..8ad1ac06b 100644 --- a/src/xml/repr.cpp +++ b/src/xml/repr.cpp @@ -17,7 +17,7 @@ #define noREPR_VERBOSE #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp index 3cbedc80b..49057a54b 100644 --- a/src/xml/simple-node.cpp +++ b/src/xml/simple-node.cpp @@ -16,19 +16,17 @@ #include #include +#include #include #include "preferences.h" -#include "xml/node.h" #include "xml/simple-node.h" #include "xml/node-event-vector.h" #include "xml/node-fns.h" -#include "xml/repr.h" #include "debug/event-tracker.h" #include "debug/simple-event.h" -#include "util/share.h" #include "util/format.h" #include "attribute-rel-util.h" diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h index d09392249..2aecdffda 100644 --- a/src/xml/simple-node.h +++ b/src/xml/simple-node.h @@ -19,7 +19,6 @@ #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H #include -#include #include "xml/node.h" #include "xml/attribute-record.h" -- 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/xml/node-fns.cpp | 1 + src/xml/rebase-hrefs.cpp | 3 +++ src/xml/repr-css.cpp | 2 ++ src/xml/repr-io.cpp | 3 ++- src/xml/repr-util.cpp | 2 ++ src/xml/repr.cpp | 2 +- src/xml/simple-node.cpp | 4 +++- src/xml/simple-node.h | 1 + 8 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src/xml') diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp index e1506e3f2..eb3870978 100644 --- a/src/xml/node-fns.cpp +++ b/src/xml/node-fns.cpp @@ -1,4 +1,5 @@ #ifdef HAVE_CONFIG_H +# include "config.h" #endif #include diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp index 7e3d4fa7e..a8ac3b4cc 100644 --- a/src/xml/rebase-hrefs.cpp +++ b/src/xml/rebase-hrefs.cpp @@ -4,7 +4,10 @@ #include "io/sys.h" #include "sp-object.h" #include "streq.h" +#include "util/share.h" +#include "xml/attribute-record.h" #include "xml/node.h" +#include #include #include #include diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index 9590fa97f..c043904a7 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -26,8 +26,10 @@ #include "xml/repr.h" #include "xml/simple-document.h" +#include "xml/simple-node.h" #include "xml/sp-css-attr.h" #include "style.h" +#include "libcroco/cr-sel-eng.h" using Inkscape::Util::List; using Inkscape::XML::AttributeRecord; diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 5f576d00f..6977bc1e2 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -39,6 +39,7 @@ #include "preferences.h" #include +#include using Inkscape::IO::Writer; using Inkscape::Util::List; diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 4d093a4ea..ce93bccab 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -17,6 +17,8 @@ #include "config.h" +#include + #if HAVE_STRING_H # include #endif diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp index 8ad1ac06b..0a384c9c1 100644 --- a/src/xml/repr.cpp +++ b/src/xml/repr.cpp @@ -17,7 +17,7 @@ #define noREPR_VERBOSE #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif #include diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp index 49057a54b..3cbedc80b 100644 --- a/src/xml/simple-node.cpp +++ b/src/xml/simple-node.cpp @@ -16,17 +16,19 @@ #include #include -#include #include #include "preferences.h" +#include "xml/node.h" #include "xml/simple-node.h" #include "xml/node-event-vector.h" #include "xml/node-fns.h" +#include "xml/repr.h" #include "debug/event-tracker.h" #include "debug/simple-event.h" +#include "util/share.h" #include "util/format.h" #include "attribute-rel-util.h" diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h index 2aecdffda..d09392249 100644 --- a/src/xml/simple-node.h +++ b/src/xml/simple-node.h @@ -19,6 +19,7 @@ #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H #include +#include #include "xml/node.h" #include "xml/attribute-record.h" -- 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/xml/node-fns.cpp | 1 - src/xml/rebase-hrefs.cpp | 3 --- src/xml/repr-css.cpp | 2 -- src/xml/repr-io.cpp | 3 +-- src/xml/repr-util.cpp | 2 -- src/xml/repr.cpp | 2 +- src/xml/simple-node.cpp | 3 --- 7 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/xml') diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp index eb3870978..e1506e3f2 100644 --- a/src/xml/node-fns.cpp +++ b/src/xml/node-fns.cpp @@ -1,5 +1,4 @@ #ifdef HAVE_CONFIG_H -# include "config.h" #endif #include diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp index a8ac3b4cc..7e3d4fa7e 100644 --- a/src/xml/rebase-hrefs.cpp +++ b/src/xml/rebase-hrefs.cpp @@ -4,10 +4,7 @@ #include "io/sys.h" #include "sp-object.h" #include "streq.h" -#include "util/share.h" -#include "xml/attribute-record.h" #include "xml/node.h" -#include #include #include #include diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index c043904a7..9590fa97f 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -26,10 +26,8 @@ #include "xml/repr.h" #include "xml/simple-document.h" -#include "xml/simple-node.h" #include "xml/sp-css-attr.h" #include "style.h" -#include "libcroco/cr-sel-eng.h" using Inkscape::Util::List; using Inkscape::XML::AttributeRecord; diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 6977bc1e2..5f576d00f 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -39,7 +39,6 @@ #include "preferences.h" #include -#include using Inkscape::IO::Writer; using Inkscape::Util::List; diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index ce93bccab..4d093a4ea 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -17,8 +17,6 @@ #include "config.h" -#include - #if HAVE_STRING_H # include #endif diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp index 0a384c9c1..8ad1ac06b 100644 --- a/src/xml/repr.cpp +++ b/src/xml/repr.cpp @@ -17,7 +17,7 @@ #define noREPR_VERBOSE #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp index 3cbedc80b..6bd47fd22 100644 --- a/src/xml/simple-node.cpp +++ b/src/xml/simple-node.cpp @@ -21,14 +21,11 @@ #include "preferences.h" -#include "xml/node.h" #include "xml/simple-node.h" #include "xml/node-event-vector.h" #include "xml/node-fns.h" -#include "xml/repr.h" #include "debug/event-tracker.h" #include "debug/simple-event.h" -#include "util/share.h" #include "util/format.h" #include "attribute-rel-util.h" -- cgit v1.2.3