From 4ecab9c24a0e8bb9bb263e9f2541ae6b6024dc78 Mon Sep 17 00:00:00 2001 From: sherySSH Date: Thu, 7 Mar 2019 17:35:24 +0000 Subject: [PATCH 001/207] Adding drawing directory to move all drawing related files --- src/display/drawing/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/display/drawing/.gitkeep diff --git a/src/display/drawing/.gitkeep b/src/display/drawing/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 -- GitLab From e1c7f67c2f593a8f0ffb09fad9ed6fb80c7355d2 Mon Sep 17 00:00:00 2001 From: sherySSH Date: Thu, 7 Mar 2019 17:36:14 +0000 Subject: [PATCH 002/207] Creating canvas directory to move all canvas related files --- 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 1080e591b852fd6cdf23f902b8dc6315358a0b86 Mon Sep 17 00:00:00 2001 From: sherySSH Date: Thu, 7 Mar 2019 17:39:13 +0000 Subject: [PATCH 003/207] Add new directory --- src/display/common/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/display/common/.gitkeep diff --git a/src/display/common/.gitkeep b/src/display/common/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 -- GitLab From 684b03dbd9ff07e3f38ebe7dff6db7bc62efc42c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:37:23 +0000 Subject: [PATCH 004/207] 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 ece7c9d230e7b27a85d995e4b6a0de0f859752f0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:37:30 +0000 Subject: [PATCH 005/207] 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 256db7cb7b545ffd0f15d987614c84acbbb4ca58 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:38:17 +0000 Subject: [PATCH 006/207] 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 71272b082c78f4833f7aba0363341be36dbce2e1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:38:47 +0000 Subject: [PATCH 007/207] 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 65bf5353db076dddb872b6202c658a6ee835d6c2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:39:10 +0000 Subject: [PATCH 008/207] 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 e37e5e9aa50421715438bd89b6b25d4845a765ad Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:39:35 +0000 Subject: [PATCH 009/207] 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 5b2e09e62ff4bbc0a285c50e34f91dd001e7a072 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:42:08 +0000 Subject: [PATCH 010/207] 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 d082db691ec20d4fc1e2f686508c25cd577db456 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:42:49 +0000 Subject: [PATCH 011/207] Moved canvas-debug.cpp to canvas directory -- GitLab From 353f39f506760cea040b000f5654a7f936d47532 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:43:25 +0000 Subject: [PATCH 012/207] Moved canvas-debug.h to canvas directory inside src/display --- 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 757832f26560f8e751c8842c2cb0a8003102870e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:44:28 +0000 Subject: [PATCH 013/207] Moved canvas-grid.cpp to canvas directory inside src/display --- 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 c51532f3655bea0cb3d8631d47310bdcfdb119a2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:45:20 +0000 Subject: [PATCH 014/207] Moved canvas-grid.h to canvas directory src/display --- 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 5e53f0d607cb795ff04c5aaf088444a47c76ac58 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:46:45 +0000 Subject: [PATCH 015/207] Moved canvas-rotate.h to canvas directory inside src/display --- 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 be462ac517c48f7e775417882a23a9d630bf827b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:48:22 +0000 Subject: [PATCH 016/207] Moved canvas-rotate.cpp to canvas directory inside src/display --- 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 2b11a6639111dd015e59ee46a7d43e9c721ffb11 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:49:23 +0000 Subject: [PATCH 017/207] Moved canvas-temporary-item-list.cpp to canvas directory inside src/display --- src/display/{ => canvas}/canvas-temporary-item-list.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-temporary-item-list.cpp (100%) diff --git a/src/display/canvas-temporary-item-list.cpp b/src/display/canvas/canvas-temporary-item-list.cpp similarity index 100% rename from src/display/canvas-temporary-item-list.cpp rename to src/display/canvas/canvas-temporary-item-list.cpp -- GitLab From d6f96d7c8b6b9f4edcebed3bca82b039b448603a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:50:28 +0000 Subject: [PATCH 018/207] Moved canvas-temporary-item-list.h to canvas directory inside src/display --- 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 fbb220158aa84dfed542038c817180b86c7df993 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:51:34 +0000 Subject: [PATCH 019/207] Moved canvas-temporary-item.cpp to canvas directory inside src/display --- src/display/{ => canvas}/canvas-temporary-item.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/canvas-temporary-item.cpp (100%) diff --git a/src/display/canvas-temporary-item.cpp b/src/display/canvas/canvas-temporary-item.cpp similarity index 100% rename from src/display/canvas-temporary-item.cpp rename to src/display/canvas/canvas-temporary-item.cpp -- GitLab From 5ad877c494db1356314f9aff27410e08d36d415a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:52:12 +0000 Subject: [PATCH 020/207] Moved canvas-temporary-item.h to canvas directory inside src/display --- 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 63f3c43ee88eaa00f7af6ff12b8e6e649ff274f5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:54:02 +0000 Subject: [PATCH 021/207] Moved canvas-text.cpp to canvas directory inside src/display -- GitLab From 59f8c8f3612795c67f6d54539ea53a71a568cf75 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:54:40 +0000 Subject: [PATCH 022/207] Moved canvas-text.h into canvas directory inside src/directory --- 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 6c35908604b0e30db7aa05481b08a9f1538f2ee7 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:56:24 +0000 Subject: [PATCH 023/207] Moved canvas-debug.cpp to canvas directory inside src/display -- GitLab From 11a6da2b2a41b008f670c9a9e2916ca3bc733c15 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:56:49 +0000 Subject: [PATCH 024/207] Moved canvas-bpath.h to canvas directory in src/display -- GitLab From 57a55f020ae55e5fbcc6a62d26474c513534121f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:57:13 +0000 Subject: [PATCH 025/207] Moved canvas-bpath.cpp to canvas directory inside src/display -- GitLab From 75dbe33d21387b06c73b56da2eba1af702d55d69 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:57:49 +0000 Subject: [PATCH 026/207] Moved canvas-axonomgrid.h to canvas directory in src/display -- GitLab From 03ba88f4010392e32dba196e476a0d9f5cc70b93 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:58:10 +0000 Subject: [PATCH 027/207] Moved canvas-axonomgrid.cpp to canvas directory in src/display -- GitLab From af14ed644fcfb39388ae588ed41bd6569081cc84 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:58:40 +0000 Subject: [PATCH 028/207] Moved canvas-arena.h to canvas direcory inside src/display -- GitLab From 23d9b76c41775af94e194df00183d1e24f086d1d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:58:53 +0000 Subject: [PATCH 029/207] Moved canvas-arena.h to canvas directory inside src/display -- GitLab From 0458dc8610a1202980eb2d943f901a37a9750e71 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 18:59:13 +0000 Subject: [PATCH 030/207] Moved canvas-arena.cpp to canvas directory inside src/display -- GitLab From ff89795ee2d674b8b61a5a8268ee9849f0b1f7e6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 19:00:19 +0000 Subject: [PATCH 031/207] Moved canvas-axonomgrid.cpp to canvas directory inside src/display -- GitLab From c07b05df2ecad31097ffc0bdeda30cfd9cfe99cd Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 19:00:54 +0000 Subject: [PATCH 032/207] Moved canvas-axonomgrid.h to canvas directory inside src/display -- GitLab From 759cf0572a3a8abe5c444b81dd89908f04b1f63e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Thu, 7 Mar 2019 19:01:59 +0000 Subject: [PATCH 033/207] Moved canvas-arena.h to canvas directory inside src/display -- GitLab From 33e96b2e5f96f3ba1db7123e384b15a9b3fa1edc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:14:58 +0000 Subject: [PATCH 034/207] Moved drawing-context.cpp into drawing directory insides src/display --- src/display/{ => drawing}/drawing-context.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-context.cpp (100%) diff --git a/src/display/drawing-context.cpp b/src/display/drawing/drawing-context.cpp similarity index 100% rename from src/display/drawing-context.cpp rename to src/display/drawing/drawing-context.cpp -- GitLab From 28c9c873e31e34a9f9ddfd967f30806112715ec1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:15:56 +0000 Subject: [PATCH 035/207] Moved drawing-context.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-context.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-context.h (100%) diff --git a/src/display/drawing-context.h b/src/display/drawing/drawing-context.h similarity index 100% rename from src/display/drawing-context.h rename to src/display/drawing/drawing-context.h -- GitLab From 9abd19eb244728551bbe971cc2b8a68e13d89ade Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:16:51 +0000 Subject: [PATCH 036/207] Moved drawing-group.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-group.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-group.cpp (100%) diff --git a/src/display/drawing-group.cpp b/src/display/drawing/drawing-group.cpp similarity index 100% rename from src/display/drawing-group.cpp rename to src/display/drawing/drawing-group.cpp -- GitLab From 2f6d462c38e4817260a41a855362b7457088a5c0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:17:31 +0000 Subject: [PATCH 037/207] Moved drawing-group.h to drawing folder inside src/display --- src/display/{ => drawing}/drawing-group.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-group.h (100%) diff --git a/src/display/drawing-group.h b/src/display/drawing/drawing-group.h similarity index 100% rename from src/display/drawing-group.h rename to src/display/drawing/drawing-group.h -- GitLab From dddf4f7080da7dc4c297c82f60b12d8553fb2bf0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:18:15 +0000 Subject: [PATCH 038/207] Moved drawing-image.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-image.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-image.cpp (100%) diff --git a/src/display/drawing-image.cpp b/src/display/drawing/drawing-image.cpp similarity index 100% rename from src/display/drawing-image.cpp rename to src/display/drawing/drawing-image.cpp -- GitLab From 8379f44d84f06f1308e7cb46ace691469eb6f462 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:18:54 +0000 Subject: [PATCH 039/207] Moved drawing-image.h to drawing directory insides src/display --- src/display/{ => drawing}/drawing-image.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-image.h (100%) diff --git a/src/display/drawing-image.h b/src/display/drawing/drawing-image.h similarity index 100% rename from src/display/drawing-image.h rename to src/display/drawing/drawing-image.h -- GitLab From 25d393d2bf9732a85d90bc59289eb6b2fda53200 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:20:11 +0000 Subject: [PATCH 040/207] Moved drawing-item.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-item.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-item.cpp (100%) diff --git a/src/display/drawing-item.cpp b/src/display/drawing/drawing-item.cpp similarity index 100% rename from src/display/drawing-item.cpp rename to src/display/drawing/drawing-item.cpp -- GitLab From 1614a8b040e46febf75b31da1c2eb4d81ca54f09 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:21:03 +0000 Subject: [PATCH 041/207] Moved drawing-item.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-item.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-item.h (100%) diff --git a/src/display/drawing-item.h b/src/display/drawing/drawing-item.h similarity index 100% rename from src/display/drawing-item.h rename to src/display/drawing/drawing-item.h -- GitLab From dca3ecc1e0e03ab441747a24f750e55941545464 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:21:47 +0000 Subject: [PATCH 042/207] Moved drawing-pattern.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-pattern.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-pattern.cpp (100%) diff --git a/src/display/drawing-pattern.cpp b/src/display/drawing/drawing-pattern.cpp similarity index 100% rename from src/display/drawing-pattern.cpp rename to src/display/drawing/drawing-pattern.cpp -- GitLab From 60ad5522fbec21a3f5ec9d973838cebf53ae761a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:22:27 +0000 Subject: [PATCH 043/207] Moved drawing-pattern.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-pattern.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-pattern.h (100%) diff --git a/src/display/drawing-pattern.h b/src/display/drawing/drawing-pattern.h similarity index 100% rename from src/display/drawing-pattern.h rename to src/display/drawing/drawing-pattern.h -- GitLab From fd47ed8a6bfe12337cc632122b3a098d252dd43a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:23:06 +0000 Subject: [PATCH 044/207] Moved drawing-shape.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-shape.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-shape.cpp (100%) diff --git a/src/display/drawing-shape.cpp b/src/display/drawing/drawing-shape.cpp similarity index 100% rename from src/display/drawing-shape.cpp rename to src/display/drawing/drawing-shape.cpp -- GitLab From 929dd07b684ff75657684242be09dd4335af0c04 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:23:37 +0000 Subject: [PATCH 045/207] Moved drawing-shape.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-shape.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-shape.h (100%) diff --git a/src/display/drawing-shape.h b/src/display/drawing/drawing-shape.h similarity index 100% rename from src/display/drawing-shape.h rename to src/display/drawing/drawing-shape.h -- GitLab From 9fe995e65558d3d20484a73e48dab5b4bf7c2a2b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:24:10 +0000 Subject: [PATCH 046/207] Moved drawing-surface.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing-surface.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-surface.cpp (100%) diff --git a/src/display/drawing-surface.cpp b/src/display/drawing/drawing-surface.cpp similarity index 100% rename from src/display/drawing-surface.cpp rename to src/display/drawing/drawing-surface.cpp -- GitLab From 85ee3aa5b7d183eb982eb793c666b6fbfdeb3abc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:25:00 +0000 Subject: [PATCH 047/207] Moved drawing-surface.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-surface.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-surface.h (100%) diff --git a/src/display/drawing-surface.h b/src/display/drawing/drawing-surface.h similarity index 100% rename from src/display/drawing-surface.h rename to src/display/drawing/drawing-surface.h -- GitLab From 10dd5eec12e40b11c72768dfe81754c1e97f4e70 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:27:50 +0000 Subject: [PATCH 048/207] Moved drawing-text.cpp to drawing folder inside src/display --- src/display/{ => drawing}/drawing-text.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-text.cpp (100%) diff --git a/src/display/drawing-text.cpp b/src/display/drawing/drawing-text.cpp similarity index 100% rename from src/display/drawing-text.cpp rename to src/display/drawing/drawing-text.cpp -- GitLab From 6d644349695a8142c2db452017fe39e489ed5ed2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:28:25 +0000 Subject: [PATCH 049/207] Moved drawing-text.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing-text.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing-text.h (100%) diff --git a/src/display/drawing-text.h b/src/display/drawing/drawing-text.h similarity index 100% rename from src/display/drawing-text.h rename to src/display/drawing/drawing-text.h -- GitLab From 18defb1ff722b7ab349013470c6db6e9c096827b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:29:04 +0000 Subject: [PATCH 050/207] Moved drawing.cpp to drawing directory inside src/display --- src/display/{ => drawing}/drawing.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing.cpp (100%) diff --git a/src/display/drawing.cpp b/src/display/drawing/drawing.cpp similarity index 100% rename from src/display/drawing.cpp rename to src/display/drawing/drawing.cpp -- GitLab From 3b24c53a941014289ef88988c8e7c46543e9f407 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:29:36 +0000 Subject: [PATCH 051/207] Moved drawing.h to drawing directory inside src/display --- src/display/{ => drawing}/drawing.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/drawing.h (100%) diff --git a/src/display/drawing.h b/src/display/drawing/drawing.h similarity index 100% rename from src/display/drawing.h rename to src/display/drawing/drawing.h -- GitLab From ed8e1fa6f3d5e6362430e68f7aab0ada0058882c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:46:34 +0000 Subject: [PATCH 052/207] Moved canvas-text.cpp to canvas directory inside src/display --- 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 6ab9c03910c17fc183c9d58b8947ec105ab06752 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:47:56 +0000 Subject: [PATCH 053/207] Moved curve-test.h to common/curve --- src/display/{ => common/curve}/curve-test.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/curve}/curve-test.h (100%) diff --git a/src/display/curve-test.h b/src/display/common/curve/curve-test.h similarity index 100% rename from src/display/curve-test.h rename to src/display/common/curve/curve-test.h -- GitLab From 959d3202472b09cb6108de4fdf2d28cef418ea32 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:48:44 +0000 Subject: [PATCH 054/207] Moved curve.cpp to common/curve --- src/display/{ => common/curve}/curve.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/curve}/curve.cpp (100%) diff --git a/src/display/curve.cpp b/src/display/common/curve/curve.cpp similarity index 100% rename from src/display/curve.cpp rename to src/display/common/curve/curve.cpp -- GitLab From 31c92cc8a0ded104f8b6cea7d5c15abd45cd6a85 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:49:16 +0000 Subject: [PATCH 055/207] Moved curve.h to common/curve --- src/display/{ => common/curve}/curve.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/curve}/curve.h (100%) diff --git a/src/display/curve.h b/src/display/common/curve/curve.h similarity index 100% rename from src/display/curve.h rename to src/display/common/curve/curve.h -- GitLab From 5ce4d5f0d7ff3efd2294a074edba00fada44867f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:51:55 +0000 Subject: [PATCH 056/207] Moved nr-3dutils.cpp to common/nr/ --- src/display/{ => common/nr}/nr-3dutils.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-3dutils.cpp (100%) diff --git a/src/display/nr-3dutils.cpp b/src/display/common/nr/nr-3dutils.cpp similarity index 100% rename from src/display/nr-3dutils.cpp rename to src/display/common/nr/nr-3dutils.cpp -- GitLab From ad90a2cab54222aa6d122e638986a804a0d0f0dc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:52:40 +0000 Subject: [PATCH 057/207] Moved nr-3dutils.h to common/nr/ --- src/display/{ => common/nr}/nr-3dutils.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-3dutils.h (100%) diff --git a/src/display/nr-3dutils.h b/src/display/common/nr/nr-3dutils.h similarity index 100% rename from src/display/nr-3dutils.h rename to src/display/common/nr/nr-3dutils.h -- GitLab From 3c82d8c4c25e0c264f4954d7244f47936239228b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:53:19 +0000 Subject: [PATCH 058/207] Moved nr-filter-blend.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-blend.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-blend.cpp (100%) diff --git a/src/display/nr-filter-blend.cpp b/src/display/common/nr/nr-filter-blend.cpp similarity index 100% rename from src/display/nr-filter-blend.cpp rename to src/display/common/nr/nr-filter-blend.cpp -- GitLab From 9f3774789a02e61688a874a1ffcf390e7ad83cbc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:53:44 +0000 Subject: [PATCH 059/207] Moved nr-filter-blend.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-blend.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-blend.h (100%) diff --git a/src/display/nr-filter-blend.h b/src/display/common/nr/nr-filter-blend.h similarity index 100% rename from src/display/nr-filter-blend.h rename to src/display/common/nr/nr-filter-blend.h -- GitLab From 92649a459741ac92ba8dccce4045bf22437717da Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:54:09 +0000 Subject: [PATCH 060/207] Moved nr-filter-colormatrix.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-colormatrix.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-colormatrix.cpp (100%) diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/common/nr/nr-filter-colormatrix.cpp similarity index 100% rename from src/display/nr-filter-colormatrix.cpp rename to src/display/common/nr/nr-filter-colormatrix.cpp -- GitLab From 3ec04144af1c0d5b6e49a5e3e8f58c1d887dd6d0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:55:15 +0000 Subject: [PATCH 061/207] Moved nr-filter-colormatrix.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-colormatrix.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-colormatrix.h (100%) diff --git a/src/display/nr-filter-colormatrix.h b/src/display/common/nr/nr-filter-colormatrix.h similarity index 100% rename from src/display/nr-filter-colormatrix.h rename to src/display/common/nr/nr-filter-colormatrix.h -- GitLab From aa41f72f02d27ffaa829fa4eedbba3109aca18c9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:56:12 +0000 Subject: [PATCH 062/207] Moved nr-filter-component-transfer.cpp common/nr/ --- src/display/{ => common/nr}/nr-filter-component-transfer.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-component-transfer.cpp (100%) diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/common/nr/nr-filter-component-transfer.cpp similarity index 100% rename from src/display/nr-filter-component-transfer.cpp rename to src/display/common/nr/nr-filter-component-transfer.cpp -- GitLab From 5b77d201533018566a1d006b3eed85bb45c48ba6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:56:39 +0000 Subject: [PATCH 063/207] Moved nr-filter-component-transfer.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-component-transfer.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-component-transfer.h (100%) diff --git a/src/display/nr-filter-component-transfer.h b/src/display/common/nr/nr-filter-component-transfer.h similarity index 100% rename from src/display/nr-filter-component-transfer.h rename to src/display/common/nr/nr-filter-component-transfer.h -- GitLab From 85d27d7a38811c72191e69ebac434a42e15058f1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 13:57:05 +0000 Subject: [PATCH 064/207] Moved nr-filter-composite.cpp common/nr/ --- src/display/{ => common/nr}/nr-filter-composite.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-composite.cpp (100%) diff --git a/src/display/nr-filter-composite.cpp b/src/display/common/nr/nr-filter-composite.cpp similarity index 100% rename from src/display/nr-filter-composite.cpp rename to src/display/common/nr/nr-filter-composite.cpp -- GitLab From b2e33ac9fbdd162763fc05b5a4ace3c7364edd50 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:01:27 +0000 Subject: [PATCH 065/207] Moved nr-filter-composite.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-composite.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-composite.h (100%) diff --git a/src/display/nr-filter-composite.h b/src/display/common/nr/nr-filter-composite.h similarity index 100% rename from src/display/nr-filter-composite.h rename to src/display/common/nr/nr-filter-composite.h -- GitLab From ae73ee25205f5efccb8e1e28bfd9d01786e1e665 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:02:31 +0000 Subject: [PATCH 066/207] Moved nr-filter-convolve-matrix.cpp common/nr/ --- src/display/{ => common/nr}/nr-filter-convolve-matrix.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-convolve-matrix.cpp (100%) diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/common/nr/nr-filter-convolve-matrix.cpp similarity index 100% rename from src/display/nr-filter-convolve-matrix.cpp rename to src/display/common/nr/nr-filter-convolve-matrix.cpp -- GitLab From 5f4a332c91364258da78731e36b24ad384c4ece8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:03:16 +0000 Subject: [PATCH 067/207] Moved nr-filter-convolve-matrix.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-convolve-matrix.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-convolve-matrix.h (100%) diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/common/nr/nr-filter-convolve-matrix.h similarity index 100% rename from src/display/nr-filter-convolve-matrix.h rename to src/display/common/nr/nr-filter-convolve-matrix.h -- GitLab From 4d51046c32cc8652bbffebf19acfd657f9c6f017 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:03:57 +0000 Subject: [PATCH 068/207] Moved nr-filter-diffuselighting.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-diffuselighting.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-diffuselighting.cpp (100%) diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/common/nr/nr-filter-diffuselighting.cpp similarity index 100% rename from src/display/nr-filter-diffuselighting.cpp rename to src/display/common/nr/nr-filter-diffuselighting.cpp -- GitLab From 3dd33f1f35d012b89b75d742e007fc5b6627a499 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:06:10 +0000 Subject: [PATCH 069/207] Moved nr-filter-diffuselighting.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-diffuselighting.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-diffuselighting.h (100%) diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/common/nr/nr-filter-diffuselighting.h similarity index 100% rename from src/display/nr-filter-diffuselighting.h rename to src/display/common/nr/nr-filter-diffuselighting.h -- GitLab From 82e91d1ee0fdc2f674bc9a3b1577fc8e150c242e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:08:19 +0000 Subject: [PATCH 070/207] Moved nr-filter-displacement-map.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-displacement-map.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-displacement-map.cpp (100%) diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/common/nr/nr-filter-displacement-map.cpp similarity index 100% rename from src/display/nr-filter-displacement-map.cpp rename to src/display/common/nr/nr-filter-displacement-map.cpp -- GitLab From 6cb13f3bfdaa5af5de7157b373f01168c1a18038 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:08:55 +0000 Subject: [PATCH 071/207] Moved nr-filter-displacement-map.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-displacement-map.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-displacement-map.h (100%) diff --git a/src/display/nr-filter-displacement-map.h b/src/display/common/nr/nr-filter-displacement-map.h similarity index 100% rename from src/display/nr-filter-displacement-map.h rename to src/display/common/nr/nr-filter-displacement-map.h -- GitLab From 3912ab54de8f4ee65a1c392a1c3fab48c2ff7e1a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:10:21 +0000 Subject: [PATCH 072/207] Moved nr-filter-flood.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-flood.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-flood.cpp (100%) diff --git a/src/display/nr-filter-flood.cpp b/src/display/common/nr/nr-filter-flood.cpp similarity index 100% rename from src/display/nr-filter-flood.cpp rename to src/display/common/nr/nr-filter-flood.cpp -- GitLab From f6eab97d086e6520906f5c4f2a640a92dca67b26 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:10:57 +0000 Subject: [PATCH 073/207] Moved nr-filter-flood.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-flood.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-flood.h (100%) diff --git a/src/display/nr-filter-flood.h b/src/display/common/nr/nr-filter-flood.h similarity index 100% rename from src/display/nr-filter-flood.h rename to src/display/common/nr/nr-filter-flood.h -- GitLab From ca1fedf09f2e49cc00968ed1e1d346183c51465c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:14:18 +0000 Subject: [PATCH 074/207] Moved nr-filter-gaussian.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-gaussian.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-gaussian.cpp (100%) diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/common/nr/nr-filter-gaussian.cpp similarity index 100% rename from src/display/nr-filter-gaussian.cpp rename to src/display/common/nr/nr-filter-gaussian.cpp -- GitLab From a7d0e4fce53a6bf44993ee12b063b04a538c3268 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:15:29 +0000 Subject: [PATCH 075/207] Moved nr-filter-gaussian.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-gaussian.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-gaussian.h (100%) diff --git a/src/display/nr-filter-gaussian.h b/src/display/common/nr/nr-filter-gaussian.h similarity index 100% rename from src/display/nr-filter-gaussian.h rename to src/display/common/nr/nr-filter-gaussian.h -- GitLab From 5e3800caaaa01d06adc40e1495c9e0aac9bab4d3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:16:26 +0000 Subject: [PATCH 076/207] Moved nr-filter-image.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-image.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-image.cpp (100%) diff --git a/src/display/nr-filter-image.cpp b/src/display/common/nr/nr-filter-image.cpp similarity index 100% rename from src/display/nr-filter-image.cpp rename to src/display/common/nr/nr-filter-image.cpp -- GitLab From 6ebfb063e43cf8a02977096b1d2e677a70ad9b02 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:16:52 +0000 Subject: [PATCH 077/207] Moved nr-filter-image.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-image.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-image.h (100%) diff --git a/src/display/nr-filter-image.h b/src/display/common/nr/nr-filter-image.h similarity index 100% rename from src/display/nr-filter-image.h rename to src/display/common/nr/nr-filter-image.h -- GitLab From 90bcdd1dbbeae4c66f2f8cd7b1973cc5becc457f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:22:04 +0000 Subject: [PATCH 078/207] Moved nr-filter-morphology.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-morphology.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-morphology.cpp (100%) diff --git a/src/display/nr-filter-morphology.cpp b/src/display/common/nr/nr-filter-morphology.cpp similarity index 100% rename from src/display/nr-filter-morphology.cpp rename to src/display/common/nr/nr-filter-morphology.cpp -- GitLab From 273d3b8679e0f27509794e74181a6fd17c923898 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:22:25 +0000 Subject: [PATCH 079/207] Moved nr-filter-morphology.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-morphology.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-morphology.h (100%) diff --git a/src/display/nr-filter-morphology.h b/src/display/common/nr/nr-filter-morphology.h similarity index 100% rename from src/display/nr-filter-morphology.h rename to src/display/common/nr/nr-filter-morphology.h -- GitLab From 0d102ecc41da3d479ada7cd5a9cb7ab21738cd5c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:22:54 +0000 Subject: [PATCH 080/207] Moved nr-filter-offset.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-offset.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-offset.cpp (100%) diff --git a/src/display/nr-filter-offset.cpp b/src/display/common/nr/nr-filter-offset.cpp similarity index 100% rename from src/display/nr-filter-offset.cpp rename to src/display/common/nr/nr-filter-offset.cpp -- GitLab From fb1a121b0b64032e66972dccf908451651c5de53 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:23:21 +0000 Subject: [PATCH 081/207] Moved nr-filter-offset.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-offset.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-offset.h (100%) diff --git a/src/display/nr-filter-offset.h b/src/display/common/nr/nr-filter-offset.h similarity index 100% rename from src/display/nr-filter-offset.h rename to src/display/common/nr/nr-filter-offset.h -- GitLab From 0970e45b64e93dd9072e56d24e10d63122c6b12b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:24:50 +0000 Subject: [PATCH 082/207] Moved nr-filter-specularlighting.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-specularlighting.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-specularlighting.cpp (100%) diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/common/nr/nr-filter-specularlighting.cpp similarity index 100% rename from src/display/nr-filter-specularlighting.cpp rename to src/display/common/nr/nr-filter-specularlighting.cpp -- GitLab From aed5efb9354956ccf3c5752dce5df16adbb39fee Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:25:26 +0000 Subject: [PATCH 083/207] Moved nr-filter-specularlighting.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-specularlighting.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-specularlighting.h (100%) diff --git a/src/display/nr-filter-specularlighting.h b/src/display/common/nr/nr-filter-specularlighting.h similarity index 100% rename from src/display/nr-filter-specularlighting.h rename to src/display/common/nr/nr-filter-specularlighting.h -- GitLab From 14f860f654a26971267c1bc0e65ae6e4be5c26e3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:26:04 +0000 Subject: [PATCH 084/207] Moved nr-filter-tile.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-tile.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-tile.cpp (100%) diff --git a/src/display/nr-filter-tile.cpp b/src/display/common/nr/nr-filter-tile.cpp similarity index 100% rename from src/display/nr-filter-tile.cpp rename to src/display/common/nr/nr-filter-tile.cpp -- GitLab From 623e66ac462a447220981dbcca8872c9c456581e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:26:34 +0000 Subject: [PATCH 085/207] Moved nr-filter-tile.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-tile.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-tile.h (100%) diff --git a/src/display/nr-filter-tile.h b/src/display/common/nr/nr-filter-tile.h similarity index 100% rename from src/display/nr-filter-tile.h rename to src/display/common/nr/nr-filter-tile.h -- GitLab From 8017458a6606835d483caadd36d85eece8d7ec37 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:27:00 +0000 Subject: [PATCH 086/207] Moved nr-filter-merge.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-merge.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-merge.cpp (100%) diff --git a/src/display/nr-filter-merge.cpp b/src/display/common/nr/nr-filter-merge.cpp similarity index 100% rename from src/display/nr-filter-merge.cpp rename to src/display/common/nr/nr-filter-merge.cpp -- GitLab From 68fee28cac362f0c249f3809d5cd0b2db760fa6f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:27:18 +0000 Subject: [PATCH 087/207] Moved nr-filter-merge.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-merge.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-merge.h (100%) diff --git a/src/display/nr-filter-merge.h b/src/display/common/nr/nr-filter-merge.h similarity index 100% rename from src/display/nr-filter-merge.h rename to src/display/common/nr/nr-filter-merge.h -- GitLab From 124e70ef8ababb0456e201fa254af01e8528b1b3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:28:03 +0000 Subject: [PATCH 088/207] Moved nr-filter-primitive.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-primitive.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-primitive.cpp (100%) diff --git a/src/display/nr-filter-primitive.cpp b/src/display/common/nr/nr-filter-primitive.cpp similarity index 100% rename from src/display/nr-filter-primitive.cpp rename to src/display/common/nr/nr-filter-primitive.cpp -- GitLab From 969bbff3e8c399382efa875e201721b95a5c161d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:28:26 +0000 Subject: [PATCH 089/207] Moved nr-filter-primitive.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-primitive.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-primitive.h (100%) diff --git a/src/display/nr-filter-primitive.h b/src/display/common/nr/nr-filter-primitive.h similarity index 100% rename from src/display/nr-filter-primitive.h rename to src/display/common/nr/nr-filter-primitive.h -- GitLab From fb15b810f1724869f15060d5950b26e3deece7b6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:28:50 +0000 Subject: [PATCH 090/207] Moved nr-filter-skeleton.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-skeleton.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-skeleton.cpp (100%) diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/common/nr/nr-filter-skeleton.cpp similarity index 100% rename from src/display/nr-filter-skeleton.cpp rename to src/display/common/nr/nr-filter-skeleton.cpp -- GitLab From e82888d575a61d1397eff1c6767067689c3d4f40 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:29:15 +0000 Subject: [PATCH 091/207] Moved nr-filter-skeleton.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-skeleton.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-skeleton.h (100%) diff --git a/src/display/nr-filter-skeleton.h b/src/display/common/nr/nr-filter-skeleton.h similarity index 100% rename from src/display/nr-filter-skeleton.h rename to src/display/common/nr/nr-filter-skeleton.h -- GitLab From 975a4a9aab767dfce9f64245696c0e091785f923 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:29:49 +0000 Subject: [PATCH 092/207] Moved nr-filter-slot.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-slot.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-slot.cpp (100%) diff --git a/src/display/nr-filter-slot.cpp b/src/display/common/nr/nr-filter-slot.cpp similarity index 100% rename from src/display/nr-filter-slot.cpp rename to src/display/common/nr/nr-filter-slot.cpp -- GitLab From f8474fbdf8aa07a6d357ef882b532b5a309b3103 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:30:22 +0000 Subject: [PATCH 093/207] Moved nr-filter-slot.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-slot.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-slot.h (100%) diff --git a/src/display/nr-filter-slot.h b/src/display/common/nr/nr-filter-slot.h similarity index 100% rename from src/display/nr-filter-slot.h rename to src/display/common/nr/nr-filter-slot.h -- GitLab From 23b46143ff39806ecfdbc2b2f933d197a94abd3b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:32:43 +0000 Subject: [PATCH 094/207] Moved nr-filter-turbulence.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-turbulence.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-turbulence.cpp (100%) diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/common/nr/nr-filter-turbulence.cpp similarity index 100% rename from src/display/nr-filter-turbulence.cpp rename to src/display/common/nr/nr-filter-turbulence.cpp -- GitLab From b4b866440b01c3c0f3365518f098f17b1472e070 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:33:05 +0000 Subject: [PATCH 095/207] Moved nr-filter-turbulence.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-turbulence.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-turbulence.h (100%) diff --git a/src/display/nr-filter-turbulence.h b/src/display/common/nr/nr-filter-turbulence.h similarity index 100% rename from src/display/nr-filter-turbulence.h rename to src/display/common/nr/nr-filter-turbulence.h -- GitLab From 08ab859e21ed24248bf372269545ba9ec435bcaa Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:33:34 +0000 Subject: [PATCH 096/207] Moved nr-filter-types.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-types.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-types.h (100%) diff --git a/src/display/nr-filter-types.h b/src/display/common/nr/nr-filter-types.h similarity index 100% rename from src/display/nr-filter-types.h rename to src/display/common/nr/nr-filter-types.h -- GitLab From 6d25c938451a3494e1c1049f74c6a4df08136c84 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:34:07 +0000 Subject: [PATCH 097/207] Moved nr-filter-units.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter-units.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-units.cpp (100%) diff --git a/src/display/nr-filter-units.cpp b/src/display/common/nr/nr-filter-units.cpp similarity index 100% rename from src/display/nr-filter-units.cpp rename to src/display/common/nr/nr-filter-units.cpp -- GitLab From 51c7cf4b25686be71b249e5328f7f4677c9afc34 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:34:46 +0000 Subject: [PATCH 098/207] Moved nr-filter-units.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-units.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-units.h (100%) diff --git a/src/display/nr-filter-units.h b/src/display/common/nr/nr-filter-units.h similarity index 100% rename from src/display/nr-filter-units.h rename to src/display/common/nr/nr-filter-units.h -- GitLab From 0f41d8d51f7998130e9a2c11d9a0814c3aa08f9f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:35:01 +0000 Subject: [PATCH 099/207] Moved nr-filter-utils.h to common/nr/ --- src/display/{ => common/nr}/nr-filter-utils.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter-utils.h (100%) diff --git a/src/display/nr-filter-utils.h b/src/display/common/nr/nr-filter-utils.h similarity index 100% rename from src/display/nr-filter-utils.h rename to src/display/common/nr/nr-filter-utils.h -- GitLab From 262035d5c22514b2a1f694d646f460f48a7c5020 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:35:17 +0000 Subject: [PATCH 100/207] Moved nr-filter.cpp to common/nr/ --- src/display/{ => common/nr}/nr-filter.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter.cpp (100%) diff --git a/src/display/nr-filter.cpp b/src/display/common/nr/nr-filter.cpp similarity index 100% rename from src/display/nr-filter.cpp rename to src/display/common/nr/nr-filter.cpp -- GitLab From ab8c7833a43da47a1670d3ce2c5a5da0445536ae Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:35:54 +0000 Subject: [PATCH 101/207] Moved nr-filter.h to common/nr/ --- src/display/{ => common/nr}/nr-filter.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-filter.h (100%) diff --git a/src/display/nr-filter.h b/src/display/common/nr/nr-filter.h similarity index 100% rename from src/display/nr-filter.h rename to src/display/common/nr/nr-filter.h -- GitLab From 9b98ca4915ed909d43c617433f530f4a36bee95f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:36:13 +0000 Subject: [PATCH 102/207] Moved nr-light-types.h to common/nr/ --- src/display/{ => common/nr}/nr-light-types.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-light-types.h (100%) diff --git a/src/display/nr-light-types.h b/src/display/common/nr/nr-light-types.h similarity index 100% rename from src/display/nr-light-types.h rename to src/display/common/nr/nr-light-types.h -- GitLab From a2828440110c74f83fa4c18e08215eca3b821168 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:39:58 +0000 Subject: [PATCH 103/207] Moved nr-light.cpp to common/nr/ --- src/display/{ => common/nr}/nr-light.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-light.cpp (100%) diff --git a/src/display/nr-light.cpp b/src/display/common/nr/nr-light.cpp similarity index 100% rename from src/display/nr-light.cpp rename to src/display/common/nr/nr-light.cpp -- GitLab From 91e63ba5ea10b221276cf93af83b1ef8b8479b74 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:40:24 +0000 Subject: [PATCH 104/207] Moved nr-light.h to common/nr/ --- src/display/{ => common/nr}/nr-light.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-light.h (100%) diff --git a/src/display/nr-light.h b/src/display/common/nr/nr-light.h similarity index 100% rename from src/display/nr-light.h rename to src/display/common/nr/nr-light.h -- GitLab From f08387926475bc80ce2ccf711bcf0ff2cecb3655 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:41:10 +0000 Subject: [PATCH 105/207] Moved nr-style.cpp to common/nr/ --- src/display/{ => common/nr}/nr-style.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-style.cpp (100%) diff --git a/src/display/nr-style.cpp b/src/display/common/nr/nr-style.cpp similarity index 100% rename from src/display/nr-style.cpp rename to src/display/common/nr/nr-style.cpp -- GitLab From c3b4b6fc3e3cef8ba6a6f89f5b701da9074b64b6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:41:50 +0000 Subject: [PATCH 106/207] Moved nr-style.h to common/nr/ --- src/display/{ => common/nr}/nr-style.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-style.h (100%) diff --git a/src/display/nr-style.h b/src/display/common/nr/nr-style.h similarity index 100% rename from src/display/nr-style.h rename to src/display/common/nr/nr-style.h -- GitLab From 727b840a4554e96bf5747f9d5195d2b59efc79b5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:42:15 +0000 Subject: [PATCH 107/207] Moved nr-svgfonts.cpp to common/nr/ --- src/display/{ => common/nr}/nr-svgfonts.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-svgfonts.cpp (100%) diff --git a/src/display/nr-svgfonts.cpp b/src/display/common/nr/nr-svgfonts.cpp similarity index 100% rename from src/display/nr-svgfonts.cpp rename to src/display/common/nr/nr-svgfonts.cpp -- GitLab From bc2b58f699da18d56607c5c4b845cb905df5a843 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:42:41 +0000 Subject: [PATCH 108/207] Moved nr-svgfonts.h to common/nr/ --- src/display/{ => common/nr}/nr-svgfonts.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/nr}/nr-svgfonts.h (100%) diff --git a/src/display/nr-svgfonts.h b/src/display/common/nr/nr-svgfonts.h similarity index 100% rename from src/display/nr-svgfonts.h rename to src/display/common/nr/nr-svgfonts.h -- GitLab From c2f1f62a8e24bae3a6ee8aa9ad0217c51b504427 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:44:43 +0000 Subject: [PATCH 109/207] Moved cairo-templates.h to common/cairo/ --- src/display/{ => common/cairo}/cairo-templates.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/cairo}/cairo-templates.h (100%) diff --git a/src/display/cairo-templates.h b/src/display/common/cairo/cairo-templates.h similarity index 100% rename from src/display/cairo-templates.h rename to src/display/common/cairo/cairo-templates.h -- GitLab From 38bbcec395fdbfb787a1c09abb107c99b5b609dc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:45:11 +0000 Subject: [PATCH 110/207] Moved cairo-utils.cpp to common/cairo/ --- src/display/{ => common/cairo}/cairo-utils.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/cairo}/cairo-utils.cpp (100%) diff --git a/src/display/cairo-utils.cpp b/src/display/common/cairo/cairo-utils.cpp similarity index 100% rename from src/display/cairo-utils.cpp rename to src/display/common/cairo/cairo-utils.cpp -- GitLab From cd190767b48cd6ac4b6a1e7dfb2dde144d4342c9 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:45:37 +0000 Subject: [PATCH 111/207] Moved cairo-utils.h to common/cairo/ --- src/display/{ => common/cairo}/cairo-utils.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/cairo}/cairo-utils.h (100%) diff --git a/src/display/cairo-utils.h b/src/display/common/cairo/cairo-utils.h similarity index 100% rename from src/display/cairo-utils.h rename to src/display/common/cairo/cairo-utils.h -- GitLab From beae3923c2d4bd91c22dc1b925f19d0501a9aad0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:48:04 +0000 Subject: [PATCH 112/207] Moved sp-canvas-group.h to common/sp/ --- src/display/{ => common/sp}/sp-canvas-group.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas-group.h (100%) diff --git a/src/display/sp-canvas-group.h b/src/display/common/sp/sp-canvas-group.h similarity index 100% rename from src/display/sp-canvas-group.h rename to src/display/common/sp/sp-canvas-group.h -- GitLab From 354f1f292774a6c8f7061169bbdbd953262cefa8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:48:20 +0000 Subject: [PATCH 113/207] Moved sp-canvas-item.h to common/sp/ --- src/display/{ => common/sp}/sp-canvas-item.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas-item.h (100%) diff --git a/src/display/sp-canvas-item.h b/src/display/common/sp/sp-canvas-item.h similarity index 100% rename from src/display/sp-canvas-item.h rename to src/display/common/sp/sp-canvas-item.h -- GitLab From 013242cd31db2497703453d2e8a53a90f1a19b0e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:48:34 +0000 Subject: [PATCH 114/207] Moved sp-canvas-util.cpp to common/sp/ --- src/display/{ => common/sp}/sp-canvas-util.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas-util.cpp (100%) diff --git a/src/display/sp-canvas-util.cpp b/src/display/common/sp/sp-canvas-util.cpp similarity index 100% rename from src/display/sp-canvas-util.cpp rename to src/display/common/sp/sp-canvas-util.cpp -- GitLab From aa81bda7dce4b66f7f539e34954d8abd1a454ed3 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:48:59 +0000 Subject: [PATCH 115/207] Moved sp-canvas-util.h to common/sp/ --- src/display/{ => common/sp}/sp-canvas-util.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas-util.h (100%) diff --git a/src/display/sp-canvas-util.h b/src/display/common/sp/sp-canvas-util.h similarity index 100% rename from src/display/sp-canvas-util.h rename to src/display/common/sp/sp-canvas-util.h -- GitLab From 6761aa7ac27b00c695ce9d54fbd0c09aca7ede70 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:49:17 +0000 Subject: [PATCH 116/207] Moved sp-canvas.cpp to common/sp/ --- src/display/{ => common/sp}/sp-canvas.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas.cpp (100%) diff --git a/src/display/sp-canvas.cpp b/src/display/common/sp/sp-canvas.cpp similarity index 100% rename from src/display/sp-canvas.cpp rename to src/display/common/sp/sp-canvas.cpp -- GitLab From 535cd1c82a2fcbcea5e5a92f1b2e21f3e65c4601 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:49:39 +0000 Subject: [PATCH 117/207] Moved sp-canvas.h to common/sp/ --- src/display/{ => common/sp}/sp-canvas.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-canvas.h (100%) diff --git a/src/display/sp-canvas.h b/src/display/common/sp/sp-canvas.h similarity index 100% rename from src/display/sp-canvas.h rename to src/display/common/sp/sp-canvas.h -- GitLab From b4c5be73e47865f90665c490d5314706b66626c1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:50:25 +0000 Subject: [PATCH 118/207] Moved sp-ctrlcurve.cpp to common/sp/ --- src/display/{ => common/sp}/sp-ctrlcurve.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlcurve.cpp (100%) diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/common/sp/sp-ctrlcurve.cpp similarity index 100% rename from src/display/sp-ctrlcurve.cpp rename to src/display/common/sp/sp-ctrlcurve.cpp -- GitLab From e8acc6f25fee4dd6a86ba81c23037ee1b5684090 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:50:40 +0000 Subject: [PATCH 119/207] Moved sp-ctrlcurve.h to common/sp/ --- src/display/{ => common/sp}/sp-ctrlcurve.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlcurve.h (100%) diff --git a/src/display/sp-ctrlcurve.h b/src/display/common/sp/sp-ctrlcurve.h similarity index 100% rename from src/display/sp-ctrlcurve.h rename to src/display/common/sp/sp-ctrlcurve.h -- GitLab From 709bcee3b764d5d190f2118522674143927a0c22 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:50:57 +0000 Subject: [PATCH 120/207] Moved sp-ctrlline.cpp to common/sp/ --- src/display/{ => common/sp}/sp-ctrlline.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlline.cpp (100%) diff --git a/src/display/sp-ctrlline.cpp b/src/display/common/sp/sp-ctrlline.cpp similarity index 100% rename from src/display/sp-ctrlline.cpp rename to src/display/common/sp/sp-ctrlline.cpp -- GitLab From f0822ecbd9e64695dad98e62195f381e94c12ba8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:51:41 +0000 Subject: [PATCH 121/207] Move sp-ctrlline.h to common/sp/ --- src/display/{ => common/sp}/sp-ctrlline.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlline.h (100%) diff --git a/src/display/sp-ctrlline.h b/src/display/common/sp/sp-ctrlline.h similarity index 100% rename from src/display/sp-ctrlline.h rename to src/display/common/sp/sp-ctrlline.h -- GitLab From 007ef3544af41d48b31e2b02ea57afefdb4a3f1f Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:52:04 +0000 Subject: [PATCH 122/207] Moved sp-ctrlquadr.cpp to common/sp/ --- src/display/{ => common/sp}/sp-ctrlquadr.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlquadr.cpp (100%) diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/common/sp/sp-ctrlquadr.cpp similarity index 100% rename from src/display/sp-ctrlquadr.cpp rename to src/display/common/sp/sp-ctrlquadr.cpp -- GitLab From 8beab0c62aaffd617b0b84e1ed8331b9568d312c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:52:38 +0000 Subject: [PATCH 123/207] Moved sp-ctrlquadr.h to common/sp/ --- src/display/{ => common/sp}/sp-ctrlquadr.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sp}/sp-ctrlquadr.h (100%) diff --git a/src/display/sp-ctrlquadr.h b/src/display/common/sp/sp-ctrlquadr.h similarity index 100% rename from src/display/sp-ctrlquadr.h rename to src/display/common/sp/sp-ctrlquadr.h -- GitLab From 7ced625830ac35f64b039079a053c845af572c87 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:54:14 +0000 Subject: [PATCH 124/207] Moved snap-indicator.cpp to common/snap/ --- src/display/{ => common/snap}/snap-indicator.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/snap}/snap-indicator.cpp (100%) diff --git a/src/display/snap-indicator.cpp b/src/display/common/snap/snap-indicator.cpp similarity index 100% rename from src/display/snap-indicator.cpp rename to src/display/common/snap/snap-indicator.cpp -- GitLab From 0c27772f4b20c5304f8fd7dace9faf31773f5888 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:54:26 +0000 Subject: [PATCH 125/207] Moved snap-indicator.h to common/snap/ --- src/display/{ => common/snap}/snap-indicator.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/snap}/snap-indicator.h (100%) diff --git a/src/display/snap-indicator.h b/src/display/common/snap/snap-indicator.h similarity index 100% rename from src/display/snap-indicator.h rename to src/display/common/snap/snap-indicator.h -- GitLab From bf3cd125163b7b6a565c7c1413b84886f9333f3b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:55:56 +0000 Subject: [PATCH 126/207] Moved sodipodi-ctrl.cpp to common/sodipodi/ -- GitLab From 3f7fbf2c37ec011ffec86989218080343e0a8439 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:56:18 +0000 Subject: [PATCH 127/207] Moved sodipodi-ctrl.h to common/sodipodi/ --- src/display/{ => common/sodipodi}/sodipodi-ctrl.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sodipodi}/sodipodi-ctrl.h (100%) diff --git a/src/display/sodipodi-ctrl.h b/src/display/common/sodipodi/sodipodi-ctrl.h similarity index 100% rename from src/display/sodipodi-ctrl.h rename to src/display/common/sodipodi/sodipodi-ctrl.h -- GitLab From 641dc4a16cadfd771c885b8c0426d08e2f0ff194 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:56:31 +0000 Subject: [PATCH 128/207] Moved sodipodi-ctrlrect.cpp to common/sodipodi/ --- src/display/{ => common/sodipodi}/sodipodi-ctrlrect.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sodipodi}/sodipodi-ctrlrect.cpp (100%) diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/common/sodipodi/sodipodi-ctrlrect.cpp similarity index 100% rename from src/display/sodipodi-ctrlrect.cpp rename to src/display/common/sodipodi/sodipodi-ctrlrect.cpp -- GitLab From bd6a7862fd4daef009728a357468f124b18ea038 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:56:47 +0000 Subject: [PATCH 129/207] Moved sodipodi-ctrlrect.h to common/sodipodi/ --- src/display/{ => common/sodipodi}/sodipodi-ctrlrect.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sodipodi}/sodipodi-ctrlrect.h (100%) diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/common/sodipodi/sodipodi-ctrlrect.h similarity index 100% rename from src/display/sodipodi-ctrlrect.h rename to src/display/common/sodipodi/sodipodi-ctrlrect.h -- GitLab From 9ccee7bf5bb7178ef9099a68b4aefea90f912d08 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:57:43 +0000 Subject: [PATCH 130/207] Moved sodipodi-ctrl.cpp to common/sodipodi/ --- src/display/{ => common/sodipodi}/sodipodi-ctrl.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => common/sodipodi}/sodipodi-ctrl.cpp (100%) diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/common/sodipodi/sodipodi-ctrl.cpp similarity index 100% rename from src/display/sodipodi-ctrl.cpp rename to src/display/common/sodipodi/sodipodi-ctrl.cpp -- GitLab From 73a469fa9ebbc720b8d2600f377a7cbc3bd40014 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:59:13 +0000 Subject: [PATCH 131/207] Moved gnome-canvas-acetate.cpp to canvas --- src/display/{ => canvas}/gnome-canvas-acetate.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/gnome-canvas-acetate.cpp (100%) diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/canvas/gnome-canvas-acetate.cpp similarity index 100% rename from src/display/gnome-canvas-acetate.cpp rename to src/display/canvas/gnome-canvas-acetate.cpp -- GitLab From 6372a75829d3ebc745ee1d54112afcf06e5e4561 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 14:59:30 +0000 Subject: [PATCH 132/207] Moved gnome-canvas-acetate.h to canvas --- src/display/{ => canvas}/gnome-canvas-acetate.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => canvas}/gnome-canvas-acetate.h (100%) diff --git a/src/display/gnome-canvas-acetate.h b/src/display/canvas/gnome-canvas-acetate.h similarity index 100% rename from src/display/gnome-canvas-acetate.h rename to src/display/canvas/gnome-canvas-acetate.h -- GitLab From 2051e54b66ba1fbf375987eb44953363a42acd12 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 15:03:04 +0000 Subject: [PATCH 133/207] Moved guideline.cpp to drawing --- src/display/{ => drawing}/guideline.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/guideline.cpp (100%) diff --git a/src/display/guideline.cpp b/src/display/drawing/guideline.cpp similarity index 100% rename from src/display/guideline.cpp rename to src/display/drawing/guideline.cpp -- GitLab From 30430aa836a34d8e1044c991531568d0e79a3743 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 15:03:30 +0000 Subject: [PATCH 134/207] Moved guideline.h to drawing --- src/display/{ => drawing}/guideline.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/display/{ => drawing}/guideline.h (100%) diff --git a/src/display/guideline.h b/src/display/drawing/guideline.h similarity index 100% rename from src/display/guideline.h rename to src/display/drawing/guideline.h -- GitLab From 9801594fd6f8509f7a9ffd0ffb7eb97da89b7391 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 15:06:18 +0000 Subject: [PATCH 135/207] Update README --- src/display/README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/display/README b/src/display/README index 0a74759508..884dfcc561 100644 --- a/src/display/README +++ b/src/display/README @@ -1,5 +1,4 @@ - This directory contains code for rendering graphics to the canvas. This includes rendering of SVG elements (DrawingItem and derived classes) as well as rendering of control items - @@ -7,9 +6,12 @@ nodes/handles/lines (CanvasItem and derived classes). Currently we rely on the "Cairo" graphics library for rendering. +Done: +* Split into three directories: drawing, canvas, common. + To do: -* Split into three directories: drawing, canvas, common. +* Make sure in .cpp and .h files the path for including files is correct * Remove SPCurve. -- GitLab From b37e0429a03065091d09e5cbff21e2ba750a730a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:14:21 +0000 Subject: [PATCH 136/207] Update canvas-arena.cpp --- src/display/canvas/canvas-arena.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/display/canvas/canvas-arena.cpp b/src/display/canvas/canvas-arena.cpp index 83693ea205..ba4dc7d761 100644 --- a/src/display/canvas/canvas-arena.cpp +++ b/src/display/canvas/canvas-arena.cpp @@ -14,14 +14,14 @@ #include -#include "display/sp-canvas-util.h" +#include "display/sp/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" -#include "display/drawing-group.h" -#include "display/drawing-surface.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-item.h" +#include "display/drawing/drawing-group.h" +#include "display/drawing/drawing-surface.h" #include "preferences.h" using namespace Inkscape; -- GitLab From 01bfda7ec73ffc4722763fa94feb6e26236a83b6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:15:50 +0000 Subject: [PATCH 137/207] 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 ba4dc7d761..8db1c10047 100644 --- a/src/display/canvas/canvas-arena.cpp +++ b/src/display/canvas/canvas-arena.cpp @@ -17,7 +17,7 @@ #include "display/sp/sp-canvas-util.h" #include "helper/sp-marshal.h" #include "display/canvas/canvas-arena.h" -#include "display/cairo-utils.h" +#include "display/common/cairo/cairo-utils.h" #include "display/drawing/drawing-context.h" #include "display/drawing/drawing-item.h" #include "display/drawing/drawing-group.h" -- GitLab From ba54921405d2f89e837e9d9ff008f23c8507e1ef Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:21:03 +0000 Subject: [PATCH 138/207] Update canvas-arena.h --- src/display/canvas/canvas-arena.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/canvas/canvas-arena.h b/src/display/canvas/canvas-arena.h index 8d40964bed..64f136c74f 100644 --- a/src/display/canvas/canvas-arena.h +++ b/src/display/canvas/canvas-arena.h @@ -16,10 +16,10 @@ #include <2geom/rect.h> -#include "display/drawing.h" -#include "display/drawing-item.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-item.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-item.h" +#include "display/sp/sp-canvas.h" +#include "display/sp/sp-canvas-item.h" #define SP_TYPE_CANVAS_ARENA (sp_canvas_arena_get_type ()) #define SP_CANVAS_ARENA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVAS_ARENA, SPCanvasArena)) -- GitLab From 1736e4909e423a3378c5ce8d26d822b569870393 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:22:31 +0000 Subject: [PATCH 139/207] Update canvas-axonomgrid.cpp --- src/display/canvas/canvas-axonomgrid.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/display/canvas/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp index 3d66c0a5ae..e5a12cd16f 100644 --- a/src/display/canvas/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -20,15 +20,15 @@ #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/sp-canvas-util.h" -#include "display/sp-canvas.h" +#include "display/cairo/cairo-utils.h" +#include "display/canvas/canvas-grid.h" +#include "display/sp/sp-canvas-util.h" +#include "display/sp/sp-canvas.h" #include "document.h" #include "inkscape.h" #include "preferences.h" -- GitLab From b729f5c1ba9d6df1d8136b4a28c70d1291f2689c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:24:51 +0000 Subject: [PATCH 140/207] 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..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 "canvas-grid.h" +#include "display/canvas/canvas-grid.h" struct SPCanvasBuf; class SPNamedView; -- GitLab From 721615d3902dbc321b56b9b7436b729ab3e475ab Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:42:19 +0000 Subject: [PATCH 141/207] 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 b82eab9b51..b3dd82961e 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(display_SRC - cairo-utils.cpp - canvas-arena.cpp + common/cairo/cairo-utils.cpp + canvas/canvas-arena.cpp canvas-axonomgrid.cpp canvas-bpath.cpp canvas-debug.cpp -- GitLab From 0abc495ec6b82d3885393a1a94f961d909155493 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:53:25 +0000 Subject: [PATCH 142/207] 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..44c7393226 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 7ee0eb6d700f9e7b7161bf845887f4133a467434 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:53:54 +0000 Subject: [PATCH 143/207] Update .gitkeep --- src/display/common/.gitkeep | 1 + 1 file changed, 1 insertion(+) diff --git a/src/display/common/.gitkeep b/src/display/common/.gitkeep index e69de29bb2..44c7393226 100644 --- a/src/display/common/.gitkeep +++ b/src/display/common/.gitkeep @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file -- GitLab From 335159465786f227a7f6185bbb6a47abc97331e2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:54:30 +0000 Subject: [PATCH 144/207] Update .gitkeep --- src/display/drawing/.gitkeep | 1 + 1 file changed, 1 insertion(+) diff --git a/src/display/drawing/.gitkeep b/src/display/drawing/.gitkeep index e69de29bb2..44c7393226 100644 --- a/src/display/drawing/.gitkeep +++ b/src/display/drawing/.gitkeep @@ -0,0 +1 @@ +# SPDX-License-Identifier: GPL-2.0-or-later \ No newline at end of file -- GitLab From 3f92dbf3468f4a5dbf8cad3a36e1598f2aff4074 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 18:56:42 +0000 Subject: [PATCH 145/207] Update .gitkeep -- GitLab From f407c3b22897518646780595eacb96959ace6c88 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 19:03:00 +0000 Subject: [PATCH 146/207] Update CMakeLists.txt --- src/display/CMakeLists.txt | 228 ++++++++++++++++++------------------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index b3dd82961e..e24623b72a 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -3,128 +3,128 @@ set(display_SRC common/cairo/cairo-utils.cpp canvas/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 - drawing-image.cpp - drawing-item.cpp - drawing-pattern.cpp - drawing-shape.cpp - drawing-surface.cpp - drawing-text.cpp - drawing.cpp - gnome-canvas-acetate.cpp + canvas/canvas-axonomgrid.cpp + canvas/-bpath.cpp + canvas/canvas-debug.cpp + canvas/canvas-grid.cpp + canvas/canvas-rotate.cpp + canvas/canvas-temporary-item-list.cpp + canvas/canvas-temporary-item.cpp + canvas/canvas-text.cpp + canvas/curve.cpp + drawing/drawing-context.cpp + drawing/drawing-group.cpp + drawing/drawing-image.cpp + drawing/drawing-item.cpp + drawing/drawing-pattern.cpp + drawing/drawing-shape.cpp + drawing/drawing-surface.cpp + drawing/drawing-text.cpp + drawing/drawing.cpp + canvas/gnome-canvas-acetate.cpp grayscale.cpp - guideline.cpp - nr-3dutils.cpp - nr-filter-blend.cpp - nr-filter-colormatrix.cpp - nr-filter-component-transfer.cpp - nr-filter-composite.cpp - nr-filter-convolve-matrix.cpp - nr-filter-diffuselighting.cpp - nr-filter-displacement-map.cpp - nr-filter-flood.cpp - nr-filter-gaussian.cpp - nr-filter-image.cpp - nr-filter-merge.cpp - nr-filter-morphology.cpp - nr-filter-offset.cpp - nr-filter-primitive.cpp + drawing/guideline.cpp + common/nr/nr-3dutils.cpp + common/nr/nr-filter-blend.cpp + common/nr/nr-filter-colormatrix.cpp + common/nr/nr-filter-component-transfer.cpp + common/nr/nr-filter-composite.cpp + common/nr/nr-filter-convolve-matrix.cpp + common/nr/nr-filter-diffuselighting.cpp + common/nr/nr-filter-displacement-map.cpp + common/nr/nr-filter-flood.cpp + common/nr/nr-filter-gaussian.cpp + common/nr/nr-filter-image.cpp + common/nr/nr-filter-merge.cpp + common/nr/nr-filter-morphology.cpp + common/nr/nr-filter-offset.cpp + common/nr/nr-filter-primitive.cpp # nr-filter-skeleton.cpp - nr-filter-slot.cpp - nr-filter-specularlighting.cpp - nr-filter-tile.cpp - nr-filter-turbulence.cpp - nr-filter-units.cpp - nr-filter.cpp - nr-light.cpp - nr-style.cpp - nr-svgfonts.cpp - nr-svgfonts.h - snap-indicator.cpp - sodipodi-ctrl.cpp - sodipodi-ctrlrect.cpp - sp-canvas-util.cpp - sp-canvas.cpp - sp-ctrlcurve.cpp - sp-ctrlline.cpp - sp-ctrlquadr.cpp + common/nr/nr-filter-slot.cpp + common/nr/nr-filter-specularlighting.cpp + common/nr/nr-filter-tile.cpp + common/nr/nr-filter-turbulence.cpp + common/nr/nr-filter-units.cpp + common/nr/nr-filter.cpp + common/nr/nr-light.cpp + common/nr/nr-style.cpp + common/nr/nr-svgfonts.cpp + common/nr/nr-svgfonts.h + common/snap/snap-indicator.cpp + common/sodipodi/sodipodi-ctrl.cpp + common/sodipodi/sodipodi-ctrlrect.cpp + common/sp/sp-canvas-util.cpp + common/sp/sp-canvas.cpp + common/sp/sp-ctrlcurve.cpp + common/sp/sp-ctrlline.cpp + common/sp/sp-ctrlquadr.cpp # ------- # 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 - drawing-group.h - drawing-image.h - drawing-item.h - drawing-pattern.h - drawing-shape.h - drawing-surface.h - drawing-text.h - drawing.h - gnome-canvas-acetate.h + common/cairo/cairo-templates.h + common/cairo/cairo-utils.h + canvas/canvas-arena.h + canvas/canvas-axonomgrid.h + canvas/canvas-bpath.h + canvas/canvas-debug.h + canvas/canvas-grid.h + canvas/canvas-rotate.h + canvas/canvas-temporary-item-list.h + canvas/canvas-temporary-item.h + canvas/canvas-text.h + common/curve/curve-test.h + common/curve/curve.h + drawing/drawing-context.h + drawing/drawing-group.h + drawing/drawing-image.h + drawing/drawing-item.h + drawing/drawing-pattern.h + drawing/drawing-shape.h + drawing/drawing-surface.h + drawing/drawing-text.h + drawing/drawing.h + canvas/gnome-canvas-acetate.h grayscale.h - guideline.h - nr-3dutils.h - nr-filter-blend.h - nr-filter-colormatrix.h - nr-filter-component-transfer.h - nr-filter-composite.h - nr-filter-convolve-matrix.h - nr-filter-diffuselighting.h - nr-filter-displacement-map.h - nr-filter-flood.h - nr-filter-gaussian.h - nr-filter-image.h - nr-filter-merge.h - nr-filter-morphology.h - nr-filter-offset.h - nr-filter-primitive.h - nr-filter-skeleton.h - nr-filter-slot.h - nr-filter-specularlighting.h - nr-filter-tile.h - nr-filter-turbulence.h - nr-filter-types.h - nr-filter-units.h - nr-filter-utils.h - nr-filter.h - nr-light-types.h - nr-light.h - nr-style.h + drawing/guideline.h + common/nr/nr-3dutils.h + common/nr/nr-filter-blend.h + common/nr/nr-filter-colormatrix.h + common/nr/nr-filter-component-transfer.h + common/nr/nr-filter-composite.h + common/nr/nr-filter-convolve-matrix.h + common/nr/nr-filter-diffuselighting.h + common/nr/nr-filter-displacement-map.h + common/nr/nr-filter-flood.h + common/nr/-filter-gaussian.h + common/nr/nr-filter-image.h + common/nr/nr-filter-merge.h + common/nr/nr-filter-morphology.h + common/nr/nr-filter-offset.h + common/nr/nr-filter-primitive.h + common/nr/nr-filter-skeleton.h + common/nr/nr-filter-slot.h + common/nr/nr-filter-specularlighting.h + common/nr/nr-filter-tile.h + common/nr/nr-filter-turbulence.h + common/nr/nr-filter-types.h + common/nr/nr-filter-units.h + common/nr/nr-filter-utils.h + common/nr/nr-filter.h + common/nr/nr-light-types.h + common/nr/nr-light.h + common/nr/nr-style.h rendermode.h - snap-indicator.h - sodipodi-ctrl.h - sodipodi-ctrlrect.h - sp-canvas-group.h - sp-canvas-item.h - sp-canvas-util.h - sp-canvas.h - sp-ctrlcurve.h - sp-ctrlline.h - sp-ctrlquadr.h + common/snap/snap-indicator.h + common/sodipodi/sodipodi-ctrl.h + common/sodipodi/sodipodi-ctrlrect.h + common/sp/sp-canvas-group.h + common/sp/sp-canvas-item.h + common/sp/sp-canvas-util.h + common/sp/sp-canvas.h + common/sp/sp-ctrlcurve.h + common/sp/sp-ctrlline.h + common/sp/sp-ctrlquadr.h ) # add_inkscape_lib(display_LIB "${display_SRC}") -- GitLab From eab7d1fec0fcf67796a4843559fbad3cb32b623d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 19:10:46 +0000 Subject: [PATCH 147/207] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index e24623b72a..b62b5e15a4 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -4,7 +4,7 @@ set(display_SRC common/cairo/cairo-utils.cpp canvas/canvas-arena.cpp canvas/canvas-axonomgrid.cpp - canvas/-bpath.cpp + canvas/canvas-bpath.cpp canvas/canvas-debug.cpp canvas/canvas-grid.cpp canvas/canvas-rotate.cpp -- GitLab From 23d18836f08823e8c3ee59e421a587a7ef081831 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 19:18:26 +0000 Subject: [PATCH 148/207] Update CMakeLists.txt -- GitLab From 0003d16ed6656e72e95a6ad098c300d3d44d52d8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 19:19:47 +0000 Subject: [PATCH 149/207] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index b62b5e15a4..ea15b81f19 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -11,7 +11,7 @@ set(display_SRC canvas/canvas-temporary-item-list.cpp canvas/canvas-temporary-item.cpp canvas/canvas-text.cpp - canvas/curve.cpp + common/curve/curve.cpp drawing/drawing-context.cpp drawing/drawing-group.cpp drawing/drawing-image.cpp -- GitLab From 4f518bd0216f459a1e0a0b172f1f9961be498317 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 10 Mar 2019 20:40:45 +0000 Subject: [PATCH 150/207] Update CMakeLists.txt --- src/display/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index ea15b81f19..7f45487c30 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -96,7 +96,7 @@ set(display_SRC common/nr/nr-filter-diffuselighting.h common/nr/nr-filter-displacement-map.h common/nr/nr-filter-flood.h - common/nr/-filter-gaussian.h + common/nr/nr-filter-gaussian.h common/nr/nr-filter-image.h common/nr/nr-filter-merge.h common/nr/nr-filter-morphology.h -- GitLab From a97a2081680cf745f2eab22b5950cb1a67a0010e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 07:59:13 +0000 Subject: [PATCH 151/207] Update canvas-bpath.cpp --- src/display/canvas/canvas-bpath.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/display/canvas/canvas-bpath.cpp b/src/display/canvas/canvas-bpath.cpp index 327bb1c06d..c65d3fb619 100644 --- a/src/display/canvas/canvas-bpath.cpp +++ b/src/display/canvas/canvas-bpath.cpp @@ -17,13 +17,13 @@ #include "desktop.h" #include "color.h" -#include "display/sp-canvas-group.h" -#include "display/sp-canvas-util.h" -#include "display/canvas-bpath.h" -#include "display/curve.h" -#include "display/cairo-utils.h" +#include "display/common/sp/sp-canvas-group.h" +#include "display/common/sp/sp-canvas-util.h" +#include "display/canvas/canvas-bpath.h" +#include "display/common/curve/curve.h" +#include "display/common/cairo/cairo-utils.h" #include "helper/geom.h" -#include "display/sp-canvas.h" +#include "display/common/sp/sp-canvas.h" static void sp_canvas_bpath_destroy(SPCanvasItem *object); -- GitLab From 21de5c7239c5ecf621ae009d4c5f06b35a957d2c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:03:22 +0000 Subject: [PATCH 152/207] Update canvas-bpath.h --- src/display/canvas/canvas-bpath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-bpath.h b/src/display/canvas/canvas-bpath.h index 4dc98315cc..3f441d9f99 100644 --- a/src/display/canvas/canvas-bpath.h +++ b/src/display/canvas/canvas-bpath.h @@ -18,7 +18,7 @@ #include -#include "sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" struct SPCanvasBPath; struct SPCanvasBPathClass; -- GitLab From 35415251c7c50036af6ae4e0c53d4f439cef7a03 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:05:47 +0000 Subject: [PATCH 153/207] Update canvas-debug.cpp --- src/display/canvas/canvas-debug.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/canvas/canvas-debug.cpp b/src/display/canvas/canvas-debug.cpp index 03db61f69c..25ebbdd22c 100644 --- a/src/display/canvas/canvas-debug.cpp +++ b/src/display/canvas/canvas-debug.cpp @@ -10,9 +10,9 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "canvas-debug.h" -#include "sp-canvas.h" -#include "cairo-utils.h" +#include "display/canvas/canvas-debug.h" +#include "display/common/sp/sp-canvas.h" +#include "display/common/cairo/cairo-utils.h" #include "ui/event-debug.h" namespace { -- GitLab From bfad96cdf5323a88bd12b3c9d799be500d16ace2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:11:41 +0000 Subject: [PATCH 154/207] 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..9b1d88b271 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/common/sp/sp-canvas-item.h" class SPItem; -- GitLab From cd04e5d5fa386d80053876f55ef2c94a45b3740e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:14:49 +0000 Subject: [PATCH 155/207] Update canvas-grid.cpp --- src/display/canvas/canvas-grid.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/display/canvas/canvas-grid.cpp b/src/display/canvas/canvas-grid.cpp index 585ae5b82f..2acec03149 100644 --- a/src/display/canvas/canvas-grid.cpp +++ b/src/display/canvas/canvas-grid.cpp @@ -26,13 +26,13 @@ #include #include "desktop.h" -#include "sp-canvas-util.h" +#include "display/common/sp/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/sp-canvas-group.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/canvas/canvas-axonomgrid.h" +#include "display/canvas/canvas-grid.h" +#include "display/common/sp/sp-canvas-group.h" #include "document.h" #include "util/units.h" #include "inkscape.h" @@ -45,7 +45,7 @@ #include "helper/mathfns.h" #include "xml/node-event-vector.h" #include "verbs.h" -#include "display/sp-canvas.h" +#include "display/common/sp/sp-canvas.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; -- GitLab From 7fd4cb8bde8801044c8558479951fa503fdcf7a1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:22:53 +0000 Subject: [PATCH 156/207] 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 3cd5a76b50..d27e2f0a91 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/common/sp/sp-canvas-item.h" #include "ui/widget/alignment-selector.h" #include "ui/widget/registered-widget.h" #include "ui/widget/registry.h" -- GitLab From c72f62956a9afb14928b8fef1e6c445d8399996d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:23:49 +0000 Subject: [PATCH 157/207] Update canvas-grid.h -- GitLab From b2a73bf98c262cb941284eaca5a563c37a8a43bc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:25:04 +0000 Subject: [PATCH 158/207] Update canvas-rotate.cpp --- src/display/canvas/canvas-rotate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/canvas/canvas-rotate.cpp b/src/display/canvas/canvas-rotate.cpp index f747c66f54..e77ef0fb9c 100644 --- a/src/display/canvas/canvas-rotate.cpp +++ b/src/display/canvas/canvas-rotate.cpp @@ -13,9 +13,9 @@ #include "inkscape.h" #include "desktop.h" -#include "canvas-rotate.h" -#include "sp-canvas.h" -#include "cairo-utils.h" +#include "display/canvas/canvas-rotate.h" +#include "display/common/sp/sp-canvas.h" +#include "display/common/cairo/cairo-utils.h" #include "ui/event-debug.h" #include "2geom/point.h" -- GitLab From 176563570f29ab0b68d509d79d997cb4e0a273d1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:27:57 +0000 Subject: [PATCH 159/207] 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..4f472aa3f8 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/common/sp/sp-canvas-item.h" #include "2geom/line.h" class SPItem; -- GitLab From 3f4898202a8665bef160b2ad2b6a24e73e41cb9e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:28:55 +0000 Subject: [PATCH 160/207] Update canvas-temporary-item-list.cpp --- src/display/canvas/canvas-temporary-item-list.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/canvas/canvas-temporary-item-list.cpp b/src/display/canvas/canvas-temporary-item-list.cpp index caa9609699..c41fde9031 100644 --- a/src/display/canvas/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 3b6a65d6ae75c58bc7d522e065ef197c1a5361e4 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:29:05 +0000 Subject: [PATCH 161/207] Update canvas-temporary-item-list.h -- GitLab From 8f591cf8297919aef79be22ceb4e23a8287ca4c5 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:34:26 +0000 Subject: [PATCH 162/207] Update gnome-canvas-acetate.h --- src/display/canvas/gnome-canvas-acetate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/gnome-canvas-acetate.h b/src/display/canvas/gnome-canvas-acetate.h index d08667daa1..36f9d3a94c 100644 --- a/src/display/canvas/gnome-canvas-acetate.h +++ b/src/display/canvas/gnome-canvas-acetate.h @@ -16,7 +16,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" #define GNOME_TYPE_CANVAS_ACETATE (sp_canvas_acetate_get_type ()) #define SP_CANVAS_ACETATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CANVAS_ACETATE, SPCanvasAcetate)) -- GitLab From aef2f1eb44d88bf4af6863adef2817440dc25a3e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:34:40 +0000 Subject: [PATCH 163/207] Update canvas-temporary-item.cpp --- src/display/canvas/canvas-temporary-item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/canvas-temporary-item.cpp b/src/display/canvas/canvas-temporary-item.cpp index 38266872bd..30dffe376b 100644 --- a/src/display/canvas/canvas-temporary-item.cpp +++ b/src/display/canvas/canvas-temporary-item.cpp @@ -18,7 +18,7 @@ #include "display/canvas-temporary-item.h" #include -#include "display/sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" namespace Inkscape { namespace Display { -- GitLab From e47b3f8f6b0f70680f02297dd34a8ec4e6b92382 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:34:53 +0000 Subject: [PATCH 164/207] Update canvas-temporary-item.h -- GitLab From 5805bdfe496a5b76faad1a631504d2107c3db5a6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:37:37 +0000 Subject: [PATCH 165/207] Update canvas-text.cpp --- src/display/canvas/canvas-text.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/canvas/canvas-text.cpp b/src/display/canvas/canvas-text.cpp index e725a1f93c..70a60405aa 100644 --- a/src/display/canvas/canvas-text.cpp +++ b/src/display/canvas/canvas-text.cpp @@ -16,11 +16,11 @@ #include #include -#include "sp-canvas-util.h" -#include "canvas-text.h" -#include "display/cairo-utils.h" +#include "display/common/sp/sp-canvas-util.h" +#include "display/common/canvas/canvas-text.h" +#include "display/common/cairo/cairo-utils.h" #include "desktop.h" -#include "display/sp-canvas.h" +#include "display/common/sp/sp-canvas.h" static void sp_canvastext_destroy(SPCanvasItem *object); -- GitLab From 34202ca7fa38c2e4065e883276ce98fcd4ffb1fc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:37:59 +0000 Subject: [PATCH 166/207] 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..7fda4471a8 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/common/sp/sp-canvas-item.h" class SPItem; class SPDesktop; -- GitLab From b8343f0dc828a0284e8ad7ae452d272f42d045b0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:39:46 +0000 Subject: [PATCH 167/207] Update gnome-canvas-acetate.cpp --- src/display/canvas/gnome-canvas-acetate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/canvas/gnome-canvas-acetate.cpp b/src/display/canvas/gnome-canvas-acetate.cpp index 5157ab8b2f..56046bf70b 100644 --- a/src/display/canvas/gnome-canvas-acetate.cpp +++ b/src/display/canvas/gnome-canvas-acetate.cpp @@ -14,7 +14,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "gnome-canvas-acetate.h" +#include "display/canvas/gnome-canvas-acetate.h" #include "ui/event-debug.h" static void sp_canvas_acetate_destroy(SPCanvasItem *object); -- GitLab From 4c29d342bb33b6d49cc387e80ea263d5c0050466 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:41:49 +0000 Subject: [PATCH 168/207] Update canvas-arena.h --- src/display/canvas/canvas-arena.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/canvas/canvas-arena.h b/src/display/canvas/canvas-arena.h index 64f136c74f..77fe90282b 100644 --- a/src/display/canvas/canvas-arena.h +++ b/src/display/canvas/canvas-arena.h @@ -18,8 +18,8 @@ #include "display/drawing/drawing.h" #include "display/drawing/drawing-item.h" -#include "display/sp/sp-canvas.h" -#include "display/sp/sp-canvas-item.h" +#include "display/common/sp/sp-canvas.h" +#include "display/common/sp/sp-canvas-item.h" #define SP_TYPE_CANVAS_ARENA (sp_canvas_arena_get_type ()) #define SP_CANVAS_ARENA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVAS_ARENA, SPCanvasArena)) -- GitLab From b06ece8fb3b6dd3c4647b7f4bd5bd53ff2d8b1bc Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:42:19 +0000 Subject: [PATCH 169/207] Update canvas-axonomgrid.cpp --- src/display/canvas/canvas-axonomgrid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/canvas/canvas-axonomgrid.cpp b/src/display/canvas/canvas-axonomgrid.cpp index e5a12cd16f..a1eb81b210 100644 --- a/src/display/canvas/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -27,8 +27,8 @@ #include "display/cairo/cairo-utils.h" #include "display/canvas/canvas-grid.h" -#include "display/sp/sp-canvas-util.h" -#include "display/sp/sp-canvas.h" +#include "display/common/sp/sp-canvas-util.h" +#include "display/common/sp/sp-canvas.h" #include "document.h" #include "inkscape.h" #include "preferences.h" -- GitLab From da5bec3438a4a4b235044d2045172108b42f9a81 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:42:33 +0000 Subject: [PATCH 170/207] Update canvas-axonomgrid.h -- GitLab From 49ede9b343b96af7ac15c3c1b6a3259ef74ba3a8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 08:47:58 +0000 Subject: [PATCH 171/207] 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 a1eb81b210..6f69b735f6 100644 --- a/src/display/canvas/canvas-axonomgrid.cpp +++ b/src/display/canvas/canvas-axonomgrid.cpp @@ -25,7 +25,7 @@ #include "ui/widget/registered-widget.h" #include "desktop.h" -#include "display/cairo/cairo-utils.h" +#include "display/common/cairo/cairo-utils.h" #include "display/canvas/canvas-grid.h" #include "display/common/sp/sp-canvas-util.h" #include "display/common/sp/sp-canvas.h" -- GitLab From 1f42b6b2a6d441b5df32b5656ca35d0706b02659 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:38:31 +0000 Subject: [PATCH 172/207] Update drawing-context.cpp --- src/display/drawing/drawing-context.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/drawing/drawing-context.cpp b/src/display/drawing/drawing-context.cpp index d6b42ab618..fb7ea57251 100644 --- a/src/display/drawing/drawing-context.cpp +++ b/src/display/drawing/drawing-context.cpp @@ -10,9 +10,9 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/drawing-context.h" -#include "display/drawing-surface.h" -#include "display/cairo-utils.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-surface.h" +#include "display/common/cairo/cairo-utils.h" namespace Inkscape { -- GitLab From ced9c7af99d2d2eef0986ad91062fecd14788028 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:40:14 +0000 Subject: [PATCH 173/207] Update drawing-context.h -- GitLab From 2c315137262555f09172f8698385930e8cdc6257 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:41:02 +0000 Subject: [PATCH 174/207] Update drawing-group.cpp --- src/display/drawing/drawing-group.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/drawing/drawing-group.cpp b/src/display/drawing/drawing-group.cpp index 0d6a2edfc2..7d09da64aa 100644 --- a/src/display/drawing/drawing-group.cpp +++ b/src/display/drawing/drawing-group.cpp @@ -10,9 +10,9 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/drawing.h" -#include "display/drawing-item.h" -#include "display/drawing-group.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-item.h" +#include "display/drawing/drawing-group.h" namespace Inkscape { -- GitLab From e87347db095b16eea3d9bc4ea8f8bd47685bd9c0 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:41:29 +0000 Subject: [PATCH 175/207] Update drawing-group.h --- src/display/drawing/drawing-group.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing/drawing-group.h b/src/display/drawing/drawing-group.h index 1f5f283934..f5eb02cb6b 100644 --- a/src/display/drawing/drawing-group.h +++ b/src/display/drawing/drawing-group.h @@ -13,7 +13,7 @@ #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_GROUP_H #define SEEN_INKSCAPE_DISPLAY_DRAWING_GROUP_H -#include "display/drawing-item.h" +#include "display/drawing/drawing-item.h" namespace Inkscape { -- GitLab From 1cb04bb0f37e053c4bd6bcfa65345b682b28d224 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:42:26 +0000 Subject: [PATCH 176/207] Update drawing-image.cpp --- src/display/drawing/drawing-image.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/drawing/drawing-image.cpp b/src/display/drawing/drawing-image.cpp index 339a8070d4..6dcbe0b345 100644 --- a/src/display/drawing/drawing-image.cpp +++ b/src/display/drawing/drawing-image.cpp @@ -12,12 +12,12 @@ #include <2geom/bezier-curve.h> -#include "display/drawing.h" -#include "display/drawing-context.h" -#include "display/drawing-image.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-image.h" #include "preferences.h" -#include "display/cairo-utils.h" +#include "display/common/cairo/cairo-utils.h" namespace Inkscape { -- GitLab From c52e4ac5ac7da38d82d3c1de89afeea033725e51 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:43:00 +0000 Subject: [PATCH 177/207] Update drawing-image.h --- src/display/drawing/drawing-image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing/drawing-image.h b/src/display/drawing/drawing-image.h index fd962dbb51..3bb18977ce 100644 --- a/src/display/drawing/drawing-image.h +++ b/src/display/drawing/drawing-image.h @@ -17,7 +17,7 @@ #include #include <2geom/transforms.h> -#include "display/drawing-item.h" +#include "display/drawing/drawing-item.h" namespace Inkscape { class Pixbuf; -- GitLab From 162c9af63b0caab77efc3d87cd9e866eaf20d608 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:47:06 +0000 Subject: [PATCH 178/207] Update drawing-item.cpp --- src/display/drawing/drawing-item.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/display/drawing/drawing-item.cpp b/src/display/drawing/drawing-item.cpp index 6777be5ccb..d5765c4628 100644 --- a/src/display/drawing/drawing-item.cpp +++ b/src/display/drawing/drawing-item.cpp @@ -12,18 +12,18 @@ #include -#include "display/drawing.h" -#include "display/drawing-context.h" -#include "display/drawing-item.h" -#include "display/drawing-group.h" -#include "display/drawing-pattern.h" -#include "display/drawing-surface.h" -#include "nr-filter.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-item.h" +#include "display/drawing/drawing-group.h" +#include "display/drawing/drawing-pattern.h" +#include "display/drawing/drawing-surface.h" +#include "display/common/nr/nr-filter.h" #include "preferences.h" #include "style.h" -#include "display/cairo-utils.h" -#include "display/cairo-templates.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/common/cairo/cairo-templates.h" #include "object/sp-item.h" -- GitLab From 688c26ae7eeafa18be2a784e5a084695ad329eb8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:47:35 +0000 Subject: [PATCH 179/207] Update drawing-item.h -- GitLab From 3bd410e3d5b1e806f66ccab8cebcc7a3134c64b8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:49:49 +0000 Subject: [PATCH 180/207] Update drawing-item.h -- GitLab From 0039a4927bccbbeda5f5e29d0814e3a47950a20c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:50:52 +0000 Subject: [PATCH 181/207] Update drawing-pattern.cpp --- src/display/drawing/drawing-pattern.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/drawing/drawing-pattern.cpp b/src/display/drawing/drawing-pattern.cpp index 15bdc6139c..872cdb692d 100644 --- a/src/display/drawing/drawing-pattern.cpp +++ b/src/display/drawing/drawing-pattern.cpp @@ -10,10 +10,10 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/cairo-utils.h" -#include "display/drawing-context.h" -#include "display/drawing-pattern.h" -#include "display/drawing-surface.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-pattern.h" +#include "display/drawing/drawing-surface.h" namespace Inkscape { -- GitLab From de3721b3cb0ed9c23123941df74068d70628f2da Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:51:19 +0000 Subject: [PATCH 182/207] Update drawing-pattern.h --- src/display/drawing/drawing-pattern.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing/drawing-pattern.h b/src/display/drawing/drawing-pattern.h index 86b881ae1f..95b0963732 100644 --- a/src/display/drawing/drawing-pattern.h +++ b/src/display/drawing/drawing-pattern.h @@ -13,7 +13,7 @@ #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_PATTERN_H #define SEEN_INKSCAPE_DISPLAY_DRAWING_PATTERN_H -#include "display/drawing-group.h" +#include "display/drawing/drawing-group.h" typedef struct _cairo_pattern cairo_pattern_t; -- GitLab From 5d36c6f44beb440d6daa2f1080792c9e1d8f52ec Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:53:16 +0000 Subject: [PATCH 183/207] Update drawing-shape.cpp --- src/display/drawing/drawing-shape.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/display/drawing/drawing-shape.cpp b/src/display/drawing/drawing-shape.cpp index 20544e1bea..584427ccd4 100644 --- a/src/display/drawing/drawing-shape.cpp +++ b/src/display/drawing/drawing-shape.cpp @@ -16,14 +16,14 @@ #include <2geom/path-sink.h> #include <2geom/svg-path-parser.h> -#include "display/cairo-utils.h" -#include "display/canvas-arena.h" -#include "display/canvas-bpath.h" -#include "display/curve.h" -#include "display/drawing.h" -#include "display/drawing-context.h" -#include "display/drawing-group.h" -#include "display/drawing-shape.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/canvas/canvas-arena.h" +#include "display/canvas/canvas-bpath.h" +#include "display/common/curve/curve.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-group.h" +#include "display/drawing/drawing-shape.h" #include "helper/geom-curves.h" #include "helper/geom.h" #include "preferences.h" -- GitLab From d1ee4913953820d7cf1bef589322cbad344a1246 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:54:29 +0000 Subject: [PATCH 184/207] Update drawing-shape.h --- src/display/drawing/drawing-shape.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/drawing/drawing-shape.h b/src/display/drawing/drawing-shape.h index f8a3d23efe..5d173e9ada 100644 --- a/src/display/drawing/drawing-shape.h +++ b/src/display/drawing/drawing-shape.h @@ -13,8 +13,8 @@ #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_SHAPE_H #define SEEN_INKSCAPE_DISPLAY_DRAWING_SHAPE_H -#include "display/drawing-item.h" -#include "display/nr-style.h" +#include "display/drawing/drawing-item.h" +#include "display/common/nr/nr-style.h" class SPStyle; class SPCurve; -- GitLab From b0b61d62740186eedb34abed38026da20779743a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:55:16 +0000 Subject: [PATCH 185/207] Update drawing-surface.cpp --- src/display/drawing/drawing-surface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/drawing/drawing-surface.cpp b/src/display/drawing/drawing-surface.cpp index 24fc525b17..6a73f4aad3 100644 --- a/src/display/drawing/drawing-surface.cpp +++ b/src/display/drawing/drawing-surface.cpp @@ -11,9 +11,9 @@ */ //#include -#include "display/drawing-surface.h" -#include "display/drawing-context.h" -#include "display/cairo-utils.h" +#include "display/drawing/drawing-surface.h" +#include "display/drawing/drawing-context.h" +#include "display/common/cairo/cairo-utils.h" namespace Inkscape { -- GitLab From f7b060737037bb92efc7bfe792e797b0c9741536 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:55:31 +0000 Subject: [PATCH 186/207] Update drawing-surface.h -- GitLab From 670a8ddc865749b196545d9f190e1dd019848279 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:56:17 +0000 Subject: [PATCH 187/207] Update drawing-text.cpp --- src/display/drawing/drawing-text.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/display/drawing/drawing-text.cpp b/src/display/drawing/drawing-text.cpp index 9d81d736da..ed3b260845 100644 --- a/src/display/drawing/drawing-text.cpp +++ b/src/display/drawing/drawing-text.cpp @@ -12,17 +12,17 @@ //#include "display/cairo-utils.h" //#include "display/canvas-bpath.h" // for SPWindRule (WTF!) -#include "display/drawing.h" -#include "display/drawing-context.h" -#include "display/drawing-surface.h" -#include "display/drawing-text.h" +#include "display/drawing/drawing.h" +#include "display/drawing/drawing-context.h" +#include "display/drawing/drawing-surface.h" +#include "display/drawing/drawing-text.h" #include "helper/geom.h" #include "libnrtype/font-instance.h" #include "style.h" #include "2geom/pathvector.h" -#include "display/cairo-utils.h" -#include "display/canvas-bpath.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/canvas/canvas-bpath.h" namespace Inkscape { -- GitLab From 99eb9c565a20f3426d74e91aaa30d928eba84f7c Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 11:57:11 +0000 Subject: [PATCH 188/207] Update drawing-text.h --- src/display/drawing/drawing-text.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/drawing/drawing-text.h b/src/display/drawing/drawing-text.h index d557cad77a..9dece28c96 100644 --- a/src/display/drawing/drawing-text.h +++ b/src/display/drawing/drawing-text.h @@ -13,8 +13,8 @@ #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_TEXT_H #define SEEN_INKSCAPE_DISPLAY_DRAWING_TEXT_H -#include "display/drawing-group.h" -#include "display/nr-style.h" +#include "display/drawing/drawing-group.h" +#include "display/common/nr/nr-style.h" class SPStyle; class font_instance; -- GitLab From f46be7f3fad1c1d61943534bfd5c2d74a63f56ed Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:01:33 +0000 Subject: [PATCH 189/207] Update drawing.cpp --- src/display/drawing/drawing.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/display/drawing/drawing.cpp b/src/display/drawing/drawing.cpp index 511de780a0..193bb7b8d5 100644 --- a/src/display/drawing/drawing.cpp +++ b/src/display/drawing/drawing.cpp @@ -12,13 +12,13 @@ */ #include -#include "display/drawing.h" -#include "nr-filter-gaussian.h" -#include "nr-filter-types.h" +#include "display/drawing/drawing.h" +#include "display/common/nr/nr-filter-gaussian.h" +#include "display/common/nr/nr-filter-types.h" //grayscale colormode: -#include "cairo-templates.h" -#include "drawing-context.h" +#include "display/common/cairo/cairo-templates.h" +#include "display/drawing/drawing-context.h" namespace Inkscape { -- GitLab From 1e07da4096178064557cf2db4b741fff2b6f7629 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:04:50 +0000 Subject: [PATCH 190/207] Update drawing.h --- src/display/drawing/drawing.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/drawing/drawing.h b/src/display/drawing/drawing.h index fb82cdd796..37f0d9cab1 100644 --- a/src/display/drawing/drawing.h +++ b/src/display/drawing/drawing.h @@ -19,9 +19,9 @@ #include #include -#include "display/drawing-item.h" +#include "display/drawing/drawing-item.h" #include "display/rendermode.h" -#include "nr-filter-colormatrix.h" +#include "display/common/nr/nr-filter-colormatrix.h" typedef struct _SPCanvasArena SPCanvasArena; typedef unsigned int guint32; -- GitLab From 08b786cfc3ac1102cfb013648d51acf64d7ff36b Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:07:55 +0000 Subject: [PATCH 191/207] Update guideline.cpp --- src/display/drawing/guideline.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/display/drawing/guideline.cpp b/src/display/drawing/guideline.cpp index 4f32de9c7b..5d1c36bb59 100644 --- a/src/display/drawing/guideline.cpp +++ b/src/display/drawing/guideline.cpp @@ -20,12 +20,12 @@ #include <2geom/transforms.h> #include <2geom/line.h> -#include "sp-canvas-util.h" +#include "display/common/sp/sp-canvas-util.h" #include "inkscape.h" -#include "guideline.h" -#include "display/cairo-utils.h" -#include "display/sp-canvas.h" -#include "display/sodipodi-ctrl.h" +#include "display/drawing/guideline.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/common/sp/sp-canvas.h" +#include "display/common/sodipodi/sodipodi-ctrl.h" #include "object/sp-namedview.h" static void sp_guideline_destroy(SPCanvasItem *object); -- GitLab From 5ac5b958ab759b8e10825593fb0df404e29d5a7a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:10:32 +0000 Subject: [PATCH 192/207] Update guideline.h --- src/display/drawing/guideline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/drawing/guideline.h b/src/display/drawing/guideline.h index e81cb35f5b..06fbe8d1bc 100644 --- a/src/display/drawing/guideline.h +++ b/src/display/drawing/guideline.h @@ -16,7 +16,7 @@ */ #include <2geom/point.h> -#include "sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" #define SP_TYPE_GUIDELINE (sp_guideline_get_type()) #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine)) -- GitLab From 5804f7bee920b3cb9cb5c6bf7718af9c5932002e Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:10:52 +0000 Subject: [PATCH 193/207] Update guideline.cpp -- GitLab From d839b2026bbeb857aa9d79bfb16b8358bcd1fd34 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:15:09 +0000 Subject: [PATCH 194/207] Update curve-test.h --- src/display/common/curve/curve-test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/common/curve/curve-test.h b/src/display/common/curve/curve-test.h index d338e2883c..8d3b5871d2 100644 --- a/src/display/common/curve/curve-test.h +++ b/src/display/common/curve/curve-test.h @@ -9,7 +9,7 @@ */ #include -#include "display/curve.h" +#include "display/common/curve/curve.h" #include <2geom/curves.h> #include <2geom/path.h> #include <2geom/pathvector.h> -- GitLab From df1d445ed7f61cbdd5be7fb417a5e7f62ce0d588 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:15:27 +0000 Subject: [PATCH 195/207] Update curve.cpp --- src/display/common/curve/curve.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/common/curve/curve.cpp b/src/display/common/curve/curve.cpp index 331701f278..635dbfcfc1 100644 --- a/src/display/common/curve/curve.cpp +++ b/src/display/common/curve/curve.cpp @@ -12,7 +12,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/curve.h" +#include "display/common/curve/curve.h" #include #include <2geom/pathvector.h> -- GitLab From b8065863e785d2a8bbd129f38fb9eb46db1da0c6 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:16:06 +0000 Subject: [PATCH 196/207] Update curve.h -- GitLab From 96c63142bee5162b6f73329fe983a94c0ae927f1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:17:26 +0000 Subject: [PATCH 197/207] Update cairo-templates.h --- src/display/common/cairo/cairo-templates.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/common/cairo/cairo-templates.h b/src/display/common/cairo/cairo-templates.h index 9a3dd66da0..2aaded1188 100644 --- a/src/display/common/cairo/cairo-templates.h +++ b/src/display/common/cairo/cairo-templates.h @@ -29,8 +29,8 @@ static const int OPENMP_THRESHOLD = 2048; #include #include #include -#include "display/nr-3dutils.h" -#include "display/cairo-utils.h" +#include "display/common/nr/nr-3dutils.h" +#include "display/common/cairo/cairo-utils.h" /** * Blend two surfaces using the supplied functor. -- GitLab From 1aa46d19e5cbeefedee710749ae4a2d3afedcfc1 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:18:24 +0000 Subject: [PATCH 198/207] Update cairo-utils.cpp --- src/display/common/cairo/cairo-utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display/common/cairo/cairo-utils.cpp b/src/display/common/cairo/cairo-utils.cpp index 0a1dbd3d66..3293718abb 100644 --- a/src/display/common/cairo/cairo-utils.cpp +++ b/src/display/common/cairo/cairo-utils.cpp @@ -9,7 +9,7 @@ * */ -#include "display/cairo-utils.h" +#include "display/common/cairo/cairo-utils.h" #include @@ -30,7 +30,7 @@ #include #include "color.h" -#include "cairo-templates.h" +#include "display/common/cairo/cairo-templates.h" #include "document.h" #include "preferences.h" #include "util/units.h" -- GitLab From 15927161f2ce9d1e91b3ac04c3a7697ec3244c47 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:18:57 +0000 Subject: [PATCH 199/207] Update cairo-utils.h -- GitLab From d13aabc1e2d0ffdd4eed25d940b8c4c781e4402a Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:20:51 +0000 Subject: [PATCH 200/207] Update snap-indicator.cpp --- src/display/common/snap/snap-indicator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/display/common/snap/snap-indicator.cpp b/src/display/common/snap/snap-indicator.cpp index 4039a3717a..365a35604f 100644 --- a/src/display/common/snap/snap-indicator.cpp +++ b/src/display/common/snap/snap-indicator.cpp @@ -12,14 +12,14 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "display/snap-indicator.h" +#include "display/common/snap/snap-indicator.h" #include "desktop.h" -#include "display/sodipodi-ctrl.h" -#include "display/sodipodi-ctrlrect.h" -#include "display/canvas-text.h" -#include "display/sp-canvas-util.h" +#include "display/common/sodipodi/sodipodi-ctrl.h" +#include "display/common/sodipodi/sodipodi-ctrlrect.h" +#include "display/canvas/canvas-text.h" +#include "display/common/sp/sp-canvas-util.h" #include "knot.h" #include "preferences.h" #include -- GitLab From 7e864b56a0c8f8763f79352d5fac3d82e378b51d Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:21:29 +0000 Subject: [PATCH 201/207] Update snap-indicator.h -- GitLab From 1f6d3bf460573a6a8e4817505dd3d2151120c5fa Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:23:20 +0000 Subject: [PATCH 202/207] Update sodipodi-ctrl.cpp --- src/display/common/sodipodi/sodipodi-ctrl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/common/sodipodi/sodipodi-ctrl.cpp b/src/display/common/sodipodi/sodipodi-ctrl.cpp index e16b1f2ce1..51be36254c 100644 --- a/src/display/common/sodipodi/sodipodi-ctrl.cpp +++ b/src/display/common/sodipodi/sodipodi-ctrl.cpp @@ -17,10 +17,10 @@ #include <2geom/transforms.h> #include <2geom/line.h> -#include "sp-canvas-util.h" -#include "sodipodi-ctrl.h" -#include "display/cairo-utils.h" -#include "display/sp-canvas.h" +#include "display/common/sp/sp-canvas-util.h" +#include "display/common/sodipodi/sodipodi-ctrl.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/common/sp/sp-canvas.h" enum { ARG_0, -- GitLab From 256860d66c9b0083c0ac83466d6eda18c0e0a6e2 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:24:35 +0000 Subject: [PATCH 203/207] Update sodipodi-ctrl.h --- src/display/common/sodipodi/sodipodi-ctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/common/sodipodi/sodipodi-ctrl.h b/src/display/common/sodipodi/sodipodi-ctrl.h index 50973dc988..70a140fe2a 100644 --- a/src/display/common/sodipodi/sodipodi-ctrl.h +++ b/src/display/common/sodipodi/sodipodi-ctrl.h @@ -17,7 +17,7 @@ */ #include -#include "sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" #include "enums.h" -- GitLab From f0f906ebabfb8126394cd03adb83a2d167689c78 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:25:55 +0000 Subject: [PATCH 204/207] Update sodipodi-ctrlrect.cpp --- src/display/common/sodipodi/sodipodi-ctrlrect.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/common/sodipodi/sodipodi-ctrlrect.cpp b/src/display/common/sodipodi/sodipodi-ctrlrect.cpp index 683b2fb15e..288e301e1d 100644 --- a/src/display/common/sodipodi/sodipodi-ctrlrect.cpp +++ b/src/display/common/sodipodi/sodipodi-ctrlrect.cpp @@ -18,10 +18,10 @@ */ #include "inkscape.h" -#include "sodipodi-ctrlrect.h" -#include "sp-canvas-util.h" -#include "display/cairo-utils.h" -#include "display/sp-canvas.h" +#include "display/common/sodipodi/sodipodi-ctrlrect.h" +#include "display/common/sp/sp-canvas-util.h" +#include "display/common/cairo/cairo-utils.h" +#include "display/common/sp/sp-canvas.h" #include <2geom/transforms.h> /* -- GitLab From 769e56a595bde6ce6e13735a2723d07a584cbce8 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Mon, 11 Mar 2019 12:27:05 +0000 Subject: [PATCH 205/207] Update sodipodi-ctrlrect.h --- src/display/common/sodipodi/sodipodi-ctrlrect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/common/sodipodi/sodipodi-ctrlrect.h b/src/display/common/sodipodi/sodipodi-ctrlrect.h index 39290e3b38..948a6e3041 100644 --- a/src/display/common/sodipodi/sodipodi-ctrlrect.h +++ b/src/display/common/sodipodi/sodipodi-ctrlrect.h @@ -22,7 +22,7 @@ */ #include -#include "sp-canvas-item.h" +#include "display/common/sp/sp-canvas-item.h" #include <2geom/rect.h> #include <2geom/int-rect.h> #include <2geom/transforms.h> -- GitLab From fb9c528b8fbd1a10dd30b3d47caa326cb4818d97 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 17 Mar 2019 19:26:05 +0000 Subject: [PATCH 206/207] Update node.cpp --- src/ui/tool/node.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index e1b63370c7..b2ca202b27 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -20,9 +20,9 @@ #include "multi-path-manipulator.h" #include "snap.h" -#include "display/sp-ctrlline.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-util.h" +#include "display/common/sp/sp-ctrlline.h" +#include "display/common/sp/sp-canvas.h" +#include "display/common/sp/sp-canvas-util.h" #include "ui/control-manager.h" #include "ui/tool/control-point-selection.h" -- GitLab From c900ba6d66dac326a364ed8c7c1b12a81042a4c4 Mon Sep 17 00:00:00 2001 From: shaharyaar Date: Sun, 17 Mar 2019 19:28:34 +0000 Subject: [PATCH 207/207] Update node-tool.cpp --- src/ui/tools/node-tool.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index a14114cb71..a58f29b484 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -23,10 +23,10 @@ #include "selection.h" #include "snap.h" -#include "display/canvas-bpath.h" -#include "display/curve.h" -#include "display/sp-canvas-group.h" -#include "display/sp-canvas.h" +#include "display/canvas/canvas-bpath.h" +#include "display/common/curve/curve.h" +#include "display/common/sp/sp-canvas-group.h" +#include "display/common/sp/sp-canvas.h" #include "live_effects/effect.h" #include "live_effects/lpeobject.h" -- GitLab