summaryrefslogtreecommitdiffstats
path: root/src/sp-shape.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
committerTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
commitff848ebc9919d158c3ec3d7420e72b6aca99a3ea (patch)
tree030ab171865d0ed7f6bae3ef68315639cdb2622b /src/sp-shape.cpp
parentMerging 0.92.x branch (diff)
parentCloneTiler: Further C++ification (diff)
downloadinkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.tar.gz
inkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.zip
Merge trunk
(bzr r14950.1.20)
Diffstat (limited to 'src/sp-shape.cpp')
-rw-r--r--src/sp-shape.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 78135d459..acec00024 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -15,21 +15,19 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
#endif
#include <2geom/rect.h>
#include <2geom/transforms.h>
#include <2geom/pathvector.h>
#include <2geom/path-intersection.h>
-#include <2geom/exception.h>
#include "helper/geom.h"
#include "helper/geom-nodetype.h"
#include <sigc++/functors/ptr_fun.h>
#include <sigc++/adaptors/bind.h>
-#include "macros.h"
#include "display/drawing-shape.h"
#include "display/curve.h"
#include "print.h"
@@ -41,11 +39,6 @@
#include "attributes.h"
#include "live_effects/lpeobject.h"
-#include "uri.h"
-#include "extract-uri.h"
-#include "uri-references.h"
-#include "bad-uri-exception.h"
-#include "xml/repr.h"
#include "helper/mathfns.h" // for triangle_area()