diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index e35cd2abaea0052756a904664064076a61e2f7b2..c12d4d4d9e9c65a3a5a63765b014865e9c75f55a 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -40,7 +40,7 @@ #include "sp-cursor.h" #include "verbs.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/guideline.h" #include "display/snap-indicator.h" #include "display/sp-canvas.h" diff --git a/src/desktop.cpp b/src/desktop.cpp index ebc3e559135f2e5a1f951b9ad2e480ed94f5386e..9d63102b82aa32b8e11ac6c92b19973934c5a05a 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -41,11 +41,11 @@ #include "message-context.h" #include "message-stack.h" -#include "display/canvas-arena.h" -#include "display/canvas-debug.h" -#include "display/canvas-grid.h" -#include "display/canvas-rotate.h" -#include "display/canvas-temporary-item-list.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-debug.h" +#include "display/canvas/canvas-grid.h" +#include "display/canvas/canvas-rotate.h" +#include "display/canvas/canvas-temporary-item-list.h" #include "display/drawing-group.h" #include "display/gnome-canvas-acetate.h" #include "display/snap-indicator.h" diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 91d5b779c8d4276a9e75b970667d82131407cc1f..5b0518cab83f9740653724eb77eb507a373ae1b3 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,15 +2,6 @@ set(display_SRC cairo-utils.cpp - canvas-arena.cpp - canvas-axonomgrid.cpp - canvas-bpath.cpp - canvas-debug.cpp - canvas-grid.cpp - canvas-rotate.cpp - canvas-temporary-item-list.cpp - canvas-temporary-item.cpp - canvas-text.cpp curve.cpp drawing-context.cpp drawing-group.cpp @@ -63,15 +54,6 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - canvas-arena.h - canvas-axonomgrid.h - canvas-bpath.h - canvas-debug.h - canvas-grid.h - canvas-rotate.h - canvas-temporary-item-list.h - canvas-temporary-item.h - canvas-text.h curve-test.h curve.h drawing-context.h @@ -128,4 +110,7 @@ set(display_SRC ) # add_inkscape_lib(display_LIB "${display_SRC}") + + add_inkscape_source("${display_SRC}") +add_subdirectory(canvas) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..81862b8f91fa746750f59ebd7ae9fa49282a66c4 --- /dev/null +++ b/src/display/canvas/CMakeLists.txt @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +set(canvas_SRC + + canvas-arena.cpp + canvas-axonomgrid.cpp + canvas-text.cpp + canvas-grid.cpp + canvas-bpath.cpp + canvas-rotate.cpp + canvas-temporary-item-list.cpp + canvas-temporary-item.cpp + canvas-debug.cpp + + canvas-arena.h + canvas-axonomgrid.h + canvas-text.h + canvas-grid.h + canvas-bpath.h + canvas-rotate.h + canvas-temporary-item-list.h + canvas-temporary-item.h + canvas-debug.h + ) + +add_inkscape_source("${canvas_SRC}") \ No newline at end of file diff --git a/src/display/canvas-arena.cpp b/src/display/canvas/canvas-arena.cpp similarity index 99% rename from src/display/canvas-arena.cpp rename to src/display/canvas/canvas-arena.cpp index 83693ea2054968c2ffd7c24fa2c4941d7029ecad..6e6ae80162361aa48c8ba22bf30113c970a7a24d 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas/canvas-arena.cpp @@ -16,7 +16,7 @@ #include "display/sp-canvas-util.h" #include "helper/sp-marshal.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-item.h" diff --git a/src/display/canvas-arena.h b/src/display/canvas/canvas-arena.h similarity index 100% rename from src/display/canvas-arena.h rename to src/display/canvas/canvas-arena.h diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp similarity index 99% rename from src/display/canvas-axonomgrid.cpp rename to src/display/canvas/canvas-axonomgrid.cpp index 2e4a20d6a64938571f8801b974653d4b88ca2f1c..da4955c14f55f661c26b2dda46816afd7e796bb9 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -20,13 +20,13 @@ #include -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-axonomgrid.h" #include "ui/widget/registered-widget.h" #include "desktop.h" #include "display/cairo-utils.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/sp-canvas-util.h" #include "display/sp-canvas.h" #include "document.h" diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas/canvas-axonomgrid.h similarity index 98% rename from src/display/canvas-axonomgrid.h rename to src/display/canvas/canvas-axonomgrid.h index ce4a19edf53070dee0045bba4d2b4b2de6e57a49..b5e08b5819ed0a865f01d296b5c406d2e90a5d8a 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas/canvas-axonomgrid.h @@ -11,7 +11,7 @@ */ #include "line-snapper.h" -#include "canvas-grid.h" +#include "display/canvas/canvas-grid.h" struct SPCanvasBuf; class SPNamedView; diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas/canvas-bpath.cpp similarity index 99% rename from src/display/canvas-bpath.cpp rename to src/display/canvas/canvas-bpath.cpp index 327bb1c06d62b620294ff2f1179213db1d0e266b..024d82db1d9fc232a614ef2a7c1508eee305cc3b 100644 --- a/src/display/canvas-bpath.cpp +++ b/src/display/canvas/canvas-bpath.cpp @@ -19,7 +19,7 @@ #include "color.h" #include "display/sp-canvas-group.h" #include "display/sp-canvas-util.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/cairo-utils.h" #include "helper/geom.h" diff --git a/src/display/canvas-bpath.h b/src/display/canvas/canvas-bpath.h similarity index 98% rename from src/display/canvas-bpath.h rename to src/display/canvas/canvas-bpath.h index 4dc98315ccf6d4a6f719610078503531a0e971b6..59be1fef47cc38f9b3430e2f1d620316cdfcba94 100644 --- a/src/display/canvas-bpath.h +++ b/src/display/canvas/canvas-bpath.h @@ -18,7 +18,7 @@ #include -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" struct SPCanvasBPath; struct SPCanvasBPathClass; diff --git a/src/display/canvas-debug.cpp b/src/display/canvas/canvas-debug.cpp similarity index 97% rename from src/display/canvas-debug.cpp rename to src/display/canvas/canvas-debug.cpp index 03db61f69cf33bdcb96269c263bcc78906fe386d..58ef6f7253e873d7a9da7dc1e547c72b8e7a3fed 100644 --- a/src/display/canvas-debug.cpp +++ b/src/display/canvas/canvas-debug.cpp @@ -11,8 +11,8 @@ */ #include "canvas-debug.h" -#include "sp-canvas.h" -#include "cairo-utils.h" +#include "display/sp-canvas.h" +#include "display/cairo-utils.h" #include "ui/event-debug.h" namespace { diff --git a/src/display/canvas-debug.h b/src/display/canvas/canvas-debug.h similarity index 96% rename from src/display/canvas-debug.h rename to src/display/canvas/canvas-debug.h index 19ccd154ca36342c3202c984b5d5ac8043c1cce9..359b1af9d60cae02a7251aff9b861939c74d58d7 100644 --- a/src/display/canvas-debug.h +++ b/src/display/canvas/canvas-debug.h @@ -13,7 +13,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" class SPItem; diff --git a/src/display/canvas-grid.cpp b/src/display/canvas/canvas-grid.cpp similarity index 99% rename from src/display/canvas-grid.cpp rename to src/display/canvas/canvas-grid.cpp index f4a210fe66b89bf151eb12571d9293f287196082..5c6fc79a37865766642cd7cdd0a8931519b1e1b9 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas/canvas-grid.cpp @@ -26,12 +26,12 @@ #include #include "desktop.h" -#include "sp-canvas-util.h" +#include "display/sp-canvas-util.h" #include "helper/mathfns.h" #include "display/cairo-utils.h" -#include "display/canvas-axonomgrid.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-axonomgrid.h" +#include "display/canvas/canvas-grid.h" #include "display/sp-canvas-group.h" #include "document.h" #include "util/units.h" diff --git a/src/display/canvas-grid.h b/src/display/canvas/canvas-grid.h similarity index 99% rename from src/display/canvas-grid.h rename to src/display/canvas/canvas-grid.h index 6fde5a6e317730228b5a178227e5a19911d0bcc9..38df42a8249134c5ce76b73f98b9179ce226e63a 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas/canvas-grid.h @@ -13,7 +13,7 @@ #ifndef INKSCAPE_CANVAS_GRID_H #define INKSCAPE_CANVAS_GRID_H -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" #include "ui/widget/alignment-selector.h" #include "ui/widget/registered-widget.h" #include "ui/widget/registry.h" diff --git a/src/display/canvas-rotate.cpp b/src/display/canvas/canvas-rotate.cpp similarity index 99% rename from src/display/canvas-rotate.cpp rename to src/display/canvas/canvas-rotate.cpp index f747c66f5418ebae0aacc8466553327014284c2e..b2408bdf85524ed68c794dda9af90faaaa122398 100644 --- a/src/display/canvas-rotate.cpp +++ b/src/display/canvas/canvas-rotate.cpp @@ -14,8 +14,8 @@ #include "desktop.h" #include "canvas-rotate.h" -#include "sp-canvas.h" -#include "cairo-utils.h" +#include "display/sp-canvas.h" +#include "display/cairo-utils.h" #include "ui/event-debug.h" #include "2geom/point.h" diff --git a/src/display/canvas-rotate.h b/src/display/canvas/canvas-rotate.h similarity index 97% rename from src/display/canvas-rotate.h rename to src/display/canvas/canvas-rotate.h index b45eae2850f34ca29d59ac57b925636c1645366e..bbe6b09aeb89addd66e55c5e5ee1d9a1fbe09bf6 100644 --- a/src/display/canvas-rotate.h +++ b/src/display/canvas/canvas-rotate.h @@ -13,7 +13,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" #include "2geom/line.h" class SPItem; diff --git a/src/display/canvas-temporary-item-list.cpp b/src/display/canvas/canvas-temporary-item-list.cpp similarity index 95% rename from src/display/canvas-temporary-item-list.cpp rename to src/display/canvas/canvas-temporary-item-list.cpp index caa960969981bf442bb30864cf8a82b634bef3ff..c41fde903199a5beb1181f75e3f13b9960265946 100644 --- a/src/display/canvas-temporary-item-list.cpp +++ b/src/display/canvas/canvas-temporary-item-list.cpp @@ -11,8 +11,8 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/canvas-temporary-item.h" -#include "display/canvas-temporary-item-list.h" +#include "display/canvas/canvas-temporary-item.h" +#include "display/canvas/canvas-temporary-item-list.h" namespace Inkscape { namespace Display { diff --git a/src/display/canvas-temporary-item-list.h b/src/display/canvas/canvas-temporary-item-list.h similarity index 100% rename from src/display/canvas-temporary-item-list.h rename to src/display/canvas/canvas-temporary-item-list.h diff --git a/src/display/canvas-temporary-item.cpp b/src/display/canvas/canvas-temporary-item.cpp similarity index 97% rename from src/display/canvas-temporary-item.cpp rename to src/display/canvas/canvas-temporary-item.cpp index 38266872bdea6ac167500bf904458395f21e32b1..7e919ac7e59fe4ad5dc9b8e0a28ffab71b60363c 100644 --- a/src/display/canvas-temporary-item.cpp +++ b/src/display/canvas/canvas-temporary-item.cpp @@ -15,7 +15,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/canvas-temporary-item.h" +#include "display/canvas/canvas-temporary-item.h" #include #include "display/sp-canvas-item.h" diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas/canvas-temporary-item.h similarity index 100% rename from src/display/canvas-temporary-item.h rename to src/display/canvas/canvas-temporary-item.h diff --git a/src/display/canvas-text.cpp b/src/display/canvas/canvas-text.cpp similarity index 99% rename from src/display/canvas-text.cpp rename to src/display/canvas/canvas-text.cpp index e725a1f93cf4193e2c936b520bbe1ee957a93702..064bab4cdd34ed16fb96a84465de91ec24c489ba 100644 --- a/src/display/canvas-text.cpp +++ b/src/display/canvas/canvas-text.cpp @@ -16,7 +16,7 @@ #include #include -#include "sp-canvas-util.h" +#include "display/sp-canvas-util.h" #include "canvas-text.h" #include "display/cairo-utils.h" #include "desktop.h" diff --git a/src/display/canvas-text.h b/src/display/canvas/canvas-text.h similarity index 98% rename from src/display/canvas-text.h rename to src/display/canvas/canvas-text.h index 257f360a68dc36e482b2f715d32d20a8091659aa..322a635abd155d6cacb885cf1cf57347858bfb3a 100644 --- a/src/display/canvas-text.h +++ b/src/display/canvas/canvas-text.h @@ -15,7 +15,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" class SPItem; class SPDesktop; diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp index 20544e1bea58c816290c99f847d113048f337730..fea471789247e44ca6a18e3c501a9c089cd7df6d 100644 --- a/src/display/drawing-shape.cpp +++ b/src/display/drawing-shape.cpp @@ -17,8 +17,8 @@ #include <2geom/svg-path-parser.h> #include "display/cairo-utils.h" -#include "display/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/drawing.h" #include "display/drawing-context.h" diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index 9d81d736da8dc082c2dc85c4e7588eade6107b63..6fc24565fdf0f2bc6d796fb6ee1eca3d807d6427 100644 --- a/src/display/drawing-text.cpp +++ b/src/display/drawing-text.cpp @@ -22,7 +22,7 @@ #include "2geom/pathvector.h" #include "display/cairo-utils.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" namespace Inkscape { diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index 1832a5f51fa7cc6c978cb5c0a481fe3559bce315..7ce9368e333149e5b0528d872fcb1b0c0b7cb6e8 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -13,7 +13,7 @@ #include "display/nr-style.h" #include "style.h" #include "object/sp-paint-server.h" -#include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!) +#include "display/canvas/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!) #include "display/drawing-context.h" #include "display/drawing-pattern.h" diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp index 4039a3717a47d3a60ffbfd733db2b7adce219699..3c6441661f24e368b19ee92fe2b09a8ac1aee600 100644 --- a/src/display/snap-indicator.cpp +++ b/src/display/snap-indicator.cpp @@ -18,7 +18,7 @@ #include "display/sodipodi-ctrl.h" #include "display/sodipodi-ctrlrect.h" -#include "display/canvas-text.h" +#include "display/canvas/canvas-text.h" #include "display/sp-canvas-util.h" #include "knot.h" #include "preferences.h" diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 4285b4b9804fd6d4ef16b6445db221554b43022c..31c8447bcd65b97bcedca5ac2ca5cbea4df17a8b 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -32,7 +32,7 @@ #include "debug/gdk-event-latency-tracker.h" #include "desktop.h" #include "display/cairo-utils.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/rendermode.h" #include "display/sp-canvas-group.h" #include "display/sp-canvas.h" diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 5dfbe051ed601eaf204997a7f01c16506f7cffe0..b0139b93d984d92a7d7c69ced644b446c76882f0 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -31,7 +31,7 @@ #include "display/drawing.h" #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "object/sp-item.h" #include "object/sp-root.h" diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index db0a6867e3c7eb66e01bb28e3418370aee353a35..0281dcb199e184dfd1990dcd735991cba4126b05 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -38,7 +38,7 @@ #include #include "display/drawing.h" #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/cairo-utils.h" #include "object/sp-item.h" #include "object/sp-item-group.h" diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index a48025c1a01b86890f90f1fc32211b444a496680..0de7e252e65f0368fbacebca41404b119f5ab1d6 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -30,7 +30,7 @@ #include "display/drawing.h" #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "object/sp-item.h" #include "object/sp-root.h" diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 3f045f42b872063ff7f2f307a6af49e1640a81db..6490d821e9db9c8daaddb713f49470baf752347a 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -37,7 +37,7 @@ #include #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/cairo-utils.h" #include "object/sp-item.h" #include "object/sp-item-group.h" diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 6d330f2ea0ffd516bbbc84bcb476360f4bf1098d..f47860468d4eb2e6b0c9a7ec7d2db360b736ffdf 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -57,7 +57,7 @@ #include "splivarot.h" // pieces for union on shapes #include "2geom/svg-path-parser.h" // to get from SVG text to Geom::Path -#include "display/canvas-bpath.h" // for SPWindRule +#include "display/canvas/canvas-bpath.h" // for SPWindRule #include "display/cairo-utils.h" // for Inkscape::Pixbuf::PF_CAIRO #include "emf-print.h" diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index e48e332dd76f49418837569e8fe15510f53b616f..f38908ff8b91929fc6d39057f5456358b0afa6a9 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -17,7 +17,7 @@ #include "extension/internal/metafile-print.h" #include "splivarot.h" // pieces for union on shapes -#include "display/canvas-bpath.h" // for SPWindRule +#include "display/canvas/canvas-bpath.h" // for SPWindRule namespace Inkscape { namespace Extension { diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 1b0e9150d6070c070f8b6411230b730d56316006..2cef60ba1e92fe2632e8498dc665f809b4097a34 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include <2geom/pathvector.h> diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index 3aeb0a07666479998a362567d23b2060cf84fd59..b47e5d58ba00a49c68bb4baef275017b47d45217 100644 --- a/src/extension/internal/metafile-print.h +++ b/src/extension/internal/metafile-print.h @@ -21,7 +21,7 @@ #include "extension/implementation/implementation.h" #include "splivarot.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" class SPGradient; class SPObject; diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 9eba6cae87a98340065980c78e294f58f0027d0e..395c8c723c061c8234b7401fd4b08c951276b5d8 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -53,7 +53,7 @@ #include "splivarot.h" // pieces for union on shapes #include <2geom/svg-path-parser.h> // to get from SVG text to Geom::Path -#include "display/canvas-bpath.h" // for SPWindRule +#include "display/canvas/canvas-bpath.h" // for SPWindRule #include "display/cairo-utils.h" // for Inkscape::Pixbuf::PF_CAIRO #include "wmf-print.h" diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index 92f5577f31bf0f139fafe0ce17d7767ee1202b2b..cc8324d35bd2a3f832f7d43f5c4bbcb8524a46ba 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -16,7 +16,7 @@ #include "extension/internal/metafile-print.h" #include "splivarot.h" // pieces for union on shapes -#include "display/canvas-bpath.h" // for SPWindRule +#include "display/canvas/canvas-bpath.h" // for SPWindRule namespace Inkscape { namespace Extension { diff --git a/src/file-update.cpp b/src/file-update.cpp index 5489ee499b77f3866db1ec8a94960ad4bff6caaf..9cf7de75ec18e72ea7ae582a76867eadab084dc5 100644 --- a/src/file-update.cpp +++ b/src/file-update.cpp @@ -37,7 +37,7 @@ #include "text-editing.h" #include "verbs.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "extension/effect.h" #include "extension/db.h" diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp index 6f989698106a86f5d70fe6f71e14b0dc3c500a02..e54342d271d5052f659a8f2b9d0f0f7a0b67aa0b 100644 --- a/src/live_effects/parameter/text.cpp +++ b/src/live_effects/parameter/text.cpp @@ -18,7 +18,7 @@ #include "svg/stringstream.h" #include "inkscape.h" #include "verbs.h" -#include "display/canvas-text.h" +#include "display/canvas/canvas-text.h" #include <2geom/sbasis-geometric.h> #include diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index 12e6295c0d2cd0601c02d1adfa0cd84faf6d4876..cd53e0f8ef75600ebcc83775e2b9e5d179e146f5 100644 --- a/src/live_effects/parameter/text.h +++ b/src/live_effects/parameter/text.h @@ -16,7 +16,7 @@ #include -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "live_effects/parameter/parameter.h" struct SPCanvasText; diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp index b17af346ca864ebc0732513e244a7c969bbb2fb0..a7647c4fc99419110e6f910ee67e39616f2968a2 100644 --- a/src/object/sp-namedview.cpp +++ b/src/object/sp-namedview.cpp @@ -20,7 +20,7 @@ #include "event-log.h" #include <2geom/transforms.h> -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "util/units.h" #include "svg/svg-color.h" #include "xml/repr.h" diff --git a/src/rubberband.cpp b/src/rubberband.cpp index e6db06efa0d107a1c31771eebff45780890005a8..8ed05b4a95ada163582931fa63b4a975eafd5784 100644 --- a/src/rubberband.cpp +++ b/src/rubberband.cpp @@ -16,7 +16,7 @@ #include "rubberband.h" #include "display/sp-canvas.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" Inkscape::Rubberband *Inkscape::Rubberband::_instance = nullptr; diff --git a/src/snap.cpp b/src/snap.cpp index 210a1989ee7cc05e261adaff028e262a19e6ad59..e80edc0f3b32852600d13fd896129d34d6409c19 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -27,7 +27,7 @@ #include "inkscape.h" #include "pure-transform.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/snap-indicator.h" #include "helper/mathfns.h" diff --git a/src/style-enums.h b/src/style-enums.h index 24e4c95da2670193a274a29cee2db4eab4ee7a44..d524c6e102b58ff14b35a189a71c97e4a5c09746 100644 --- a/src/style-enums.h +++ b/src/style-enums.h @@ -18,7 +18,7 @@ /* SPFontStyle */ -#include "display/canvas-bpath.h" // FIXME those enums belong here! +#include "display/canvas/canvas-bpath.h" // FIXME those enums belong here! enum SPCSSFontSize { SP_CSS_FONT_SIZE_XX_SMALL, diff --git a/src/style.cpp b/src/style.cpp index 1cece6dbdf921d38957028089bf6bcacb32864c9..345875d35847a963a711541a17e9e9cde16862e6 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -35,7 +35,7 @@ #include "document.h" #include "preferences.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "3rdparty/libcroco/cr-sel-eng.h" diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 9e212b193e39db46a613c3294baa656c9f705412..9a67faf0370f690025b435d3e738c9e3d22e11af 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -28,7 +28,7 @@ #include "rdf.h" #include "verbs.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "document-properties.h" #include "helper/action.h" #include "include/gtkmm_version.h" diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 0c89a22578d90901c6a954a9754fb2dfd4d0883f..ca0f1d0808b1edf99c9044917ba1f26e731d5de0 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -45,7 +45,7 @@ #include "shortcuts.h" #include "verbs.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/nr-filter-gaussian.h" #include "extension/internal/gdkpixbuf-input.h" diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 86f497ba7a9b907186d8fb3592cb3d9596f60f66..4f3466bb980d7f9a32570a2dca94ec831e14258f 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -19,7 +19,7 @@ #include "display/sp-canvas.h" #include "display/sp-canvas-util.h" #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "helper/geom.h" diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 37a4a24f01d5e95f39ee4b6893359f23dbd34e74..08dc70ac4bbc3ea1c5a6ff4f133d0adce5df52fa 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -48,8 +48,8 @@ #include "verbs.h" #include "display/cairo-utils.h" -#include "display/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas.h" diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index d6ce66a9e84079cb0310e8a42739a4acc6a8edb6..0d74b575e1d9f739bb542b4fe19661ac8b23961d 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -86,7 +86,7 @@ #include "snap.h" #include "verbs.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas.h" diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 99d92b58aa09921acc47034d741e718c22e1515f..2af7ebacad2e0511e54ec460d28b35673566fa71 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -29,8 +29,8 @@ #include "sp-cursor.h" #include "verbs.h" -#include "display/canvas-bpath.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-bpath.h" +#include "display/canvas/canvas-arena.h" #include "display/curve.h" #include "display/cairo-utils.h" diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index eaad1cee4fcd290ec15f0776479ad05184458d89..6ec318427d34762d7778425ef9a0229b91a974f6 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -53,8 +53,8 @@ #include "verbs.h" #include "display/sp-canvas.h" -#include "display/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "include/macros.h" diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index c211fc8ec8e072a42cfa752a99de76dc226c8c58..bd93761d0d586fdf626702d23158dbdfc0fc023a 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -21,7 +21,7 @@ #include "message-stack.h" #include "selection-chemistry.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "include/macros.h" diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index 55ec014abdb7fe4a18ba73183482b1c1a09660fa..bf8333e13511219f9f6c88ccc3988a193ec67169 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -27,8 +27,8 @@ #include "selection.h" #include "display/curve.h" -#include "display/canvas-bpath.h" -#include "display/canvas-text.h" +#include "display/canvas/canvas-bpath.h" +#include "display/canvas/canvas-text.h" #include "object/sp-path.h" diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h index a6ca39ec7a1a9554661823cb896914430cc7ac33..e2201bd90a118d70544bde13146b2c0e9522a3c7 100644 --- a/src/ui/tools/measure-tool.h +++ b/src/ui/tools/measure-tool.h @@ -17,8 +17,8 @@ #include #include "ui/tools/tool-base.h" #include <2geom/point.h> -#include "display/canvas-text.h" -#include "display/canvas-temporary-item.h" +#include "display/canvas/canvas-text.h" +#include "display/canvas/canvas-temporary-item.h" #include "ui/control-manager.h" #include diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index a14114cb71ddf7b99b715bb036b058155b83cf0e..2ae0574fd64e45ceb049a6b7fa17f4633a896bb5 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -23,7 +23,7 @@ #include "selection.h" #include "snap.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas-group.h" #include "display/sp-canvas.h" diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 84933b929229d4f201161c697da9a5e67110d926..45abf5cafc4c646db1e607dbc012decf30d6bb99 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -35,7 +35,7 @@ #include "shortcuts.h" #include "verbs.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sodipodi-ctrl.h" #include "display/sp-canvas.h" diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index 8e1966f4c77d430208079ed5f3a57a440479c97f..2c49d15ddcb01ef75822b61df2c34bd593d16e14 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -37,7 +37,7 @@ #include "selection.h" #include "snap.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas.h" diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 28990bd2d61cab3d4d781671bf9b1e22aeb5d767..54ead98171b1436eb55c3791ec04bf424b1739f5 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -46,7 +46,7 @@ #include "verbs.h" #include "display/cairo-utils.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/curve.h" #include "display/drawing-context.h" #include "display/drawing.h" diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 6b0608fd54c9921e3459efd276681880a7aee268..da85ac0b1bf29b6640481c10fbfdc74c21c7ea76 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -38,7 +38,7 @@ #include "display/sp-canvas.h" #include "display/sp-canvas-group.h" -#include "display/canvas-rotate.h" +#include "display/canvas/canvas-rotate.h" #include "include/gtkmm_version.h" diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index b8cf5549c2e6660c65416b7e7f39d5e934e4fb39..6a4a5f3f9bedef09fde20c33d07c22a252bac2f6 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -36,7 +36,7 @@ #include "splivarot.h" #include "verbs.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/curve.h" #include "display/sp-canvas.h" diff --git a/src/ui/view/svg-view-widget.cpp b/src/ui/view/svg-view-widget.cpp index c349b5acab8d89404fde7ee423d6b67820f448ac..f9ddd20538e9b0fdc647ec2376bab0603c0d7f2c 100644 --- a/src/ui/view/svg-view-widget.cpp +++ b/src/ui/view/svg-view-widget.cpp @@ -30,7 +30,7 @@ #include "display/sp-canvas.h" #include "display/sp-canvas-group.h" #include "display/sp-canvas-item.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "object/sp-item.h" #include "object/sp-root.h" diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 7386f2fa5d48527aee4c1461f68058099995aa40..2913ec804885b0a5b54d80ce725c3ea40d55033c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -39,8 +39,8 @@ #include "inkscape-version.h" #include "verbs.h" -#include "display/canvas-arena.h" -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-axonomgrid.h" #include "display/guideline.h" #include "display/sp-canvas.h" diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index dd8cf07dc1ebfaf9ee995142a45df93b4af8fa40..29af1013a48a2ed7f8d92e5862d0b0df499e0cfc 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -36,7 +36,7 @@ #include "selection.h" #include "verbs.h" -#include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_* +#include "display/canvas/canvas-bpath.h" // for SP_STROKE_LINEJOIN_* #include "display/drawing.h" #include "helper/stock-items.h"