diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2013-03-11 21:47:05 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2013-03-11 21:47:05 +0000 |
| commit | c9ab0e5a52eeea522ba9f526836310a80bcfe466 (patch) | |
| tree | c920867ca58d37bfd847e929aa797c51e366b8ad /src/extension | |
| parent | fix build warnings / cppcheck ( Bug #1120585 ) (diff) | |
| download | inkscape-c9ab0e5a52eeea522ba9f526836310a80bcfe466.tar.gz inkscape-c9ab0e5a52eeea522ba9f526836310a80bcfe466.zip | |
Drop duplicate io code ( Bug #1120585 )
(bzr r12192)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/internal/odf.cpp | 18 | ||||
| -rw-r--r-- | src/extension/internal/odf.h | 7 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 47671a8d2..4c27925ae 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -80,16 +80,15 @@ //# DOM-specific includes #include "dom/dom.h" #include "dom/util/ziptool.h" -#include "dom/io/domstream.h" -#include "dom/io/bufferstream.h" -#include "dom/io/stringstream.h" +//#include "dom/io/domstream.h" #include "inkscape-version.h" #include "document.h" #include "extension/extension.h" - +#include "io/inkscapestream.h" +#include "io/bufferstream.h" namespace Inkscape { @@ -97,15 +96,12 @@ namespace Extension { namespace Internal { - - - //# Shorthand notation typedef org::w3c::dom::DOMString DOMString; -typedef org::w3c::dom::XMLCh XMLCh; -typedef org::w3c::dom::io::OutputStreamWriter OutputStreamWriter; -typedef org::w3c::dom::io::BufferOutputStream BufferOutputStream; -typedef org::w3c::dom::io::StringOutputStream StringOutputStream; +typedef Inkscape::IO::BufferOutputStream BufferOutputStream; +typedef Inkscape::IO::OutputStreamWriter OutputStreamWriter; +typedef Inkscape::IO::StringOutputStream StringOutputStream; + //######################################################################## //# C L A S S SingularValueDecomposition diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 6b8883134..219a99a4f 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -24,7 +24,7 @@ #define EXTENSION_INTERNAL_ODG_OUT_H #include <dom/dom.h> -#include <dom/io/stringstream.h> +#include <io/stringstream.h> #include <dom/uri.h> #include <glibmm.h> @@ -37,7 +37,7 @@ #include <map> #include <dom/util/ziptool.h> -#include <dom/io/domstream.h> +//#include <io/domstream.h> #include "sp-item.h" namespace Inkscape @@ -48,8 +48,7 @@ namespace Internal { typedef org::w3c::dom::URI URI; -typedef org::w3c::dom::io::Writer Writer; - +typedef Inkscape::IO::Writer Writer; class StyleInfo { |