From e35e26b231a111b46ecbadde391ca490016e1c74 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:07:27 +0000 Subject: [PATCH 001/122] Add canvas directory --- src/display/canvas/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/display/canvas/.gitkeep diff --git a/src/display/canvas/.gitkeep b/src/display/canvas/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 -- GitLab From c86c235e5727e67ffa3c20ba388cecf82cd67776 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:09:28 +0000 Subject: [PATCH 002/122] Update canvas-arena.cpp --- src/display/{ => canvas}/canvas-arena.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-arena.cpp (100%) diff --git a/src/display/canvas-arena.cpp b/src/display/canvas/canvas-arena.cpp similarity index 100% rename from src/display/canvas-arena.cpp rename to src/display/canvas/canvas-arena.cpp -- GitLab From 492c9cff4d063945bc7ad2a5c7692a2acfa31735 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:09:37 +0000 Subject: [PATCH 003/122] Update canvas-arena.h --- src/display/{ => canvas}/canvas-arena.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-arena.h (100%) 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 -- GitLab From 030a639952041bd3b65e5f3399f5abb449a525ef Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:12:14 +0000 Subject: [PATCH 004/122] Add CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/display/canvas/CMakeLists.txt diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt new file mode 100644 index 0000000000..d47fbdbec5 --- /dev/null +++ b/src/display/canvas/CMakeLists.txt @@ -0,0 +1,9 @@ +set(canvas_SRC + + canvas-arena.cpp + + canvas-arena.h + + ) + +add_inkscape_source("${canvas_SRC}") \ No newline at end of file -- GitLab From cd1b614e8dd61e94b28474c502b6309e809113db Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:12:44 +0000 Subject: [PATCH 005/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 91d5b779c8..8d2053c453 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,7 +2,7 @@ set(display_SRC cairo-utils.cpp - canvas-arena.cpp + #canvas-arena.cpp canvas-axonomgrid.cpp canvas-bpath.cpp canvas-debug.cpp @@ -63,7 +63,7 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - canvas-arena.h + #canvas-arena.h canvas-axonomgrid.h canvas-bpath.h canvas-debug.h -- GitLab From b0391f07b4cd0f022a78bdf476f48da13413f9df Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:21:58 +0000 Subject: [PATCH 006/122] Update canvas-arena.cpp --- src/display/canvas/canvas-arena.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-arena.cpp b/src/display/canvas/canvas-arena.cpp index 83693ea205..a61ace84bf 100644 --- a/src/display/canvas/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 "canvas-arena.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-item.h" -- GitLab From 1cab32a1bbe3f9e8d686feef6deaa70495cff940 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:22:50 +0000 Subject: [PATCH 007/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index d47fbdbec5..17d4c42eb7 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + set(canvas_SRC canvas-arena.cpp -- GitLab From 673d1d30095e2dfe6d11ea555fb7d6a747474f31 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:32:23 +0000 Subject: [PATCH 008/122] Update drawing-shape.cpp --- src/display/drawing-shape.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp index 20544e1bea..44f3522697 100644 --- a/src/display/drawing-shape.cpp +++ b/src/display/drawing-shape.cpp @@ -17,7 +17,7 @@ #include <2geom/svg-path-parser.h> #include "display/cairo-utils.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/canvas-bpath.h" #include "display/curve.h" #include "display/drawing.h" -- GitLab From 2785429c6c976c84a5210c4f6d0bb3f35082d5ac Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:33:58 +0000 Subject: [PATCH 009/122] Update sp-canvas.cpp --- src/display/sp-canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 4285b4b980..31c8447bcd 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" -- GitLab From 869728375275264af7a0b31fad9a3dd6b3d2db4b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:49:07 +0000 Subject: [PATCH 010/122] Update calligraphic-tool.cpp --- src/ui/tools/calligraphic-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 37a4a24f01..586b98e0c8 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -48,7 +48,7 @@ #include "verbs.h" #include "display/cairo-utils.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas.h" -- GitLab From 102d15d0d50b2fd2fe67ebd1beab1fa76b92dd28 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:49:48 +0000 Subject: [PATCH 011/122] Update dropper-tool.cpp --- src/ui/tools/dropper-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 99d92b58aa..1bbe884f0a 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -30,7 +30,7 @@ #include "verbs.h" #include "display/canvas-bpath.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/curve.h" #include "display/cairo-utils.h" -- GitLab From 202d3e8786c300725d853436bf42837c6bdbda3b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 20:50:24 +0000 Subject: [PATCH 012/122] Update .gitkeep --- src/display/canvas/.gitkeep | 1 + 1 file changed, 1 insertion(+) diff --git a/src/display/canvas/.gitkeep b/src/display/canvas/.gitkeep index e69de29bb2..8e7f12d0ab 100644 --- a/src/display/canvas/.gitkeep +++ b/src/display/canvas/.gitkeep @@ -0,0 +1 @@ +// SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file -- GitLab From 01629415a1655ac8ad46a795aa4068a02915123d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:00:19 +0000 Subject: [PATCH 013/122] Update eraser-tool.cpp --- src/ui/tools/eraser-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index eaad1cee4f..64d5c6981f 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -53,7 +53,7 @@ #include "verbs.h" #include "display/sp-canvas.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/canvas-bpath.h" #include "display/curve.h" -- GitLab From 7e7881859985832522fef14d5242ed27d8cc1945 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:17:36 +0000 Subject: [PATCH 014/122] Update spray-tool.cpp --- src/ui/tools/spray-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 28990bd2d6..54ead98171 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" -- GitLab From 72d2d3a8a6c88a5ed1725f71cfef17d685a33202 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:17:55 +0000 Subject: [PATCH 015/122] Update tweak-tool.cpp --- src/ui/tools/tweak-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index b8cf5549c2..6a4a5f3f9b 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" -- GitLab From 42fa19a7099f85d72743838a1729b13141c9be6f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:33:38 +0000 Subject: [PATCH 016/122] Update desktop-widget.cpp --- src/widgets/desktop-widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 7386f2fa5d..7a5824a32f 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -39,7 +39,7 @@ #include "inkscape-version.h" #include "verbs.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/canvas-axonomgrid.h" #include "display/guideline.h" #include "display/sp-canvas.h" -- GitLab From 7b2991299b006bf940dfe66c2314cc4a2ab3b8d3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:35:13 +0000 Subject: [PATCH 017/122] Update svg-view-widget.cpp --- src/ui/view/svg-view-widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/view/svg-view-widget.cpp b/src/ui/view/svg-view-widget.cpp index c349b5acab..f9ddd20538 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" -- GitLab From 78f154eea13cf0e580306dbd76638d67bff99ef7 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 21:49:30 +0000 Subject: [PATCH 018/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index ebc3e55913..20aa84cb6a 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -41,7 +41,7 @@ #include "message-context.h" #include "message-stack.h" -#include "display/canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/canvas-debug.h" #include "display/canvas-grid.h" #include "display/canvas-rotate.h" -- GitLab From 5bb9eb3072c9e753b4519d4c16484abf21c109b6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 17 Apr 2019 22:05:16 +0000 Subject: [PATCH 019/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 8d2053c453..d457f02869 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -128,4 +128,6 @@ set(display_SRC ) # add_inkscape_lib(display_LIB "${display_SRC}") + +add_subdirectory(canvas) add_inkscape_source("${display_SRC}") -- GitLab From fce3c3c863366e465a541d8ee66a55f52b6ec0b9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 18 Apr 2019 06:23:01 +0000 Subject: [PATCH 020/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index d457f02869..3130ea3187 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -129,5 +129,6 @@ set(display_SRC # add_inkscape_lib(display_LIB "${display_SRC}") -add_subdirectory(canvas) + add_inkscape_source("${display_SRC}") +add_subdirectory(canvas) -- GitLab From 80e4ceccc90d069d376940905d1b46a8a576d669 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 18 Apr 2019 06:24:43 +0000 Subject: [PATCH 021/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index 17d4c42eb7..3be278cd3e 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-or-later set(canvas_SRC -- GitLab From b343d6ae2f6595e3f846a8d46c818a75e60a6d52 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 18 Apr 2019 06:25:13 +0000 Subject: [PATCH 022/122] Update .gitkeep --- src/display/canvas/.gitkeep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/.gitkeep b/src/display/canvas/.gitkeep index 8e7f12d0ab..44c7393226 100644 --- a/src/display/canvas/.gitkeep +++ b/src/display/canvas/.gitkeep @@ -1 +1 @@ -// SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file -- GitLab From 24088699cf85ba268b741ec7f376eea3a11e4995 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 18 Apr 2019 21:10:50 +0000 Subject: [PATCH 023/122] Update canvas-arena.cpp --- src/display/canvas/canvas-arena.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-arena.cpp b/src/display/canvas/canvas-arena.cpp index a61ace84bf..6e6ae80162 100644 --- a/src/display/canvas/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 "canvas-arena.h" +#include "display/canvas/canvas-arena.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-item.h" -- GitLab From b65dcd4ce63f96710f722e857fe0f08cca628072 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 19 Apr 2019 21:18:04 +0000 Subject: [PATCH 024/122] Delete .gitkeep --- src/display/canvas/.gitkeep | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/display/canvas/.gitkeep diff --git a/src/display/canvas/.gitkeep b/src/display/canvas/.gitkeep deleted file mode 100644 index 44c7393226..0000000000 --- a/src/display/canvas/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file -- GitLab From 0735fa277130e97f7a8844324e769640d36bc577 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 19 Apr 2019 21:18:36 +0000 Subject: [PATCH 025/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 3130ea3187..052ea8fd00 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,7 +2,6 @@ set(display_SRC cairo-utils.cpp - #canvas-arena.cpp canvas-axonomgrid.cpp canvas-bpath.cpp canvas-debug.cpp @@ -63,7 +62,6 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - #canvas-arena.h canvas-axonomgrid.h canvas-bpath.h canvas-debug.h -- GitLab From a923c7481c1ed9e8ab2d3f70cf73a30dbd5ce8af Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 10:35:10 +0000 Subject: [PATCH 026/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index 3be278cd3e..17c72af558 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -3,8 +3,10 @@ set(canvas_SRC canvas-arena.cpp + canvas-axonomgrid.cpp canvas-arena.h + canvas-axonomgrid.h ) -- GitLab From a54c4ad19edea6329a352f5f5ac7d9b974ea97a5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 10:35:35 +0000 Subject: [PATCH 027/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 052ea8fd00..cf1883a1f3 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,7 +2,6 @@ set(display_SRC cairo-utils.cpp - canvas-axonomgrid.cpp canvas-bpath.cpp canvas-debug.cpp canvas-grid.cpp @@ -62,7 +61,6 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - canvas-axonomgrid.h canvas-bpath.h canvas-debug.h canvas-grid.h -- GitLab From 66edd4970f67db25f3a16f15b7e6edd833d1edf1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 10:36:01 +0000 Subject: [PATCH 028/122] Update canvas-axonomgrid.cpp --- src/display/{ => canvas}/canvas-axonomgrid.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-axonomgrid.cpp (100%) diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp similarity index 100% rename from src/display/canvas-axonomgrid.cpp rename to src/display/canvas/canvas-axonomgrid.cpp -- GitLab From f4571e734d28cf1cab3e48f3c421fbfadd1b20da Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 10:36:10 +0000 Subject: [PATCH 029/122] Update canvas-axonomgrid.h --- src/display/{ => canvas}/canvas-axonomgrid.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-axonomgrid.h (100%) diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas/canvas-axonomgrid.h similarity index 100% rename from src/display/canvas-axonomgrid.h rename to src/display/canvas/canvas-axonomgrid.h -- GitLab From b4ada6bfe134f748c42fc8bfa30cf2318abf4098 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 11:01:54 +0000 Subject: [PATCH 030/122] Update canvas-grid.cpp --- src/display/canvas-grid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index f4a210fe66..47e68d5d98 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -30,7 +30,7 @@ #include "helper/mathfns.h" #include "display/cairo-utils.h" -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-axonomgrid.h" #include "display/canvas-grid.h" #include "display/sp-canvas-group.h" #include "document.h" -- GitLab From 75066c37a97851a6272c483be1c70564c2165470 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 11:27:11 +0000 Subject: [PATCH 031/122] Update canvas-axonomgrid.cpp --- src/display/canvas/canvas-axonomgrid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp index 2e4a20d6a6..59270c8730 100644 --- a/src/display/canvas/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -20,7 +20,7 @@ #include -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-axonomgrid.h" #include "ui/widget/registered-widget.h" #include "desktop.h" -- GitLab From 954ae253462058c87064bd9741c8a5925ba0fb32 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 12:28:26 +0000 Subject: [PATCH 032/122] Update CMakeLists.txt -- GitLab From 3c5ea730e239ca83e994d87674aab0113941a05e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 12:36:34 +0000 Subject: [PATCH 033/122] Update canvas-grid.cpp --- src/display/canvas-grid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 47e68d5d98..f4a210fe66 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -30,7 +30,7 @@ #include "helper/mathfns.h" #include "display/cairo-utils.h" -#include "display/canvas/canvas-axonomgrid.h" +#include "display/canvas-axonomgrid.h" #include "display/canvas-grid.h" #include "display/sp-canvas-group.h" #include "document.h" -- GitLab From 098dc234de3303e80b0c8458cb92a6021893878c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 12:49:09 +0000 Subject: [PATCH 034/122] Update canvas-grid.cpp --- src/display/canvas-grid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index f4a210fe66..47e68d5d98 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -30,7 +30,7 @@ #include "helper/mathfns.h" #include "display/cairo-utils.h" -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-axonomgrid.h" #include "display/canvas-grid.h" #include "display/sp-canvas-group.h" #include "document.h" -- GitLab From 9f570650b2596e237828da61611460a92975548e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 3 Jun 2019 12:55:03 +0000 Subject: [PATCH 035/122] Update canvas-axonomgrid.h --- src/display/canvas/canvas-axonomgrid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-axonomgrid.h b/src/display/canvas/canvas-axonomgrid.h index ce4a19edf5..c9637af09f 100644 --- a/src/display/canvas/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-grid.h" struct SPCanvasBuf; class SPNamedView; -- GitLab From d7e8d2ae48005242a7e3072b044aaca324d0e42c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 7 Jun 2019 13:26:24 +0000 Subject: [PATCH 036/122] Update desktop-widget.cpp --- src/widgets/desktop-widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 7a5824a32f..2913ec8048 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -40,7 +40,7 @@ #include "verbs.h" #include "display/canvas/canvas-arena.h" -#include "display/canvas-axonomgrid.h" +#include "display/canvas/canvas-axonomgrid.h" #include "display/guideline.h" #include "display/sp-canvas.h" -- GitLab From d1a2c67fa83d8add3374f011811f89821d1e2c89 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 7 Jun 2019 15:42:03 +0000 Subject: [PATCH 037/122] Update canvas-text.cpp --- src/display/{ => canvas}/canvas-text.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-text.cpp (100%) diff --git a/src/display/canvas-text.cpp b/src/display/canvas/canvas-text.cpp similarity index 100% rename from src/display/canvas-text.cpp rename to src/display/canvas/canvas-text.cpp -- GitLab From 801fa7cdc8ecdc274e92d8f455e99095e0355acc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 7 Jun 2019 15:42:16 +0000 Subject: [PATCH 038/122] Update canvas-text.h --- src/display/{ => canvas}/canvas-text.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-text.h (100%) diff --git a/src/display/canvas-text.h b/src/display/canvas/canvas-text.h similarity index 100% rename from src/display/canvas-text.h rename to src/display/canvas/canvas-text.h -- GitLab From ff024caccb9ecf7e26d74b0d6ba1622e13532cc5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 7 Jun 2019 15:43:08 +0000 Subject: [PATCH 039/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index 17c72af558..0b328b2e4e 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -4,9 +4,11 @@ set(canvas_SRC canvas-arena.cpp canvas-axonomgrid.cpp + canvas-text.cpp canvas-arena.h canvas-axonomgrid.h + canvas-text.h ) -- GitLab From ce755c20a0000817ba5a8b0b1981ea7643f77d38 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 7 Jun 2019 15:43:47 +0000 Subject: [PATCH 040/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index cf1883a1f3..948ee91709 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -8,7 +8,6 @@ set(display_SRC canvas-rotate.cpp canvas-temporary-item-list.cpp canvas-temporary-item.cpp - canvas-text.cpp curve.cpp drawing-context.cpp drawing-group.cpp @@ -67,7 +66,6 @@ set(display_SRC canvas-rotate.h canvas-temporary-item-list.h canvas-temporary-item.h - canvas-text.h curve-test.h curve.h drawing-context.h -- GitLab From 930c9cf1af3bb5f8ec49d7727a5e6e731ac1a99a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 12:34:33 +0000 Subject: [PATCH 041/122] Update snap-indicator.cpp --- src/display/snap-indicator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp index 4039a3717a..3c6441661f 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" -- GitLab From 05689f6e0fa66000f06b4a93cef39ed51ad00695 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 12:36:25 +0000 Subject: [PATCH 042/122] Update canvas-text.cpp --- src/display/canvas/canvas-text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-text.cpp b/src/display/canvas/canvas-text.cpp index e725a1f93c..064bab4cdd 100644 --- a/src/display/canvas/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" -- GitLab From 85c8e26d9e7bdba591b9122dc5db78588832c18c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 12:49:25 +0000 Subject: [PATCH 043/122] Update canvas-text.h --- src/display/canvas/canvas-text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-text.h b/src/display/canvas/canvas-text.h index 257f360a68..322a635abd 100644 --- a/src/display/canvas/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; -- GitLab From 6a0ba6278bc3aa308b04e9430fd85100c62f6765 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 12:59:33 +0000 Subject: [PATCH 044/122] Update text.cpp --- src/live_effects/parameter/text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp index 6f98969810..e54342d271 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 -- GitLab From 28e2d318807867cd6fbd688a4f41026483cbc825 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 13:08:06 +0000 Subject: [PATCH 045/122] Update measure-tool.h --- src/ui/tools/measure-tool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h index a6ca39ec7a..9eba923b53 100644 --- a/src/ui/tools/measure-tool.h +++ b/src/ui/tools/measure-tool.h @@ -17,7 +17,7 @@ #include #include "ui/tools/tool-base.h" #include <2geom/point.h> -#include "display/canvas-text.h" +#include "display/canvas/canvas-text.h" #include "display/canvas-temporary-item.h" #include "ui/control-manager.h" #include -- GitLab From 80c60b49f051484808a6de875b4625109fa68b3b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 8 Jun 2019 13:30:30 +0000 Subject: [PATCH 046/122] Update lpe-tool.cpp --- src/ui/tools/lpe-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index 55ec014abd..c295e1bd51 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -28,7 +28,7 @@ #include "display/curve.h" #include "display/canvas-bpath.h" -#include "display/canvas-text.h" +#include "display/canvas/canvas-text.h" #include "object/sp-path.h" -- GitLab From ab581874446854f539730968d1b916f3b0e1557d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:37:36 +0000 Subject: [PATCH 047/122] Update canvas-grid.cpp --- src/display/canvas-grid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 47e68d5d98..40853f164a 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -31,7 +31,7 @@ #include "display/cairo-utils.h" #include "display/canvas/canvas-axonomgrid.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/sp-canvas-group.h" #include "document.h" #include "util/units.h" -- GitLab From 868ea6f4d076df6a962510c55f49464a5cc6a9f2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:38:05 +0000 Subject: [PATCH 048/122] Update canvas-grid.cpp --- src/display/{ => canvas}/canvas-grid.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-grid.cpp (100%) diff --git a/src/display/canvas-grid.cpp b/src/display/canvas/canvas-grid.cpp similarity index 100% rename from src/display/canvas-grid.cpp rename to src/display/canvas/canvas-grid.cpp -- GitLab From d9c50b838fe38d5e76a8db256773a92903a78d5b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:38:16 +0000 Subject: [PATCH 049/122] Update canvas-grid.h --- src/display/{ => canvas}/canvas-grid.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-grid.h (100%) diff --git a/src/display/canvas-grid.h b/src/display/canvas/canvas-grid.h similarity index 100% rename from src/display/canvas-grid.h rename to src/display/canvas/canvas-grid.h -- GitLab From d028750ef40b88173cde2fe7aac45d4137b92021 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:39:07 +0000 Subject: [PATCH 050/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 948ee91709..f56b256ffe 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -4,7 +4,6 @@ set(display_SRC cairo-utils.cpp canvas-bpath.cpp canvas-debug.cpp - canvas-grid.cpp canvas-rotate.cpp canvas-temporary-item-list.cpp canvas-temporary-item.cpp @@ -62,7 +61,6 @@ set(display_SRC cairo-utils.h canvas-bpath.h canvas-debug.h - canvas-grid.h canvas-rotate.h canvas-temporary-item-list.h canvas-temporary-item.h -- GitLab From fd407b190647b798ec0310688eb47e2e553cf26b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:39:46 +0000 Subject: [PATCH 051/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index 0b328b2e4e..d4d44c46d4 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -5,10 +5,12 @@ set(canvas_SRC canvas-arena.cpp canvas-axonomgrid.cpp canvas-text.cpp + canvas-grid.cpp canvas-arena.h canvas-axonomgrid.h canvas-text.h + canvas-grid.h ) -- GitLab From 27793aef95251207b98e44cb454c6ac59e9011f9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:52:12 +0000 Subject: [PATCH 052/122] Update canvas-grid.cpp --- src/display/canvas/canvas-grid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-grid.cpp b/src/display/canvas/canvas-grid.cpp index 40853f164a..5c6fc79a37 100644 --- a/src/display/canvas/canvas-grid.cpp +++ b/src/display/canvas/canvas-grid.cpp @@ -26,7 +26,7 @@ #include #include "desktop.h" -#include "sp-canvas-util.h" +#include "display/sp-canvas-util.h" #include "helper/mathfns.h" #include "display/cairo-utils.h" -- GitLab From 540ad5353d7f3029cee9bab9effb5abe05cb8dcb Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:53:41 +0000 Subject: [PATCH 053/122] Update canvas-grid.h --- src/display/canvas/canvas-grid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-grid.h b/src/display/canvas/canvas-grid.h index 6fde5a6e31..38df42a824 100644 --- a/src/display/canvas/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" -- GitLab From ea6d920df3d0c975279d043497f0bedfa40db9ed Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:59:39 +0000 Subject: [PATCH 054/122] Update canvas-axonomgrid.cpp --- src/display/canvas/canvas-axonomgrid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp index 59270c8730..da4955c14f 100644 --- a/src/display/canvas/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -26,7 +26,7 @@ #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" -- GitLab From 70f1b2c28de674283e9082939dd3b74a35cb98c9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 10 Jun 2019 23:59:54 +0000 Subject: [PATCH 055/122] Update canvas-axonomgrid.h --- src/display/canvas/canvas-axonomgrid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-axonomgrid.h b/src/display/canvas/canvas-axonomgrid.h index c9637af09f..b5e08b5819 100644 --- a/src/display/canvas/canvas-axonomgrid.h +++ b/src/display/canvas/canvas-axonomgrid.h @@ -11,7 +11,7 @@ */ #include "line-snapper.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" struct SPCanvasBuf; class SPNamedView; -- GitLab From 41f3e1fec8a5fe2b91c4593548085bd54d7804c9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:06:19 +0000 Subject: [PATCH 056/122] Update sp-namedview.cpp --- src/object/sp-namedview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp index b17af346ca..a7647c4fc9 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" -- GitLab From f15b444692e26d8fa7ae5aca6f70d3bc2deb9c70 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:12:35 +0000 Subject: [PATCH 057/122] Update document-properties.cpp --- src/ui/dialog/document-properties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 9e212b193e..9a67faf037 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" -- GitLab From 7322ad332b401e69876ee2174ec431039db96914 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:13:32 +0000 Subject: [PATCH 058/122] Update inkscape-preferences.cpp --- src/ui/dialog/inkscape-preferences.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 0c89a22578..ca0f1d0808 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" -- GitLab From 415b78e52d3fdd27e5b3f746640d890f26d06494 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:20:54 +0000 Subject: [PATCH 059/122] Update desktop-events.cpp --- src/desktop-events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index e35cd2abae..c12d4d4d9e 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" -- GitLab From c2290084b67e2ced37be4a860f1b2f539d61c814 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:32:49 +0000 Subject: [PATCH 060/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 20aa84cb6a..6d03f3af78 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -43,7 +43,7 @@ #include "display/canvas/canvas-arena.h" #include "display/canvas-debug.h" -#include "display/canvas-grid.h" +#include "display/canvas/canvas-grid.h" #include "display/canvas-rotate.h" #include "display/canvas-temporary-item-list.h" #include "display/drawing-group.h" -- GitLab From 45af9811681d3d4af11b03dca7ecdfbeb89d7478 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 00:40:25 +0000 Subject: [PATCH 061/122] Update file-update.cpp --- src/file-update.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file-update.cpp b/src/file-update.cpp index 5489ee499b..9cf7de75ec 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" -- GitLab From d9290a14519ba0ac4e1eeec54babe98c4f96867b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 01:09:32 +0000 Subject: [PATCH 062/122] Update snap.cpp --- src/snap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/snap.cpp b/src/snap.cpp index 210a1989ee..e80edc0f3b 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" -- GitLab From 0eef7f17fb15c3674f81f9ddc2b9d1b6502f4cee Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:00:22 +0000 Subject: [PATCH 063/122] Update canvas-bpath.cpp --- src/display/canvas-bpath.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp index 327bb1c06d..024d82db1d 100644 --- a/src/display/canvas-bpath.cpp +++ b/src/display/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" -- GitLab From 8f4a71628311bfe0b136208d0ca62cb4d2ea9c94 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:00:38 +0000 Subject: [PATCH 064/122] Update canvas-bpath.h --- src/display/canvas-bpath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h index 4dc98315cc..59be1fef47 100644 --- a/src/display/canvas-bpath.h +++ b/src/display/canvas-bpath.h @@ -18,7 +18,7 @@ #include -#include "sp-canvas-item.h" +#include "display/sp-canvas-item.h" struct SPCanvasBPath; struct SPCanvasBPathClass; -- GitLab From a6ca2481952ffad90dff3549bae2b12b496432dc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:01:19 +0000 Subject: [PATCH 065/122] Update canvas-bpath.cpp --- src/display/{ => canvas}/canvas-bpath.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-bpath.cpp (100%) diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas/canvas-bpath.cpp similarity index 100% rename from src/display/canvas-bpath.cpp rename to src/display/canvas/canvas-bpath.cpp -- GitLab From dcd1b4efd8834098dd7da528f478e367dec2e0ae Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:01:30 +0000 Subject: [PATCH 066/122] Update canvas-bpath.h --- src/display/{ => canvas}/canvas-bpath.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-bpath.h (100%) diff --git a/src/display/canvas-bpath.h b/src/display/canvas/canvas-bpath.h similarity index 100% rename from src/display/canvas-bpath.h rename to src/display/canvas/canvas-bpath.h -- GitLab From 2da3497844bdf462f08bc49b5c81bbd9ee579291 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:02:26 +0000 Subject: [PATCH 067/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index f56b256ffe..f12687033d 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,7 +2,6 @@ set(display_SRC cairo-utils.cpp - canvas-bpath.cpp canvas-debug.cpp canvas-rotate.cpp canvas-temporary-item-list.cpp @@ -59,7 +58,6 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - canvas-bpath.h canvas-debug.h canvas-rotate.h canvas-temporary-item-list.h -- GitLab From 45479c449359545054973b4c6694a92d5ec6690b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:03:01 +0000 Subject: [PATCH 068/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index d4d44c46d4..aac4c659d9 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -6,11 +6,13 @@ set(canvas_SRC canvas-axonomgrid.cpp canvas-text.cpp canvas-grid.cpp + canvas-bpath.cpp canvas-arena.h canvas-axonomgrid.h canvas-text.h canvas-grid.h + canvas-bpath.h ) -- GitLab From 58bdc81072482bed1d8cbd4d11bc9d56563abcca Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 02:12:27 +0000 Subject: [PATCH 069/122] Update style-enums.h --- src/style-enums.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style-enums.h b/src/style-enums.h index 24e4c95da2..d524c6e102 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, -- GitLab From dd4dc37abf9543c53aa71f0df1237be00739f02c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 16:11:40 +0000 Subject: [PATCH 070/122] Update drawing-shape.cpp --- src/display/drawing-shape.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp index 44f3522697..fea4717892 100644 --- a/src/display/drawing-shape.cpp +++ b/src/display/drawing-shape.cpp @@ -18,7 +18,7 @@ #include "display/cairo-utils.h" #include "display/canvas/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/drawing.h" #include "display/drawing-context.h" -- GitLab From e9e3afd9e6f9c4d1617d4296988723dfbd2864c2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 11 Jun 2019 16:12:29 +0000 Subject: [PATCH 071/122] Update drawing-text.cpp --- src/display/drawing-text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index 9d81d736da..6fc24565fd 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 { -- GitLab From 21c89840973d58ff765d2bf7a775dc968cfdda22 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 12:32:56 +0000 Subject: [PATCH 072/122] Update nr-style.cpp --- src/display/nr-style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index 1832a5f51f..7ce9368e33 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" -- GitLab From 7acea728a108c59c93331853f45911e7680674f6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 12:43:16 +0000 Subject: [PATCH 073/122] Update metafile-print.h --- src/extension/internal/metafile-print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/metafile-print.h b/src/extension/internal/metafile-print.h index 3aeb0a0766..b47e5d58ba 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; -- GitLab From a66c0493ddb70f42e675266acb26efe5e29b6009 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 13:11:14 +0000 Subject: [PATCH 074/122] Update emf-print.h --- src/extension/internal/emf-print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index e48e332dd7..f38908ff8b 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 { -- GitLab From 4c5f98a283487e1d3f9200f9d2a67650b2573cc6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 13:31:54 +0000 Subject: [PATCH 075/122] Update cairo-ps-out.cpp --- src/extension/internal/cairo-ps-out.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 5dfbe051ed..b0139b93d9 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" -- GitLab From 2954d8e2ff205001ceade5f63c67cf0820c98b9b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 13:32:25 +0000 Subject: [PATCH 076/122] Update wmf-print.h --- src/extension/internal/wmf-print.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index 92f5577f31..cc8324d35b 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 { -- GitLab From 1b955bbe801df5c51a2b7ed3cb7eabe9a8380930 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 15 Jun 2019 14:06:12 +0000 Subject: [PATCH 077/122] Update cairo-render-context.cpp --- src/extension/internal/cairo-render-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index db0a6867e3..0281dcb199 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" -- GitLab From 4d2c3f9b8d27b4e4b899b5ba13e19aee0606320f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 09:41:48 +0000 Subject: [PATCH 078/122] Update cairo-renderer.cpp --- src/extension/internal/cairo-renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 3f045f42b8..6490d821e9 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" -- GitLab From ec3acb5eb72724e0e977f3b55cbf7df258758ab7 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 09:42:23 +0000 Subject: [PATCH 079/122] Update cairo-renderer-pdf-out.cpp --- src/extension/internal/cairo-renderer-pdf-out.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index a48025c1a0..0de7e252e6 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" -- GitLab From 7a3b82d12a41b754e9f0eb97f60fce5b242fa7af Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 10:07:25 +0000 Subject: [PATCH 080/122] Update emf-print.cpp --- src/extension/internal/emf-print.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 6d330f2ea0..f47860468d 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" -- GitLab From 87ed65a099dbe401fad6953756713bf3324c2dc8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 10:31:02 +0000 Subject: [PATCH 081/122] Update javafx-out.cpp --- src/extension/internal/javafx-out.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 1b0e9150d6..2cef60ba1e 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> -- GitLab From 21046444594dbc281de0211a2580261fd4a2c2b9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 10:55:31 +0000 Subject: [PATCH 082/122] Update wmf-print.cpp --- src/extension/internal/wmf-print.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 9eba6cae87..395c8c723c 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" -- GitLab From 7f3660253dfeec4f6b145f072312a60ed8d0857f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 20 Jun 2019 11:46:05 +0000 Subject: [PATCH 083/122] Update text.h --- src/live_effects/parameter/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h index 12e6295c0d..cd53e0f8ef 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; -- GitLab From e21d82f2d81013a07fdb4b69a107f9ec48446319 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 16:36:04 +0000 Subject: [PATCH 084/122] Update path-manipulator.cpp --- src/ui/tool/path-manipulator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 86f497ba7a..4f3466bb98 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" -- GitLab From 1b0434c1a96c2addeb84c28511641e599a1b1ae3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 17:35:24 +0000 Subject: [PATCH 085/122] Update calligraphic-tool.cpp --- src/ui/tools/calligraphic-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 586b98e0c8..08dc70ac4b 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -49,7 +49,7 @@ #include "display/cairo-utils.h" #include "display/canvas/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "display/sp-canvas.h" -- GitLab From e9f5dc73821c5e3975f28cdff252e13e8e22fa34 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:53:10 +0000 Subject: [PATCH 086/122] Update connector-tool.cpp --- src/ui/tools/connector-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index d6ce66a9e8..0d74b575e1 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" -- GitLab From 554bd85dc15e5e4ccb54cdba717a5e24f35395b5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:53:50 +0000 Subject: [PATCH 087/122] Update dropper-tool.cpp --- src/ui/tools/dropper-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 1bbe884f0a..2af7ebacad 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -29,7 +29,7 @@ #include "sp-cursor.h" #include "verbs.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/canvas/canvas-arena.h" #include "display/curve.h" #include "display/cairo-utils.h" -- GitLab From 94a82d83663e92afd48846eeeb392415418294e4 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:54:15 +0000 Subject: [PATCH 088/122] Update eraser-tool.cpp --- src/ui/tools/eraser-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 64d5c6981f..6ec318427d 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -54,7 +54,7 @@ #include "display/sp-canvas.h" #include "display/canvas/canvas-arena.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/curve.h" #include "include/macros.h" -- GitLab From 5f5aced83970584e31cdaa7ff081255029d32465 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:54:47 +0000 Subject: [PATCH 089/122] Update freehand-base.cpp --- src/ui/tools/freehand-base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index c211fc8ec8..bd93761d0d 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" -- GitLab From 9cae74ac25ec45f24a71388d966bbc7e9d74c50a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:55:19 +0000 Subject: [PATCH 090/122] Update lpe-tool.cpp --- src/ui/tools/lpe-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index c295e1bd51..bf8333e135 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -27,7 +27,7 @@ #include "selection.h" #include "display/curve.h" -#include "display/canvas-bpath.h" +#include "display/canvas/canvas-bpath.h" #include "display/canvas/canvas-text.h" #include "object/sp-path.h" -- GitLab From 33889e11c910a02fef806f7896511e3e7747d9a4 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:55:48 +0000 Subject: [PATCH 091/122] Update node-tool.cpp --- src/ui/tools/node-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index a14114cb71..2ae0574fd6 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" -- GitLab From dd3949d52130ec52e2886b3fba1bb23e85f0658b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:56:51 +0000 Subject: [PATCH 092/122] Update pen-tool.cpp --- src/ui/tools/pen-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 84933b9292..45abf5cafc 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" -- GitLab From 5a837f9dba1661d558ec19ffb2555dc1d1f74c1b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Tue, 25 Jun 2019 18:57:21 +0000 Subject: [PATCH 093/122] Update pencil-tool.cpp --- src/ui/tools/pencil-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index 8e1966f4c7..2c49d15ddc 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" -- GitLab From ef17a6c7badc328dfa9548d38cddaea2265052df Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 15:39:05 +0000 Subject: [PATCH 094/122] Update stroke-style.h --- src/widgets/stroke-style.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index dd8cf07dc1..29af1013a4 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" -- GitLab From 3d6518e07174d25c2d98051100c75831ebe86aed Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 15:52:52 +0000 Subject: [PATCH 095/122] Update canvas-rotate.cpp --- src/display/{ => canvas}/canvas-rotate.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-rotate.cpp (100%) diff --git a/src/display/canvas-rotate.cpp b/src/display/canvas/canvas-rotate.cpp similarity index 100% rename from src/display/canvas-rotate.cpp rename to src/display/canvas/canvas-rotate.cpp -- GitLab From db808e0b0aea9c95c20facc9dbfcb2a93a562348 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 15:53:08 +0000 Subject: [PATCH 096/122] Update canvas-rotate.h --- src/display/{ => canvas}/canvas-rotate.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-rotate.h (100%) diff --git a/src/display/canvas-rotate.h b/src/display/canvas/canvas-rotate.h similarity index 100% rename from src/display/canvas-rotate.h rename to src/display/canvas/canvas-rotate.h -- GitLab From 22e7aae5b513b41317937c58f4b35b104abda0c2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 15:54:38 +0000 Subject: [PATCH 097/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index aac4c659d9..d83923debc 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -7,13 +7,14 @@ set(canvas_SRC canvas-text.cpp canvas-grid.cpp canvas-bpath.cpp + canvas-rotate.cpp canvas-arena.h canvas-axonomgrid.h canvas-text.h canvas-grid.h canvas-bpath.h - + canvas-rotate.h ) add_inkscape_source("${canvas_SRC}") \ No newline at end of file -- GitLab From a269ec9b953f6fdc172b837fbc83f7105e734fb4 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 15:54:53 +0000 Subject: [PATCH 098/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index f12687033d..2d52d12b1e 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -3,7 +3,6 @@ set(display_SRC cairo-utils.cpp canvas-debug.cpp - canvas-rotate.cpp canvas-temporary-item-list.cpp canvas-temporary-item.cpp curve.cpp @@ -59,7 +58,6 @@ set(display_SRC cairo-templates.h cairo-utils.h canvas-debug.h - canvas-rotate.h canvas-temporary-item-list.h canvas-temporary-item.h curve-test.h -- GitLab From 7d9c2e487d590c6b69e606be5baa55d51f5a5832 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 17:12:36 +0000 Subject: [PATCH 099/122] Update canvas-rotate.h --- src/display/canvas/canvas-rotate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-rotate.h b/src/display/canvas/canvas-rotate.h index b45eae2850..bbe6b09aeb 100644 --- a/src/display/canvas/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; -- GitLab From 3db0126deeb583d84831ae95cf9898ba44731b78 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 18:51:56 +0000 Subject: [PATCH 100/122] Update canvas-rotate.cpp --- src/display/canvas/canvas-rotate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-rotate.cpp b/src/display/canvas/canvas-rotate.cpp index f747c66f54..c38f3b78ae 100644 --- a/src/display/canvas/canvas-rotate.cpp +++ b/src/display/canvas/canvas-rotate.cpp @@ -14,7 +14,7 @@ #include "desktop.h" #include "canvas-rotate.h" -#include "sp-canvas.h" +#include "display/sp-canvas.h" #include "cairo-utils.h" #include "ui/event-debug.h" -- GitLab From 4b3325ad36221314b90c7c4b6fdfe1b94b56a7d8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Wed, 26 Jun 2019 19:19:41 +0000 Subject: [PATCH 101/122] Update canvas-rotate.cpp --- src/display/canvas/canvas-rotate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-rotate.cpp b/src/display/canvas/canvas-rotate.cpp index c38f3b78ae..b2408bdf85 100644 --- a/src/display/canvas/canvas-rotate.cpp +++ b/src/display/canvas/canvas-rotate.cpp @@ -15,7 +15,7 @@ #include "canvas-rotate.h" #include "display/sp-canvas.h" -#include "cairo-utils.h" +#include "display/cairo-utils.h" #include "ui/event-debug.h" #include "2geom/point.h" -- GitLab From e6a19d9e10f61fce5d9ecbdcf1338823bf8c6411 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 27 Jun 2019 14:05:05 +0000 Subject: [PATCH 102/122] Update tool-base.cpp --- src/ui/tools/tool-base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 6b0608fd54..da85ac0b1b 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" -- GitLab From 1a372945e06efacc0ab7f27d5aba5bd8add29431 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 27 Jun 2019 15:50:13 +0000 Subject: [PATCH 103/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 6d03f3af78..213a2fb7d2 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -44,7 +44,7 @@ #include "display/canvas/canvas-arena.h" #include "display/canvas-debug.h" #include "display/canvas/canvas-grid.h" -#include "display/canvas-rotate.h" +#include "display/canvas/canvas-rotate.h" #include "display/canvas-temporary-item-list.h" #include "display/drawing-group.h" #include "display/gnome-canvas-acetate.h" -- GitLab From d87ca5fac1a7559fa15069b934ce9e628788e2b9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 27 Jun 2019 18:38:48 +0000 Subject: [PATCH 104/122] Update rubberband.cpp --- src/rubberband.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rubberband.cpp b/src/rubberband.cpp index e6db06efa0..8ed05b4a95 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; -- GitLab From d9f8fe965cc2055920d0724957cd12d10e821f6c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 18:52:10 +0000 Subject: [PATCH 105/122] Update style.cpp --- src/style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style.cpp b/src/style.cpp index 1cece6dbdf..345875d358 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" -- GitLab From 22de487d2b4c1f445dab1627864ba647e764e39a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:53:38 +0000 Subject: [PATCH 106/122] Update canvas-temporary-item-list.h --- src/display/{ => canvas}/canvas-temporary-item-list.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-temporary-item-list.h (100%) 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 -- GitLab From fcbba12233534ca488d631d35c4780ff46914744 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:53:40 +0000 Subject: [PATCH 107/122] Update canvas-temporary-item-list.cpp --- src/display/{ => canvas}/canvas-temporary-item-list.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/display/{ => canvas}/canvas-temporary-item-list.cpp (95%) 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 caa9609699..c41fde9031 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 { -- GitLab From c2878a280bd415b9a18084b80a4017edd7f71cd1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:54:14 +0000 Subject: [PATCH 108/122] Update canvas-temporary-item.cpp --- src/display/{ => canvas}/canvas-temporary-item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/display/{ => canvas}/canvas-temporary-item.cpp (97%) 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 38266872bd..7e919ac7e5 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" -- GitLab From ffc4e4a8f489c12ae86c4779d15d1ada72e291ea Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:54:41 +0000 Subject: [PATCH 109/122] Update canvas-temporary-item.h --- src/display/{ => canvas}/canvas-temporary-item.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-temporary-item.h (100%) 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 -- GitLab From 6f171f0504c57cf9b82136f4eb7ae0b91804dbdd Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:55:53 +0000 Subject: [PATCH 110/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index d83923debc..41d5da5e8d 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -8,13 +8,17 @@ set(canvas_SRC canvas-grid.cpp canvas-bpath.cpp canvas-rotate.cpp - + canvas-temporary-item-list.cpp + canvas-temporary-item.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 ) add_inkscape_source("${canvas_SRC}") \ No newline at end of file -- GitLab From 58d770e70bb0da184183834a0c86144879f31e2b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sat, 29 Jun 2019 20:55:59 +0000 Subject: [PATCH 111/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 2d52d12b1e..ee62a89c54 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -3,8 +3,6 @@ set(display_SRC cairo-utils.cpp canvas-debug.cpp - canvas-temporary-item-list.cpp - canvas-temporary-item.cpp curve.cpp drawing-context.cpp drawing-group.cpp @@ -58,8 +56,6 @@ set(display_SRC cairo-templates.h cairo-utils.h canvas-debug.h - canvas-temporary-item-list.h - canvas-temporary-item.h curve-test.h curve.h drawing-context.h -- GitLab From 27668182d45c1d7fa6db75f7481005786b9ecd0b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 4 Jul 2019 16:07:32 +0000 Subject: [PATCH 112/122] Update measure-tool.h --- src/ui/tools/measure-tool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/measure-tool.h b/src/ui/tools/measure-tool.h index 9eba923b53..e2201bd90a 100644 --- a/src/ui/tools/measure-tool.h +++ b/src/ui/tools/measure-tool.h @@ -18,7 +18,7 @@ #include "ui/tools/tool-base.h" #include <2geom/point.h> #include "display/canvas/canvas-text.h" -#include "display/canvas-temporary-item.h" +#include "display/canvas/canvas-temporary-item.h" #include "ui/control-manager.h" #include -- GitLab From 94c98363877f0c45ca1db6cf597ead86196ee9bf Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 5 Jul 2019 13:42:11 +0000 Subject: [PATCH 113/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 213a2fb7d2..87416d818d 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -45,7 +45,7 @@ #include "display/canvas-debug.h" #include "display/canvas/canvas-grid.h" #include "display/canvas/canvas-rotate.h" -#include "display/canvas-temporary-item-list.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" -- GitLab From ccbe827b4fb846cc1c87e16039a358883f5020b2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 07:02:55 +0000 Subject: [PATCH 114/122] Revert "Update desktop.cpp" This reverts commit 94c98363877f0c45ca1db6cf597ead86196ee9bf --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 87416d818d..213a2fb7d2 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -45,7 +45,7 @@ #include "display/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/canvas-temporary-item-list.h" #include "display/drawing-group.h" #include "display/gnome-canvas-acetate.h" #include "display/snap-indicator.h" -- GitLab From a2105f21fc102ee57025a4e5440f2685b8b8c8d1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 07:09:19 +0000 Subject: [PATCH 115/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 213a2fb7d2..87416d818d 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -45,7 +45,7 @@ #include "display/canvas-debug.h" #include "display/canvas/canvas-grid.h" #include "display/canvas/canvas-rotate.h" -#include "display/canvas-temporary-item-list.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" -- GitLab From acbba41493b07dfd759e0a28a75a72237d96b2d3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:05:14 +0000 Subject: [PATCH 116/122] Update canvas-debug.cpp --- src/display/{ => canvas}/canvas-debug.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-debug.cpp (100%) diff --git a/src/display/canvas-debug.cpp b/src/display/canvas/canvas-debug.cpp similarity index 100% rename from src/display/canvas-debug.cpp rename to src/display/canvas/canvas-debug.cpp -- GitLab From 0cb38141a292c04308d87927b3084d01395128a6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:05:29 +0000 Subject: [PATCH 117/122] Update canvas-debug.h --- src/display/{ => canvas}/canvas-debug.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-debug.h (100%) diff --git a/src/display/canvas-debug.h b/src/display/canvas/canvas-debug.h similarity index 100% rename from src/display/canvas-debug.h rename to src/display/canvas/canvas-debug.h -- GitLab From f29be6ca7bc402288d67bc472dae39d5e0a28565 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:05:44 +0000 Subject: [PATCH 118/122] Update canvas-debug.h --- src/display/canvas/canvas-debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-debug.h b/src/display/canvas/canvas-debug.h index 19ccd154ca..359b1af9d6 100644 --- a/src/display/canvas/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; -- GitLab From 2f64b3f75c8f7af57afafbc90e9fa510db3843a5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:06:04 +0000 Subject: [PATCH 119/122] Update canvas-debug.cpp --- src/display/canvas/canvas-debug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/canvas/canvas-debug.cpp b/src/display/canvas/canvas-debug.cpp index 03db61f69c..58ef6f7253 100644 --- a/src/display/canvas/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 { -- GitLab From 57427c4ec608c9989b586479578cb7fc38001dea Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:07:03 +0000 Subject: [PATCH 120/122] Update CMakeLists.txt --- src/display/canvas/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display/canvas/CMakeLists.txt b/src/display/canvas/CMakeLists.txt index 41d5da5e8d..81862b8f91 100644 --- a/src/display/canvas/CMakeLists.txt +++ b/src/display/canvas/CMakeLists.txt @@ -10,6 +10,7 @@ set(canvas_SRC canvas-rotate.cpp canvas-temporary-item-list.cpp canvas-temporary-item.cpp + canvas-debug.cpp canvas-arena.h canvas-axonomgrid.h @@ -19,6 +20,7 @@ set(canvas_SRC 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 -- GitLab From 68bf5c3ffa8808ce83a7c1fe631db4dfc9469f48 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 08:07:22 +0000 Subject: [PATCH 121/122] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index ee62a89c54..5b0518cab8 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -2,7 +2,6 @@ set(display_SRC cairo-utils.cpp - canvas-debug.cpp curve.cpp drawing-context.cpp drawing-group.cpp @@ -55,7 +54,6 @@ set(display_SRC # Headers cairo-templates.h cairo-utils.h - canvas-debug.h curve-test.h curve.h drawing-context.h -- GitLab From 05ac0b2ca05cd5d27be88b4d9dc78d5804ec41c1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Fri, 12 Jul 2019 15:45:20 +0000 Subject: [PATCH 122/122] Update desktop.cpp --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 87416d818d..9d63102b82 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -42,7 +42,7 @@ #include "message-stack.h" #include "display/canvas/canvas-arena.h" -#include "display/canvas-debug.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" -- GitLab