diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
| commit | 2d71db83e3fe52505116fecf024f79a9777d4ee1 (patch) | |
| tree | 07b5e7b87af9ea1ba6bedd8b39fd96b0a13944c7 /src/helper | |
| parent | Renamed some functions, fixed tests (diff) | |
| parent | Removed unused includes, decreased compilation time. Once again (diff) | |
| download | inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.tar.gz inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.zip | |
Merged trunk
(bzr r14954.1.29)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/action-context.cpp | 1 | ||||
| -rw-r--r-- | src/helper/action.cpp | 2 | ||||
| -rw-r--r-- | src/helper/geom-nodetype.cpp | 2 | ||||
| -rw-r--r-- | src/helper/geom-pathstroke.cpp | 4 | ||||
| -rw-r--r-- | src/helper/geom.cpp | 7 | ||||
| -rw-r--r-- | src/helper/pixbuf-ops.cpp | 6 | ||||
| -rw-r--r-- | src/helper/png-write.cpp | 4 |
7 files changed, 2 insertions, 24 deletions
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 <string.h> - #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 <vector> 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 <iomanip> #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 <math.h> #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 <algorithm> #include "helper/geom.h" #include "helper/geom-curves.h" -#include <typeinfo> -#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 <math.h> // for M_PI using Geom::X; using Geom::Y; diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 24d2d7f1e..bab998fdb 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 <config.h> #endif -#include <png.h> #include <boost/scoped_ptr.hpp> #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 2255157e2..682aee9b2 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 <config.h> #endif #include <png.h> #include "ui/interface.h" #include <2geom/rect.h> #include <2geom/transforms.h> -#include <glib.h> #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" |