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/helper/action-context.cpp | 1 - src/helper/action.cpp | 2 -- src/helper/action.h | 1 + src/helper/geom-nodetype.cpp | 2 -- src/helper/geom-pathstroke.cpp | 4 ---- src/helper/geom.cpp | 7 ------- src/helper/pixbuf-ops.cpp | 6 +----- src/helper/png-write.cpp | 4 +--- 8 files changed, 3 insertions(+), 24 deletions(-) (limited to 'src/helper') diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp index d52e43d96..1ea12776b 100644 --- a/src/helper/action-context.cpp +++ b/src/helper/action-context.cpp @@ -14,7 +14,6 @@ #include "layer-model.h" #include "selection.h" #include "helper/action-context.h" -#include "ui/view/view.h" namespace Inkscape { diff --git a/src/helper/action.cpp b/src/helper/action.cpp index 060bf317c..e37575a9c 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -9,8 +9,6 @@ * This code is in public domain */ -#include - #include "debug/logger.h" #include "debug/timestamp.h" #include "debug/simple-event.h" diff --git a/src/helper/action.h b/src/helper/action.h index 4b81ee7f9..9a16cdfc7 100644 --- a/src/helper/action.h +++ b/src/helper/action.h @@ -15,6 +15,7 @@ #include "helper/action-context.h" #include #include +#include #define SP_TYPE_ACTION (sp_action_get_type()) #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction)) diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp index fe8e8af0e..da620b3fd 100644 --- a/src/helper/geom-nodetype.cpp +++ b/src/helper/geom-nodetype.cpp @@ -12,8 +12,6 @@ #include "helper/geom-nodetype.h" #include <2geom/curve.h> -#include <2geom/point.h> -#include namespace Geom { diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index d2e9f9a1b..10641692d 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -9,13 +9,9 @@ #include #include <2geom/path-sink.h> -#include <2geom/point.h> -#include <2geom/bezier-curve.h> -#include <2geom/elliptical-arc.h> #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis #include <2geom/path-intersection.h> #include <2geom/circle.h> -#include #include "helper/geom-pathstroke.h" diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index ecb330b01..42c494c00 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -12,15 +12,8 @@ #include #include "helper/geom.h" #include "helper/geom-curves.h" -#include -#include <2geom/pathvector.h> -#include <2geom/path.h> #include <2geom/curves.h> -#include <2geom/transforms.h> -#include <2geom/rect.h> -#include <2geom/coord.h> #include <2geom/sbasis-to-bezier.h> -#include // for M_PI using Geom::X; using Geom::Y; diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 9639096fb..8a363d736 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -12,10 +12,9 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif -#include #include #include <2geom/transforms.h> @@ -24,11 +23,8 @@ #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "display/drawing-item.h" #include "document.h" -#include "sp-item.h" #include "sp-root.h" -#include "sp-use.h" #include "sp-defs.h" #include "util/units.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 9430feeff..e2b7e5b8c 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -14,19 +14,17 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include #include "ui/interface.h" #include <2geom/rect.h> #include <2geom/transforms.h> -#include #include "png-write.h" #include "io/sys.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "display/drawing-item.h" #include "document.h" #include "sp-item.h" #include "sp-root.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/helper/action-context.cpp | 1 + src/helper/action.cpp | 2 ++ src/helper/action.h | 1 - src/helper/geom-nodetype.cpp | 2 ++ src/helper/geom-pathstroke.cpp | 4 ++++ src/helper/geom.cpp | 7 +++++++ src/helper/pixbuf-ops.cpp | 6 +++++- src/helper/png-write.cpp | 4 +++- 8 files changed, 24 insertions(+), 3 deletions(-) (limited to 'src/helper') diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp index 1ea12776b..d52e43d96 100644 --- a/src/helper/action-context.cpp +++ b/src/helper/action-context.cpp @@ -14,6 +14,7 @@ #include "layer-model.h" #include "selection.h" #include "helper/action-context.h" +#include "ui/view/view.h" namespace Inkscape { diff --git a/src/helper/action.cpp b/src/helper/action.cpp index e37575a9c..060bf317c 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -9,6 +9,8 @@ * This code is in public domain */ +#include + #include "debug/logger.h" #include "debug/timestamp.h" #include "debug/simple-event.h" diff --git a/src/helper/action.h b/src/helper/action.h index 9a16cdfc7..4b81ee7f9 100644 --- a/src/helper/action.h +++ b/src/helper/action.h @@ -15,7 +15,6 @@ #include "helper/action-context.h" #include #include -#include #define SP_TYPE_ACTION (sp_action_get_type()) #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction)) diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp index da620b3fd..fe8e8af0e 100644 --- a/src/helper/geom-nodetype.cpp +++ b/src/helper/geom-nodetype.cpp @@ -12,6 +12,8 @@ #include "helper/geom-nodetype.h" #include <2geom/curve.h> +#include <2geom/point.h> +#include namespace Geom { diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 10641692d..d2e9f9a1b 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -9,9 +9,13 @@ #include #include <2geom/path-sink.h> +#include <2geom/point.h> +#include <2geom/bezier-curve.h> +#include <2geom/elliptical-arc.h> #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis #include <2geom/path-intersection.h> #include <2geom/circle.h> +#include #include "helper/geom-pathstroke.h" diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 42c494c00..ecb330b01 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -12,8 +12,15 @@ #include #include "helper/geom.h" #include "helper/geom-curves.h" +#include +#include <2geom/pathvector.h> +#include <2geom/path.h> #include <2geom/curves.h> +#include <2geom/transforms.h> +#include <2geom/rect.h> +#include <2geom/coord.h> #include <2geom/sbasis-to-bezier.h> +#include // for M_PI using Geom::X; using Geom::Y; diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 8a363d736..9639096fb 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -12,9 +12,10 @@ */ #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif +#include #include #include <2geom/transforms.h> @@ -23,8 +24,11 @@ #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" +#include "display/drawing-item.h" #include "document.h" +#include "sp-item.h" #include "sp-root.h" +#include "sp-use.h" #include "sp-defs.h" #include "util/units.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index e2b7e5b8c..9430feeff 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -14,17 +14,19 @@ */ #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif #include #include "ui/interface.h" #include <2geom/rect.h> #include <2geom/transforms.h> +#include #include "png-write.h" #include "io/sys.h" #include "display/drawing.h" #include "display/drawing-context.h" +#include "display/drawing-item.h" #include "document.h" #include "sp-item.h" #include "sp-root.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/helper/action-context.cpp | 1 - src/helper/action.cpp | 2 -- src/helper/geom-nodetype.cpp | 2 -- src/helper/geom-pathstroke.cpp | 4 ---- src/helper/geom.cpp | 7 ------- src/helper/pixbuf-ops.cpp | 6 +----- src/helper/png-write.cpp | 4 +--- 7 files changed, 2 insertions(+), 24 deletions(-) (limited to 'src/helper') diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp index d52e43d96..1ea12776b 100644 --- a/src/helper/action-context.cpp +++ b/src/helper/action-context.cpp @@ -14,7 +14,6 @@ #include "layer-model.h" #include "selection.h" #include "helper/action-context.h" -#include "ui/view/view.h" namespace Inkscape { diff --git a/src/helper/action.cpp b/src/helper/action.cpp index 060bf317c..e37575a9c 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -9,8 +9,6 @@ * This code is in public domain */ -#include - #include "debug/logger.h" #include "debug/timestamp.h" #include "debug/simple-event.h" diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp index fe8e8af0e..da620b3fd 100644 --- a/src/helper/geom-nodetype.cpp +++ b/src/helper/geom-nodetype.cpp @@ -12,8 +12,6 @@ #include "helper/geom-nodetype.h" #include <2geom/curve.h> -#include <2geom/point.h> -#include namespace Geom { diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index d2e9f9a1b..10641692d 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -9,13 +9,9 @@ #include #include <2geom/path-sink.h> -#include <2geom/point.h> -#include <2geom/bezier-curve.h> -#include <2geom/elliptical-arc.h> #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis #include <2geom/path-intersection.h> #include <2geom/circle.h> -#include #include "helper/geom-pathstroke.h" diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index ecb330b01..42c494c00 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -12,15 +12,8 @@ #include #include "helper/geom.h" #include "helper/geom-curves.h" -#include -#include <2geom/pathvector.h> -#include <2geom/path.h> #include <2geom/curves.h> -#include <2geom/transforms.h> -#include <2geom/rect.h> -#include <2geom/coord.h> #include <2geom/sbasis-to-bezier.h> -#include // for M_PI using Geom::X; using Geom::Y; diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 9639096fb..8a363d736 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -12,10 +12,9 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif -#include #include #include <2geom/transforms.h> @@ -24,11 +23,8 @@ #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "display/drawing-item.h" #include "document.h" -#include "sp-item.h" #include "sp-root.h" -#include "sp-use.h" #include "sp-defs.h" #include "util/units.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 9430feeff..e2b7e5b8c 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -14,19 +14,17 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include #include "ui/interface.h" #include <2geom/rect.h> #include <2geom/transforms.h> -#include #include "png-write.h" #include "io/sys.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "display/drawing-item.h" #include "document.h" #include "sp-item.h" #include "sp-root.h" -- cgit v1.2.3