From f1b212195dff9e5fdf18b89ba53e4238e987deb4 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Sun, 18 Nov 2018 12:29:03 +0000 Subject: Fix stream class locations --- src/extension/internal/filter/filter-file.cpp | 2 +- src/extension/internal/odf.cpp | 4 ++-- src/extension/internal/odf.h | 1 - src/io/stream/uristream.cpp | 2 +- src/ui/clipboard.cpp | 1 - src/xml/repr-io.cpp | 6 +++--- 6 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp index df0855076..f6d9a58f5 100644 --- a/src/extension/internal/filter/filter-file.cpp +++ b/src/extension/internal/filter/filter-file.cpp @@ -10,7 +10,7 @@ #include "io/sys.h" #include "io/resource.h" -#include "io/inkscapestream.h" +#include "io/stream/inkscapestream.h" /* Directory includes */ #include "path-prefix.h" diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 475111466..722826f19 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -66,8 +66,8 @@ #include "document.h" #include "extension/extension.h" -#include "io/inkscapestream.h" -#include "io/bufferstream.h" +#include "io/stream/bufferstream.h" +#include "io/stream/stringstream.h" #include "io/sys.h" #include #include diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 2745d70f0..94cd360b6 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -13,7 +13,6 @@ #ifndef EXTENSION_INTERNAL_ODG_OUT_H #define EXTENSION_INTERNAL_ODG_OUT_H -#include #include #include "extension/implementation/implementation.h" diff --git a/src/io/stream/uristream.cpp b/src/io/stream/uristream.cpp index 2ff7460e0..1596919d1 100644 --- a/src/io/stream/uristream.cpp +++ b/src/io/stream/uristream.cpp @@ -13,7 +13,7 @@ #include "uristream.h" -#include "sys.h" +#include "io/sys.h" #include #include diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 7ca50c285..2e9bbe123 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -25,7 +25,6 @@ #include "inkgc/gc-core.h" #include "xml/repr.h" #include "inkscape.h" -#include "io/stringstream.h" #include "desktop.h" #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 032d956dd..b1bf26118 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -24,9 +24,9 @@ #include "xml/text-node.h" #include "io/sys.h" -#include "io/uristream.h" -#include "io/stringstream.h" -#include "io/gzipstream.h" +#include "io/stream/stringstream.h" +#include "io/stream/gzipstream.h" +#include "io/stream/uristream.h" #include "extension/extension.h" -- cgit v1.2.3