diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-29 19:54:30 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-29 19:54:30 +0000 |
| commit | 8b605523195bcad80c4a3134134066e677282640 (patch) | |
| tree | 7258ae78c0ae7e2ee7519dcecead8b1fc34ca78f /src/dom | |
| parent | merge from trunk (r12240) (diff) | |
| parent | Header cleanup (diff) | |
| download | inkscape-8b605523195bcad80c4a3134134066e677282640.tar.gz inkscape-8b605523195bcad80c4a3134134066e677282640.zip | |
merge from trunk (r12258)
(bzr r11668.1.65)
Diffstat (limited to 'src/dom')
| -rw-r--r-- | src/dom/dom.h | 4 | ||||
| -rw-r--r-- | src/dom/io/domstream.cpp | 5 | ||||
| -rw-r--r-- | src/dom/uri.cpp | 9 | ||||
| -rw-r--r-- | src/dom/views.h | 5 | ||||
| -rw-r--r-- | src/dom/xpathparser.cpp | 3 |
5 files changed, 10 insertions, 16 deletions
diff --git a/src/dom/dom.h b/src/dom/dom.h index 22fd09ebf..14165166e 100644 --- a/src/dom/dom.h +++ b/src/dom/dom.h @@ -60,9 +60,9 @@ */ #ifdef DOM_STANDALONE -#include <string> +# include <string> #else -#include <glibmm.h> +# include <glibmm/ustring.h> #endif //# Unfortunate hack for a name collision diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp index 7118025d6..1f08c0eee 100644 --- a/src/dom/io/domstream.cpp +++ b/src/dom/io/domstream.cpp @@ -34,9 +34,10 @@ * */ +#include <cmath> +#include <cstdarg> #include <cstdio> -#include <math.h> -#include <stdarg.h> +#include <cstdlib> #include "domstream.h" #include "dom/ucd.h" diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp index e1089017d..231995daf 100644 --- a/src/dom/uri.cpp +++ b/src/dom/uri.cpp @@ -27,17 +27,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - - - #include "uri.h" #include "ucd.h" -#include <stdio.h> -#include <stdarg.h> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> #include <vector> - namespace org { namespace w3c diff --git a/src/dom/views.h b/src/dom/views.h index f165d2a9b..f1154fb62 100644 --- a/src/dom/views.h +++ b/src/dom/views.h @@ -45,12 +45,9 @@ * Be prepared in the future to adjust to this, if SVG ever switches . */ - - +#include <cstdlib> #include "dom.h" - - namespace org { namespace w3c diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp index b19975966..4785ce93f 100644 --- a/src/dom/xpathparser.cpp +++ b/src/dom/xpathparser.cpp @@ -27,10 +27,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include "ucd.h" #include "xpathparser.h" - +#include <cstdlib> namespace org { |