Merge trunk

(bzr r14950.1.20)

7 files changed, 2 insertions, 45 deletions

diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
deleted file mode 100644
index 4f82bdd76..000000000
--- a/src/svg/Makefile_insert
+++ /dev/null
@@ -1,32 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-ink_common_sources +=	\
-	svg/css-ostringstream.h	\
-	svg/css-ostringstream.cpp	\
-	svg/path-string.h	\
-	svg/path-string.cpp \
-	svg/stringstream.h	\
-	svg/stringstream.cpp	\
-	svg/strip-trailing-zeros.h	\
-	svg/strip-trailing-zeros.cpp	\
-	svg/svg-affine.cpp	\
-	svg/svg-color.cpp	\
-	svg/svg-color.h 	\
-	svg/svg-icc-color.h \
-	svg/svg-angle.cpp   \
-	svg/svg-angle.h     \
-	svg/svg-length.cpp	\
-	svg/svg-length.h	\
-	svg/svg-path.cpp	\
-	svg/svg.h
-
-# ######################
-# ### CxxTest stuff ####
-# ######################
-CXXTEST_TESTSUITES += \
-	$(srcdir)/svg/css-ostringstream-test.h	\
-	$(srcdir)/svg/stringstream-test.h	\
-	$(srcdir)/svg/svg-affine-test.h		\
-	$(srcdir)/svg/svg-color-test.h		\
-	$(srcdir)/svg/svg-length-test.h		\
-	$(srcdir)/svg/svg-path-geom-test.h
diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index 33985443e..ef0413372 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,7 +1,6 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
-#include <glib.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp
index 6dddeadff..7d0092dfa 100644
--- a/src/svg/path-string.cpp
+++ b/src/svg/path-string.cpp
@@ -17,7 +17,6 @@
 #include "svg/stringstream.h"
 #include "svg/svg.h"
 #include "preferences.h"
-#include <algorithm>
 
 // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense)
 // Please note that these constants are used to allocate sufficient space to hold serialized numbers
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index d9d79bba5..21635c79b 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include <cstring>
@@ -21,7 +21,6 @@
 #include <cstdio>
 #include <glib.h>
 #include <2geom/transforms.h>
-#include <2geom/angle.h>
 #include "svg.h"
 #include "preferences.h"
 
diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp
index ed5ccd45e..9d4435a18 100644
--- a/src/svg/svg-angle.cpp
+++ b/src/svg/svg-angle.cpp
@@ -13,16 +13,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include <cstring>
 #include <string>
-#include <math.h>
 #include <glib.h>
 
-#include "svg.h"
-#include "stringstream.h"
 #include "svg/svg-angle.h"
 #include "util/units.h"
 
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 693094048..89a5636a8 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -19,7 +19,6 @@
 #include <cstdio> // sprintf
 #include <cstring>
 #include <string>
-#include <cassert>
 #include <math.h>
 #include <glib.h> // g_assert
 #include <errno.h>
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 7bb58fc9c..13795f2a3 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -17,17 +17,13 @@
 
 #include <cstring>
 #include <string>
-#include <cassert>
 #include <glib.h> // g_assert()
 
 #include <2geom/pathvector.h>
-#include <2geom/path.h>
 #include <2geom/curves.h>
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/path-sink.h>
 #include <2geom/svg-path-parser.h>
-#include <2geom/exception.h>
-#include <2geom/angle.h>
 
 #include "svg/svg.h"
 #include "svg/path-string.h"