diff options
38 files changed, 41 insertions, 66 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac888bf2d..26551e99e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -159,7 +159,6 @@ set(inkscape_SRC layer-model.h line-geometry.h line-snapper.h - macros.h main-cmdlineact.h main-cmdlinexact.h media.h diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 9d8e96987..4a11e40f6 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -684,8 +684,6 @@ CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool page return ret; } -#include "macros.h" // SP_PRINT_* - // Apply an SVG clip path void CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp) @@ -701,7 +699,6 @@ CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp) // FIXME: the access to the first clippath view to obtain the bbox is completely bogus Geom::Affine saved_ctm; if (cp->clipPathUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX && cp->display->bbox) { - //SP_PRINT_DRECT("clipd", cp->display->bbox); Geom::Rect clip_bbox = *cp->display->bbox; Geom::Affine t(Geom::Scale(clip_bbox.dimensions())); t[4] = clip_bbox.left(); @@ -754,7 +751,6 @@ CairoRenderer::applyMask(CairoRenderContext *ctx, SPMask const *mask) // FIXME: the access to the first mask view to obtain the bbox is completely bogus // TODO: should the bbox be transformed if maskUnits != userSpaceOnUse ? if (mask->maskContentUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX && mask->display->bbox) { - //SP_PRINT_DRECT("maskd", &mask->display->bbox); Geom::Rect mask_bbox = *mask->display->bbox; Geom::Affine t(Geom::Scale(mask_bbox.dimensions())); t[4] = mask_bbox.left(); diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 8f6b3aeb6..0358bc5d7 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -451,8 +451,6 @@ ExportResult sp_export_png_file(SPDocument *doc, gchar const *filename, * Geom::Scale(width / area.width(), height / area.height())); - //SP_PRINT_MATRIX("SVG2PNG", &affine); - struct SPEBP ebp; ebp.width = width; ebp.height = height; diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt index 7a089b86c..f63079edf 100644 --- a/src/include/CMakeLists.txt +++ b/src/include/CMakeLists.txt @@ -1,5 +1,6 @@ set(include_SRC gtkmm_version.h + macros.h ) add_inkscape_source("${io_SRC}") diff --git a/src/include/README b/src/include/README new file mode 100644 index 000000000..336b3e20d --- /dev/null +++ b/src/include/README @@ -0,0 +1,3 @@ +Configuration, defines, macros and similar that do not fit anywhere else. + +Try to keep this to a minimum and move to more suitable locations whenever possible. diff --git a/src/macros.h b/src/include/macros.h index cbb9bca78..71a81848f 100644 --- a/src/macros.h +++ b/src/include/macros.h @@ -15,27 +15,10 @@ // I'm of the opinion that this file should be removed, so I will in the future take the necessary steps to wipe it out. // Macros are not in general bad, but these particular ones are rather ugly. Especially that sp_round one. --Liam -#ifdef SP_MACROS_SILENT -#define SP_PRINT_MATRIX(s,m) -#define SP_PRINT_TRANSFORM(s,t) -#define SP_PRINT_DRECT(s,r) -#define SP_PRINT_DRECT_WH(s,r) -#define SP_PRINT_IRECT(s,r) -#define SP_PRINT_IRECT_WH(s,r) -#else -#define SP_PRINT_MATRIX(s,m) g_print("%s (%g %g %g %g %g %g)\n", (s), (m)->c[0], (m)->c[1], (m)->c[2], (m)->c[3], (m)->c[4], (m)->c[5]) -#define SP_PRINT_TRANSFORM(s,t) g_print("%s (%g %g %g %g %g %g)\n", (s), (t)[0], (t)[1], (t)[2], (t)[3], (t)[4], (t)[5]) -#define SP_PRINT_DRECT(s,r) g_print("%s (%g %g %g %g)\n", (s), (r)->x0, (r)->y0, (r)->x1, (r)->y1) -#define SP_PRINT_DRECT_WH(s,r) g_print("%s (%g %g %g %g)\n", (s), (r)->x0, (r)->y0, (r)->x1 - (r)->x0, (r)->y1 - (r)->y0) -#define SP_PRINT_IRECT(s,r) g_print("%s (%d %d %d %d)\n", (s), (r)->x0, (r)->y0, (r)->x1, (r)->y1) -#define SP_PRINT_IRECT_WH(s,r) g_print("%s (%d %d %d %d)\n", (s), (r)->x0, (r)->y0, (r)->x1 - (r)->x0, (r)->y1 - (r)->y0) -#endif - #define sp_signal_disconnect_by_data(o,d) g_signal_handlers_disconnect_matched(o, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, d) #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m))) -#endif // keyboard modifiers in an event #define MOD__SHIFT(event) ((event)->key.state & GDK_SHIFT_MASK) @@ -45,6 +28,8 @@ #define MOD__CTRL_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && ((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK)) #define MOD__ALT_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && ((event)->key.state & GDK_MOD1_MASK)) +#endif // SEEN_MACROS_H + /* Local Variables: mode:c++ diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp index 83cc3d772..3664bbc81 100644 --- a/src/knot-holder-entity.cpp +++ b/src/knot-holder-entity.cpp @@ -20,14 +20,14 @@ #include "desktop.h" #include "inkscape.h" #include "knotholder.h" -#include "macros.h" #include "preferences.h" #include "snap.h" +#include "style.h" +#include "include/macros.h" #include "object/sp-item.h" #include "object/sp-namedview.h" #include "object/sp-pattern.h" -#include "style.h" int KnotHolderEntity::counter = 0; diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp index 7d4074b64..79779d713 100644 --- a/src/object/box3d.cpp +++ b/src/object/box3d.cpp @@ -34,7 +34,7 @@ #include "desktop.h" -#include "macros.h" +#include "include/macros.h" static void box3d_ref_changed(SPObject *old_ref, SPObject *ref, SPBox3D *box); diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp index 5fb454075..f45f96958 100644 --- a/src/object/filters/componenttransfer-funcnode.cpp +++ b/src/object/filters/componenttransfer-funcnode.cpp @@ -22,9 +22,6 @@ #include "xml/repr.h" #include "helper-fns.h" -#define SP_MACROS_SILENT - - /* FeFuncNode class */ SPFeFuncNode::SPFeFuncNode(SPFeFuncNode::Channel channel) : SPObject(), type(Inkscape::Filters::COMPONENTTRANSFER_TYPE_IDENTITY), diff --git a/src/object/filters/distantlight.cpp b/src/object/filters/distantlight.cpp index 382cba4eb..32f50c754 100644 --- a/src/object/filters/distantlight.cpp +++ b/src/object/filters/distantlight.cpp @@ -25,9 +25,6 @@ #include "xml/repr.h" -#define SP_MACROS_SILENT - - SPFeDistantLight::SPFeDistantLight() : SPObject(), azimuth(0), azimuth_set(FALSE), elevation(0), elevation_set(FALSE) { } diff --git a/src/object/filters/pointlight.cpp b/src/object/filters/pointlight.cpp index 8c8101356..640db877e 100644 --- a/src/object/filters/pointlight.cpp +++ b/src/object/filters/pointlight.cpp @@ -27,8 +27,6 @@ #include "xml/node.h" #include "xml/repr.h" -#define SP_MACROS_SILENT - SPFePointLight::SPFePointLight() : SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE) { } diff --git a/src/object/filters/spotlight.cpp b/src/object/filters/spotlight.cpp index 9d911047a..1df720722 100644 --- a/src/object/filters/spotlight.cpp +++ b/src/object/filters/spotlight.cpp @@ -23,8 +23,6 @@ #include "xml/repr.h" -#define SP_MACROS_SILENT - SPFeSpotLight::SPFeSpotLight() : SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE), pointsAtX(0), pointsAtX_set(FALSE), pointsAtY(0), pointsAtY_set(FALSE), pointsAtZ(0), pointsAtZ_set(FALSE), diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp index 3c6533892..fa39f5486 100644 --- a/src/object/sp-filter.cpp +++ b/src/object/sp-filter.cpp @@ -32,8 +32,6 @@ using std::map; using std::pair; -#define SP_MACROS_SILENT - static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter); static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter); 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" diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp index 1dfc11795..67b1e3d38 100644 --- a/src/widgets/gradient-image.cpp +++ b/src/widgets/gradient-image.cpp @@ -18,7 +18,6 @@ #include <cairomm/surface.h> #include "gradient-image.h" -#include "macros.h" #include "display/cairo-utils.h" diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index b15275d62..91f5ebc77 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -35,7 +35,7 @@ #include "document-undo.h" #include "gradient-vector.h" #include "layer-manager.h" -#include "macros.h" +#include "include/macros.h" #include "selection-chemistry.h" #include "verbs.h" diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index 767692b1e..e30f3bf0e 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -18,7 +18,7 @@ #include "sp-attribute-widget.h" -#include "macros.h" +#include "include/macros.h" #include "document.h" #include "document-undo.h" #include "verbs.h" |