Move macros.h and remove unneeded macros

22 files changed, 30 insertions, 24 deletions

diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp
index 99e58a7c6..116016bfe 100644
--- a/src/ui/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -13,12 +13,12 @@
 
 #include <gtkmm/entry.h>
 #include <gtkmm/window.h>
-#include "macros.h"
+
 #include "desktop.h"
 #include "inkscape.h"
-#include "ui/tools/tool-base.h"
-
+#include "include/macros.h"
 #include "ui/dialog-events.h"
+#include "ui/tools/tool-base.h"
 
 
 /**
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index 64e7d6812..9383ac117 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -32,7 +32,7 @@
 #include "object/sp-star.h"
 #include "style.h"
 
-#define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
+#include "include/macros.h"
 
 class RectKnotHolder : public KnotHolder {
 public:
diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp
index ff9790046..de374035a 100644
--- a/src/ui/toolbar/gradient-toolbar.cpp
+++ b/src/ui/toolbar/gradient-toolbar.cpp
@@ -24,7 +24,6 @@
 #include "widgets/ink-action.h"
 #include "widgets/ink-toggle-action.h"
 #include "widgets/toolbox.h"
-#include "macros.h"
 #include "selection.h"
 #include "verbs.h"
 
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index cc4b55999..bd3567df7 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -23,7 +23,6 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
 #include "message-context.h"
 #include "preferences.h"
 #include "selection.h"
@@ -33,6 +32,8 @@
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
 
+#include "include/macros.h"
+
 #include "object/sp-ellipse.h"
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index d7ec50360..9c7d6c6c9 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -25,7 +25,6 @@
 #include "document-private.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
 #include "message-context.h"
 #include "perspective-line.h"
 #include "selection-chemistry.h"
@@ -35,6 +34,8 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
 
+#include "include/macros.h"
+
 #include "ui/pixmaps/cursor-3dbox.xpm"
 
 #include "object/box3d-side.h"
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index b4017e5e7..779cf29d9 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -41,7 +41,6 @@
 #include "document-undo.h"
 #include "document.h"
 #include "inkscape.h"
-#include "macros.h"
 #include "message-context.h"
 #include "selection.h"
 #include "splivarot.h"
@@ -53,6 +52,8 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 
+#include "include/macros.h"
+
 #include "livarot/Shape.h"
 
 #include "object/sp-shape.h"
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 0b5de4f46..19eef6c7d 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -22,7 +22,6 @@
 #include "desktop-style.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "macros.h"
 #include "message-context.h"
 #include "preferences.h"
 #include "selection.h"
@@ -34,6 +33,8 @@
 #include "display/curve.h"
 #include "display/cairo-utils.h"
 
+#include "include/macros.h"
+
 #include "object/sp-namedview.h"
 
 #include "ui/pixmaps/cursor-dropper-f.xpm"
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index c0742f9df..22e843bd6 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -43,7 +43,6 @@
 #include "document.h"
 #include "layer-manager.h"
 #include "layer-model.h"
-#include "macros.h"
 #include "message-context.h"
 #include "path-chemistry.h"
 #include "rubberband.h"
@@ -57,6 +56,8 @@
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 
+#include "include/macros.h"
+
 #include "object/sp-clippath.h"
 #include "object/sp-item-group.h"
 #include "object/sp-path.h"
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 43f2d6745..8ea64dce8 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -33,7 +33,6 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "rubberband.h"
@@ -47,6 +46,8 @@
 #include "display/drawing.h"
 #include "display/sp-canvas.h"
 
+#include "include/macros.h"
+
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
 
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 08c637d2e..8589b896b 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -17,13 +17,14 @@
 #define DRAW_VERBOSE
 
 #include "desktop-style.h"
-#include "macros.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
 
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 
+#include "include/macros.h"
+
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-simplify.h"
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 3016d30b5..8b85f8854 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -20,7 +20,7 @@
 #include "document.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "rubberband.h"
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index c78575972..41f2938c2 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -27,7 +27,7 @@
 #include "document.h"
 #include "gradient-drag.h"
 #include "gradient-chemistry.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "rubberband.h"
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 9ea403b09..7fbc08d33 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -26,7 +26,7 @@
 
 #include "context-fns.h"
 #include "desktop.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 7d2f78401..3edbf4f5c 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -25,7 +25,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "selection-chemistry.h"
 #include "selection.h"
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 291737778..459708456 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -28,7 +28,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-stack.h"
 #include "rubberband.h"
 #include "selection-chemistry.h"
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 6add09442..29cf408b8 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -25,7 +25,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "ui/pixmaps/cursor-spiral.xpm"
 #include "selection.h"
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0cad1382e..f590be059 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -36,7 +36,7 @@
 #include "document.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "path-chemistry.h"
 #include "selection.h"
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 297708208..d19cc1b27 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -25,7 +25,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "selection.h"
 #include "verbs.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index d79d09692..6f4acc367 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -26,7 +26,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "rubberband.h"
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index b0cfbcce9..8637b640d 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -28,7 +28,7 @@
 #include "desktop.h"
 #include "gradient-drag.h"
 #include "knot-ptr.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "rubberband.h"
 #include "selcue.h"
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index d0b8209f0..4a4bf6114 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -28,7 +28,7 @@
 #include "filter-chemistry.h"
 #include "gradient-chemistry.h"
 #include "inkscape.h"
-#include "macros.h"
+#include "include/macros.h"
 #include "message-context.h"
 #include "path-chemistry.h"
 #include "selection.h"
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 907f66678..ad86d767d 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -14,7 +14,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "macros.h"
+#include "include/macros.h"
 #include "rubberband.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"