diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-01-30 08:33:01 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-01-30 08:33:01 +0000 |
| commit | 267299811df952d08324a39008f52c19641de9e0 (patch) | |
| tree | 28fef736a52cb7a72119d119be8eb663ad20a77f /src | |
| parent | Translations: update inkscape.pot (diff) | |
| download | inkscape-267299811df952d08324a39008f52c19641de9e0.tar.gz inkscape-267299811df952d08324a39008f52c19641de9e0.zip | |
Move classes derived from SPObject to own directory.
A lot of header clean-up.
Diffstat (limited to 'src')
548 files changed, 3367 insertions, 2446 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 342691151..730138ff4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,188 +2,13 @@ # Define the main source # ----------------------------------------------------------------------------- -set(sp_SRC +set(inkscape_SRC attribute-rel-css.cpp attribute-rel-svg.cpp attribute-rel-util.cpp attribute-sort-util.cpp - sp-anchor.cpp - sp-clippath.cpp - sp-conn-end-pair.cpp - sp-conn-end.cpp - sp-cursor.cpp - sp-defs.cpp - sp-desc.cpp - sp-dimensions.cpp - sp-ellipse.cpp - sp-factory.cpp - sp-filter-primitive.cpp - sp-filter-reference.cpp - sp-filter.cpp - sp-flowdiv.cpp - sp-flowregion.cpp - sp-flowtext.cpp - sp-font-face.cpp - sp-font.cpp - sp-glyph-kerning.cpp - sp-glyph.cpp - sp-gradient-reference.cpp - sp-gradient.cpp - sp-guide.cpp - sp-hatch-path.cpp - sp-hatch.cpp - sp-image.cpp - sp-item-group.cpp - sp-item-notify-moveto.cpp - sp-item-rm-unsatisfied-cns.cpp - sp-item-transform.cpp - sp-item-update-cns.cpp - sp-item.cpp - sp-line.cpp - sp-linear-gradient.cpp - sp-lpe-item.cpp - sp-marker.cpp - sp-mask.cpp - sp-mesh-array.cpp - sp-mesh-gradient.cpp - sp-mesh-patch.cpp - sp-mesh-row.cpp - sp-metadata.cpp - sp-missing-glyph.cpp - sp-namedview.cpp - sp-object-group.cpp - sp-object.cpp - sp-offset.cpp - sp-paint-server.cpp - sp-path.cpp - sp-pattern.cpp - sp-polygon.cpp - sp-polyline.cpp - sp-radial-gradient.cpp - sp-rect.cpp - sp-root.cpp - sp-script.cpp - sp-shape.cpp - sp-solid-color.cpp - sp-spiral.cpp - sp-star.cpp - sp-stop.cpp - sp-string.cpp - sp-style-elem.cpp - sp-switch.cpp - sp-symbol.cpp - sp-tag-use-reference.cpp - sp-tag-use.cpp - sp-tag.cpp - sp-text.cpp - sp-title.cpp - sp-tref-reference.cpp - sp-tref.cpp - sp-tspan.cpp - sp-use-reference.cpp - sp-use.cpp - splivarot.cpp - viewbox.cpp - - # ------- - # Headers - attribute-rel-css.h - attribute-rel-svg.h - attribute-rel-util.h - attribute-sort-util.h - sp-anchor.h - sp-clippath.h - sp-conn-end-pair.h - sp-conn-end.h - sp-cursor.h - sp-defs.h - sp-desc.h - sp-dimensions.h - sp-ellipse.h - sp-factory.h - sp-filter-primitive.h - sp-filter-reference.h - sp-filter-units.h - sp-filter.h - sp-flowdiv.h - sp-flowregion.h - sp-flowtext.h - sp-font-face.h - sp-font.h - sp-glyph-kerning.h - sp-glyph.h - sp-gradient-reference.h - sp-gradient-spread.h - sp-gradient-units.h - sp-gradient-vector.h - sp-gradient.h - sp-guide-attachment.h - sp-guide-constraint.h - sp-guide.h - sp-hatch-path.h - sp-hatch.h - sp-image.h - sp-item-group.h - sp-item-notify-moveto.h - sp-item-rm-unsatisfied-cns.h - sp-item-transform.h - sp-item-update-cns.h - sp-item.h - sp-line.h - sp-linear-gradient.h - sp-lpe-item.h - sp-marker-loc.h - sp-marker.h - sp-mask.h - sp-mesh-array.h - sp-mesh-gradient.h - sp-mesh-patch.h - sp-mesh-row.h - sp-metadata.h - sp-missing-glyph.h - sp-namedview.h - sp-object-group.h - sp-object.h - sp-offset.h - sp-paint-server-reference.h - sp-paint-server.h - sp-path.h - sp-pattern.h - sp-polygon.h - sp-polyline.h - sp-radial-gradient.h - sp-rect.h - sp-root.h - sp-script.h - sp-shape.h - sp-solid-color.h - sp-spiral.h - sp-star.h - sp-stop.h - sp-string.h - sp-style-elem.h - sp-switch.h - sp-symbol.h - sp-tag.h - sp-tag-use.h - sp-tag-use-reference.h - sp-text.h - sp-textpath.h - sp-title.h - sp-tref-reference.h - sp-tref.h - sp-tspan.h - sp-use-reference.h - sp-use.h - viewbox.h -) - -set(inkscape_SRC attributes.cpp axis-manip.cpp - box3d-side.cpp - box3d.cpp - color-profile.cpp color.cpp composite-undo-stack-observer.cpp conditions.cpp @@ -230,12 +55,9 @@ set(inkscape_SRC message-stack.cpp mod360.cpp object-hierarchy.cpp - object-set.cpp object-snapper.cpp path-chemistry.cpp path-prefix.cpp - persp3d-reference.cpp - persp3d.cpp perspective-line.cpp preferences.cpp prefix.cpp @@ -261,6 +83,9 @@ set(inkscape_SRC snapped-line.cpp snapped-point.cpp snapper.cpp + splivarot.cpp + sp-cursor.cpp + sp-item-notify-moveto.cpp style-internal.cpp style.cpp svg-view-slideshow.cpp @@ -271,8 +96,6 @@ set(inkscape_SRC transf_mat_3x4.cpp unclump.cpp unicoderange.cpp - uri-references.cpp - uri.cpp vanishing-point.cpp verbs.cpp version.cpp @@ -282,15 +105,16 @@ set(inkscape_SRC MultiPrinter.h PylogFormatter.h TRPIFormatter.h + attribute-rel-css.h + attribute-rel-svg.h + attribute-rel-util.h + attribute-sort-util.h attributes.h axis-manip.h bad-uri-exception.h - box3d-side.h - box3d.h cms-color-types.h cms-system.h color-profile-cms-fns.h - color-profile.h color-rgba.h color.h colorspace.h @@ -350,12 +174,9 @@ set(inkscape_SRC mod360.h number-opt-number.h object-hierarchy.h - object-set.h object-snapper.h path-chemistry.h path-prefix.h - persp3d-reference.h - persp3d.h perspective-line.h preferences-skeleton.h preferences.h @@ -385,6 +206,10 @@ set(inkscape_SRC snapped-line.h snapped-point.h snapper.h + sp-cursor.h + sp-guide-attachment.h + sp-guide-constraint.h + sp-item-notify-moveto.h splivarot.h streq.h strneq.h @@ -403,8 +228,6 @@ set(inkscape_SRC unclump.h undo-stack-observer.h unicoderange.h - uri-references.h - uri.h vanishing-point.h verbs.h version.h @@ -440,10 +263,10 @@ list(APPEND inkscape_SRC add_subdirectory(debug) add_subdirectory(display) add_subdirectory(extension) -add_subdirectory(filters) add_subdirectory(helper) add_subdirectory(io) add_subdirectory(live_effects) +add_subdirectory(object) add_subdirectory(svg) add_subdirectory(trace) add_subdirectory(ui) diff --git a/src/conditions.cpp b/src/conditions.cpp index 9b233a74f..b531f22cf 100644 --- a/src/conditions.cpp +++ b/src/conditions.cpp @@ -15,11 +15,16 @@ #endif #include <set> + #include <glibmm/ustring.h> + #include "conditions.h" -#include "xml/repr.h" #include "rdf.h" +#include "object/sp-item.h" + +#include "xml/repr.h" + typedef bool (* condition_evaluator)(SPItem const *item, gchar const *value); struct Condition { diff --git a/src/conditions.h b/src/conditions.h index 35a20ae4f..15e9f3d58 100644 --- a/src/conditions.h +++ b/src/conditions.h @@ -1,7 +1,7 @@ #ifndef CONDITIONS_H_ #define CONDITIONS_H_ -#include "sp-item.h" +class SPItem; bool sp_item_evaluate(SPItem const *item); diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp index 5e7942f19..34fe27cd5 100644 --- a/src/conn-avoid-ref.cpp +++ b/src/conn-avoid-ref.cpp @@ -15,26 +15,28 @@ #include <string> #include <iostream> -#include "sp-item.h" -#include "display/curve.h" -#include "2geom/line.h" #include "2geom/convex-hull.h" -#include "svg/stringstream.h" +#include "2geom/line.h" + #include "conn-avoid-ref.h" -#include "sp-conn-end.h" -#include "sp-path.h" -#include "libavoid/router.h" -#include "libavoid/shape.h" -#include "xml/node.h" -#include "document.h" #include "desktop.h" - #include "document-undo.h" -#include "sp-namedview.h" -#include "sp-item-group.h" +#include "document.h" #include "inkscape.h" #include "verbs.h" +#include "display/curve.h" + +#include "libavoid/router.h" +#include "libavoid/shape.h" + +#include "object/sp-namedview.h" +#include "object/sp-shape.h" + +#include "svg/stringstream.h" + +#include "xml/node.h" + using Inkscape::DocumentUndo; using Avoid::Router; diff --git a/src/context-fns.cpp b/src/context-fns.cpp index 46bd19cb3..971bc5ddd 100644 --- a/src/context-fns.cpp +++ b/src/context-fns.cpp @@ -1,12 +1,16 @@ #include <glibmm/i18n.h> #include "context-fns.h" + #include "desktop.h" -#include "display/snap-indicator.h" #include "message-context.h" #include "message-stack.h" #include "snap.h" -#include "sp-namedview.h" + +#include "display/snap-indicator.h" + +#include "object/sp-namedview.h" + #include "ui/tools/tool-base.h" static const double midpt_1_goldenratio = (1 + goldenratio) / 2; diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 758c3e939..c48b06a9c 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -15,46 +15,55 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif + #include <map> #include <string> -#include "ui/dialog/guides.h" #include "desktop-events.h" #include <gdkmm/display.h> +#include <gtk/gtk.h> #if GTK_CHECK_VERSION(3, 20, 0) # include <gdkmm/seat.h> #else # include <gdkmm/devicemanager.h> #endif +#include <glibmm/i18n.h> + #include <2geom/line.h> #include <2geom/angle.h> -#include <glibmm/i18n.h> #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "message-context.h" +#include "preferences.h" +#include "snap.h" +#include "sp-cursor.h" +#include "verbs.h" -#include "ui/dialog-events.h" #include "display/canvas-axonomgrid.h" #include "display/canvas-grid.h" #include "display/guideline.h" #include "display/snap-indicator.h" -#include "document.h" -#include "document-undo.h" -#include "ui/tools/tool-base.h" -#include "helper/action.h" -#include "message-context.h" -#include "preferences.h" -#include "snap.h" #include "display/sp-canvas.h" -#include "sp-guide.h" -#include "sp-namedview.h" -#include "sp-root.h" + +#include "helper/action.h" + +#include "pixmaps/cursor-select.xpm" + +#include "object/sp-guide.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" + +#include "ui/dialog-events.h" #include "ui/tools-switch.h" -#include "verbs.h" +#include "ui/dialog/guides.h" +#include "ui/tools/tool-base.h" + #include "widgets/desktop-widget.h" -#include "sp-cursor.h" -#include "pixmaps/cursor-select.xpm" + #include "xml/repr.h" using Inkscape::DocumentUndo; diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 23f803d6a..3b80d0e9e 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -14,33 +14,39 @@ #include <string> #include <cstring> + #include <glibmm.h> -#include "desktop.h" +#include "desktop-style.h" + #include "color-rgba.h" -#include "svg/css-ostringstream.h" -#include "svg/svg.h" -#include "svg/svg-color.h" -#include "selection.h" +#include "desktop.h" #include "inkscape.h" +#include "selection.h" + +#include "object/box3d-side.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowregion.h" +#include "object/sp-flowtext.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-path.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-textpath.h" +#include "object/sp-tref.h" +#include "object/sp-tspan.h" +#include "object/sp-use.h" #include "style.h" -#include "filters/blend.h" -#include "filters/gaussian-blur.h" -#include "sp-flowtext.h" -#include "sp-flowregion.h" -#include "sp-flowdiv.h" -#include "sp-linear-gradient.h" -#include "sp-pattern.h" -#include "sp-radial-gradient.h" -#include "sp-textpath.h" -#include "sp-tref.h" -#include "sp-tspan.h" -#include "xml/sp-css-attr.h" -#include "sp-path.h" +#include "object/filters/blend.h" +#include "object/filters/gaussian-blur.h" + +#include "svg/css-ostringstream.h" +#include "svg/svg-color.h" +#include "svg/svg.h" + #include "ui/tools/tool-base.h" -#include "desktop-style.h" -#include "box3d-side.h" +#include "xml/sp-css-attr.h" namespace { diff --git a/src/desktop-style.h b/src/desktop-style.h index bc2c56fac..7887f2709 100644 --- a/src/desktop-style.h +++ b/src/desktop-style.h @@ -12,6 +12,11 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ + +#include <vector> + +#include <glib.h> + class ColorRGBA; class SPCSSAttr; class SPDesktop; diff --git a/src/desktop.cpp b/src/desktop.cpp index f798079fd..262f1339b 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -26,19 +26,25 @@ #include <config.h> #endif -#include "ui/dialog/dialog-manager.h" #include <glibmm/i18n.h> - #include <2geom/transforms.h> + #include <2geom/rect.h> -#include "ui/tools/box3d-tool.h" -#include "color.h" -#include "desktop-events.h" #include "desktop.h" +#include "color.h" +#include "desktop-events.h" #include "desktop-style.h" #include "device-manager.h" +#include "document-undo.h" +#include "event-log.h" +#include "layer-fns.h" +#include "layer-manager.h" +#include "message-context.h" +#include "message-stack.h" +#include "resource-manager.h" + #include "display/canvas-arena.h" #include "display/canvas-debug.h" #include "display/canvas-grid.h" @@ -50,21 +56,20 @@ #include "display/sodipodi-ctrlrect.h" #include "display/sp-canvas-group.h" #include "display/sp-canvas-util.h" -#include "document-undo.h" -#include "event-log.h" + #include "helper/action-context.h" +#include "helper/action.h" //sp_action_perform + +#include "object/sp-namedview.h" +#include "object/sp-root.h" + +#include "ui/dialog/dialog-manager.h" #include "ui/interface.h" -#include "layer-fns.h" -#include "layer-manager.h" -#include "message-context.h" -#include "message-stack.h" -#include "resource-manager.h" -#include "ui/tools/select-tool.h" -#include "sp-namedview.h" -#include "sp-root.h" #include "ui/tool-factory.h" +#include "ui/tools/box3d-tool.h" +#include "ui/tools/select-tool.h" + #include "widgets/desktop-widget.h" -#include "helper/action.h" //sp_action_perform // TODO those includes are only for node tool quick zoom. Remove them after fixing it. #include "ui/tools/node-tool.h" diff --git a/src/desktop.h b/src/desktop.h index 0ddf3805b..f4eecf8b7 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -37,7 +37,7 @@ #include <glibmm/ustring.h> #include "preferences.h" -#include "sp-gradient.h" // TODO refactor enums out to their own .h file +#include "object/sp-gradient.h" // TODO refactor enums out to their own .h file class SPCSSAttr; struct SPCanvas; diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index c94cb45ae..c640de13b 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -32,7 +32,6 @@ #include <boost/optional/optional.hpp> #include "color.h" -#include "style.h" #include "cairo-templates.h" /** diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 187597794..bc094ff5a 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -35,9 +35,9 @@ #include "document.h" #include "inkscape.h" #include "preferences.h" -#include "sp-namedview.h" -#include "sp-object.h" -#include "sp-root.h" +#include "object/sp-namedview.h" +#include "object/sp-object.h" +#include "object/sp-root.h" #include "svg/svg-color.h" #include "2geom/line.h" #include "2geom/angle.h" diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 01bfc2fc0..c00fa8283 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -37,9 +37,9 @@ #include "util/units.h" #include "inkscape.h" #include "preferences.h" -#include "sp-namedview.h" -#include "sp-object.h" -#include "sp-root.h" +#include "object/sp-namedview.h" +#include "object/sp-object.h" +#include "object/sp-root.h" #include "svg/svg-color.h" #include "svg/stringstream.h" #include "helper/mathfns.h" diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index 508fcc503..4be3099bf 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -15,7 +15,6 @@ #include "display/drawing-context.h" #include "display/drawing-image.h" #include "preferences.h" -#include "style.h" #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-composite.h b/src/display/nr-filter-composite.h index 74806ad5e..820c64da0 100644 --- a/src/display/nr-filter-composite.h +++ b/src/display/nr-filter-composite.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "filters/composite.h" +#include "object/filters/composite.h" #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h index c469f4ced..00c8d8264 100644 --- a/src/display/nr-filter-displacement-map.h +++ b/src/display/nr-filter-displacement-map.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "filters/displacementmap.h" +#include "object/filters/displacementmap.h" #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp index 86ebb49cb..551a86cbf 100644 --- a/src/display/nr-filter-image.cpp +++ b/src/display/nr-filter-image.cpp @@ -12,7 +12,7 @@ */ #include "display/nr-filter-image.h" #include "document.h" -#include "sp-item.h" +#include "object/sp-item.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing.h" diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp index ea72efff0..ec392ea06 100644 --- a/src/display/nr-filter-primitive.cpp +++ b/src/display/nr-filter-primitive.cpp @@ -19,7 +19,6 @@ #include "desktop.h" #include "document.h" -#include "sp-root.h" #include "style.h" namespace Inkscape { diff --git a/src/display/nr-filter-units.cpp b/src/display/nr-filter-units.cpp index e242e3963..a0cbe80ef 100644 --- a/src/display/nr-filter-units.cpp +++ b/src/display/nr-filter-units.cpp @@ -12,7 +12,7 @@ #include <glib.h> #include "display/nr-filter-units.h" -#include "sp-filter-units.h" +#include "object/sp-filter-units.h" #include <2geom/transforms.h> using Geom::X; diff --git a/src/display/nr-filter-units.h b/src/display/nr-filter-units.h index 0ee6c3707..474d1e787 100644 --- a/src/display/nr-filter-units.h +++ b/src/display/nr-filter-units.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-filter-units.h" +#include "object/sp-filter-units.h" #include <2geom/affine.h> #include <2geom/rect.h> diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index a1bea4fce..4782f3f54 100644 --- a/src/display/nr-filter.cpp +++ b/src/display/nr-filter.cpp @@ -46,7 +46,7 @@ #include <2geom/affine.h> #include <2geom/rect.h> #include "svg/svg-length.h" -#include "sp-filter-units.h" +//#include "sp-filter-units.h" #include "preferences.h" namespace Inkscape { diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h index b48d4c938..573e6ca93 100644 --- a/src/display/nr-filter.h +++ b/src/display/nr-filter.h @@ -17,7 +17,7 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-types.h" #include "svg/svg-length.h" -#include "sp-filter-units.h" +#include "object/sp-filter-units.h" #include "inkgc/gc-managed.h" namespace Inkscape { diff --git a/src/display/nr-light.cpp b/src/display/nr-light.cpp index 791ae53da..47938f00c 100644 --- a/src/display/nr-light.cpp +++ b/src/display/nr-light.cpp @@ -13,9 +13,9 @@ #include "display/nr-light.h" #include "display/nr-3dutils.h" -#include "filters/distantlight.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" +#include "object/filters/distantlight.h" +#include "object/filters/pointlight.h" +#include "object/filters/spotlight.h" #include "color.h" namespace Inkscape { diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index 8b82a1dff..31bb27755 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -11,7 +11,7 @@ #include "display/nr-style.h" #include "style.h" -#include "sp-paint-server.h" +#include "object/sp-paint-server.h" #include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!) #include "display/drawing-context.h" #include "display/drawing-pattern.h" diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp index aeed761b3..c3354bc0b 100644 --- a/src/display/nr-svgfonts.cpp +++ b/src/display/nr-svgfonts.cpp @@ -16,22 +16,24 @@ #include <2geom/transforms.h> #include <cairo.h> #include <vector> -#include "sp-object.h" + #include "svg/svg.h" #include "display/cairo-utils.h" #include "display/nr-svgfonts.h" #include "display/nr-svgfonts.h" -#include "sp-path.h" -#include "sp-object-group.h" -#include "sp-use.h" -#include "sp-use-reference.h" #include "display/curve.h" + #include "xml/repr.h" -#include "sp-font-face.h" -#include "sp-glyph.h" -#include "sp-missing-glyph.h" -#include "sp-font.h" -#include "sp-glyph-kerning.h" + +#include "object/sp-path.h" +#include "object/sp-object-group.h" +#include "object/sp-use.h" +#include "object/sp-use-reference.h" +#include "object/sp-font-face.h" +#include "object/sp-glyph.h" +#include "object/sp-missing-glyph.h" +#include "object/sp-font.h" +#include "object/sp-glyph-kerning.h" // ************************// // UserFont Implementation // diff --git a/src/document-private.h b/src/document-private.h index 9cac8fac6..6ca36ac1a 100644 --- a/src/document-private.h +++ b/src/document-private.h @@ -20,8 +20,6 @@ #include <stddef.h> #include <sigc++/sigc++.h> #include "xml/event-fns.h" -#include "sp-defs.h" -#include "sp-root.h" #include "document.h" #include "composite-undo-stack-observer.h" @@ -30,6 +28,8 @@ // XXX only for testing! #include "console-output-undo-observer.h" +class SPObject; + namespace Inkscape { namespace XML { class Event; diff --git a/src/document-subset.cpp b/src/document-subset.cpp index 02607d527..e0ec941f6 100644 --- a/src/document-subset.cpp +++ b/src/document-subset.cpp @@ -8,12 +8,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <map> + #include "gc-finalized.h" #include "document-subset.h" #include "document.h" -#include "sp-object.h" -#include <map> +#include "object/sp-object.h" + namespace Inkscape { diff --git a/src/document.cpp b/src/document.cpp index 4c24d0a96..a2babbed7 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -39,33 +39,42 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif + #include <string> #include <cstring> + #include <2geom/transforms.h> -#include "widgets/desktop-widget.h" #include "desktop.h" #include "dir-util.h" -#include "display/drawing.h" #include "document-private.h" #include "document-undo.h" #include "file.h" #include "id-clash.h" -#include "inkscape.h" #include "inkscape-version.h" -#include "libavoid/router.h" -#include "persp3d.h" +#include "inkscape.h" #include "profile-manager.h" #include "rdf.h" -#include "sp-factory.h" -#include "sp-namedview.h" -#include "sp-symbol.h" -#include "xml/rebase-hrefs.h" +#include "display/drawing.h" + +#include "libavoid/router.h" + +#include "libcroco/cr-parser.h" #include "libcroco/cr-sel-eng.h" #include "libcroco/cr-selector.h" -#include "libcroco/cr-parser.h" -#include "src/xml/croco-node-iface.h" + +#include "object/persp3d.h" +#include "object/sp-factory.h" +#include "object/sp-defs.h" +#include "object/sp-root.h" +#include "object/sp-namedview.h" +#include "object/sp-symbol.h" + +#include "widgets/desktop-widget.h" + +#include "xml/croco-node-iface.h" +#include "xml/rebase-hrefs.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp index b608ea59c..e475b58a0 100644 --- a/src/extension/effect.cpp +++ b/src/extension/effect.cpp @@ -13,7 +13,6 @@ #include "helper/action.h" #include "ui/view/view.h" -#include "sp-namedview.h" #include "desktop.h" #include "implementation/implementation.h" #include "effect.h" diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index 588543a76..7e233d215 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -24,7 +24,7 @@ #include "document.h" #include "document-undo.h" #include "desktop.h" -#include "sp-namedview.h" +#include "object/sp-namedview.h" #include "display/sp-canvas.h" diff --git a/src/extension/find_extension_by_mime.h b/src/extension/find_extension_by_mime.h index 1686c62e4..bc963001e 100644 --- a/src/extension/find_extension_by_mime.h +++ b/src/extension/find_extension_by_mime.h @@ -19,6 +19,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "input.h" + namespace Inkscape { namespace Extension { static inline Inkscape::Extension::Extension *find_by_mime(const char *const mime) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 260204cb0..69d4869ea 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -37,7 +37,8 @@ #include "preferences.h" #include "script.h" #include "selection.h" -#include "sp-namedview.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" #include "extension/system.h" #include "ui/view/view.h" #include "xml/node.h" diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp index 8f6c503ca..99faef9d3 100644 --- a/src/extension/internal/bitmap/crop.cpp +++ b/src/extension/internal/bitmap/crop.cpp @@ -11,7 +11,8 @@ #include "crop.h" #include "selection-chemistry.h" -#include "sp-item-transform.h" +#include "object/sp-item.h" +#include "object/sp-item-transform.h" #include <Magick++.h> namespace Inkscape { diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp index 352271e26..636b9d6a4 100644 --- a/src/extension/internal/bitmap/imagemagick.cpp +++ b/src/extension/internal/bitmap/imagemagick.cpp @@ -23,7 +23,6 @@ #include "desktop.h" #include "selection.h" -#include "sp-object.h" #include "extension/effect.h" #include "extension/system.h" diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp index 1040ef194..f04007d00 100644 --- a/src/extension/internal/bluredge.cpp +++ b/src/extension/internal/bluredge.cpp @@ -20,7 +20,7 @@ #include "helper/action-context.h" #include "preferences.h" #include "path-chemistry.h" -#include "sp-item.h" +#include "object/sp-item.h" #include "extension/effect.h" #include "extension/system.h" diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp index 956fcce9a..3cdbee8c1 100644 --- a/src/extension/internal/cairo-png-out.cpp +++ b/src/extension/internal/cairo-png-out.cpp @@ -31,10 +31,8 @@ #include "display/curve.h" #include "display/canvas-bpath.h" -#include "sp-item.h" -#include "style.h" -#include "sp-root.h" -#include "sp-shape.h" +#include "object/sp-item.h" +#include "object/sp-root.h" #include "io/sys.h" #include "document.h" diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 57169ed45..287cf636f 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -34,10 +34,8 @@ #include "display/curve.h" #include "display/canvas-bpath.h" -#include "sp-item.h" -#include "style.h" -#include "sp-root.h" -#include "sp-shape.h" +#include "object/sp-item.h" +#include "object/sp-root.h" #include "io/sys.h" #include "document.h" diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h index b438b55b4..3c273f6d4 100644 --- a/src/extension/internal/cairo-ps-out.h +++ b/src/extension/internal/cairo-ps-out.h @@ -17,7 +17,6 @@ #define EXTENSION_INTERNAL_CAIRO_PS_OUT_H #include "extension/implementation/implementation.h" -#include "sp-item.h" #ifdef HAVE_CAIRO_PDF diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index b631f8c04..1878b2c89 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -36,16 +36,16 @@ #include "display/curve.h" #include "display/canvas-bpath.h" #include "display/cairo-utils.h" -#include "sp-item.h" -#include "sp-item-group.h" -#include "style.h" -#include "sp-hatch.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-pattern.h" -#include "sp-mask.h" -#include "sp-clippath.h" +#include "object/sp-item.h" +#include "object/sp-item-group.h" +#include "object/sp-hatch.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-mask.h" +#include "object/sp-clippath.h" + #include "util/units.h" #ifdef WIN32 #include "libnrtype/FontFactory.h" // USE_PANGO_WIN32 diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h index f75d05ea7..401b06885 100644 --- a/src/extension/internal/cairo-render-context.h +++ b/src/extension/internal/cairo-render-context.h @@ -24,7 +24,7 @@ #include <2geom/forward.h> #include <2geom/affine.h> -#include "style.h" +#include "style-internal.h" // SPIEnum #include <cairo.h> diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index 865de1a07..5b9759c15 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -33,8 +33,8 @@ #include "display/curve.h" #include "display/canvas-bpath.h" -#include "sp-item.h" -#include "sp-root.h" +#include "object/sp-item.h" +#include "object/sp-root.h" #include <2geom/affine.h> #include "document.h" diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 116364739..b48be2ed7 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -38,23 +38,22 @@ #include "display/curve.h" #include "display/canvas-bpath.h" #include "display/cairo-utils.h" -#include "sp-item.h" -#include "sp-item-group.h" -#include "style.h" -#include "sp-marker.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-root.h" -#include "sp-shape.h" -#include "sp-use.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-hatch-path.h" -#include "sp-image.h" -#include "sp-symbol.h" -#include "sp-pattern.h" -#include "sp-mask.h" -#include "sp-clippath.h" +#include "object/sp-item.h" +#include "object/sp-item-group.h" +#include "object/sp-marker.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-use.h" +#include "object/sp-text.h" +#include "object/sp-flowtext.h" +#include "object/sp-hatch-path.h" +#include "object/sp-image.h" +#include "object/sp-symbol.h" +#include "object/sp-pattern.h" +#include "object/sp-mask.h" +#include "object/sp-clippath.h" #include "util/units.h" #include "helper/png-write.h" diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h index abc0447d8..b069e5bfe 100644 --- a/src/extension/internal/cairo-renderer.h +++ b/src/extension/internal/cairo-renderer.h @@ -23,10 +23,9 @@ #include <string> //#include "libnrtype/font-instance.h" -#include "style.h" -#include "sp-item.h" #include <cairo.h> +class SPItem; class SPClipPath; class SPMask; class SPHatchPath; diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index 7342ad48d..bfba67282 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -55,6 +55,8 @@ #include "svg-view-widget.h" +#include "object/sp-root.h" + #include "util/units.h" namespace Inkscape { diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index 69fcd3424..8da11fc98 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -33,8 +33,8 @@ #include <libuemf/symbol_convert.h> #include "document.h" -#include "sp-root.h" // even though it is included indirectly by wmf-inout.h -#include "sp-path.h" +#include "object/sp-root.h" +#include "object/sp-path.h" #include "print.h" #include "extension/system.h" #include "extension/print.h" diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 58543b67e..539477a13 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -34,28 +34,29 @@ #include <2geom/pathvector.h> #include <2geom/rect.h> #include <2geom/curves.h> -#include <sp-clippath.h> #include "helper/geom.h" #include "helper/geom-curves.h" -#include "sp-item.h" #include "util/units.h" -#include "style.h" #include "inkscape-version.h" -#include "sp-root.h" #include "extension/system.h" #include "extension/print.h" #include "document.h" #include "path-prefix.h" -#include "sp-pattern.h" -#include "sp-image.h" -#include "sp-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-linear-gradient.h" + +#include "object/sp-pattern.h" +#include "object/sp-image.h" +#include "object/sp-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-item.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-clippath.h" +#include "style.h" #include "display/cairo-utils.h" -#include "sp-shape.h" #include "splivarot.h" // pieces for union on shapes #include "2geom/svg-path-parser.h" // to get from SVG text to Geom::Path diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index 5bad48de5..7ca602fec 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -19,7 +19,6 @@ #include <libuemf/uemf.h> #include "extension/internal/metafile-print.h" -#include "sp-gradient.h" #include "splivarot.h" // pieces for union on shapes #include "display/canvas-bpath.h" // for SPWindRule diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp index 0408d516e..166e5406f 100644 --- a/src/extension/internal/filter/filter.cpp +++ b/src/extension/internal/filter/filter.cpp @@ -10,13 +10,13 @@ #include "desktop.h" #include "selection.h" #include "document-private.h" -#include "sp-item.h" #include "extension/extension.h" #include "extension/effect.h" #include "extension/system.h" #include "xml/repr.h" #include "xml/simple-node.h" #include "xml/attribute-record.h" +#include "object/sp-defs.h" #include "filter.h" diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp index 26e6531dd..efac1a02e 100644 --- a/src/extension/internal/gdkpixbuf-input.cpp +++ b/src/extension/internal/gdkpixbuf-input.cpp @@ -14,7 +14,8 @@ #include "gdkpixbuf-input.h" #include "preferences.h" #include "selection-chemistry.h" -#include "sp-image.h" +#include "object/sp-image.h" +#include "object/sp-root.h" #include "util/units.h" #include <set> diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 649859ee5..c7ebf2494 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -23,7 +23,6 @@ #include "document.h" #include "selection.h" -#include "sp-object.h" #include "2geom/geom.h" #include "svg/path-string.h" diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 56ea46808..d4666fcee 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -25,10 +25,6 @@ #include "javafx-out.h" #include <inkscape.h> #include <inkscape-version.h> -#include <sp-path.h> -#include <sp-linear-gradient.h> -#include <sp-radial-gradient.h> -#include <style.h> #include <display/curve.h> #include <display/canvas-bpath.h> #include <svg/svg.h> @@ -39,7 +35,12 @@ #include "helper/geom.h" #include "helper/geom-curves.h" #include <io/sys.h> -#include "sp-root.h" + +#include "object/sp-root.h" +#include "object/sp-path.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "style.h" #include <string> #include <stdio.h> diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h index 2e0f5a124..ec1cde032 100644 --- a/src/extension/internal/javafx-out.h +++ b/src/extension/internal/javafx-out.h @@ -17,8 +17,9 @@ #include <glib.h> #include "extension/implementation/implementation.h" -#include <document.h> -#include <sp-gradient.h> +#include "document.h" + +class SPGradient; namespace Inkscape { diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp index 3ce2c5531..0581f8edd 100644 --- a/src/extension/internal/latex-pstricks-out.cpp +++ b/src/extension/internal/latex-pstricks-out.cpp @@ -13,13 +13,12 @@ # include <config.h> #endif #include "latex-pstricks-out.h" -#include "sp-path.h" #include <print.h> #include "extension/system.h" #include "extension/print.h" #include "extension/db.h" #include "display/drawing.h" -#include "sp-root.h" +#include "object/sp-root.h" #include "document.h" diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp index 018c56d82..83100d11e 100644 --- a/src/extension/internal/latex-pstricks.cpp +++ b/src/extension/internal/latex-pstricks.cpp @@ -28,7 +28,6 @@ #include "inkscape-version.h" #include "io/sys.h" #include "latex-pstricks.h" -#include "sp-item.h" #include "style.h" #include "document.h" #include <cstring> diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp index 6904d2e6e..85426e376 100644 --- a/src/extension/internal/latex-text-renderer.cpp +++ b/src/extension/internal/latex-text-renderer.cpp @@ -27,16 +27,17 @@ #include "libnrtype/Layout-TNG.h" #include <2geom/transforms.h> #include <2geom/rect.h> - #include <glibmm/i18n.h> -#include "sp-item.h" -#include "sp-item-group.h" + +#include "object/sp-item.h" +#include "object/sp-item-group.h" +#include "object/sp-root.h" +#include "object/sp-use.h" +#include "object/sp-text.h" +#include "object/sp-flowtext.h" +#include "object/sp-rect.h" #include "style.h" -#include "sp-root.h" -#include "sp-use.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-rect.h" + #include "text-editing.h" #include "util/units.h" diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp index 824934b3e..ae79c8a8a 100644 --- a/src/extension/internal/metafile-inout.cpp +++ b/src/extension/internal/metafile-inout.cpp @@ -17,25 +17,21 @@ #include <glib.h> #include <glibmm/miscutils.h> -#include "sp-root.h" #include "display/curve.h" #include "extension/internal/metafile-inout.h" // picks up PNG #include "extension/print.h" #include "path-prefix.h" -#include "sp-gradient.h" -#include "sp-image.h" -#include "sp-linear-gradient.h" -#include "sp-pattern.h" -#include "sp-radial-gradient.h" -#include "style.h" #include "document.h" #include "util/units.h" #include "ui/shape-editor.h" -#include "sp-namedview.h" #include "document-undo.h" #include "inkscape.h" #include "preferences.h" +#include "object/sp-root.h" +#include "object/sp-namedview.h" +#include "svg/stringstream.h" + namespace Inkscape { namespace Extension { namespace Internal { diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp index 68a425d85..fb44f8499 100644 --- a/src/extension/internal/metafile-print.cpp +++ b/src/extension/internal/metafile-print.cpp @@ -23,11 +23,11 @@ #include "extension/internal/metafile-print.h" #include "extension/print.h" #include "path-prefix.h" -#include "sp-gradient.h" -#include "sp-image.h" -#include "sp-linear-gradient.h" -#include "sp-pattern.h" -#include "sp-radial-gradient.h" +#include "object/sp-gradient.h" +#include "object/sp-image.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" #include "style.h" namespace Inkscape { diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 091be8c7d..42c2bbae3 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -52,7 +52,6 @@ //# Inkscape includes #include "clear-n_.h" #include "inkscape.h" -#include <style.h> #include "display/curve.h" #include <2geom/pathvector.h> #include <2geom/curves.h> @@ -63,20 +62,21 @@ #include "xml/repr.h" #include "xml/attribute-record.h" -#include "sp-image.h" -#include "sp-gradient.h" -#include "sp-stop.h" -#include "gradient-chemistry.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-path.h" -#include "sp-text.h" -#include "sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-gradient.h" +#include "object/sp-stop.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-path.h" +#include "object/sp-text.h" +#include "object/sp-flowtext.h" +#include "object/uri.h" +#include "style.h" + #include "svg/svg.h" #include "text-editing.h" #include "util/units.h" -#include "uri.h" #include "inkscape-version.h" #include "document.h" diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 9a1cfadf0..2e01d2e49 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -32,8 +32,8 @@ #include <string> #include <map> -#include "uri.h" -#include "sp-item.h" +#include "object/uri.h" +class SPItem; #include <glibmm/ustring.h> diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 6e0ee75aa..552051eed 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -40,6 +40,12 @@ #include <glibmm/convert.h> #include <glibmm/miscutils.h> +#include <gtk/gtk.h> +#include <glibmm/i18n.h> + +#include "ui/dialog-events.h" +#include "ui/widget/spinbutton.h" +#include "ui/widget/frame.h" #include "extension/system.h" #include "extension/input.h" @@ -51,11 +57,8 @@ #include "inkscape.h" #include "util/units.h" -#include "ui/dialog-events.h" -#include <gtk/gtk.h> -#include "ui/widget/spinbutton.h" -#include "ui/widget/frame.h" -#include <glibmm/i18n.h> +#include "object/sp-root.h" + #include <gdkmm/general.h> diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index a448be639..6fad4c3eb 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -38,6 +38,7 @@ #include "io/base64stream.h" #include "display/nr-filter-utils.h" #include "libnrtype/font-instance.h" +#include "object/sp-defs.h" #include "Function.h" #include "GfxState.h" diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 8df883069..15acb97ec 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -24,8 +24,6 @@ #include "pov-out.h" #include <inkscape.h> #include <inkscape-version.h> -#include <sp-path.h> -#include <style.h> #include <display/curve.h> #include <extension/system.h> #include <2geom/pathvector.h> @@ -34,7 +32,10 @@ #include "helper/geom.h" #include "helper/geom-curves.h" #include <io/sys.h> -#include "sp-root.h" + +#include "object/sp-root.h" +#include "object/sp-path.h" +#include "style.h" #include <string> #include <stdio.h> diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h index dddc7e6b2..3f7aa7e90 100644 --- a/src/extension/internal/pov-out.h +++ b/src/extension/internal/pov-out.h @@ -18,8 +18,9 @@ #include <glib.h> #include "extension/implementation/implementation.h" -#include <sp-path.h> +class SPObject; +class SPItem; namespace Inkscape { diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index b05a7c19b..7bf4f34e6 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -21,14 +21,13 @@ #include <vector> #include <giomm/file.h> -#include "sp-object.h" + #include "svg.h" #include "file.h" #include "extension/system.h" #include "extension/output.h" #include "xml/attribute-record.h" #include "xml/simple-document.h" -#include "sp-root.h" #include "document.h" namespace Inkscape { diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index cf5dd64f4..7c92a895d 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -54,6 +54,7 @@ #include "svg-view-widget.h" +#include "object/sp-root.h" #include "util/units.h" diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index e2d1433e4..a91725f6b 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -34,8 +34,8 @@ #include <libuemf/symbol_convert.h> #include "document.h" -#include "sp-root.h" // even though it is included indirectly by wmf-inout.h -#include "sp-path.h" +#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h +#include "object/sp-path.h" #include "print.h" #include "extension/system.h" #include "extension/print.h" diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 3df237ce3..ccf5ddd0b 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -38,11 +38,8 @@ #include <2geom/curves.h> #include "helper/geom.h" #include "helper/geom-curves.h" -#include "sp-item.h" -#include "style.h" #include "inkscape-version.h" -#include "sp-root.h" #include "util/units.h" @@ -50,17 +47,19 @@ #include "extension/print.h" #include "document.h" #include "path-prefix.h" -#include "sp-pattern.h" -#include "sp-image.h" -#include "sp-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-linear-gradient.h" -#include "display/cairo-utils.h" + +#include "object/sp-pattern.h" +#include "object/sp-image.h" +#include "object/sp-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-root.h" +#include "object/sp-item.h" #include "splivarot.h" // pieces for union on shapes #include <2geom/svg-path-parser.h> // to get from SVG text to Geom::Path #include "display/canvas-bpath.h" // for SPWindRule -#include "display/cairo-utils.h" // for Inkscape::Pixbuf::PF_CAIRO +#include "display/cairo-utils.h" // for Inkscape::Pixbuf::PF_CAIRO #include "wmf-print.h" diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index e4cf19184..45b94441c 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -18,7 +18,6 @@ #include <libuemf/uwmf.h> #include "extension/internal/metafile-print.h" -#include "sp-gradient.h" #include "splivarot.h" // pieces for union on shapes #include "display/canvas-bpath.h" // for SPWindRule diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index 37f26c4bb..2f3bfe27b 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -48,7 +48,7 @@ #include "extension/system.h" #include "extension/input.h" #include "document.h" -#include "sp-root.h" +#include "object/sp-root.h" #include "util/units.h" #include <cstring> diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index db34a6ef9..ddcbb358b 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -25,7 +25,6 @@ #include "xml/node.h" #include "extension/extension.h" #include "document-private.h" -#include "sp-object.h" #include "enum.h" #include "preferences.h" diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index 220d6eb32..e47644f45 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -28,7 +28,6 @@ #include <extension/extension.h> #include "preferences.h" #include "document-private.h" -#include "sp-object.h" #include "notebook.h" diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 5c4fe591f..7220045c4 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -26,7 +26,7 @@ #include <extension/extension.h> #include "document-private.h" -#include "sp-object.h" +#include "object/sp-defs.h" #include <color.h> #include "parameter.h" diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index ca6dbb31d..890b92219 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -27,7 +27,6 @@ #include "extension/extension.h" #include "preferences.h" #include "document-private.h" -#include "sp-object.h" #include "radiobutton.h" diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp index e30ec97df..1e9e093ef 100644 --- a/src/extension/patheffect.cpp +++ b/src/extension/patheffect.cpp @@ -12,6 +12,8 @@ #include "patheffect.h" #include "db.h" +#include "object/sp-defs.h" + namespace Inkscape { namespace Extension { diff --git a/src/extension/print.h b/src/extension/print.h index c1afe59b3..b5e6c1065 100644 --- a/src/extension/print.h +++ b/src/extension/print.h @@ -13,7 +13,8 @@ #include "extension.h" -#include "sp-item.h" +class SPItem; +class SPStyle; namespace Inkscape { diff --git a/src/file-update.cpp b/src/file-update.cpp index 1d95b5d4c..0585fa875 100644 --- a/src/file-update.cpp +++ b/src/file-update.cpp @@ -8,47 +8,52 @@ * Marc Jeanmougin * su_v */ +#include <clocale> +#include <string> + #include <gtkmm.h> +#include "desktop.h" +#include "dir-util.h" +#include "document-undo.h" +#include "document.h" +#include "file.h" +#include "inkscape.h" +#include "message-stack.h" +#include "message.h" +#include "preferences.h" +#include "print.h" +#include "proj_pt.h" +#include "selection-chemistry.h" +#include "text-editing.h" +#include "verbs.h" + +#include "display/canvas-grid.h" + #include "extension/effect.h" #include "extension/db.h" #include "extension/input.h" #include "extension/output.h" #include "extension/system.h" -#include "inkscape.h" -#include "preferences.h" +#include "io/sys.h" -#include "file.h" -#include "sp-root.h" -#include "sp-text.h" -#include "sp-tspan.h" -#include "sp-flowdiv.h" -#include "sp-flowtext.h" -#include "sp-object.h" -#include "sp-item.h" +#include "object/persp3d.h" +#include "object/sp-defs.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowtext.h" +#include "object/sp-guide.h" +#include "object/sp-item.h" +#include "object/sp-namedview.h" +#include "object/sp-object.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "object/sp-tspan.h" #include "style.h" -#include "sp-defs.h" -#include "dir-util.h" -#include "document.h" -#include <string> -#include <clocale> -#include "text-editing.h" -#include "document-undo.h" -#include "display/canvas-grid.h" -#include "sp-guide.h" -#include "selection-chemistry.h" -#include "persp3d.h" -#include "proj_pt.h" -#include "ui/shape-editor.h" -#include "io/sys.h" -#include "print.h" + #include "ui/interface.h" -#include "desktop.h" -#include "message.h" -#include "message-stack.h" -#include "verbs.h" -#include "sp-namedview.h" +#include "ui/shape-editor.h" + using Inkscape::DocumentUndo; using namespace std; diff --git a/src/file.cpp b/src/file.cpp index e0134e839..06db60765 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -33,38 +33,45 @@ #include <gtkmm.h> -#include "ui/dialog/ocaldialogs.h" -#include "desktop.h" +#include "file.h" -#include "extension/effect.h" +#include "desktop.h" #include "document-private.h" #include "document-undo.h" -#include "ui/tools/tool-base.h" -#include "extension/db.h" -#include "extension/input.h" -#include "extension/output.h" -#include "file.h" -#include "helper/png-write.h" +#include "event-log.h" #include "id-clash.h" -#include "inkscape.h" #include "inkscape-version.h" -#include "ui/interface.h" -#include "io/sys.h" -#include "io/resource.h" +#include "inkscape.h" #include "message-stack.h" #include "path-prefix.h" #include "print.h" -#include "resource-manager.h" #include "rdf.h" +#include "resource-manager.h" #include "selection-chemistry.h" -#include "sp-namedview.h" +#include "verbs.h" + +#include "extension/db.h" +#include "extension/effect.h" +#include "extension/input.h" +#include "extension/output.h" + +#include "helper/png-write.h" + +#include "io/resource.h" +#include "io/sys.h" + +#include "object/sp-namedview.h" +#include "object/sp-root.h" #include "style.h" + +#include "ui/dialog/font-substitution.h" +#include "ui/dialog/ocaldialogs.h" +#include "ui/interface.h" +#include "ui/tools/tool-base.h" #include "ui/view/view-widget.h" + #include "xml/rebase-hrefs.h" #include "xml/sp-css-attr.h" -#include "verbs.h" -#include "event-log.h" -#include "ui/dialog/font-substitution.h" using Inkscape::DocumentUndo; diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp index 560e73322..2ab7aff48 100644 --- a/src/filter-chemistry.cpp +++ b/src/filter-chemistry.cpp @@ -17,15 +17,17 @@ #include <cstring> #include <glibmm.h> -#include "style.h" #include "document-private.h" #include "desktop-style.h" #include "filter-chemistry.h" #include "filter-enums.h" -#include "filters/blend.h" -#include "filters/gaussian-blur.h" +#include "object/sp-defs.h" +#include "object/sp-item.h" +#include "style.h" +#include "object/filters/blend.h" +#include "object/filters/gaussian-blur.h" /** * Count how many times the filter is used by the styles of o and its diff --git a/src/filter-enums.h b/src/filter-enums.h index 3ced5ab94..fb289c898 100644 --- a/src/filter-enums.h +++ b/src/filter-enums.h @@ -20,7 +20,7 @@ #include "display/nr-filter-morphology.h" #include "display/nr-filter-turbulence.h" #include "display/nr-filter-types.h" -#include "filters/displacementmap.h" +#include "object/filters/displacementmap.h" #include "util/enums.h" // Filter primitives diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt deleted file mode 100644 index 50d4bc33a..000000000 --- a/src/filters/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ - -set(filters_SRC - blend.cpp - colormatrix.cpp - componenttransfer-funcnode.cpp - componenttransfer.cpp - composite.cpp - convolvematrix.cpp - diffuselighting.cpp - displacementmap.cpp - distantlight.cpp - flood.cpp - gaussian-blur.cpp - image.cpp - merge.cpp - mergenode.cpp - morphology.cpp - offset.cpp - pointlight.cpp - specularlighting.cpp - spotlight.cpp - tile.cpp - turbulence.cpp - - - # ------- - # Headers - blend.h - colormatrix.h - componenttransfer-funcnode.h - componenttransfer.h - composite.h - convolvematrix.h - diffuselighting.h - displacementmap.h - distantlight.h - flood.h - gaussian-blur.h - image.h - merge.h - mergenode.h - morphology.h - offset.h - pointlight.h - specularlighting.h - spotlight.h - tile.h - turbulence.h -) - -# add_inkscape_lib(filters_LIB "${filters_SRC}"") -add_inkscape_source("${filters_SRC}") diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp index cc676bffe..110aa8b38 100644 --- a/src/gradient-chemistry.cpp +++ b/src/gradient-chemistry.cpp @@ -18,38 +18,40 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "widgets/gradient-vector.h" +#include <glibmm/i18n.h> #include <2geom/transforms.h> #include <2geom/bezier-curve.h> #include <2geom/crossing.h> #include <2geom/line.h> -#include "style.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-private.h" #include "document-undo.h" -#include "desktop.h" -#include "desktop-style.h" - -#include "ui/tools/tool-base.h" +#include "gradient-chemistry.h" +#include "gradient-drag.h" #include "selection.h" #include "verbs.h" -#include <glibmm/i18n.h> -#include "sp-gradient-reference.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-stop.h" -#include "gradient-drag.h" -#include "gradient-chemistry.h" +#include "object/sp-defs.h" +#include "object/sp-gradient-reference.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" +#include "object/sp-text.h" +#include "object/sp-tspan.h" +#include "style.h" -#include "sp-text.h" -#include "sp-tspan.h" #include "svg/svg.h" #include "svg/svg-color.h" #include "svg/css-ostringstream.h" +#include "ui/tools/tool-base.h" + +#include "widgets/gradient-vector.h" + #define noSP_GR_VERBOSE using Inkscape::DocumentUndo; diff --git a/src/gradient-chemistry.h b/src/gradient-chemistry.h index 792ccc72e..4da56af13 100644 --- a/src/gradient-chemistry.h +++ b/src/gradient-chemistry.h @@ -18,11 +18,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-gradient.h" +#include "object/sp-gradient.h" class SPCSSAttr; class SPItem; -typedef unsigned int guint32; +class SPGradient; +class SPDesktop; + /** * Either normalizes given gradient to vector, or returns fresh normalized diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index 41045f33f..a67d18e9f 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -18,40 +18,44 @@ #include <config.h> #endif -#include <glibmm/i18n.h> #include <cstring> #include <string> +#include <glibmm/i18n.h> -#include "selection.h" -#include "desktop.h" #include "desktop-style.h" - -#include "document.h" +#include "desktop.h" #include "document-undo.h" -#include "display/sp-ctrlline.h" -#include "display/sp-ctrlcurve.h" -#include "display/sp-canvas-util.h" -#include "xml/sp-css-attr.h" -#include "svg/css-ostringstream.h" -#include "svg/svg.h" -#include "inkscape.h" -#include "style.h" -#include "knot.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" +#include "document.h" #include "gradient-chemistry.h" #include "gradient-drag.h" -#include "sp-stop.h" -#include "snap.h" -#include "sp-namedview.h" +#include "inkscape.h" +#include "knot.h" #include "selection-chemistry.h" +#include "selection.h" +#include "snap.h" #include "verbs.h" + +#include "display/sp-canvas-util.h" #include "display/sp-canvas.h" +#include "display/sp-ctrlcurve.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-namedview.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" +#include "style.h" + +#include "svg/css-ostringstream.h" +#include "svg/svg.h" + #include "ui/control-manager.h" #include "ui/tools/tool-base.h" +#include "xml/sp-css-attr.h" + using Inkscape::ControlManager; using Inkscape::CtrlLineType; using Inkscape::DocumentUndo; diff --git a/src/gradient-drag.h b/src/gradient-drag.h index 1fe2fb3f0..3e9e7a151 100644 --- a/src/gradient-drag.h +++ b/src/gradient-drag.h @@ -26,8 +26,8 @@ #include <2geom/point.h> -#include "sp-gradient.h" // TODO refactor enums to external .h file -#include "sp-mesh-array.h" +#include "object/sp-gradient.h" // TODO refactor enums to external .h file +#include "object/sp-mesh-array.h" class SPKnot; diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp index ba8cd10d5..31115b999 100644 --- a/src/graphlayout.cpp +++ b/src/graphlayout.cpp @@ -12,24 +12,29 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ +#include <algorithm> +#include <cstring> #include <iostream> #include <map> #include <vector> -#include <algorithm> -#include <cstring> + #include <2geom/transforms.h> +#include "conn-avoid-ref.h" #include "desktop.h" -#include "inkscape.h" -#include "sp-namedview.h" #include "graphlayout.h" -#include "sp-item-transform.h" -#include "style.h" -#include "conn-avoid-ref.h" +#include "inkscape.h" + #include "libavoid/router.h" + #include "libcola/cola.h" #include "libcola/connected_components.h" +#include "object/sp-item-transform.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "style.h" + using namespace std; using namespace cola; using namespace vpsc; diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp index 17f2d9583..96864f8e5 100644 --- a/src/guide-snapper.cpp +++ b/src/guide-snapper.cpp @@ -11,9 +11,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-namedview.h" #include "desktop.h" -#include "sp-guide.h" + +#include "object/sp-guide.h" +#include "object/sp-namedview.h" Inkscape::GuideSnapper::GuideSnapper(SnapManager *sm, Geom::Coord const d) : LineSnapper(sm, d) { diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 8881f54a5..3b43735ad 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -23,8 +23,9 @@ #include "display/drawing.h" #include "display/drawing-context.h" #include "document.h" -#include "sp-root.h" -#include "sp-defs.h" +#include "object/sp-root.h" +#include "object/sp-defs.h" +#include "object/sp-use.h" #include "util/units.h" #include "helper/pixbuf-ops.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index e06c539d3..93b07d410 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -25,15 +25,16 @@ #include "io/sys.h" #include "display/drawing.h" #include "display/drawing-context.h" +#include "display/cairo-utils.h" #include "document.h" -#include "sp-item.h" -#include "sp-root.h" -#include "sp-defs.h" #include "preferences.h" #include "rdf.h" -#include "display/cairo-utils.h" #include "util/units.h" +#include "object/sp-item.h" +#include "object/sp-root.h" +#include "object/sp-defs.h" + /* This is an example of how to use libpng to read and write PNG files. * The file libpng.txt is much more verbose then this. If you have not * read it, do so first. This was designed to be a starting point of an diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index 930640a6c..d33186344 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -25,17 +25,17 @@ #include "path-prefix.h" #include <xml/repr.h> -#include "sp-gradient.h" #include "document-private.h" -#include "sp-pattern.h" -#include "sp-marker.h" #include "desktop.h" #include "inkscape.h" #include "io/sys.h" #include "stock-items.h" - +#include "object/sp-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-marker.h" +#include "object/sp-defs.h" static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc); static SPObject *sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc); diff --git a/src/id-clash.cpp b/src/id-clash.cpp index 162cb9e89..146eeb2b5 100644 --- a/src/id-clash.cpp +++ b/src/id-clash.cpp @@ -20,11 +20,12 @@ #include "extract-uri.h" #include "id-clash.h" -#include "sp-object.h" + +#include "object/sp-gradient.h" +#include "object/sp-object.h" +#include "object/sp-paint-server.h" +#include "object/sp-root.h" #include "style.h" -#include "sp-paint-server.h" -#include "sp-root.h" -#include "sp-gradient.h" typedef enum { REF_HREF, REF_STYLE, REF_URL, REF_CLIPBOARD } ID_REF_TYPE; diff --git a/src/io/uristream.h b/src/io/uristream.h index 92fc0f76f..f51df6e74 100644 --- a/src/io/uristream.h +++ b/src/io/uristream.h @@ -15,13 +15,16 @@ */ -#include <uri.h> +#include "object/uri.h" #include "inkscapestream.h" namespace Inkscape { + +class URI; + namespace IO { diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp index bb7ef6eb3..b1ca394e4 100644 --- a/src/knot-holder-entity.cpp +++ b/src/knot-holder-entity.cpp @@ -16,16 +16,18 @@ */ #include "knot-holder-entity.h" + +#include "desktop.h" +#include "inkscape.h" #include "knotholder.h" -#include "sp-item.h" -#include "style.h" -#include "preferences.h" #include "macros.h" -#include "sp-pattern.h" +#include "preferences.h" #include "snap.h" -#include "desktop.h" -#include "inkscape.h" -#include "sp-namedview.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/knotholder.cpp b/src/knotholder.cpp index 5fbccf52d..58469107d 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -13,32 +13,39 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "document.h" -#include "document-undo.h" +#include "knotholder.h" + #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "knot-holder-entity.h" +#include "knot.h" #include "verbs.h" -#include "box3d.h" + +#include "live_effects/effect.h" +#include "live_effects/lpeobject.h" + +#include "object/box3d.h" +#include "object/sp-ellipse.h" +#include "object/sp-offset.h" +#include "object/sp-pattern.h" +#include "object/sp-rect.h" +#include "object/sp-shape.h" +#include "object/sp-spiral.h" +#include "object/sp-star.h" #include "style.h" -#include "knot.h" -#include "knotholder.h" -#include "knot-holder-entity.h" + #include "display/sp-canvas.h" -#include "ui/tools/rect-tool.h" -#include "ui/tools/arc-tool.h" + +#include "ui/control-manager.h" +#include "ui/shape-editor.h" #include "ui/tools-switch.h" -#include "ui/tools/tweak-tool.h" +#include "ui/tools/arc-tool.h" #include "ui/tools/node-tool.h" -#include "ui/shape-editor.h" +#include "ui/tools/rect-tool.h" #include "ui/tools/spiral-tool.h" -#include "ui/control-manager.h" -#include "sp-shape.h" -#include "sp-ellipse.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-offset.h" -#include "sp-pattern.h" -#include "live_effects/lpeobject.h" -#include "live_effects/effect.h" +#include "ui/tools/tweak-tool.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp index d115910b1..0bc721c37 100644 --- a/src/layer-fns.cpp +++ b/src/layer-fns.cpp @@ -15,11 +15,14 @@ #endif #include "document.h" -#include "sp-item-group.h" -#include "xml/repr.h" -#include "util/find-last-if.h" #include "layer-fns.h" +#include "object/sp-item-group.h" + +#include "util/find-last-if.h" + +#include "xml/repr.h" + // TODO move the documentation comments into the .h file namespace Inkscape { diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index f68175055..a42f0d4cc 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -9,19 +9,25 @@ */ #include <set> + #include <sigc++/functors/mem_fun.h> #include <sigc++/adaptors/hide.h> -#include "inkgc/gc-managed.h" -#include "gc-finalized.h" -#include "document.h" -#include "desktop.h" + +#include "desktop.h" +#include "document.h" +#include "gc-finalized.h" #include "layer-manager.h" #include "selection.h" -#include "sp-item-group.h" -#include "xml/node-observer.h" + +#include "inkgc/gc-managed.h" + +#include "object/sp-item-group.h" + #include "util/format.h" +#include "xml/node-observer.h" + namespace Inkscape { diff --git a/src/layer-model.cpp b/src/layer-model.cpp index 3de96e0d1..62f47966f 100644 --- a/src/layer-model.cpp +++ b/src/layer-model.cpp @@ -25,14 +25,16 @@ #include <config.h> #endif +#include "layer-model.h" + #include "document.h" #include "layer-fns.h" -#include "layer-model.h" #include "object-hierarchy.h" -#include "sp-defs.h" -#include "sp-item.h" -#include "sp-item-group.h" -#include "sp-root.h" + +#include "object/sp-defs.h" +#include "object/sp-item.h" +#include "object/sp-item-group.h" +#include "object/sp-root.h" // Callbacks static void _layer_activated(SPObject *layer, Inkscape::LayerModel *layer_model); diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index dfbb84793..2ef689a88 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -12,7 +12,7 @@ #include "style.h" #include "font-instance.h" #include "svg/svg-length.h" -#include "sp-object.h" +#include "object/sp-object.h" #include "Layout-TNG-Scanline-Maker.h" #include <limits> diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp index 98ce7d526..6ad3bc23b 100644 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -21,8 +21,6 @@ #include "Layout-TNG.h" #include "style.h" #include "svg/svg-length.h" -#include "sp-object.h" -#include "sp-string.h" #include "FontFactory.h" diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 1b75f70af..ca15baa81 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -15,8 +15,8 @@ #include "document.h" #include "inkscape.h" #include "preferences.h" -#include "sp-object.h" -#include "sp-root.h" +#include "object/sp-object.h" +#include "object/sp-root.h" #include "xml/repr.h" #include <glibmm/regex.h> @@ -183,8 +183,8 @@ void FontLister::insert_font_family(Glib::ustring new_family) void FontLister::update_font_list(SPDocument *document) { - SPObject *r = document->getRoot(); - if (!r) { + SPObject *root = document->getRoot(); + if (!root) { return; } @@ -217,7 +217,7 @@ void FontLister::update_font_list(SPDocument *document) /* Get "font-family"s used in document. */ std::list<Glib::ustring> fontfamilies; - update_font_list_recursive(r, &fontfamilies); + update_font_list_recursive(root, &fontfamilies); fontfamilies.sort(); fontfamilies.unique(); diff --git a/src/line-geometry.h b/src/line-geometry.h index a77d6e1f3..34c79d9dd 100644 --- a/src/line-geometry.h +++ b/src/line-geometry.h @@ -16,7 +16,7 @@ #include <boost/optional.hpp> #include "axis-manip.h" // FIXME: This is only for Box3D::epsilon; move that to a better location -#include "persp3d.h" +#include "object/persp3d.h" class SPDesktop; typedef unsigned int guint32; diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h index da1edc6b3..2651f4d7f 100644 --- a/src/livarot/Shape.h +++ b/src/livarot/Shape.h @@ -17,7 +17,7 @@ #include <2geom/point.h> #include "livarot/LivarotDefs.h" -#include "object-set.h" +#include "object/object-set.h" class Path; class FloatLigne; diff --git a/src/livarot/int-line.h b/src/livarot/int-line.h index ed3ccfb96..0a52d4639 100644 --- a/src/livarot/int-line.h +++ b/src/livarot/int-line.h @@ -2,7 +2,7 @@ #define INKSCAPE_LIVAROT_INT_LINE_H #include "livarot/LivarotDefs.h" -#include "object-set.h" +#include "object/object-set.h" // For BooleanOp /** \file * Coverage with integer boundaries. diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index a1fe9855a..b827cff4b 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -67,7 +67,11 @@ #include "live_effects/lpe-embrodery-stitch.h" #include "live_effects/lpe-bool.h" +#include "live_effects/lpeobject.h" + #include "xml/node-event-vector.h" +#include "xml/sp-css-attr.h" + #include "message-stack.h" #include "document-private.h" #include "ui/tools/pen-tool.h" @@ -75,12 +79,14 @@ #include "ui/tools-switch.h" #include "knotholder.h" #include "path-chemistry.h" -#include "xml/sp-css-attr.h" -#include "live_effects/lpeobject.h" -#include <pangomm/layout.h> #include "display/curve.h" + +#include "object/sp-defs.h" +#include "object/sp-shape.h" + #include <stdio.h> #include <string.h> +#include <pangomm/layout.h> #include <gtkmm/expander.h> namespace Inkscape { diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp index 56d33eb4b..4b64f048e 100644 --- a/src/live_effects/lpe-angle_bisector.cpp +++ b/src/live_effects/lpe-angle_bisector.cpp @@ -10,7 +10,7 @@ #include "live_effects/lpe-angle_bisector.h" #include "2geom/sbasis-to-bezier.h" -#include "sp-lpe-item.h" + #include "knot-holder-entity.h" #include "knotholder.h" // TODO due to internal breakage in glibmm headers, this must be last: diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp index 302165719..ea2965c6a 100644 --- a/src/live_effects/lpe-attach-path.cpp +++ b/src/live_effects/lpe-attach-path.cpp @@ -7,8 +7,6 @@ #include <math.h> #include "live_effects/lpe-attach-path.h" #include "display/curve.h" -#include "sp-shape.h" -#include "sp-text.h" #include "2geom/path-sink.h" // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 1988f34f9..314ddc84c 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -6,7 +6,6 @@ */ #include "live_effects/lpe-bendpath.h" -#include "sp-item-group.h" #include "knot-holder-entity.h" #include "knotholder.h" #include "display/curve.h" diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index 6299b282b..259acba4e 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -14,19 +14,19 @@ #include "live_effects/lpe-bool.h" #include "display/curve.h" -#include "sp-item.h" + #include "2geom/path.h" -#include "sp-shape.h" -#include "sp-text.h" #include "2geom/bezier-curve.h" #include "2geom/path-sink.h" #include "2geom/affine.h" -#include "splivarot.h" +#include "2geom/svg-path-parser.h" + #include "helper/geom.h" + +#include "splivarot.h" #include "livarot/Path.h" #include "livarot/Shape.h" #include "livarot/path-description.h" -#include "2geom/svg-path-parser.h" namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp index c83d7e3bc..ba519f1c6 100644 --- a/src/live_effects/lpe-bounding-box.cpp +++ b/src/live_effects/lpe-bounding-box.cpp @@ -6,8 +6,7 @@ #include "live_effects/lpe-bounding-box.h" #include "display/curve.h" -#include "sp-shape.h" -#include "sp-text.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp index 721a4ecab..f00759921 100644 --- a/src/live_effects/lpe-bspline.cpp +++ b/src/live_effects/lpe-bspline.cpp @@ -6,7 +6,7 @@ #include "ui/widget/scalar.h" #include "display/curve.h" #include "helper/geom-curves.h" -#include "sp-path.h" +#include "object/sp-path.h" #include "svg/svg.h" #include "xml/repr.h" #include "preferences.h" diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp index 3da6dfbe6..413c18893 100644 --- a/src/live_effects/lpe-clone-original.cpp +++ b/src/live_effects/lpe-clone-original.cpp @@ -12,8 +12,12 @@ #include "display/curve.h" #include "svg/path-string.h" #include "svg/svg.h" -#include "sp-clippath.h" -#include "sp-mask.h" + +#include "object/sp-clippath.h" +#include "object/sp-mask.h" +#include "object/sp-path.h" +#include "object/sp-shape.h" + #include "xml/sp-css-attr.h" // TODO due to internal breakage in glibmm headers, this must be last: diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 3abcbf217..ebcb95f0d 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -20,10 +20,13 @@ #include "display/curve.h" #include "svg/path-string.h" #include "svg/svg.h" -#include "style.h" #include "helper/geom.h" #include "xml/sp-css-attr.h" #include "path-chemistry.h" + +#include "object/sp-path.h" +#include "object/sp-shape.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp index f8d2e56ca..1ee29bbaf 100644 --- a/src/live_effects/lpe-curvestitch.cpp +++ b/src/live_effects/lpe-curvestitch.cpp @@ -15,11 +15,13 @@ #include "ui/widget/scalar.h" #include "live_effects/lpe-curvestitch.h" -#include "sp-path.h" +#include "object/sp-path.h" + #include "svg/svg.h" #include "xml/repr.h" #include <2geom/bezier-to-sbasis.h> + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp index 4a3ad7508..0b144053e 100644 --- a/src/live_effects/lpe-extrude.cpp +++ b/src/live_effects/lpe-extrude.cpp @@ -12,7 +12,7 @@ */ #include "live_effects/lpe-extrude.h" -#include "sp-item.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp index 7e2131f76..85b78f688 100644 --- a/src/live_effects/lpe-fill-between-many.cpp +++ b/src/live_effects/lpe-fill-between-many.cpp @@ -11,10 +11,12 @@ #include "display/curve.h" #include "inkscape.h" #include "selection.h" -#include "sp-shape.h" -#include "sp-text.h" -#include "sp-defs.h" + +#include "object/sp-defs.h" +#include "object/sp-shape.h" + #include "svg/svg.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp index f8d86ae99..37d13830c 100644 --- a/src/live_effects/lpe-fill-between-strokes.cpp +++ b/src/live_effects/lpe-fill-between-strokes.cpp @@ -6,9 +6,8 @@ #include "live_effects/lpe-fill-between-strokes.h" #include "display/curve.h" -#include "sp-shape.h" -#include "sp-text.h" #include "svg/svg.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index fb78c2065..94a43b728 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -9,14 +9,18 @@ */ #include "live_effects/lpe-fillet-chamfer.h" + #include "helper/geom.h" -#include "display/curve.h" #include "helper/geom-curves.h" #include "helper/geom-satellite.h" + #include <2geom/elliptical-arc.h> #include "knotholder.h" +#include "display/curve.h" #include <boost/optional.hpp> +#include "object/sp-shape.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp index db3faa307..f6b42cfb9 100644 --- a/src/live_effects/lpe-interpolate.cpp +++ b/src/live_effects/lpe-interpolate.cpp @@ -13,8 +13,10 @@ #include <2geom/sbasis-to-bezier.h> -#include "sp-path.h" #include "display/curve.h" + +#include "object/sp-path.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp index 0e1e46a94..b58fd01da 100644 --- a/src/live_effects/lpe-jointype.cpp +++ b/src/live_effects/lpe-jointype.cpp @@ -10,15 +10,21 @@ #include "live_effects/parameter/enum.h" #include "helper/geom-pathstroke.h" -#include "style.h" -#include "svg/svg-color.h" #include "desktop-style.h" -#include "svg/css-ostringstream.h" + #include "display/curve.h" +#include "object/sp-item-group.h" +#include "object/sp-shape.h" +#include "style.h" + +#include "svg/css-ostringstream.h" +#include "svg/svg-color.h" + #include <2geom/elliptical-arc.h> #include "lpe-jointype.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index b3918b6ab..d62965ca8 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -12,11 +12,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-shape.h" -#include "sp-path.h" #include "display/curve.h" #include "live_effects/lpe-knot.h" -#include "style.h" #include "knot-holder-entity.h" #include "knotholder.h" @@ -27,6 +24,10 @@ #include <2geom/basic-intersection.h> #include "helper/geom.h" +#include "object/sp-shape.h" +#include "object/sp-path.h" +#include "style.h" + // for change crossing undo #include "verbs.h" #include "document.h" diff --git a/src/live_effects/lpe-knot.h b/src/live_effects/lpe-knot.h index ac518b97c..c268b051a 100644 --- a/src/live_effects/lpe-knot.h +++ b/src/live_effects/lpe-knot.h @@ -13,7 +13,7 @@ #ifndef INKSCAPE_LPE_KNOT_H #define INKSCAPE_LPE_KNOT_H -#include "sp-item-group.h" + #include "live_effects/effect.h" #include "live_effects/lpegroupbbox.h" #include "live_effects/parameter/parameter.h" @@ -22,6 +22,8 @@ #include "live_effects/parameter/bool.h" #include "2geom/crossing.h" +class SPLPEItem; + namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp index 57bff2034..9bfa2c52e 100644 --- a/src/live_effects/lpe-measure-segments.cpp +++ b/src/live_effects/lpe-measure-segments.cpp @@ -20,24 +20,25 @@ #include "util/units.h" #include "svg/svg-length.h" #include "svg/svg-color.h" +#include "svg/stringstream.h" #include "svg/svg.h" #include "display/curve.h" #include "helper/geom.h" #include "2geom/affine.h" #include "path-chemistry.h" -#include "style.h" -#include "sp-root.h" -#include "sp-defs.h" -#include "sp-item.h" -#include "sp-shape.h" -#include "sp-path.h" -#include "sp-star.h" -#include "sp-spiral.h" #include "document.h" #include "document-undo.h" #include <iomanip> #include <cmath> +#include "object/sp-root.h" +#include "object/sp-defs.h" +#include "object/sp-item.h" +#include "object/sp-shape.h" +#include "object/sp-path.h" +#include "object/sp-star.h" +#include "object/sp-spiral.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 5d80d65fe..926977a07 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -21,15 +21,18 @@ #include "display/curve.h" #include "svg/path-string.h" #include "svg/svg.h" -#include "sp-defs.h" #include "helper/geom.h" #include "2geom/intersection-graph.h" #include "2geom/path-intersection.h" #include "2geom/affine.h" #include "helper/geom.h" -#include "sp-lpe-item.h" #include "path-chemistry.h" + +#include "object/sp-defs.h" +#include "object/sp-path.h" +#include "object/sp-lpe-item.h" #include "style.h" + #include "xml/sp-css-attr.h" // TODO due to internal breakage in glibmm headers, this must be last: diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index a5d1d23c8..8300fe755 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -12,7 +12,7 @@ */ #include "live_effects/lpe-offset.h" -#include "sp-shape.h" +#include "object/sp-shape.h" #include "display/curve.h" #include <2geom/elliptical-arc.h> // TODO due to internal breakage in glibmm headers, this must be last: diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp index 271442c7d..9c3b714cc 100644 --- a/src/live_effects/lpe-parallel.cpp +++ b/src/live_effects/lpe-parallel.cpp @@ -12,7 +12,7 @@ */ #include "live_effects/lpe-parallel.h" -#include "sp-shape.h" +#include "object/sp-shape.h" #include "display/curve.h" #include "knotholder.h" diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index efd1aec2d..6e6f35f7d 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -4,15 +4,18 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <cmath> +#include <algorithm> + +#include <2geom/bezier-to-sbasis.h> + #include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpeobject.h" #include "display/curve.h" -#include <2geom/bezier-to-sbasis.h> +#include "object/sp-shape.h" #include "knotholder.h" -#include <cmath> -#include <algorithm> // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp index dab169cfe..2819094e7 100644 --- a/src/live_effects/lpe-perp_bisector.cpp +++ b/src/live_effects/lpe-perp_bisector.cpp @@ -13,9 +13,10 @@ */ #include "live_effects/lpe-perp_bisector.h" #include "display/curve.h" -#include "sp-path.h" #include "line-geometry.h" +#include "object/sp-path.h" + #include "knotholder.h" // TODO due to internal breakage in glibmm headers, this must be last: diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp index 4ec760e41..3484d00a5 100644 --- a/src/live_effects/lpe-perspective_path.cpp +++ b/src/live_effects/lpe-perspective_path.cpp @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #include <gtkmm.h> -#include "persp3d.h" + //#include "transf_mat_3x4.h" #include "document-private.h" #include "live_effects/lpe-perspective_path.h" @@ -20,6 +20,9 @@ #include "knotholder.h" #include <util/units.h> +#include "object/persp3d.h" +#include "object/sp-defs.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp index 18276270d..2e90abfeb 100644 --- a/src/live_effects/lpe-powerclip.cpp +++ b/src/live_effects/lpe-powerclip.cpp @@ -6,16 +6,17 @@ #include <2geom/intersection-graph.h> #include "display/curve.h" #include "helper/geom.h" -#include "sp-clippath.h" -#include "sp-path.h" -#include "sp-shape.h" -#include "sp-item-group.h" #include "ui/tools-switch.h" #include "path-chemistry.h" -#include "uri.h" #include "extract-uri.h" #include <bad-uri-exception.h> +#include "object/sp-clippath.h" +#include "object/sp-path.h" +#include "object/sp-shape.h" +#include "object/sp-item-group.h" +#include "object/uri.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp index f5a419bcb..947482c24 100644 --- a/src/live_effects/lpe-powermask.cpp +++ b/src/live_effects/lpe-powermask.cpp @@ -6,19 +6,22 @@ #include <2geom/intersection-graph.h> #include "display/curve.h" #include "helper/geom.h" -#include "sp-mask.h" -#include "sp-path.h" -#include "sp-shape.h" -#include "sp-defs.h" -#include "style.h" -#include "sp-item-group.h" #include "svg/svg.h" #include "svg/svg-color.h" +#include "svg/stringstream.h" #include "ui/tools-switch.h" #include "path-chemistry.h" -#include "uri.h" #include "extract-uri.h" #include <bad-uri-exception.h> + +#include "object/sp-mask.h" +#include "object/sp-path.h" +#include "object/sp-shape.h" +#include "object/sp-defs.h" +#include "object/sp-item-group.h" +#include "object/uri.h" + + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp index 4e937c1e4..6d63ffa81 100644 --- a/src/live_effects/lpe-powerstroke.cpp +++ b/src/live_effects/lpe-powerstroke.cpp @@ -13,7 +13,6 @@ #include "live_effects/lpe-powerstroke.h" #include "live_effects/lpe-powerstroke-interpolators.h" -#include "style.h" #include "svg/svg-color.h" #include "desktop-style.h" #include "svg/css-ostringstream.h" @@ -25,6 +24,9 @@ #include <2geom/circle.h> #include "helper/geom.h" +#include "object/sp-shape.h" +#include "style.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp index d832b3615..79ce89c9f 100644 --- a/src/live_effects/lpe-rough-hatches.cpp +++ b/src/live_effects/lpe-rough-hatches.cpp @@ -15,8 +15,8 @@ #include "ui/widget/scalar.h" #include "live_effects/lpe-rough-hatches.h" -#include "sp-item.h" -#include "sp-path.h" +#include "object/sp-item.h" + #include "xml/repr.h" #include <2geom/sbasis-math.h> diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp index 2da570537..149425112 100644 --- a/src/live_effects/lpe-show_handles.cpp +++ b/src/live_effects/lpe-show_handles.cpp @@ -13,9 +13,11 @@ #include "helper/geom.h" #include "desktop-style.h" #include "display/curve.h" -#include "style.h" #include "svg/svg.h" +#include "object/sp-shape.h" +#include "style.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp index 69a4dfad9..3a225c0be 100644 --- a/src/live_effects/lpe-tangent_to_curve.cpp +++ b/src/live_effects/lpe-tangent_to_curve.cpp @@ -14,10 +14,12 @@ */ #include "live_effects/lpe-tangent_to_curve.h" -#include "sp-path.h" #include "display/curve.h" - #include "knotholder.h" + +#include "object/sp-shape.h" +#include "object/sp-object-group.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp index 45394ae91..b5e440767 100644 --- a/src/live_effects/lpe-taperstroke.cpp +++ b/src/live_effects/lpe-taperstroke.cpp @@ -16,16 +16,21 @@ #include <2geom/circle.h> #include <2geom/sbasis-to-bezier.h> +#include "desktop-style.h" + #include "helper/geom-nodetype.h" #include "helper/geom-pathstroke.h" #include "display/curve.h" -#include "style.h" #include "svg/svg-color.h" -#include "desktop-style.h" #include "svg/css-ostringstream.h" #include "svg/svg.h" #include "knotholder.h" + +#include "object/sp-shape.h" +#include "object/sp-object-group.h" +#include "style.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp index ab05b880c..914d23e4b 100644 --- a/src/live_effects/lpe-transform_2pts.cpp +++ b/src/live_effects/lpe-transform_2pts.cpp @@ -17,6 +17,8 @@ #include "ui/icon-names.h" #include "svg/svg.h" #include "verbs.h" +#include "object/sp-path.h" + // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp index 3862ebcc8..8a42fc8b6 100644 --- a/src/live_effects/lpegroupbbox.cpp +++ b/src/live_effects/lpegroupbbox.cpp @@ -7,6 +7,8 @@ #include "live_effects/lpegroupbbox.h" +#include "object/sp-lpe-item.h" + namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpegroupbbox.h b/src/live_effects/lpegroupbbox.h index cc14203d1..7d4ac3e78 100644 --- a/src/live_effects/lpegroupbbox.h +++ b/src/live_effects/lpegroupbbox.h @@ -8,7 +8,8 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-lpe-item.h" + +class SPLPEItem; #include <2geom/interval.h> diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp index 89df843e8..e96054212 100644 --- a/src/live_effects/lpeobject-reference.cpp +++ b/src/live_effects/lpeobject-reference.cpp @@ -12,7 +12,7 @@ #include "bad-uri-exception.h" #include "live_effects/lpeobject.h" -#include "uri.h" +#include "object/uri.h" namespace Inkscape { diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index baee35614..f22bea2b5 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -11,9 +11,10 @@ #include <sigc++/sigc++.h> -#include "uri-references.h" +#include "object/uri-references.h" namespace Inkscape { + namespace XML { class Node; } diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp index ca3ae46e0..bc5ff0576 100644 --- a/src/live_effects/lpeobject.cpp +++ b/src/live_effects/lpeobject.cpp @@ -15,6 +15,8 @@ #include "document.h" #include "document-private.h" +#include "object/sp-defs.h" + //#define LIVEPATHEFFECT_VERBOSE static void livepatheffect_on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data); diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h index e468b4080..9a95775aa 100644 --- a/src/live_effects/lpeobject.h +++ b/src/live_effects/lpeobject.h @@ -9,9 +9,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" + #include "effect-enum.h" +#include "object/sp-object.h" + namespace Inkscape { namespace XML { class Node; diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp index a775d93b7..6540245d3 100644 --- a/src/live_effects/parameter/item-reference.cpp +++ b/src/live_effects/parameter/item-reference.cpp @@ -8,9 +8,9 @@ #include "live_effects/parameter/item-reference.h" -#include "sp-shape.h" -#include "sp-text.h" -#include "sp-item-group.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" +#include "object/sp-item-group.h" namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h index 91231455a..597e7ba51 100644 --- a/src/live_effects/parameter/item-reference.h +++ b/src/live_effects/parameter/item-reference.h @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information. */ -#include <uri-references.h> +#include "object/uri-references.h" class SPItem; namespace Inkscape { diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp index bf7402d99..2107a5912 100644 --- a/src/live_effects/parameter/item.cpp +++ b/src/live_effects/parameter/item.cpp @@ -27,7 +27,7 @@ // clipboard support #include "ui/clipboard.h" // required for linking to other paths -#include "uri.h" +#include "object/uri.h" #include "ui/icon-names.h" diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index e828e1800..52e4c2fd8 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -15,15 +15,15 @@ #include <gtkmm/button.h> #include <gtkmm/label.h> -#include "uri.h" -#include "sp-shape.h" -#include "sp-text.h" #include "display/curve.h" #include "live_effects/effect.h" #include "inkscape.h" #include "desktop.h" #include "selection.h" + +#include "object/uri.h" + #include "ui/icon-names.h" namespace Inkscape { diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index f45de4ad8..fe2dc0c8d 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -23,7 +23,8 @@ #include "svg/svg.h" #include "svg/stringstream.h" #include "originalitem.h" -#include "uri.h" + +#include "object/uri.h" #include "live_effects/effect.h" diff --git a/src/live_effects/parameter/originalitemarray.h b/src/live_effects/parameter/originalitemarray.h index f93d865ec..ac5e486ea 100644 --- a/src/live_effects/parameter/originalitemarray.h +++ b/src/live_effects/parameter/originalitemarray.h @@ -22,7 +22,8 @@ #include "svg/svg.h" #include "svg/stringstream.h" #include "item-reference.h" -#include "sp-object.h" + +class SPObject; namespace Inkscape { diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp index 3f833d2ac..b6a90671e 100644 --- a/src/live_effects/parameter/originalpath.cpp +++ b/src/live_effects/parameter/originalpath.cpp @@ -15,12 +15,13 @@ #include <gtkmm/button.h> #include <gtkmm/label.h> -#include "uri.h" -#include "sp-shape.h" -#include "sp-text.h" #include "display/curve.h" #include "live_effects/effect.h" +#include "object/uri.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + #include "inkscape.h" #include "desktop.h" #include "selection.h" diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index a98c91770..caec74a8b 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -27,13 +27,15 @@ #include "svg/svg.h" #include "svg/stringstream.h" #include "originalpath.h" -#include "uri.h" #include "display/curve.h" #include <2geom/coord.h> #include <2geom/point.h> -#include "sp-shape.h" -#include "sp-text.h" + +#include "object/sp-shape.h" +#include "object/sp-text.h" +#include "object/uri.h" + #include "live_effects/effect.h" #include "verbs.h" diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h index c80d5daf3..8c972fd96 100644 --- a/src/live_effects/parameter/originalpatharray.h +++ b/src/live_effects/parameter/originalpatharray.h @@ -22,7 +22,8 @@ #include "svg/svg.h" #include "svg/stringstream.h" #include "path-reference.h" -#include "sp-object.h" + +class SPObject; namespace Inkscape { diff --git a/src/live_effects/parameter/path-reference.cpp b/src/live_effects/parameter/path-reference.cpp index 42589b050..b169e5b32 100644 --- a/src/live_effects/parameter/path-reference.cpp +++ b/src/live_effects/parameter/path-reference.cpp @@ -8,8 +8,8 @@ #include "live_effects/parameter/path-reference.h" -#include "sp-shape.h" -#include "sp-text.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h index fafb880d3..c32d063f6 100644 --- a/src/live_effects/parameter/path-reference.h +++ b/src/live_effects/parameter/path-reference.h @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information. */ -#include <uri-references.h> +#include "object/uri-references.h" class SPItem; namespace Inkscape { diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index 88ba85b48..02075ee8e 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -39,9 +39,11 @@ // clipboard support #include "ui/clipboard.h" // required for linking to other paths -#include "uri.h" -#include "sp-shape.h" -#include "sp-text.h" + +#include "object/uri.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + #include "display/curve.h" #include "ui/tools/node-tool.h" diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp index 459225bc6..cf4adc5fd 100644 --- a/src/live_effects/parameter/powerstrokepointarray.cpp +++ b/src/live_effects/parameter/powerstrokepointarray.cpp @@ -9,7 +9,7 @@ #include "live_effects/effect.h" #include "knotholder.h" -#include "sp-lpe-item.h" + #include <2geom/piecewise.h> #include <2geom/sbasis-geometric.h> diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp index 6b50f8c09..c6f5492d1 100644 --- a/src/live_effects/parameter/satellitesarray.cpp +++ b/src/live_effects/parameter/satellitesarray.cpp @@ -10,7 +10,7 @@ #include "ui/dialog/lpe-fillet-chamfer-properties.h" #include "live_effects/parameter/satellitesarray.h" #include "live_effects/effect.h" -#include "sp-lpe-item.h" + #include "inkscape.h" #include <preferences.h> // TODO due to internal breakage in glibmm headers, diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp index 6ec2d0943..a010faf27 100644 --- a/src/live_effects/parameter/transformedpoint.cpp +++ b/src/live_effects/parameter/transformedpoint.cpp @@ -6,7 +6,7 @@ #include "ui/widget/registered-widget.h" #include "live_effects/parameter/transformedpoint.h" -#include "sp-lpe-item.h" + #include "knotholder.h" #include "svg/svg.h" #include "svg/stringstream.h" diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp index 6b565536e..ced93ef0d 100644 --- a/src/live_effects/parameter/vector.cpp +++ b/src/live_effects/parameter/vector.cpp @@ -8,7 +8,7 @@ #include <glibmm/i18n.h> #include "live_effects/parameter/vector.h" -#include "sp-lpe-item.h" + #include "knotholder.h" #include "svg/svg.h" #include "svg/stringstream.h" diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp index 03bf4083c..4c4cf5f9a 100644 --- a/src/main-cmdlineact.cpp +++ b/src/main-cmdlineact.cpp @@ -7,19 +7,23 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information */ -#include <ui/view/view.h> -#include <desktop.h> -#include <helper/action.h> -#include <selection.h> -#include <verbs.h> -#include <inkscape.h> -#include <document.h> -#include <file.h> - -#include <glibmm/i18n.h> +#include <list> #include "main-cmdlineact.h" +#include "desktop.h" +#include "document.h" +#include "file.h" +#include "inkscape.h" +#include "selection.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "ui/view/view.h" + +#include <glibmm/i18n.h> + namespace Inkscape { std::list <CmdLineAction *> CmdLineAction::_list; diff --git a/src/main-cmdlinexact.cpp b/src/main-cmdlinexact.cpp index eca402ab3..fe4d52220 100644 --- a/src/main-cmdlinexact.cpp +++ b/src/main-cmdlinexact.cpp @@ -10,39 +10,46 @@ */ #ifdef WITH_YAML -#include <ui/view/view.h> -#include <desktop.h> -#include <helper/action.h> -#include <helper/action-context.h> -#include <selection.h> -#include <verbs.h> -#include <inkscape.h> -#include <document.h> +#include <list> +#include <map> +#include <glib.h> +#include <glib/gstdio.h> #include <glibmm/i18n.h> #include "main-cmdlinexact.h" -#include "yaml.h" - -#include "extension/system.h" -#include "file.h" -#include <glib.h> -#include <glib/gstdio.h> -#include "sp-root.h" +#include "desktop.h" #include "document-undo.h" -#include "util/units.h" -#include "sp-namedview.h" +#include "document-undo.h" +#include "document.h" +#include "file.h" +#include "inkscape.h" +#include "preferences.h" #include "resource-manager.h" -#include "ui/dialog/font-substitution.h" +#include "selection.h" +#include "verbs.h" +#include "yaml.h" + #include "extension/db.h" -#include "preferences.h" +#include "extension/system.h" + +#include "helper/action-context.h" +#include "helper/action.h" #include "helper/png-write.h" -#include <document-undo.h> -#include <ui/view/view-widget.h> -#include <ui/interface.h> -#include <io/sys.h> + +#include "io/sys.h" + +#include "object/sp-namedview.h" +#include "object/sp-root.h" + +#include "ui/dialog/font-substitution.h" +#include "ui/interface.h" +#include "ui/view/view-widget.h" +#include "ui/view/view.h" + +#include "util/units.h" #define DPI_BASE Inkscape::Util::Quantity::convert(1, "in", "px") diff --git a/src/main.cpp b/src/main.cpp index ee381ca6f..94e63ec1c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -63,7 +63,6 @@ #include "ui/interface.h" #include "print.h" #include "color.h" -#include "sp-root.h" #include "svg/svg.h" #include "svg/svg-color.h" @@ -72,8 +71,13 @@ #include "inkscape.h" #include "inkscape-version.h" -#include "sp-namedview.h" -#include "sp-guide.h" +#include "object/object-set.h" +#include "object/sp-guide.h" +#include "object/sp-root.h" +#include "object/sp-namedview.h" +#include "object/sp-text.h" +#include "object/sp-flowtext.h" + #include "xml/repr.h" #include "io/sys.h" @@ -119,9 +123,6 @@ #include "verbs.h" #include "path-chemistry.h" -#include "object-set.h" -#include "sp-text.h" -#include "sp-flowtext.h" #include "text-editing.h" enum { diff --git a/src/object-hierarchy.cpp b/src/object-hierarchy.cpp index 87b7ac570..15afbb59d 100644 --- a/src/object-hierarchy.cpp +++ b/src/object-hierarchy.cpp @@ -11,9 +11,10 @@ #include <cstdio> -#include "sp-object.h" #include "object-hierarchy.h" +#include "object/sp-object.h" + namespace Inkscape { ObjectHierarchy::ObjectHierarchy(SPObject *top) { diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index b4f4024cc..7ef053f9b 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -12,25 +12,30 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "svg/svg.h" -#include <2geom/path-intersection.h> -#include <2geom/line.h> #include <2geom/circle.h> +#include <2geom/line.h> +#include <2geom/path-intersection.h> #include <2geom/path-sink.h> + +#include "desktop.h" #include "document.h" -#include "sp-namedview.h" -#include "sp-image.h" -#include "sp-item-group.h" -#include "sp-use.h" #include "inkscape.h" #include "preferences.h" -#include "sp-text.h" -#include "sp-flowtext.h" #include "text-editing.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "desktop.h" -#include "sp-root.h" + +#include "object/sp-clippath.h" +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-item-group.h" +#include "object/sp-mask.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" +#include "object/sp-use.h" + +#include "svg/svg.h" Inkscape::ObjectSnapper::ObjectSnapper(SnapManager *sm, Geom::Coord const d) : Snapper(sm, d) diff --git a/src/object-snapper.h b/src/object-snapper.h index c0dab5c58..8cffd147e 100644 --- a/src/object-snapper.h +++ b/src/object-snapper.h @@ -11,13 +11,13 @@ */ #include "snapper.h" -#include "sp-path.h" #include "splivarot.h" #include "snap-candidate.h" class SPNamedView; -class SPItem; -class SPObject; +class SPItem; +class SPObject; +class SPPath; namespace Inkscape { diff --git a/src/object/CMakeLists.txt b/src/object/CMakeLists.txt new file mode 100644 index 000000000..3c347ce03 --- /dev/null +++ b/src/object/CMakeLists.txt @@ -0,0 +1,180 @@ + + +set(object_SRC + box3d-side.cpp + box3d.cpp + color-profile.cpp + object-set.cpp + persp3d-reference.cpp + persp3d.cpp + sp-anchor.cpp + sp-clippath.cpp + sp-conn-end-pair.cpp + sp-conn-end.cpp + sp-defs.cpp + sp-desc.cpp + sp-dimensions.cpp + sp-ellipse.cpp + sp-factory.cpp + sp-filter-reference.cpp + sp-filter.cpp + sp-flowdiv.cpp + sp-flowregion.cpp + sp-flowtext.cpp + sp-font-face.cpp + sp-font.cpp + sp-glyph-kerning.cpp + sp-glyph.cpp + sp-gradient-reference.cpp + sp-gradient.cpp + sp-guide.cpp + sp-hatch-path.cpp + sp-hatch.cpp + sp-image.cpp + sp-item-group.cpp + sp-item-rm-unsatisfied-cns.cpp + sp-item-transform.cpp + sp-item-update-cns.cpp + sp-item.cpp + sp-line.cpp + sp-linear-gradient.cpp + sp-lpe-item.cpp + sp-marker.cpp + sp-mask.cpp + sp-mesh-array.cpp + sp-mesh-gradient.cpp + sp-mesh-patch.cpp + sp-mesh-row.cpp + sp-metadata.cpp + sp-missing-glyph.cpp + sp-namedview.cpp + sp-object-group.cpp + sp-object.cpp + sp-offset.cpp + sp-paint-server.cpp + sp-path.cpp + sp-pattern.cpp + sp-polygon.cpp + sp-polyline.cpp + sp-radial-gradient.cpp + sp-rect.cpp + sp-root.cpp + sp-script.cpp + sp-shape.cpp + sp-solid-color.cpp + sp-spiral.cpp + sp-star.cpp + sp-stop.cpp + sp-string.cpp + sp-style-elem.cpp + sp-switch.cpp + sp-symbol.cpp + sp-tag-use-reference.cpp + sp-tag-use.cpp + sp-tag.cpp + sp-text.cpp + sp-title.cpp + sp-tref-reference.cpp + sp-tref.cpp + sp-tspan.cpp + sp-use-reference.cpp + sp-use.cpp + uri-references.cpp + uri.cpp + viewbox.cpp + + # ------- + # Headers + box3d-side.h + box3d.h + color-profile.h + object-set.h + persp3d-reference.h + persp3d.h + sp-anchor.h + sp-clippath.h + sp-conn-end-pair.h + sp-conn-end.h + sp-defs.h + sp-desc.h + sp-dimensions.h + sp-ellipse.h + sp-factory.h + sp-filter-reference.h + sp-filter-units.h + sp-filter.h + sp-flowdiv.h + sp-flowregion.h + sp-flowtext.h + sp-font-face.h + sp-font.h + sp-glyph-kerning.h + sp-glyph.h + sp-gradient-reference.h + sp-gradient-spread.h + sp-gradient-units.h + sp-gradient-vector.h + sp-gradient.h + sp-guide.h + sp-hatch-path.h + sp-hatch.h + sp-image.h + sp-item-group.h + sp-item-rm-unsatisfied-cns.h + sp-item-transform.h + sp-item-update-cns.h + sp-item.h + sp-line.h + sp-linear-gradient.h + sp-lpe-item.h + sp-marker-loc.h + sp-marker.h + sp-mask.h + sp-mesh-array.h + sp-mesh-gradient.h + sp-mesh-patch.h + sp-mesh-row.h + sp-metadata.h + sp-missing-glyph.h + sp-namedview.h + sp-object-group.h + sp-object.h + sp-offset.h + sp-paint-server-reference.h + sp-paint-server.h + sp-path.h + sp-pattern.h + sp-polygon.h + sp-polyline.h + sp-radial-gradient.h + sp-rect.h + sp-root.h + sp-script.h + sp-shape.h + sp-solid-color.h + sp-spiral.h + sp-star.h + sp-stop.h + sp-string.h + sp-style-elem.h + sp-switch.h + sp-symbol.h + sp-tag.h + sp-tag-use.h + sp-tag-use-reference.h + sp-text.h + sp-textpath.h + sp-title.h + sp-tref-reference.h + sp-tref.h + sp-tspan.h + sp-use-reference.h + sp-use.h + uri-references.h + uri.h + viewbox.h +) + +add_inkscape_source("${object_SRC}") + +add_subdirectory(filters) diff --git a/src/object/README b/src/object/README new file mode 100644 index 000000000..f0b8c5eb1 --- /dev/null +++ b/src/object/README @@ -0,0 +1,118 @@ + +This directory contains classes that are derived from SPObject as well as closely related code. + +The object tree implements an XML-to-display primitive mapping, and +provides an object hierarchy that can be modified using the +GUI. Changes in the XML tree are automatically propagated to the +object tree via observers, but not the other way around — a function +called updateRepr() must be explicitly called. Relevant nodes of the +object tree contains fully cascaded CSS style information. The object +tree also includes clones of objects that are referenced by the <use> +element in the XML tree (this is needed as clones may have different +styling due to inheritance). + +See: http://wiki.inkscape.org/wiki/index.php/Object_tree + +Object class inheritance: + +sp-object.h: + color-profile.h: class ColorProfile + persp3d.h: class Persp3D + sp-defs.h: class SPDefs + sp-desc.h: class SPDesc + sp-filter.h: class SPFilter + sp-flowdiv.h: class SPFlowline + sp-flowdiv.h: class SPFlowregionbreak + sp-font-face.h: class SPFontFace + sp-font.h: class SPFont + sp-glyph.h: class SPGlyph + sp-glyph-kerning.h: class SPGlyphKerning + sp-glyph-kerning.h: class SPHkern + sp-glyph-kerning.h: class SPVkern + sp-guide.h: class SPGuide + sp-hatch-path.h: class SPHatchPath + sp-item.h: class SPItem + sp-flowdiv.h: class SPFlowdiv + sp-flowdiv.h: class SPFlowtspan + sp-flowdiv.h: class SPFlowpara + sp-flowregion.h: class SPFlowregion + sp-flowregion.h: class SPFlowregionExclude + sp-flowtext.h: class SPFlowtext + sp-image.h: class SPImage + sp-lpe-item.h: class SPLPEItem + sp-item-group.h: class SPGroup + box3d.h: class SPBox3D + sp-anchor.h: class SPAnchor + sp-marker.h: class SPMarker + sp-root.h: class SPRoot + sp-switch.h: class SPSwitch + sp-symbol.h: class SPSymbol + sp-shape.h: class SPShape + sp-ellipse.h: class SPGenericEllipse + sp-line.h: class SPLine + sp-offset.h: class SPOffset + sp-path.h: class SPPath + sp-polygon.h: class SPPolygon + sp-star.h: class SPStar + sp-polyline.h: class SPPolyLine + box3d-side.h: class Box3DSide + sp-rect.h: class SPRect + sp-spiral.h: class SPSpiral + sp-text.h: class SPText + sp-textpath.h: class SPTextPath + sp-tref.h: class SPTRef + sp-tspan.h: class SPTSpan + sp-use.h: class SPUse + sp-mesh-patch.h: class SPMeshpatch + sp-mesh-row.h: class SPMeshrow + sp-metadata.h: class SPMetadata + sp-missing-glyph.h: class SPMissingGlyph + sp-object-group.h: class SPObjectGroup + sp-clippath.h: class SPClipPath + sp-mask.h: class SPMask + sp-namedview.h: class SPNamedView + sp-paint-server.h: class SPPaintServer + sp-gradient.h: class SPGradient + sp-linear-gradient.h: class SPLinearGradient + sp-mesh-gradient.h: class SPMeshGradient + sp-radial-gradient.h: class SPRadialGradient + sp-hatch.h: class SPHatch + sp-pattern.h: class SPPattern + sp-solid-color.h: class SPSolidColor + sp-script.h: class SPScript + sp-stop.h: class SPStop + sp-string.h: class SPString + sp-style-elem.h: class SPStyleElem + sp-tag.h: class SPTag + sp-tag-use.h: class SPTagUse + sp-title.h: class SPTitle + +Other related files: + + object-set.h: + persp3d-reference.h + sp-conn-end-pair.h + sp-conn-end.h + sp-dimensions.h + sp-factory.h + sp-filter-reference.h + sp-filter-units.h + sp-gradient-reference.h + sp-gradient-spread.h + sp-gradient-units.h + sp-gradient-vector.h + sp-item-rm-unsatisfied-cns.h + sp-item-transform.h + sp-item-update-cns.h + sp-marker-loc.h + sp-mesh-array.h + sp-paint-server-reference.h + sp-tag-use-reference.h + sp-tref-reference.h + sp-use-reference.h + style-enums.h + style-internal.h + style.h + uri.h + uri-references.h + viewbox.h diff --git a/src/box3d-side.cpp b/src/object/box3d-side.cpp index 3eea8855c..3eea8855c 100644 --- a/src/box3d-side.cpp +++ b/src/object/box3d-side.cpp diff --git a/src/box3d-side.h b/src/object/box3d-side.h index 29f17b8f3..29f17b8f3 100644 --- a/src/box3d-side.h +++ b/src/object/box3d-side.h diff --git a/src/box3d.cpp b/src/object/box3d.cpp index af1d00b0f..af1d00b0f 100644 --- a/src/box3d.cpp +++ b/src/object/box3d.cpp diff --git a/src/box3d.h b/src/object/box3d.h index 85f481e5b..85f481e5b 100644 --- a/src/box3d.h +++ b/src/object/box3d.h diff --git a/src/color-profile.cpp b/src/object/color-profile.cpp index 7bdde9b6d..7bdde9b6d 100644 --- a/src/color-profile.cpp +++ b/src/object/color-profile.cpp diff --git a/src/color-profile.h b/src/object/color-profile.h index 0d27facfb..4c5222843 100644 --- a/src/color-profile.h +++ b/src/object/color-profile.h @@ -3,10 +3,12 @@ #include <set> #include <vector> -#include <sp-object.h> + #include <glibmm/ustring.h> #include "cms-color-types.h" +#include "sp-object.h" + struct SPColor; namespace Inkscape { diff --git a/src/object/filters/CMakeLists.txt b/src/object/filters/CMakeLists.txt new file mode 100644 index 000000000..04c23abe7 --- /dev/null +++ b/src/object/filters/CMakeLists.txt @@ -0,0 +1,53 @@ + +set(filters_SRC + sp-filter-primitive.cpp + blend.cpp + colormatrix.cpp + componenttransfer-funcnode.cpp + componenttransfer.cpp + composite.cpp + convolvematrix.cpp + diffuselighting.cpp + displacementmap.cpp + distantlight.cpp + flood.cpp + gaussian-blur.cpp + image.cpp + merge.cpp + mergenode.cpp + morphology.cpp + offset.cpp + pointlight.cpp + specularlighting.cpp + spotlight.cpp + tile.cpp + turbulence.cpp + + + # ------- + # Headers + sp-filter-primitive.h + blend.h + colormatrix.h + componenttransfer-funcnode.h + componenttransfer.h + composite.h + convolvematrix.h + diffuselighting.h + displacementmap.h + distantlight.h + flood.h + gaussian-blur.h + image.h + merge.h + mergenode.h + morphology.h + offset.h + pointlight.h + specularlighting.h + spotlight.h + tile.h + turbulence.h +) + +add_inkscape_source("${filters_SRC}") diff --git a/src/filters/blend.cpp b/src/object/filters/blend.cpp index 9ef544828..e23b2aa57 100644 --- a/src/filters/blend.cpp +++ b/src/object/filters/blend.cpp @@ -15,13 +15,17 @@ #include <string.h> -#include "sp-filter.h" -#include "filters/blend.h" +#include "blend.h" + #include "attributes.h" -#include "xml/repr.h" #include "display/nr-filter.h" +#include "object/sp-filter.h" + +#include "xml/repr.h" + + SPFeBlend::SPFeBlend() : SPFilterPrimitive(), blend_mode(Inkscape::Filters::BLEND_NORMAL), in2(Inkscape::Filters::NR_FILTER_SLOT_NOT_SET) diff --git a/src/filters/blend.h b/src/object/filters/blend.h index d5af9fe7d..d5af9fe7d 100644 --- a/src/filters/blend.h +++ b/src/object/filters/blend.h diff --git a/src/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp index 0e8398ace..0e8398ace 100644 --- a/src/filters/colormatrix.cpp +++ b/src/object/filters/colormatrix.cpp diff --git a/src/filters/colormatrix.h b/src/object/filters/colormatrix.h index 2a1c403f1..2a1c403f1 100644 --- a/src/filters/colormatrix.h +++ b/src/object/filters/colormatrix.h diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp index 23c8dbd96..23c8dbd96 100644 --- a/src/filters/componenttransfer-funcnode.cpp +++ b/src/object/filters/componenttransfer-funcnode.cpp diff --git a/src/filters/componenttransfer-funcnode.h b/src/object/filters/componenttransfer-funcnode.h index 4f9b8de2e..f4bb88594 100644 --- a/src/filters/componenttransfer-funcnode.h +++ b/src/object/filters/componenttransfer-funcnode.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" +#include "../sp-object.h" #include "display/nr-filter-component-transfer.h" #define SP_FEFUNCNODE(obj) (dynamic_cast<SPFeFuncNode*>((SPObject*)obj)) diff --git a/src/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp index 19843eebd..dd13d85d1 100644 --- a/src/filters/componenttransfer.cpp +++ b/src/object/filters/componenttransfer.cpp @@ -12,13 +12,17 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "document.h" #include "attributes.h" -#include "filters/componenttransfer.h" -#include "filters/componenttransfer-funcnode.h" -#include "xml/repr.h" +#include "document.h" + +// In same directory +#include "componenttransfer.h" +#include "componenttransfer-funcnode.h" + #include "display/nr-filter.h" +#include "xml/repr.h" + SPFeComponentTransfer::SPFeComponentTransfer() : SPFilterPrimitive(), renderer(NULL) { diff --git a/src/filters/componenttransfer.h b/src/object/filters/componenttransfer.h index 8dbe91db1..8dbe91db1 100644 --- a/src/filters/componenttransfer.h +++ b/src/object/filters/componenttransfer.h diff --git a/src/filters/composite.cpp b/src/object/filters/composite.cpp index 42f06915f..bca67774b 100644 --- a/src/filters/composite.cpp +++ b/src/object/filters/composite.cpp @@ -12,14 +12,19 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "composite.h" + #include "attributes.h" -#include "svg/svg.h" -#include "filters/composite.h" #include "helper-fns.h" -#include "xml/repr.h" + #include "display/nr-filter.h" #include "display/nr-filter-composite.h" -#include "sp-filter.h" + +#include "object/sp-filter.h" + +#include "svg/svg.h" + +#include "xml/repr.h" SPFeComposite::SPFeComposite() : SPFilterPrimitive(), composite_operator(COMPOSITE_DEFAULT), diff --git a/src/filters/composite.h b/src/object/filters/composite.h index 12f7b5344..12f7b5344 100644 --- a/src/filters/composite.h +++ b/src/object/filters/composite.h diff --git a/src/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp index 1b1e58407..e856690ff 100644 --- a/src/filters/convolvematrix.cpp +++ b/src/object/filters/convolvematrix.cpp @@ -16,12 +16,16 @@ #include <string.h> #include <math.h> #include <vector> + +#include "convolvematrix.h" + #include "attributes.h" -#include "filters/convolvematrix.h" #include "helper-fns.h" -#include "xml/repr.h" + #include "display/nr-filter.h" +#include "xml/repr.h" + SPFeConvolveMatrix::SPFeConvolveMatrix() : SPFilterPrimitive() { this->bias = 0; this->divisorIsSet = 0; diff --git a/src/filters/convolvematrix.h b/src/object/filters/convolvematrix.h index 9783eaa47..9783eaa47 100644 --- a/src/filters/convolvematrix.h +++ b/src/object/filters/convolvematrix.h diff --git a/src/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp index a46b367ec..f23817993 100644 --- a/src/filters/diffuselighting.cpp +++ b/src/object/filters/diffuselighting.cpp @@ -14,20 +14,23 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "strneq.h" +// Same directory +#include "diffuselighting.h" +#include "distantlight.h" +#include "pointlight.h" +#include "spotlight.h" +#include "strneq.h" #include "attributes.h" + +#include "display/nr-filter.h" +#include "display/nr-filter-diffuselighting.h" + #include "svg/svg.h" -#include "sp-object.h" #include "svg/svg-color.h" #include "svg/svg-icc-color.h" -#include "filters/diffuselighting.h" -#include "filters/distantlight.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" -#include "display/nr-filter.h" + #include "xml/repr.h" -#include "display/nr-filter-diffuselighting.h" /* FeDiffuseLighting base class */ static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffuselighting); diff --git a/src/filters/diffuselighting.h b/src/object/filters/diffuselighting.h index f41c6c056..f41c6c056 100644 --- a/src/filters/diffuselighting.h +++ b/src/object/filters/diffuselighting.h diff --git a/src/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp index f0ca36079..978fd517b 100644 --- a/src/filters/displacementmap.cpp +++ b/src/object/filters/displacementmap.cpp @@ -12,14 +12,19 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "displacementmap.h" + #include "attributes.h" -#include "svg/svg.h" -#include "filters/displacementmap.h" -#include "xml/repr.h" -#include "sp-filter.h" #include "helper-fns.h" -#include "display/nr-filter.h" + #include "display/nr-filter-displacement-map.h" +#include "display/nr-filter.h" + +#include "object/sp-filter.h" + +#include "svg/svg.h" + +#include "xml/repr.h" SPFeDisplacementMap::SPFeDisplacementMap() : SPFilterPrimitive() { this->scale=0; diff --git a/src/filters/displacementmap.h b/src/object/filters/displacementmap.h index 85a6beaaa..85a6beaaa 100644 --- a/src/filters/displacementmap.h +++ b/src/object/filters/displacementmap.h diff --git a/src/filters/distantlight.cpp b/src/object/filters/distantlight.cpp index 617f53121..076a7aab5 100644 --- a/src/filters/distantlight.cpp +++ b/src/object/filters/distantlight.cpp @@ -15,11 +15,14 @@ #include <glib.h> +// In same dirctory +#include "distantlight.h" +#include "diffuselighting.h" +#include "specularlighting.h" + #include "attributes.h" #include "document.h" -#include "filters/distantlight.h" -#include "filters/diffuselighting.h" -#include "filters/specularlighting.h" + #include "xml/repr.h" #define SP_MACROS_SILENT diff --git a/src/filters/distantlight.h b/src/object/filters/distantlight.h index 6490d987c..1aa68a1d0 100644 --- a/src/filters/distantlight.h +++ b/src/object/filters/distantlight.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" +#include "../sp-object.h" #define SP_FEDISTANTLIGHT(obj) (dynamic_cast<SPFeDistantLight*>((SPObject*)obj)) #define SP_IS_FEDISTANTLIGHT(obj) (dynamic_cast<const SPFeDistantLight*>((SPObject*)obj) != NULL) diff --git a/src/filters/flood.cpp b/src/object/filters/flood.cpp index cbcaa83eb..9132b2028 100644 --- a/src/filters/flood.cpp +++ b/src/object/filters/flood.cpp @@ -12,16 +12,19 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "strneq.h" +#include "flood.h" +#include "strneq.h" #include "attributes.h" + #include "svg/svg.h" #include "svg/svg-color.h" -#include "filters/flood.h" -#include "xml/repr.h" + #include "display/nr-filter.h" #include "display/nr-filter-flood.h" +#include "xml/repr.h" + SPFeFlood::SPFeFlood() : SPFilterPrimitive() { this->color = 0; diff --git a/src/filters/flood.h b/src/object/filters/flood.h index 75e332b73..75e332b73 100644 --- a/src/filters/flood.h +++ b/src/object/filters/flood.h diff --git a/src/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp index 814224ab1..81addb8e1 100644 --- a/src/filters/gaussian-blur.cpp +++ b/src/object/filters/gaussian-blur.cpp @@ -17,14 +17,17 @@ #include <config.h> #endif +#include "gaussian-blur.h" + #include "attributes.h" -#include "svg/svg.h" -#include "filters/gaussian-blur.h" -#include "xml/repr.h" #include "display/nr-filter.h" #include "display/nr-filter-gaussian.h" +#include "svg/svg.h" + +#include "xml/repr.h" + SPGaussianBlur::SPGaussianBlur() : SPFilterPrimitive() { } diff --git a/src/filters/gaussian-blur.h b/src/object/filters/gaussian-blur.h index 00de8a95f..00de8a95f 100644 --- a/src/filters/gaussian-blur.h +++ b/src/object/filters/gaussian-blur.h diff --git a/src/filters/image.cpp b/src/object/filters/image.cpp index 3dedb28ad..1eeb32111 100644 --- a/src/filters/image.cpp +++ b/src/object/filters/image.cpp @@ -18,14 +18,20 @@ #include <sigc++/bind.h> +#include "attributes.h" +#include "enums.h" + #include "bad-uri-exception.h" + +#include "object/sp-image.h" +#include "object/uri.h" +#include "object/uri-references.h" + #include "display/nr-filter-image.h" -#include "uri.h" -#include "uri-references.h" -#include "attributes.h" +#include "display/nr-filter.h" + #include "xml/repr.h" -#include "display/nr-filter.h" SPFeImage::SPFeImage() : SPFilterPrimitive() { this->href = NULL; diff --git a/src/filters/image.h b/src/object/filters/image.h index 9299f259e..26524c166 100644 --- a/src/filters/image.h +++ b/src/object/filters/image.h @@ -14,13 +14,16 @@ #define SP_FEIMAGE_H_SEEN #include "sp-filter-primitive.h" -#include "svg/svg-length.h" -#include "sp-item.h" -#include "uri-references.h" #define SP_FEIMAGE(obj) (dynamic_cast<SPFeImage*>((SPObject*)obj)) #define SP_IS_FEIMAGE(obj) (dynamic_cast<const SPFeImage*>((SPObject*)obj) != NULL) +class SPItem; + +namespace Inkscape { +class URIReference; +} + class SPFeImage : public SPFilterPrimitive { public: SPFeImage(); diff --git a/src/filters/merge.cpp b/src/object/filters/merge.cpp index 8ec40cb46..8ec40cb46 100644 --- a/src/filters/merge.cpp +++ b/src/object/filters/merge.cpp diff --git a/src/filters/merge.h b/src/object/filters/merge.h index 68257c38e..68257c38e 100644 --- a/src/filters/merge.h +++ b/src/object/filters/merge.h diff --git a/src/filters/mergenode.cpp b/src/object/filters/mergenode.cpp index 691184eb5..04ab2af95 100644 --- a/src/filters/mergenode.cpp +++ b/src/object/filters/mergenode.cpp @@ -13,12 +13,15 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "mergenode.h" +#include "merge.h" + #include "attributes.h" -#include "xml/repr.h" -#include "filters/mergenode.h" -#include "filters/merge.h" + #include "display/nr-filter-types.h" +#include "xml/repr.h" + SPFeMergeNode::SPFeMergeNode() : SPObject(), input(Inkscape::Filters::NR_FILTER_SLOT_NOT_SET) { } diff --git a/src/filters/mergenode.h b/src/object/filters/mergenode.h index 408b3bbb8..f2d204ad4 100644 --- a/src/filters/mergenode.h +++ b/src/object/filters/mergenode.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" +#include "object/sp-object.h" #define SP_FEMERGENODE(obj) (dynamic_cast<SPFeMergeNode*>((SPObject*)obj)) #define SP_IS_FEMERGENODE(obj) (dynamic_cast<const SPFeMergeNode*>((SPObject*)obj) != NULL) diff --git a/src/filters/morphology.cpp b/src/object/filters/morphology.cpp index b3cfa0697..b3cfa0697 100644 --- a/src/filters/morphology.cpp +++ b/src/object/filters/morphology.cpp diff --git a/src/filters/morphology.h b/src/object/filters/morphology.h index f84a7271e..f84a7271e 100644 --- a/src/filters/morphology.h +++ b/src/object/filters/morphology.h diff --git a/src/filters/offset.cpp b/src/object/filters/offset.cpp index c35649dcc..a0057d722 100644 --- a/src/filters/offset.cpp +++ b/src/object/filters/offset.cpp @@ -13,14 +13,18 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "offset.h" + #include "attributes.h" -#include "svg/svg.h" -#include "filters/offset.h" #include "helper-fns.h" -#include "xml/repr.h" + #include "display/nr-filter.h" #include "display/nr-filter-offset.h" +#include "svg/svg.h" + +#include "xml/repr.h" + SPFeOffset::SPFeOffset() : SPFilterPrimitive() { this->dx = 0; this->dy = 0; diff --git a/src/filters/offset.h b/src/object/filters/offset.h index 0d26f6f90..0d26f6f90 100644 --- a/src/filters/offset.h +++ b/src/object/filters/offset.h diff --git a/src/filters/pointlight.cpp b/src/object/filters/pointlight.cpp index e42d21999..942140c1b 100644 --- a/src/filters/pointlight.cpp +++ b/src/object/filters/pointlight.cpp @@ -13,14 +13,17 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "filters/pointlight.h" +// Same directory +#include "pointlight.h" +#include "diffuselighting.h" +#include "specularlighting.h" #include <glib.h> #include "attributes.h" #include "document.h" -#include "filters/diffuselighting.h" -#include "filters/specularlighting.h" + + #include "xml/node.h" #include "xml/repr.h" diff --git a/src/filters/pointlight.h b/src/object/filters/pointlight.h index 1d60895c4..2bd5496e1 100644 --- a/src/filters/pointlight.h +++ b/src/object/filters/pointlight.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" +#include "object/sp-object.h" #define SP_FEPOINTLIGHT(obj) (dynamic_cast<SPFePointLight*>((SPObject*)obj)) #define SP_IS_FEPOINTLIGHT(obj) (dynamic_cast<const SPFePointLight*>((SPObject*)obj) != NULL) diff --git a/src/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp index 7ced52e11..e5381373d 100644 --- a/src/sp-filter-primitive.cpp +++ b/src/object/filters/sp-filter-primitive.cpp @@ -19,11 +19,13 @@ #include <string.h> -#include "display/nr-filter-primitive.h" +#include "sp-filter-primitive.h" #include "attributes.h" + +#include "display/nr-filter-primitive.h" + #include "style.h" -#include "sp-filter-primitive.h" // CPPIFY: Make pure virtual. diff --git a/src/sp-filter-primitive.h b/src/object/filters/sp-filter-primitive.h index 0ecb8af62..cebac8b1c 100644 --- a/src/sp-filter-primitive.h +++ b/src/object/filters/sp-filter-primitive.h @@ -14,9 +14,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" -#include "sp-dimensions.h" -#include "svg/svg-length.h" +#include "../sp-object.h" +#include "../sp-dimensions.h" #define SP_FILTER_PRIMITIVE(obj) (dynamic_cast<SPFilterPrimitive*>((SPObject*)obj)) #define SP_IS_FILTER_PRIMITIVE(obj) (dynamic_cast<const SPFilterPrimitive*>((SPObject*)obj) != NULL) diff --git a/src/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp index ac7253ad9..c46a21080 100644 --- a/src/filters/specularlighting.cpp +++ b/src/object/filters/specularlighting.cpp @@ -14,20 +14,25 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "strneq.h" +// Same directory +#include "specularlighting.h" +#include "distantlight.h" +#include "pointlight.h" +#include "spotlight.h" #include "attributes.h" +#include "strneq.h" + +#include "display/nr-filter.h" +#include "display/nr-filter-specularlighting.h" + +#include "object/sp-object.h" + #include "svg/svg.h" -#include "sp-object.h" #include "svg/svg-color.h" #include "svg/svg-icc-color.h" -#include "filters/specularlighting.h" -#include "filters/distantlight.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" + #include "xml/repr.h" -#include "display/nr-filter.h" -#include "display/nr-filter-specularlighting.h" /* FeSpecularLighting base class */ static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_specularlighting); diff --git a/src/filters/specularlighting.h b/src/object/filters/specularlighting.h index 1de32ec58..1de32ec58 100644 --- a/src/filters/specularlighting.h +++ b/src/object/filters/specularlighting.h diff --git a/src/filters/spotlight.cpp b/src/object/filters/spotlight.cpp index a1e7207f3..a05691196 100644 --- a/src/filters/spotlight.cpp +++ b/src/object/filters/spotlight.cpp @@ -13,13 +13,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib.h> +// Same directory +#include "spotlight.h" +#include "diffuselighting.h" +#include "specularlighting.h" #include "attributes.h" #include "document.h" -#include "filters/spotlight.h" -#include "filters/diffuselighting.h" -#include "filters/specularlighting.h" + #include "xml/repr.h" #define SP_MACROS_SILENT diff --git a/src/filters/spotlight.h b/src/object/filters/spotlight.h index 7d5f6dd30..c82d24301 100644 --- a/src/filters/spotlight.h +++ b/src/object/filters/spotlight.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-object.h" +#include "object/sp-object.h" #define SP_FESPOTLIGHT(obj) (dynamic_cast<SPFeSpotLight*>((SPObject*)obj)) #define SP_IS_FESPOTLIGHT(obj) (dynamic_cast<const SPFeSpotLight*>((SPObject*)obj) != NULL) diff --git a/src/filters/tile.cpp b/src/object/filters/tile.cpp index 623f3ab37..82e63c220 100644 --- a/src/filters/tile.cpp +++ b/src/object/filters/tile.cpp @@ -11,13 +11,17 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "tile.h" + #include "attributes.h" -#include "svg/svg.h" -#include "filters/tile.h" -#include "xml/repr.h" + #include "display/nr-filter.h" #include "display/nr-filter-tile.h" +#include "svg/svg.h" + +#include "xml/repr.h" + SPFeTile::SPFeTile() : SPFilterPrimitive() { } diff --git a/src/filters/tile.h b/src/object/filters/tile.h index cc1a006dd..cc1a006dd 100644 --- a/src/filters/tile.h +++ b/src/object/filters/tile.h diff --git a/src/filters/turbulence.cpp b/src/object/filters/turbulence.cpp index 9af51892e..9af51892e 100644 --- a/src/filters/turbulence.cpp +++ b/src/object/filters/turbulence.cpp diff --git a/src/filters/turbulence.h b/src/object/filters/turbulence.h index 89e6d4a19..89e6d4a19 100644 --- a/src/filters/turbulence.h +++ b/src/object/filters/turbulence.h diff --git a/src/object-set.cpp b/src/object/object-set.cpp index 36ddac350..36ddac350 100644 --- a/src/object-set.cpp +++ b/src/object/object-set.cpp diff --git a/src/object-set.h b/src/object/object-set.h index f9f02a213..f9f02a213 100644 --- a/src/object-set.h +++ b/src/object/object-set.h diff --git a/src/persp3d-reference.cpp b/src/object/persp3d-reference.cpp index 49510764e..49510764e 100644 --- a/src/persp3d-reference.cpp +++ b/src/object/persp3d-reference.cpp diff --git a/src/persp3d-reference.h b/src/object/persp3d-reference.h index 871b29623..871b29623 100644 --- a/src/persp3d-reference.h +++ b/src/object/persp3d-reference.h diff --git a/src/persp3d.cpp b/src/object/persp3d.cpp index ff00f9441..ca39447a1 100644 --- a/src/persp3d.cpp +++ b/src/object/persp3d.cpp @@ -13,6 +13,9 @@ #include "persp3d.h" #include "perspective-line.h" +#include "sp-root.h" +#include "sp-defs.h" + #include "attributes.h" #include "document-private.h" #include "document-undo.h" diff --git a/src/persp3d.h b/src/object/persp3d.h index ce0e3c120..a6ca43177 100644 --- a/src/persp3d.h +++ b/src/object/persp3d.h @@ -22,6 +22,7 @@ #include "transf_mat_3x4.h" #include "document.h" #include "inkscape.h" // for SP_ACTIVE_DOCUMENT + #include "sp-object.h" class SPBox3D; diff --git a/src/sp-anchor.cpp b/src/object/sp-anchor.cpp index b40f53ee1..b40f53ee1 100644 --- a/src/sp-anchor.cpp +++ b/src/object/sp-anchor.cpp diff --git a/src/sp-anchor.h b/src/object/sp-anchor.h index 2dd81f74c..2dd81f74c 100644 --- a/src/sp-anchor.h +++ b/src/object/sp-anchor.h diff --git a/src/sp-clippath.cpp b/src/object/sp-clippath.cpp index d3a3810cb..4f69bd026 100644 --- a/src/sp-clippath.cpp +++ b/src/object/sp-clippath.cpp @@ -28,6 +28,8 @@ #include <2geom/transforms.h> #include "sp-clippath.h" +#include "sp-item.h" +#include "sp-defs.h" struct SPClipPathView { SPClipPathView *next; diff --git a/src/sp-clippath.h b/src/object/sp-clippath.h index 87b5be92c..87b5be92c 100644 --- a/src/sp-clippath.h +++ b/src/object/sp-clippath.h diff --git a/src/sp-conn-end-pair.cpp b/src/object/sp-conn-end-pair.cpp index daadd0cdd..daadd0cdd 100644 --- a/src/sp-conn-end-pair.cpp +++ b/src/object/sp-conn-end-pair.cpp diff --git a/src/sp-conn-end-pair.h b/src/object/sp-conn-end-pair.h index a1ee4f885..a1ee4f885 100644 --- a/src/sp-conn-end-pair.h +++ b/src/object/sp-conn-end-pair.h diff --git a/src/sp-conn-end.cpp b/src/object/sp-conn-end.cpp index 996d8499a..996d8499a 100644 --- a/src/sp-conn-end.cpp +++ b/src/object/sp-conn-end.cpp diff --git a/src/sp-conn-end.h b/src/object/sp-conn-end.h index 2b89a159d..2b89a159d 100644 --- a/src/sp-conn-end.h +++ b/src/object/sp-conn-end.h diff --git a/src/sp-defs.cpp b/src/object/sp-defs.cpp index 619a27c0f..619a27c0f 100644 --- a/src/sp-defs.cpp +++ b/src/object/sp-defs.cpp diff --git a/src/sp-defs.h b/src/object/sp-defs.h index c122cb2a9..c122cb2a9 100644 --- a/src/sp-defs.h +++ b/src/object/sp-defs.h diff --git a/src/sp-desc.cpp b/src/object/sp-desc.cpp index 3c75d087a..3c75d087a 100644 --- a/src/sp-desc.cpp +++ b/src/object/sp-desc.cpp diff --git a/src/sp-desc.h b/src/object/sp-desc.h index 40888bee4..40888bee4 100644 --- a/src/sp-desc.h +++ b/src/object/sp-desc.h diff --git a/src/sp-dimensions.cpp b/src/object/sp-dimensions.cpp index f39b98945..f39b98945 100644 --- a/src/sp-dimensions.cpp +++ b/src/object/sp-dimensions.cpp diff --git a/src/sp-dimensions.h b/src/object/sp-dimensions.h index eb76df739..eb76df739 100644 --- a/src/sp-dimensions.h +++ b/src/object/sp-dimensions.h diff --git a/src/sp-ellipse.cpp b/src/object/sp-ellipse.cpp index c32e3012c..c32e3012c 100644 --- a/src/sp-ellipse.cpp +++ b/src/object/sp-ellipse.cpp diff --git a/src/sp-ellipse.h b/src/object/sp-ellipse.h index a31b571d8..a31b571d8 100644 --- a/src/sp-ellipse.h +++ b/src/object/sp-ellipse.h diff --git a/src/sp-factory.cpp b/src/object/sp-factory.cpp index 9d46c9a84..a540399c7 100644 --- a/src/sp-factory.cpp +++ b/src/object/sp-factory.cpp @@ -43,6 +43,7 @@ #include "sp-missing-glyph.h" #include "sp-namedview.h" #include "sp-offset.h" +#include "sp-path.h" #include "sp-pattern.h" #include "sp-polyline.h" #include "sp-radial-gradient.h" @@ -64,6 +65,7 @@ #include "sp-title.h" #include "sp-tref.h" #include "sp-tspan.h" +#include "sp-use.h" #include "live_effects/lpeobject.h" // filters diff --git a/src/sp-factory.h b/src/object/sp-factory.h index 040fd14ae..040fd14ae 100644 --- a/src/sp-factory.h +++ b/src/object/sp-factory.h diff --git a/src/sp-filter-reference.cpp b/src/object/sp-filter-reference.cpp index afb014820..afb014820 100644 --- a/src/sp-filter-reference.cpp +++ b/src/object/sp-filter-reference.cpp diff --git a/src/sp-filter-reference.h b/src/object/sp-filter-reference.h index 5901dca07..5901dca07 100644 --- a/src/sp-filter-reference.h +++ b/src/object/sp-filter-reference.h diff --git a/src/sp-filter-units.h b/src/object/sp-filter-units.h index 415b89365..415b89365 100644 --- a/src/sp-filter-units.h +++ b/src/object/sp-filter-units.h diff --git a/src/sp-filter.cpp b/src/object/sp-filter.cpp index aa5fe2942..6cb4f8e5d 100644 --- a/src/sp-filter.cpp +++ b/src/object/sp-filter.cpp @@ -29,7 +29,7 @@ #include "display/nr-filter.h" #include "document.h" #include "sp-filter-reference.h" -#include "sp-filter-primitive.h" +#include "filters/sp-filter-primitive.h" #include "uri.h" #include "xml/repr.h" diff --git a/src/sp-filter.h b/src/object/sp-filter.h index 054562d39..054562d39 100644 --- a/src/sp-filter.h +++ b/src/object/sp-filter.h diff --git a/src/sp-flowdiv.cpp b/src/object/sp-flowdiv.cpp index 002fcff85..002fcff85 100644 --- a/src/sp-flowdiv.cpp +++ b/src/object/sp-flowdiv.cpp diff --git a/src/sp-flowdiv.h b/src/object/sp-flowdiv.h index 4a3690726..4a3690726 100644 --- a/src/sp-flowdiv.h +++ b/src/object/sp-flowdiv.h diff --git a/src/sp-flowregion.cpp b/src/object/sp-flowregion.cpp index 6640d93c2..6640d93c2 100644 --- a/src/sp-flowregion.cpp +++ b/src/object/sp-flowregion.cpp diff --git a/src/sp-flowregion.h b/src/object/sp-flowregion.h index 024a298b8..024a298b8 100644 --- a/src/sp-flowregion.h +++ b/src/object/sp-flowregion.h diff --git a/src/sp-flowtext.cpp b/src/object/sp-flowtext.cpp index 2425dada3..5cab62c83 100644 --- a/src/sp-flowtext.cpp +++ b/src/object/sp-flowtext.cpp @@ -16,14 +16,16 @@ #include "desktop.h" +#include "text-tag-attributes.h" +#include "text-editing.h" + #include "sp-flowdiv.h" #include "sp-flowregion.h" #include "sp-flowtext.h" -#include "sp-string.h" #include "sp-rect.h" -#include "text-tag-attributes.h" -#include "text-editing.h" +#include "sp-string.h" #include "sp-text.h" +#include "sp-use.h" #include "libnrtype/font-instance.h" diff --git a/src/sp-flowtext.h b/src/object/sp-flowtext.h index d0b0a19a4..d0b0a19a4 100644 --- a/src/sp-flowtext.h +++ b/src/object/sp-flowtext.h diff --git a/src/sp-font-face.cpp b/src/object/sp-font-face.cpp index 52fc09ddd..52fc09ddd 100644 --- a/src/sp-font-face.cpp +++ b/src/object/sp-font-face.cpp diff --git a/src/sp-font-face.h b/src/object/sp-font-face.h index 669b93197..669b93197 100644 --- a/src/sp-font-face.h +++ b/src/object/sp-font-face.h diff --git a/src/sp-font.cpp b/src/object/sp-font.cpp index a0193224c..a0193224c 100644 --- a/src/sp-font.cpp +++ b/src/object/sp-font.cpp diff --git a/src/sp-font.h b/src/object/sp-font.h index 6e26a02b2..6e26a02b2 100644 --- a/src/sp-font.h +++ b/src/object/sp-font.h diff --git a/src/sp-glyph-kerning.cpp b/src/object/sp-glyph-kerning.cpp index 66de5aed9..66de5aed9 100644 --- a/src/sp-glyph-kerning.cpp +++ b/src/object/sp-glyph-kerning.cpp diff --git a/src/sp-glyph-kerning.h b/src/object/sp-glyph-kerning.h index c96c0b6e4..c96c0b6e4 100644 --- a/src/sp-glyph-kerning.h +++ b/src/object/sp-glyph-kerning.h diff --git a/src/sp-glyph.cpp b/src/object/sp-glyph.cpp index 6284cbfa1..6284cbfa1 100644 --- a/src/sp-glyph.cpp +++ b/src/object/sp-glyph.cpp diff --git a/src/sp-glyph.h b/src/object/sp-glyph.h index 297ac930e..297ac930e 100644 --- a/src/sp-glyph.h +++ b/src/object/sp-glyph.h diff --git a/src/sp-gradient-reference.cpp b/src/object/sp-gradient-reference.cpp index 216ac73de..216ac73de 100644 --- a/src/sp-gradient-reference.cpp +++ b/src/object/sp-gradient-reference.cpp diff --git a/src/sp-gradient-reference.h b/src/object/sp-gradient-reference.h index 96980fd6f..96980fd6f 100644 --- a/src/sp-gradient-reference.h +++ b/src/object/sp-gradient-reference.h diff --git a/src/sp-gradient-spread.h b/src/object/sp-gradient-spread.h index 60e33b7c0..60e33b7c0 100644 --- a/src/sp-gradient-spread.h +++ b/src/object/sp-gradient-spread.h diff --git a/src/sp-gradient-units.h b/src/object/sp-gradient-units.h index 2f58897b0..2f58897b0 100644 --- a/src/sp-gradient-units.h +++ b/src/object/sp-gradient-units.h diff --git a/src/sp-gradient-vector.h b/src/object/sp-gradient-vector.h index e57820b56..e57820b56 100644 --- a/src/sp-gradient-vector.h +++ b/src/object/sp-gradient-vector.h diff --git a/src/sp-gradient.cpp b/src/object/sp-gradient.cpp index feaa04e0f..feaa04e0f 100644 --- a/src/sp-gradient.cpp +++ b/src/object/sp-gradient.cpp diff --git a/src/sp-gradient.h b/src/object/sp-gradient.h index 9a0d5070f..9a0d5070f 100644 --- a/src/sp-gradient.h +++ b/src/object/sp-gradient.h diff --git a/src/sp-guide.cpp b/src/object/sp-guide.cpp index fe6d0b64a..25bcee92b 100644 --- a/src/sp-guide.cpp +++ b/src/object/sp-guide.cpp @@ -30,7 +30,7 @@ #include "svg/stringstream.h" #include "attributes.h" #include "sp-guide.h" -#include <sp-item-notify-moveto.h> +#include "sp-item-notify-moveto.h" #include <glibmm/i18n.h> #include <xml/repr.h> #include <remove-last.h> diff --git a/src/sp-guide.h b/src/object/sp-guide.h index 25a0e5af8..25a0e5af8 100644 --- a/src/sp-guide.h +++ b/src/object/sp-guide.h diff --git a/src/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp index b40f66064..4497b6911 100644 --- a/src/sp-hatch-path.cpp +++ b/src/object/sp-hatch-path.cpp @@ -25,6 +25,7 @@ #include "helper/geom.h" #include "attributes.h" #include "document-private.h" +#include "sp-item.h" #include "sp-hatch-path.h" #include "svg/css-ostringstream.h" diff --git a/src/sp-hatch-path.h b/src/object/sp-hatch-path.h index 11fc274ec..11fc274ec 100644 --- a/src/sp-hatch-path.h +++ b/src/object/sp-hatch-path.h diff --git a/src/sp-hatch.cpp b/src/object/sp-hatch.cpp index f1958a53b..f1958a53b 100644 --- a/src/sp-hatch.cpp +++ b/src/object/sp-hatch.cpp diff --git a/src/sp-hatch.h b/src/object/sp-hatch.h index 546f06a1e..546f06a1e 100644 --- a/src/sp-hatch.h +++ b/src/object/sp-hatch.h diff --git a/src/sp-image.cpp b/src/object/sp-image.cpp index 6736efdec..6736efdec 100644 --- a/src/sp-image.cpp +++ b/src/object/sp-image.cpp diff --git a/src/sp-image.h b/src/object/sp-image.h index 9cd5faa8b..9cd5faa8b 100644 --- a/src/sp-image.h +++ b/src/object/sp-image.h diff --git a/src/sp-item-group.cpp b/src/object/sp-item-group.cpp index e9a52d3ca..73c1dcb6c 100644 --- a/src/sp-item-group.cpp +++ b/src/object/sp-item-group.cpp @@ -22,14 +22,25 @@ #include <cstring> #include <string> +#include "attributes.h" +#include "document.h" +#include "document-undo.h" +#include "selection-chemistry.h" +#include "verbs.h" + #include "display/drawing-group.h" #include "display/curve.h" -#include "xml/repr.h" +#include "live_effects/effect.h" +#include "live_effects/lpeobject.h" +#include "live_effects/lpeobject-reference.h" #include "svg/svg.h" -#include "document.h" -#include "document-undo.h" -#include "style.h" -#include "attributes.h" +#include "svg/css-ostringstream.h" +#include "xml/repr.h" +#include "xml/sp-css-attr.h" + +#include "box3d.h" +#include "persp3d.h" +#include "sp-defs.h" #include "sp-item-transform.h" #include "sp-root.h" #include "sp-rect.h" @@ -37,22 +48,13 @@ #include "sp-clippath.h" #include "sp-mask.h" #include "sp-path.h" -#include "box3d.h" -#include "persp3d.h" - -#include "live_effects/effect.h" -#include "live_effects/lpeobject.h" -#include "live_effects/lpeobject-reference.h" +#include "sp-use.h" #include "sp-title.h" #include "sp-desc.h" #include "sp-switch.h" -#include "sp-defs.h" -#include "verbs.h" #include "sp-textpath.h" #include "sp-flowtext.h" -#include "selection-chemistry.h" -#include "xml/sp-css-attr.h" -#include "svg/css-ostringstream.h" +#include "style.h" using Inkscape::DocumentUndo; diff --git a/src/sp-item-group.h b/src/object/sp-item-group.h index a96d77aa9..a96d77aa9 100644 --- a/src/sp-item-group.h +++ b/src/object/sp-item-group.h diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/object/sp-item-rm-unsatisfied-cns.cpp index 516c88672..516c88672 100644 --- a/src/sp-item-rm-unsatisfied-cns.cpp +++ b/src/object/sp-item-rm-unsatisfied-cns.cpp diff --git a/src/sp-item-rm-unsatisfied-cns.h b/src/object/sp-item-rm-unsatisfied-cns.h index 62f688b51..62f688b51 100644 --- a/src/sp-item-rm-unsatisfied-cns.h +++ b/src/object/sp-item-rm-unsatisfied-cns.h diff --git a/src/sp-item-transform.cpp b/src/object/sp-item-transform.cpp index 3675323ca..3675323ca 100644 --- a/src/sp-item-transform.cpp +++ b/src/object/sp-item-transform.cpp diff --git a/src/sp-item-transform.h b/src/object/sp-item-transform.h index d563c9768..d563c9768 100644 --- a/src/sp-item-transform.h +++ b/src/object/sp-item-transform.h diff --git a/src/sp-item-update-cns.cpp b/src/object/sp-item-update-cns.cpp index 9aef336c5..077931d52 100644 --- a/src/sp-item-update-cns.cpp +++ b/src/object/sp-item-update-cns.cpp @@ -1,5 +1,7 @@ + #include "satisfied-guide-cns.h" + #include "sp-item-update-cns.h" #include "sp-guide.h" diff --git a/src/sp-item-update-cns.h b/src/object/sp-item-update-cns.h index d0b080552..d0b080552 100644 --- a/src/sp-item-update-cns.h +++ b/src/object/sp-item-update-cns.h diff --git a/src/sp-item.cpp b/src/object/sp-item.cpp index 3fef28e5b..f7a4ff672 100644 --- a/src/sp-item.cpp +++ b/src/object/sp-item.cpp @@ -26,26 +26,32 @@ #include "display/drawing-item.h" #include "attributes.h" #include "document.h" -#include "uri.h" + #include "inkscape.h" #include "desktop.h" -#include "style.h" -#include "sp-root.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-rect.h" -#include "sp-text.h" -#include "sp-textpath.h" -#include "sp-item-rm-unsatisfied-cns.h" -#include "sp-pattern.h" -#include "sp-switch.h" + #include "gradient-chemistry.h" #include "conn-avoid-ref.h" #include "conditions.h" #include "filter-chemistry.h" + +#include "sp-clippath.h" +#include "sp-desc.h" #include "sp-guide.h" +#include "sp-item-rm-unsatisfied-cns.h" +#include "sp-mask.h" +#include "sp-pattern.h" +#include "sp-root.h" +#include "sp-rect.h" +#include "sp-switch.h" +#include "sp-text.h" +#include "sp-textpath.h" #include "sp-title.h" -#include "sp-desc.h" +#include "sp-use.h" + +#include "style.h" +#include "uri.h" + #include "util/find-last-if.h" #include "util/reverse-list.h" diff --git a/src/sp-item.h b/src/object/sp-item.h index 36af02edc..36af02edc 100644 --- a/src/sp-item.h +++ b/src/object/sp-item.h diff --git a/src/sp-line.cpp b/src/object/sp-line.cpp index 09ffd1f17..09ffd1f17 100644 --- a/src/sp-line.cpp +++ b/src/object/sp-line.cpp diff --git a/src/sp-line.h b/src/object/sp-line.h index 6c720d403..6c720d403 100644 --- a/src/sp-line.h +++ b/src/object/sp-line.h diff --git a/src/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp index 29579b617..29579b617 100644 --- a/src/sp-linear-gradient.cpp +++ b/src/object/sp-linear-gradient.cpp diff --git a/src/sp-linear-gradient.h b/src/object/sp-linear-gradient.h index a152e7fe2..a152e7fe2 100644 --- a/src/sp-linear-gradient.h +++ b/src/object/sp-linear-gradient.h diff --git a/src/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp index f3cc841fb..f3cc841fb 100644 --- a/src/sp-lpe-item.cpp +++ b/src/object/sp-lpe-item.cpp diff --git a/src/sp-lpe-item.h b/src/object/sp-lpe-item.h index 82f3940c1..82f3940c1 100644 --- a/src/sp-lpe-item.h +++ b/src/object/sp-lpe-item.h diff --git a/src/sp-marker-loc.h b/src/object/sp-marker-loc.h index b6877e5aa..b6877e5aa 100644 --- a/src/sp-marker-loc.h +++ b/src/object/sp-marker-loc.h diff --git a/src/sp-marker.cpp b/src/object/sp-marker.cpp index 01a0d5e61..e5ddb91b5 100644 --- a/src/sp-marker.cpp +++ b/src/object/sp-marker.cpp @@ -23,11 +23,13 @@ #include "display/drawing-group.h" #include "xml/repr.h" #include "attributes.h" -#include "sp-marker.h" #include "document.h" #include "document-private.h" #include "preferences.h" +#include "sp-marker.h" +#include "sp-defs.h" + class SPMarkerView { public: diff --git a/src/sp-marker.h b/src/object/sp-marker.h index bae13243b..bae13243b 100644 --- a/src/sp-marker.h +++ b/src/object/sp-marker.h diff --git a/src/sp-mask.cpp b/src/object/sp-mask.cpp index 0597d29f7..b65c145fc 100644 --- a/src/sp-mask.cpp +++ b/src/object/sp-mask.cpp @@ -25,6 +25,9 @@ #include "document-private.h" #include "style.h" #include "attributes.h" + +#include "sp-defs.h" +#include "sp-item.h" #include "sp-mask.h" struct SPMaskView { diff --git a/src/sp-mask.h b/src/object/sp-mask.h index 02d37b82b..02d37b82b 100644 --- a/src/sp-mask.h +++ b/src/object/sp-mask.h diff --git a/src/sp-mesh-array.cpp b/src/object/sp-mesh-array.cpp index d958427f2..d958427f2 100644 --- a/src/sp-mesh-array.cpp +++ b/src/object/sp-mesh-array.cpp diff --git a/src/sp-mesh-array.h b/src/object/sp-mesh-array.h index df43638db..df43638db 100644 --- a/src/sp-mesh-array.h +++ b/src/object/sp-mesh-array.h diff --git a/src/sp-mesh-gradient.cpp b/src/object/sp-mesh-gradient.cpp index 572131c60..572131c60 100644 --- a/src/sp-mesh-gradient.cpp +++ b/src/object/sp-mesh-gradient.cpp diff --git a/src/sp-mesh-gradient.h b/src/object/sp-mesh-gradient.h index a221554a3..a221554a3 100644 --- a/src/sp-mesh-gradient.h +++ b/src/object/sp-mesh-gradient.h diff --git a/src/sp-mesh-patch.cpp b/src/object/sp-mesh-patch.cpp index 04a121c7a..04a121c7a 100644 --- a/src/sp-mesh-patch.cpp +++ b/src/object/sp-mesh-patch.cpp diff --git a/src/sp-mesh-patch.h b/src/object/sp-mesh-patch.h index e018b81ea..e018b81ea 100644 --- a/src/sp-mesh-patch.h +++ b/src/object/sp-mesh-patch.h diff --git a/src/sp-mesh-row.cpp b/src/object/sp-mesh-row.cpp index 8204aff65..8204aff65 100644 --- a/src/sp-mesh-row.cpp +++ b/src/object/sp-mesh-row.cpp diff --git a/src/sp-mesh-row.h b/src/object/sp-mesh-row.h index 40335e2b9..40335e2b9 100644 --- a/src/sp-mesh-row.h +++ b/src/object/sp-mesh-row.h diff --git a/src/sp-metadata.cpp b/src/object/sp-metadata.cpp index e7907e4f0..e7907e4f0 100644 --- a/src/sp-metadata.cpp +++ b/src/object/sp-metadata.cpp diff --git a/src/sp-metadata.h b/src/object/sp-metadata.h index a89020390..a89020390 100644 --- a/src/sp-metadata.h +++ b/src/object/sp-metadata.h diff --git a/src/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp index f441b66d2..f441b66d2 100644 --- a/src/sp-missing-glyph.cpp +++ b/src/object/sp-missing-glyph.cpp diff --git a/src/sp-missing-glyph.h b/src/object/sp-missing-glyph.h index 06bc92231..06bc92231 100644 --- a/src/sp-missing-glyph.h +++ b/src/object/sp-missing-glyph.h diff --git a/src/sp-namedview.cpp b/src/object/sp-namedview.cpp index 59c7129f6..59c7129f6 100644 --- a/src/sp-namedview.cpp +++ b/src/object/sp-namedview.cpp diff --git a/src/sp-namedview.h b/src/object/sp-namedview.h index 20d762bc4..20d762bc4 100644 --- a/src/sp-namedview.h +++ b/src/object/sp-namedview.h diff --git a/src/sp-object-group.cpp b/src/object/sp-object-group.cpp index f8ef855e3..f8ef855e3 100644 --- a/src/sp-object-group.cpp +++ b/src/object/sp-object-group.cpp diff --git a/src/sp-object-group.h b/src/object/sp-object-group.h index dcaa8a1d0..dcaa8a1d0 100644 --- a/src/sp-object-group.h +++ b/src/object/sp-object-group.h diff --git a/src/sp-object.cpp b/src/object/sp-object.cpp index bc930a430..bc930a430 100644 --- a/src/sp-object.cpp +++ b/src/object/sp-object.cpp diff --git a/src/sp-object.h b/src/object/sp-object.h index ee092aa7b..ee092aa7b 100644 --- a/src/sp-object.h +++ b/src/object/sp-object.h diff --git a/src/sp-offset.cpp b/src/object/sp-offset.cpp index 82e0b4947..82e0b4947 100644 --- a/src/sp-offset.cpp +++ b/src/object/sp-offset.cpp diff --git a/src/sp-offset.h b/src/object/sp-offset.h index 117a3308e..117a3308e 100644 --- a/src/sp-offset.h +++ b/src/object/sp-offset.h diff --git a/src/sp-paint-server-reference.h b/src/object/sp-paint-server-reference.h index bbd9c25fa..bbd9c25fa 100644 --- a/src/sp-paint-server-reference.h +++ b/src/object/sp-paint-server-reference.h diff --git a/src/sp-paint-server.cpp b/src/object/sp-paint-server.cpp index 958078012..958078012 100644 --- a/src/sp-paint-server.cpp +++ b/src/object/sp-paint-server.cpp diff --git a/src/sp-paint-server.h b/src/object/sp-paint-server.h index 7f3bfcba0..7f3bfcba0 100644 --- a/src/sp-paint-server.h +++ b/src/object/sp-paint-server.h diff --git a/src/sp-path.cpp b/src/object/sp-path.cpp index 513e67810..513e67810 100644 --- a/src/sp-path.cpp +++ b/src/object/sp-path.cpp diff --git a/src/sp-path.h b/src/object/sp-path.h index 572fd648d..572fd648d 100644 --- a/src/sp-path.h +++ b/src/object/sp-path.h diff --git a/src/sp-pattern.cpp b/src/object/sp-pattern.cpp index 9ecfe8baa..ebe78d63c 100644 --- a/src/sp-pattern.cpp +++ b/src/object/sp-pattern.cpp @@ -35,6 +35,9 @@ #include "sp-factory.h" +#include "sp-defs.h" +#include "sp-item.h" + SPPattern::SPPattern() : SPPaintServer() , SPViewBox() diff --git a/src/sp-pattern.h b/src/object/sp-pattern.h index a5e7be1d4..a5e7be1d4 100644 --- a/src/sp-pattern.h +++ b/src/object/sp-pattern.h diff --git a/src/sp-polygon.cpp b/src/object/sp-polygon.cpp index 14fd104b3..14fd104b3 100644 --- a/src/sp-polygon.cpp +++ b/src/object/sp-polygon.cpp diff --git a/src/sp-polygon.h b/src/object/sp-polygon.h index 438fdf794..438fdf794 100644 --- a/src/sp-polygon.h +++ b/src/object/sp-polygon.h diff --git a/src/sp-polyline.cpp b/src/object/sp-polyline.cpp index 29054f934..29054f934 100644 --- a/src/sp-polyline.cpp +++ b/src/object/sp-polyline.cpp diff --git a/src/sp-polyline.h b/src/object/sp-polyline.h index 1ca102a9e..1ca102a9e 100644 --- a/src/sp-polyline.h +++ b/src/object/sp-polyline.h diff --git a/src/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp index fa6355478..fa6355478 100644 --- a/src/sp-radial-gradient.cpp +++ b/src/object/sp-radial-gradient.cpp diff --git a/src/sp-radial-gradient.h b/src/object/sp-radial-gradient.h index f90c8c7a9..f90c8c7a9 100644 --- a/src/sp-radial-gradient.h +++ b/src/object/sp-radial-gradient.h diff --git a/src/sp-rect.cpp b/src/object/sp-rect.cpp index 88dad5354..88dad5354 100644 --- a/src/sp-rect.cpp +++ b/src/object/sp-rect.cpp diff --git a/src/sp-rect.h b/src/object/sp-rect.h index 757229724..757229724 100644 --- a/src/sp-rect.h +++ b/src/object/sp-rect.h diff --git a/src/sp-root.cpp b/src/object/sp-root.cpp index 3f31588cc..3f31588cc 100644 --- a/src/sp-root.cpp +++ b/src/object/sp-root.cpp diff --git a/src/sp-root.h b/src/object/sp-root.h index 4a37840d9..4a37840d9 100644 --- a/src/sp-root.h +++ b/src/object/sp-root.h diff --git a/src/sp-script.cpp b/src/object/sp-script.cpp index 144c8d76a..144c8d76a 100644 --- a/src/sp-script.cpp +++ b/src/object/sp-script.cpp diff --git a/src/sp-script.h b/src/object/sp-script.h index cdacb8493..cdacb8493 100644 --- a/src/sp-script.h +++ b/src/object/sp-script.h diff --git a/src/sp-shape.cpp b/src/object/sp-shape.cpp index 9edf03cbf..9edf03cbf 100644 --- a/src/sp-shape.cpp +++ b/src/object/sp-shape.cpp diff --git a/src/sp-shape.h b/src/object/sp-shape.h index fe9d03275..fe9d03275 100644 --- a/src/sp-shape.h +++ b/src/object/sp-shape.h diff --git a/src/sp-solid-color.cpp b/src/object/sp-solid-color.cpp index 89858c18c..89858c18c 100644 --- a/src/sp-solid-color.cpp +++ b/src/object/sp-solid-color.cpp diff --git a/src/sp-solid-color.h b/src/object/sp-solid-color.h index 4dbb573b0..4dbb573b0 100644 --- a/src/sp-solid-color.h +++ b/src/object/sp-solid-color.h diff --git a/src/sp-spiral.cpp b/src/object/sp-spiral.cpp index a84fc6041..a84fc6041 100644 --- a/src/sp-spiral.cpp +++ b/src/object/sp-spiral.cpp diff --git a/src/sp-spiral.h b/src/object/sp-spiral.h index ebf4c9e28..ebf4c9e28 100644 --- a/src/sp-spiral.h +++ b/src/object/sp-spiral.h diff --git a/src/sp-star.cpp b/src/object/sp-star.cpp index 9844df98a..9844df98a 100644 --- a/src/sp-star.cpp +++ b/src/object/sp-star.cpp diff --git a/src/sp-star.h b/src/object/sp-star.h index 4519de869..4519de869 100644 --- a/src/sp-star.h +++ b/src/object/sp-star.h diff --git a/src/sp-stop.cpp b/src/object/sp-stop.cpp index 58746c951..58746c951 100644 --- a/src/sp-stop.cpp +++ b/src/object/sp-stop.cpp diff --git a/src/sp-stop.h b/src/object/sp-stop.h index f7b3a677a..f7b3a677a 100644 --- a/src/sp-stop.h +++ b/src/object/sp-stop.h diff --git a/src/sp-string.cpp b/src/object/sp-string.cpp index 0a959abea..0a959abea 100644 --- a/src/sp-string.cpp +++ b/src/object/sp-string.cpp diff --git a/src/sp-string.h b/src/object/sp-string.h index b80b4b8bf..b80b4b8bf 100644 --- a/src/sp-string.h +++ b/src/object/sp-string.h diff --git a/src/sp-style-elem.cpp b/src/object/sp-style-elem.cpp index da02d4ef1..da02d4ef1 100644 --- a/src/sp-style-elem.cpp +++ b/src/object/sp-style-elem.cpp diff --git a/src/sp-style-elem.h b/src/object/sp-style-elem.h index a3f4bdc70..a3f4bdc70 100644 --- a/src/sp-style-elem.h +++ b/src/object/sp-style-elem.h diff --git a/src/sp-switch.cpp b/src/object/sp-switch.cpp index d6ab1e904..d6ab1e904 100644 --- a/src/sp-switch.cpp +++ b/src/object/sp-switch.cpp diff --git a/src/sp-switch.h b/src/object/sp-switch.h index 57ce8b236..57ce8b236 100644 --- a/src/sp-switch.h +++ b/src/object/sp-switch.h diff --git a/src/sp-symbol.cpp b/src/object/sp-symbol.cpp index 55b5101af..55b5101af 100644 --- a/src/sp-symbol.cpp +++ b/src/object/sp-symbol.cpp diff --git a/src/sp-symbol.h b/src/object/sp-symbol.h index 6b46a8c1a..6b46a8c1a 100644 --- a/src/sp-symbol.h +++ b/src/object/sp-symbol.h diff --git a/src/sp-tag-use-reference.cpp b/src/object/sp-tag-use-reference.cpp index bb03c120a..bb03c120a 100644 --- a/src/sp-tag-use-reference.cpp +++ b/src/object/sp-tag-use-reference.cpp diff --git a/src/sp-tag-use-reference.h b/src/object/sp-tag-use-reference.h index 2a59fd6bd..0895be010 100644 --- a/src/sp-tag-use-reference.h +++ b/src/object/sp-tag-use-reference.h @@ -9,12 +9,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information. */ +#include <stddef.h> +#include <sigc++/sigc++.h> #include <glib.h> + #include "sp-object.h" #include "sp-item.h" -#include <uri-references.h> -#include <stddef.h> -#include <sigc++/sigc++.h> +#include "uri-references.h" class Path; diff --git a/src/sp-tag-use.cpp b/src/object/sp-tag-use.cpp index 1312b923f..1312b923f 100644 --- a/src/sp-tag-use.cpp +++ b/src/object/sp-tag-use.cpp diff --git a/src/sp-tag-use.h b/src/object/sp-tag-use.h index 651c8f045..651c8f045 100644 --- a/src/sp-tag-use.h +++ b/src/object/sp-tag-use.h diff --git a/src/sp-tag.cpp b/src/object/sp-tag.cpp index d331e6b18..d331e6b18 100644 --- a/src/sp-tag.cpp +++ b/src/object/sp-tag.cpp diff --git a/src/sp-tag.h b/src/object/sp-tag.h index 36459a04b..36459a04b 100644 --- a/src/sp-tag.h +++ b/src/object/sp-tag.h diff --git a/src/sp-text.cpp b/src/object/sp-text.cpp index 075536d5f..17723a5c9 100644 --- a/src/sp-text.cpp +++ b/src/object/sp-text.cpp @@ -39,10 +39,12 @@ #include "inkscape.h" #include "xml/quote.h" #include "mod360.h" + #include "sp-title.h" #include "sp-desc.h" #include "sp-text.h" +#include "sp-shape.h" #include "sp-textpath.h" #include "sp-tref.h" #include "sp-tspan.h" diff --git a/src/sp-text.h b/src/object/sp-text.h index 67613d043..67613d043 100644 --- a/src/sp-text.h +++ b/src/object/sp-text.h diff --git a/src/sp-textpath.h b/src/object/sp-textpath.h index 4457cb8cf..4457cb8cf 100644 --- a/src/sp-textpath.h +++ b/src/object/sp-textpath.h diff --git a/src/sp-title.cpp b/src/object/sp-title.cpp index ba5ae754a..ba5ae754a 100644 --- a/src/sp-title.cpp +++ b/src/object/sp-title.cpp diff --git a/src/sp-title.h b/src/object/sp-title.h index 04f3829c6..04f3829c6 100644 --- a/src/sp-title.h +++ b/src/object/sp-title.h diff --git a/src/sp-tref-reference.cpp b/src/object/sp-tref-reference.cpp index d683e34ed..d683e34ed 100644 --- a/src/sp-tref-reference.cpp +++ b/src/object/sp-tref-reference.cpp diff --git a/src/sp-tref-reference.h b/src/object/sp-tref-reference.h index 516e125c1..516e125c1 100644 --- a/src/sp-tref-reference.h +++ b/src/object/sp-tref-reference.h diff --git a/src/sp-tref.cpp b/src/object/sp-tref.cpp index dd44c5855..dd44c5855 100644 --- a/src/sp-tref.cpp +++ b/src/object/sp-tref.cpp diff --git a/src/sp-tref.h b/src/object/sp-tref.h index 1727620cd..1727620cd 100644 --- a/src/sp-tref.h +++ b/src/object/sp-tref.h diff --git a/src/sp-tspan.cpp b/src/object/sp-tspan.cpp index d8c655c06..d8c655c06 100644 --- a/src/sp-tspan.cpp +++ b/src/object/sp-tspan.cpp diff --git a/src/sp-tspan.h b/src/object/sp-tspan.h index 1aef4cd0c..1aef4cd0c 100644 --- a/src/sp-tspan.h +++ b/src/object/sp-tspan.h diff --git a/src/sp-use-reference.cpp b/src/object/sp-use-reference.cpp index ea8bc5e86..ea8bc5e86 100644 --- a/src/sp-use-reference.cpp +++ b/src/object/sp-use-reference.cpp diff --git a/src/sp-use-reference.h b/src/object/sp-use-reference.h index 297bdc26c..297bdc26c 100644 --- a/src/sp-use-reference.h +++ b/src/object/sp-use-reference.h diff --git a/src/sp-use.cpp b/src/object/sp-use.cpp index 0af7c7ebc..2837e56f1 100644 --- a/src/sp-use.cpp +++ b/src/object/sp-use.cpp @@ -34,6 +34,8 @@ #include "svg/svg.h" #include "preferences.h" #include "style.h" + +#include "sp-use.h" #include "sp-symbol.h" #include "sp-root.h" #include "sp-use-reference.h" diff --git a/src/sp-use.h b/src/object/sp-use.h index bcf0a8513..bcf0a8513 100644 --- a/src/sp-use.h +++ b/src/object/sp-use.h diff --git a/src/uri-references.cpp b/src/object/uri-references.cpp index 7d6abd10a..7d6abd10a 100644 --- a/src/uri-references.cpp +++ b/src/object/uri-references.cpp diff --git a/src/uri-references.h b/src/object/uri-references.h index ce0f5f2ae..4c57709a0 100644 --- a/src/uri-references.h +++ b/src/object/uri-references.h @@ -20,9 +20,8 @@ #include <sigc++/connection.h> #include <sigc++/trackable.h> -#include "sp-object.h" -#include "sp-item.h" -#include "sp-use.h" +class SPObject; +class SPDocument; namespace Inkscape { diff --git a/src/uri.cpp b/src/object/uri.cpp index 881b322b4..881b322b4 100644 --- a/src/uri.cpp +++ b/src/object/uri.cpp diff --git a/src/uri.h b/src/object/uri.h index f0b59780e..f0b59780e 100644 --- a/src/uri.h +++ b/src/object/uri.h diff --git a/src/viewbox.cpp b/src/object/viewbox.cpp index 1b50fe71c..1b50fe71c 100644 --- a/src/viewbox.cpp +++ b/src/object/viewbox.cpp diff --git a/src/viewbox.h b/src/object/viewbox.h index c71abb610..c71abb610 100644 --- a/src/viewbox.h +++ b/src/object/viewbox.h diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 41079bc1f..2eb471bb3 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -17,28 +17,35 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif + #include <cstring> #include <string> -#include "xml/repr.h" -#include "svg/svg.h" -#include "display/curve.h" + #include <glibmm/i18n.h> -#include "sp-path.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "text-editing.h" -#include "style.h" + + #include "desktop.h" -#include "document.h" #include "document-undo.h" +#include "document.h" #include "message-stack.h" -#include "selection.h" - -#include "box3d.h" -#include "selection-chemistry.h" #include "path-chemistry.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "text-editing.h" #include "verbs.h" -#include "object-set.h" + +#include "display/curve.h" + +#include "object/box3d.h" +#include "object/object-set.h" +#include "object/sp-flowtext.h" +#include "object/sp-path.h" +#include "object/sp-text.h" +#include "style.h" + +#include "svg/svg.h" + +#include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::ObjectSet; diff --git a/src/print.cpp b/src/print.cpp index 7cd05ac93..593e506b6 100644 --- a/src/print.cpp +++ b/src/print.cpp @@ -15,17 +15,22 @@ # include "config.h" #endif -#include "ui/dialog/print.h" #include "print.h" -#include "display/drawing.h" -#include "display/drawing-item.h" -#include "inkscape.h" + #include "desktop.h" #include "document.h" -#include "sp-item.h" +#include "inkscape.h" + +#include "display/drawing-item.h" +#include "display/drawing.h" + #include "extension/print.h" #include "extension/system.h" -#include "sp-root.h" + +#include "object/sp-item.h" +#include "object/sp-root.h" + +#include "ui/dialog/print.h" unsigned int diff --git a/src/profile-manager.cpp b/src/profile-manager.cpp index 26e1cd72c..6cd83839c 100644 --- a/src/profile-manager.cpp +++ b/src/profile-manager.cpp @@ -8,12 +8,14 @@ */ #include <algorithm> +#include <cstring> #include "profile-manager.h" + #include "document.h" -#include "color-profile.h" -#include <cstring> +#include "object/color-profile.h" + namespace Inkscape { diff --git a/src/rdf.cpp b/src/rdf.cpp index c70c32e51..f06459a41 100644 --- a/src/rdf.cpp +++ b/src/rdf.cpp @@ -14,12 +14,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "xml/repr.h" -#include "rdf.h" -#include "sp-item-group.h" #include "inkscape.h" -#include "sp-root.h" #include "preferences.h" +#include "rdf.h" + +#include "object/sp-item-group.h" +#include "object/sp-root.h" + +#include "xml/repr.h" /* Example RDF XML from various places... diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp index 9dd8e5152..06e7b81e6 100644 --- a/src/removeoverlap.cpp +++ b/src/removeoverlap.cpp @@ -12,12 +12,17 @@ */ #include <utility> + #include <2geom/transforms.h> -#include "sp-item.h" -#include "sp-item-transform.h" -#include "libvpsc/rectangle.h" + #include "removeoverlap.h" +#include "libvpsc/rectangle.h" + +#include "object/sp-item.h" +#include "object/sp-item-transform.h" + + using vpsc::Rectangle; namespace { diff --git a/src/removeoverlap.h b/src/removeoverlap.h index cc0c7d9b7..3b093382c 100644 --- a/src/removeoverlap.h +++ b/src/removeoverlap.h @@ -13,6 +13,8 @@ #ifndef SEEN_REMOVEOVERLAP_H #define SEEN_REMOVEOVERLAP_H +class SPItem; + void removeoverlap(std::vector<SPItem*> const &items, double xGap, double yGap); #endif // SEEN_REMOVEOVERLAP_H diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp index af81298e3..0176a4abe 100644 --- a/src/resource-manager.cpp +++ b/src/resource-manager.cpp @@ -9,6 +9,7 @@ #include <string> #include <vector> #include <algorithm> + #include <gtkmm/recentmanager.h> #include <glibmm/i18n.h> #include <glibmm/miscutils.h> @@ -19,11 +20,13 @@ #include "resource-manager.h" #include "document.h" -#include "sp-object.h" -#include "xml/node.h" #include "document-undo.h" #include "verbs.h" +#include "object/sp-object.h" + +#include "xml/node.h" + namespace Inkscape { static std::vector<std::string> splitPath( std::string const &path ) diff --git a/src/satisfied-guide-cns.cpp b/src/satisfied-guide-cns.cpp index 83b8b555c..b2f26761d 100644 --- a/src/satisfied-guide-cns.cpp +++ b/src/satisfied-guide-cns.cpp @@ -1,9 +1,13 @@ + #include <2geom/coord.h> -#include "desktop.h" -#include "sp-guide.h" -#include "sp-namedview.h" + #include "satisfied-guide-cns.h" +#include "desktop.h" + +#include "object/sp-guide.h" +#include "object/sp-namedview.h" + void satisfied_guide_cns(SPDesktop const &desktop, std::vector<Inkscape::SnapCandidatePoint> const &snappoints, std::vector<SPGuideConstraint> &cns) diff --git a/src/satisfied-guide-cns.h b/src/satisfied-guide-cns.h index 25e5919d0..ca67b5739 100644 --- a/src/satisfied-guide-cns.h +++ b/src/satisfied-guide-cns.h @@ -3,7 +3,8 @@ #include <2geom/forward.h> #include <vector> -#include "sp-item.h" + +#include "snap-candidate.h" class SPDesktop; class SPGuideConstraint; diff --git a/src/selcue.cpp b/src/selcue.cpp index 13600231a..b97b8ba26 100644 --- a/src/selcue.cpp +++ b/src/selcue.cpp @@ -11,17 +11,20 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "desktop.h" +#include "selcue.h" +#include "desktop.h" #include "selection.h" -#include "display/sp-canvas-util.h" +#include "text-editing.h" + #include "display/sodipodi-ctrl.h" #include "display/sodipodi-ctrlrect.h" +#include "display/sp-canvas-util.h" + #include "libnrtype/Layout-TNG.h" -#include "text-editing.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "selcue.h" + +#include "object/sp-flowtext.h" +#include "object/sp-text.h" Inkscape::SelCue::BoundingBoxPrefsObserver::BoundingBoxPrefsObserver(SelCue &sel_cue) : Observer("/tools/bounding_box"), diff --git a/src/selcue.h b/src/selcue.h index d9b16b0f5..bac25da32 100644 --- a/src/selcue.h +++ b/src/selcue.h @@ -15,8 +15,11 @@ #include <cstddef> #include <list> + #include <sigc++/sigc++.h> +#include "preferences.h" + class SPDesktop; struct SPCanvasItem; diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 9d459f8c5..ae2f63f97 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -25,86 +25,96 @@ #include <config.h> #endif +#include <boost/range/adaptor/reversed.hpp> +#include <cstring> +#include <glibmm/i18n.h> +#include <map> +#include <string> + #include <gtkmm/clipboard.h> -#include "file.h" #include "selection-chemistry.h" +#include "file.h" + // TOOD fixme: This should be moved into preference repr SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; -#include "svg/svg.h" -#include "desktop.h" + +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-private.h" +#include "document-undo.h" +#include "gradient-drag.h" +#include "layer-fns.h" +#include "layer-manager.h" #include "layer-model.h" -#include "selection.h" -#include "ui/tools-switch.h" -#include "io/resource.h" - #include "message-stack.h" -#include "sp-item-transform.h" -#include "sp-marker.h" -#include "sp-textpath.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "sp-flowtext.h" -#include "sp-flowregion.h" -#include "sp-image.h" -#include "sp-rect.h" -#include "sp-ellipse.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-polyline.h" -#include "sp-line.h" +#include "path-chemistry.h" +#include "selection.h" #include "text-editing.h" +#include "verbs.h" + +#include "display/cairo-utils.h" #include "display/sp-canvas.h" -#include "ui/tools/text-tool.h" -#include "ui/tools/connector-tool.h" -#include "sp-path.h" -#include "sp-conn-end.h" -#include "ui/tools/dropper-tool.h" -#include <glibmm/i18n.h> -#include "xml/rebase-hrefs.h" -#include "style.h" -#include "document-private.h" -#include "document-undo.h" -#include "sp-gradient-reference.h" -#include "sp-linear-gradient.h" -#include "sp-pattern.h" -#include "sp-symbol.h" -#include "sp-radial-gradient.h" -#include "ui/tools/gradient-tool.h" -#include "sp-namedview.h" -#include "sp-offset.h" -#include "sp-clippath.h" -#include "sp-mask.h" + #include "helper/png-write.h" -#include "layer-fns.h" -#include "context-fns.h" -#include <map> -#include <cstring> -#include <string> -#include <boost/range/adaptor/reversed.hpp> -#include "sp-item.h" -#include "box3d.h" -#include "persp3d.h" -#include "xml/simple-document.h" -#include "gradient-drag.h" -#include "display/cairo-utils.h" -#include "path-chemistry.h" -#include "ui/tool/control-point-selection.h" -#include "ui/tool/multi-path-manipulator.h" + +#include "io/resource.h" + #include "live_effects/effect.h" #include "live_effects/parameter/originalpath.h" -#include "layer-manager.h" -#include "object-set.h" + +#include "object/box3d.h" +#include "object/object-set.h" +#include "object/persp3d.h" +#include "object/sp-clippath.h" +#include "object/sp-conn-end.h" +#include "object/sp-defs.h" +#include "object/sp-ellipse.h" +#include "object/sp-flowregion.h" +#include "object/sp-flowtext.h" +#include "object/sp-gradient-reference.h" +#include "object/sp-image.h" +#include "object/sp-item-transform.h" +#include "object/sp-item.h" +#include "object/sp-line.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-marker.h" +#include "object/sp-mask.h" +#include "object/sp-namedview.h" +#include "object/sp-offset.h" +#include "object/sp-path.h" +#include "object/sp-pattern.h" +#include "object/sp-polyline.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-spiral.h" +#include "object/sp-star.h" +#include "object/sp-symbol.h" +#include "object/sp-textpath.h" +#include "object/sp-tref.h" +#include "object/sp-tspan.h" +#include "object/sp-use.h" +#include "style.h" + #include "svg/svg-color.h" +#include "svg/svg.h" -// For clippath editing +#include "ui/clipboard.h" +#include "ui/tool/control-point-selection.h" +#include "ui/tool/multi-path-manipulator.h" +#include "ui/tools-switch.h" +#include "ui/tools/connector-tool.h" +#include "ui/tools/dropper-tool.h" +#include "ui/tools/gradient-tool.h" #include "ui/tools/node-tool.h" +#include "ui/tools/text-tool.h" -#include "ui/clipboard.h" -#include "verbs.h" +#include "xml/rebase-hrefs.h" +#include "xml/simple-document.h" using Inkscape::DocumentUndo; using Geom::X; diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h index 82fc473b9..0c0f78370 100644 --- a/src/selection-chemistry.h +++ b/src/selection-chemistry.h @@ -18,10 +18,12 @@ */ #include <2geom/forward.h> -#include "sp-item.h" class SPCSSAttr; class SPDesktop; +class SPDocument; +class SPItem; +class SPObject; namespace Inkscape { diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp index 5e7ac7ed3..caa83fb94 100644 --- a/src/selection-describer.cpp +++ b/src/selection-describer.cpp @@ -18,18 +18,22 @@ #include <set> #include <glibmm/i18n.h> -#include "xml/quote.h" + +#include "selection-describer.h" + #include "layer-model.h" #include "selection.h" -#include "selection-describer.h" #include "desktop.h" -#include "sp-textpath.h" -#include "sp-offset.h" -#include "sp-flowtext.h" -#include "sp-use.h" -#include "sp-symbol.h" -#include "sp-image.h" -#include "sp-path.h" + +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-offset.h" +#include "object/sp-path.h" +#include "object/sp-symbol.h" +#include "object/sp-textpath.h" +#include "object/sp-use.h" + +#include "xml/quote.h" // Returns a list of terms for the items to be used in the statusbar char* collect_terms (const std::vector<SPItem*> &items) diff --git a/src/selection.cpp b/src/selection.cpp index 65e0e1e97..b8dffb4ae 100644 --- a/src/selection.cpp +++ b/src/selection.cpp @@ -22,14 +22,15 @@ #endif #include "inkscape.h" -#include "xml/repr.h" #include "preferences.h" - -#include "sp-shape.h" -#include "sp-path.h" #include "desktop.h" #include "document.h" +#include "object/sp-shape.h" +#include "object/sp-path.h" + +#include "xml/repr.h" + #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1) namespace Inkscape { diff --git a/src/selection.h b/src/selection.h index 54826970f..2b454e947 100644 --- a/src/selection.h +++ b/src/selection.h @@ -23,10 +23,8 @@ #include "inkgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" -#include "sp-item.h" -#include "object-set.h" +#include "object/object-set.h" -class SPItem; namespace Inkscape { class LayerModel; diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 141720371..0a341bf83 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -20,31 +20,36 @@ #include <cstring> #include <string> -#include <2geom/transforms.h> #include <gdk/gdkkeysyms.h> -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "desktop.h" +#include <glibmm/i18n.h> + +#include <2geom/transforms.h> + +#include "seltrans.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "knot.h" #include "message-stack.h" +#include "mod360.h" #include "pure-transform.h" +#include "selection-chemistry.h" #include "selection.h" -#include "ui/tools/select-tool.h" -#include "sp-item-transform.h" -#include "sp-root.h" #include "seltrans-handles.h" -#include "seltrans.h" -#include "selection-chemistry.h" #include "verbs.h" -#include <glibmm/i18n.h> -#include "display/sp-ctrlline.h" -#include "display/sodipodi-ctrl.h" -#include "mod360.h" + #include "display/snap-indicator.h" +#include "display/sodipodi-ctrl.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-item-transform.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" + #include "ui/control-manager.h" +#include "ui/tools/select-tool.h" using Inkscape::ControlManager; using Inkscape::DocumentUndo; diff --git a/src/seltrans.h b/src/seltrans.h index f756cc77a..bd248e5f4 100644 --- a/src/seltrans.h +++ b/src/seltrans.h @@ -26,7 +26,8 @@ #include "message-context.h" #include "seltrans-handles.h" #include "selcue.h" -#include "sp-item.h" + +#include "object/sp-item.h" class SPKnot; diff --git a/src/snap.cpp b/src/snap.cpp index b05f3e854..26d548040 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -16,19 +16,25 @@ */ #include <utility> + #include <2geom/transforms.h> -#include "sp-namedview.h" +#include "snap.h" + +#include "desktop.h" +#include "inkscape.h" #include "pure-transform.h" #include "display/canvas-grid.h" #include "display/snap-indicator.h" -#include "inkscape.h" -#include "desktop.h" -#include "sp-guide.h" -#include "ui/tools/tool-base.h" #include "helper/mathfns.h" + +#include "object/sp-namedview.h" +#include "object/sp-guide.h" + +#include "ui/tools/tool-base.h" + using std::vector; using Inkscape::Util::round_to_upper_multiple_plus; using Inkscape::Util::round_to_lower_multiple_plus; diff --git a/src/snap.h b/src/snap.h index 12fba05ff..2d84b889c 100644 --- a/src/snap.h +++ b/src/snap.h @@ -18,6 +18,7 @@ #define SEEN_SNAP_H #include <vector> + #include "guide-snapper.h" #include "object-snapper.h" #include "snap-preferences.h" diff --git a/src/snapper.cpp b/src/snapper.cpp index 78493746f..5ef619c0b 100644 --- a/src/snapper.cpp +++ b/src/snapper.cpp @@ -9,8 +9,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information. */ -#include "sp-namedview.h" -#include "desktop.h" +#include <gtk/gtk.h> + +#include "snapper.h" /** * Construct new Snapper for named view. diff --git a/src/sp-guide-attachment.h b/src/sp-guide-attachment.h index 45d2096c2..98b3d7bc9 100644 --- a/src/sp-guide-attachment.h +++ b/src/sp-guide-attachment.h @@ -1,7 +1,7 @@ #ifndef SEEN_SP_GUIDE_ATTACHMENT_H #define SEEN_SP_GUIDE_ATTACHMENT_H -#include "sp-item.h" +#include "object/sp-item.h" class SPGuideAttachment { public: diff --git a/src/sp-item-notify-moveto.cpp b/src/sp-item-notify-moveto.cpp index 28648c03a..52a76e55f 100644 --- a/src/sp-item-notify-moveto.cpp +++ b/src/sp-item-notify-moveto.cpp @@ -2,11 +2,14 @@ * Implementation of sp_item_notify_moveto(). */ -#include <sp-item.h> #include <2geom/transforms.h> -#include <sp-guide.h> -#include <sp-item-rm-unsatisfied-cns.h> -#include <sp-item-notify-moveto.h> + +#include "sp-item-notify-moveto.h" + +#include "object/sp-guide.h" +#include "object/sp-item.h" +#include "object/sp-item-rm-unsatisfied-cns.h" + using std::vector; #define return_if_fail(test) if (!(test)) { printf("WARNING: assertion '%s' failed", #test); return; } diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 145feda44..7daaefdfa 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -18,36 +18,42 @@ #include <cstring> #include <string> #include <vector> + #include <glib.h> -#include "xml/repr.h" -#include "svg/svg.h" -#include "sp-path.h" -#include "sp-image.h" -#include "sp-marker.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "text-editing.h" -#include "style.h" -#include "document.h" +#include <glibmm/i18n.h> + +#include <2geom/svg-path-parser.h> // to get from SVG on boolean to Geom::Path +#include <2geom/svg-path-writer.h> + +#include "splivarot.h" + #include "document-undo.h" +#include "document.h" #include "layer-model.h" #include "message-stack.h" #include "selection.h" +#include "text-editing.h" +#include "verbs.h" -#include <glibmm/i18n.h> - -#include "xml/repr-sorting.h" -#include <2geom/svg-path-writer.h> #include "helper/geom.h" #include "livarot/Path.h" #include "livarot/Shape.h" -#include "splivarot.h" -#include "verbs.h" -#include "2geom/svg-path-parser.h" // to get from SVG on boolean to Geom::Path +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-marker.h" +#include "object/sp-path.h" +#include "object/sp-text.h" +#include "style.h" + +#include "svg/svg.h" + #include "util/units.h" // to get abbr for document units +#include "xml/repr-sorting.h" +#include "xml/repr.h" + using Inkscape::DocumentUndo; bool Ancetre(Inkscape::XML::Node *a, Inkscape::XML::Node *who); diff --git a/src/splivarot.h b/src/splivarot.h index 17dd4f66b..ebdd6e31f 100644 --- a/src/splivarot.h +++ b/src/splivarot.h @@ -10,7 +10,7 @@ #include <2geom/forward.h> #include <2geom/path.h> #include "livarot/Path.h" -#include "object-set.h" +#include "object/object-set.h" // bool_op class SPCurve; class SPDesktop; diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 5d9be05aa..ed1c79738 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -26,22 +26,21 @@ #include <config.h> #endif -#include "style-internal.h" - #include <glibmm/regex.h> -#include "bad-uri-exception.h" +#include "style-internal.h" #include "style.h" -#include "svg/svg.h" -#include "svg/svg-color.h" - +#include "bad-uri-exception.h" +#include "extract-uri.h" +#include "preferences.h" #include "streq.h" #include "strneq.h" -#include "extract-uri.h" -#include "preferences.h" +#include "svg/svg.h" +#include "svg/svg-color.h" #include "svg/css-ostringstream.h" + #include "util/units.h" // TODO REMOVE OR MAKE MEMBER FUNCTIONS diff --git a/src/style-internal.h b/src/style-internal.h index 33e71d5b4..7a6c51a3b 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -17,19 +17,23 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <vector> +#include <map> + #include "style-enums.h" #include "color.h" + +#include "object/sp-marker-loc.h" +#include "object/sp-filter.h" +#include "object/sp-filter-reference.h" +#include "object/sp-paint-server-reference.h" +#include "object/uri.h" + #include "svg/svg-icc-color.h" -#include "sp-marker-loc.h" -#include "sp-filter.h" -#include "sp-filter-reference.h" -#include "sp-paint-server-reference.h" -#include "uri.h" + #include "xml/repr.h" -#include <vector> -#include <map> struct SPStyleEnum; diff --git a/src/style.cpp b/src/style.cpp index d84e41e42..3298cb0c9 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -31,22 +31,26 @@ #include <glibmm/regex.h> +#include "attributes.h" #include "bad-uri-exception.h" +#include "document.h" +#include "preferences.h" + +#include "display/canvas-bpath.h" + #include "libcroco/cr-sel-eng.h" -#include "xml/croco-node-iface.h" -#include "svg/svg.h" +#include "object/sp-paint-server.h" +#include "object/uri-references.h" +#include "object/uri.h" -#include "display/canvas-bpath.h" -#include "attributes.h" -#include "document.h" -#include "uri-references.h" -#include "uri.h" -#include "sp-paint-server.h" #include "svg/css-ostringstream.h" -#include "xml/simple-document.h" +#include "svg/svg.h" + #include "util/units.h" -#include "preferences.h" + +#include "xml/croco-node-iface.h" +#include "xml/simple-document.h" using Inkscape::CSSOStringStream; using std::vector; diff --git a/src/svg-view.cpp b/src/svg-view.cpp index 00ea0d381..d5ade229a 100644 --- a/src/svg-view.cpp +++ b/src/svg-view.cpp @@ -14,12 +14,17 @@ */ #include <2geom/transforms.h> + +#include "svg-view.h" + +#include "document.h" + #include "display/canvas-arena.h" #include "display/drawing-group.h" -#include "document.h" -#include "sp-item.h" -#include "svg-view.h" -#include "sp-root.h" + +#include "object/sp-item.h" +#include "object/sp-root.h" + #include "util/units.h" SPSVGView::SPSVGView(SPCanvasGroup *parent) diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 60cbff3dc..d1e91ace1 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -33,11 +33,14 @@ #include "color.h" #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "color-profile.h" + +#include "object/color-profile.h" + #include "document.h" #include "inkscape.h" #include "profile-manager.h" #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) + #include "cms-system.h" using std::sprintf; diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp index b2bd88a54..b26293801 100644 --- a/src/text-chemistry.cpp +++ b/src/text-chemistry.cpp @@ -19,24 +19,26 @@ #include <string> #include <glibmm/i18n.h> -#include "xml/repr.h" -#include "sp-rect.h" -#include "sp-textpath.h" -#include "inkscape.h" + #include "desktop.h" -#include "document.h" #include "document-undo.h" +#include "document.h" +#include "inkscape.h" #include "message-stack.h" -#include "style.h" - -#include "text-editing.h" #include "text-chemistry.h" -#include "sp-flowtext.h" -#include "sp-flowregion.h" -#include "sp-flowdiv.h" -#include "sp-tspan.h" +#include "text-editing.h" #include "verbs.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowregion.h" +#include "object/sp-flowtext.h" +#include "object/sp-rect.h" +#include "object/sp-textpath.h" +#include "object/sp-tspan.h" +#include "style.h" + +#include "xml/repr.h" + using Inkscape::DocumentUndo; static SPItem * diff --git a/src/text-editing.cpp b/src/text-editing.cpp index 8bcdd3407..ec9b82235 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -20,25 +20,25 @@ #include <glibmm/i18n.h> #include "desktop.h" +#include "document.h" #include "inkscape.h" #include "message-stack.h" +#include "text-editing.h" + +#include "object/sp-textpath.h" +#include "object/sp-flowtext.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowregion.h" +#include "object/sp-item-group.h" +#include "object/sp-tref.h" +#include "object/sp-tspan.h" #include "style.h" + #include "util/units.h" -#include "document.h" #include "xml/attribute-record.h" #include "xml/sp-css-attr.h" -#include "sp-textpath.h" -#include "sp-flowtext.h" -#include "sp-flowdiv.h" -#include "sp-flowregion.h" -#include "sp-item-group.h" -#include "sp-tref.h" -#include "sp-tspan.h" - -#include "text-editing.h" - static const gchar *tref_edit_message = _("You cannot edit <b>cloned character data</b>."); static bool tidy_xml_tree_recursively(SPObject *root, bool has_text_decoration); diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp index a0b0df1f6..b438be248 100644 --- a/src/trace/potrace/inkscape-potrace.cpp +++ b/src/trace/potrace/inkscape-potrace.cpp @@ -27,7 +27,9 @@ #include <inkscape.h> #include "desktop.h" #include "message-stack.h" -#include <sp-path.h> + +#include "object/sp-path.h" + #include <svg/path-string.h> #include "bitmap.h" diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index b93d8358f..5595b2544 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -25,9 +25,6 @@ #include "selection.h" #include "xml/repr.h" #include "xml/attribute-record.h" -#include "sp-item.h" -#include "sp-shape.h" -#include "sp-image.h" #include <2geom/transforms.h> #include "verbs.h" @@ -35,6 +32,10 @@ #include "display/drawing.h" #include "display/drawing-shape.h" +#include "object/sp-item.h" +#include "object/sp-shape.h" +#include "object/sp-image.h" + #include "siox.h" #include "imagemap-gdk.h" diff --git a/src/trace/trace.h b/src/trace/trace.h index 4bf13123b..b6b7684d0 100644 --- a/src/trace/trace.h +++ b/src/trace/trace.h @@ -18,10 +18,10 @@ #include <glibmm/refptr.h> #include <gdkmm/pixbuf.h> #include <vector> -#include <sp-shape.h> class SPImage; -class SPItem; +class SPItem; +class SPShape; namespace Inkscape { diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp index eeb99e045..829c6b0ef 100644 --- a/src/ui/cache/svg_preview_cache.cpp +++ b/src/ui/cache/svg_preview_cache.cpp @@ -20,17 +20,19 @@ #endif #include <gtk/gtk.h> + #include <2geom/transforms.h> -#include "sp-namedview.h" + #include "selection.h" #include "inkscape.h" -#include "sp-rect.h" #include "document-private.h" + #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-item.h" #include "display/drawing.h" + #include "ui/cache/svg_preview_cache.h" GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, Geom::Rect const &dbox, unsigned psize) diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index e11aabcb6..ac09b803f 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -41,43 +41,45 @@ #include "message-stack.h" #include "context-fns.h" #include "ui/tools/dropper-tool.h" // used in copy() -#include "style.h" #include "extension/db.h" // extension database #include "extension/input.h" #include "extension/output.h" #include "selection-chemistry.h" #include <2geom/transforms.h> -#include "box3d.h" #include "gradient-drag.h" -#include "sp-marker.h" -#include "sp-item-transform.h" // for sp_item_scale_rel, used in _pasteSize -#include "sp-path.h" -#include "sp-pattern.h" -#include "sp-gradient-reference.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-textpath.h" -#include "sp-rect.h" -#include "sp-object.h" #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" -#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection -#include "svg/css-ostringstream.h" // used in copy #include "ui/tools/text-tool.h" #include "text-editing.h" #include "ui/tools-switch.h" #include "path-chemistry.h" #include "util/units.h" #include "helper/png-write.h" -#include "svg/svg-color.h" -#include "sp-namedview.h" -#include "persp3d.h" -#include "object-set.h" #include "extension/find_extension_by_mime.h" +#include "object/box3d.h" +#include "object/persp3d.h" +#include "object/sp-clippath.h" +#include "object/sp-defs.h" +#include "object/sp-gradient-reference.h" +#include "object/sp-item-transform.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-marker.h" +#include "object/sp-mask.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-use.h" +#include "object/sp-textpath.h" +#include "style.h" + +#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection +#include "svg/css-ostringstream.h" // used in copy +#include "svg/svg-color.h" + /// Made up mimetype to represent Gdk::Pixbuf clipboard contents. #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf" diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index 3ca752c82..1a5691c3f 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -39,13 +39,14 @@ #include "selection.h" #include "selection-chemistry.h" #include "shortcuts.h" -#include "sp-anchor.h" -#include "sp-clippath.h" -#include "sp-image.h" -#include "sp-item.h" -#include "sp-mask.h" -#include "sp-shape.h" -#include "sp-text.h" + +#include "object/sp-anchor.h" +#include "object/sp-clippath.h" +#include "object/sp-image.h" +#include "object/sp-mask.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + #include "ui/dialog/dialog-manager.h" #include "ui/dialog/layer-properties.h" #include "verbs.h" diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 4f094f876..7a87a75ad 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -21,7 +21,7 @@ # include <config.h> #endif -#include "ui/dialog/aboutbox.h" +#include "aboutbox.h" #include <fstream> @@ -32,15 +32,17 @@ #include <gtkmm/aspectframe.h> #include <gtkmm/textview.h> -#include "path-prefix.h" #include "document.h" +#include "inkscape-version.h" +#include "path-prefix.h" #include "svg-view-widget.h" -#include "sp-text.h" #include "text-editing.h" + +#include "object/sp-text.h" + #include "ui/icon-names.h" #include "util/units.h" -#include "inkscape-version.h" namespace Inkscape { diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 4314c9e89..d622b5e06 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -21,32 +21,34 @@ #include "config.h" #endif -#include "align-and-distribute.h" +#include <glibmm/i18n.h> + #include <2geom/transforms.h> -#include "ui/widget/spinbutton.h" -#include "unclump.h" +#include "align-and-distribute.h" + +#include "desktop.h" +#include "document-undo.h" #include "document.h" #include "graphlayout.h" #include "inkscape.h" #include "preferences.h" #include "removeoverlap.h" -#include "sp-flowtext.h" -#include "sp-item-transform.h" -#include "sp-text.h" #include "text-editing.h" -#include "ui/tools-switch.h" -#include "ui/icon-names.h" -#include "ui/tools/node-tool.h" -#include "ui/tool/multi-path-manipulator.h" -#include "ui/tool/control-point-selection.h" +#include "unclump.h" #include "verbs.h" -#include "sp-root.h" -#include "document-undo.h" -#include "desktop.h" -#include <glibmm/i18n.h> +#include "object/sp-flowtext.h" +#include "object/sp-item-transform.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "ui/icon-names.h" +#include "ui/tool/control-point-selection.h" +#include "ui/tool/multi-path-manipulator.h" +#include "ui/tools-switch.h" +#include "ui/tools/node-tool.h" +#include "ui/widget/spinbutton.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 59c9e4cd4..06f25c5ae 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -21,7 +21,6 @@ #include "clonetiler.h" #include <glibmm/i18n.h> -#include <2geom/transforms.h> #include <gtkmm/adjustment.h> #include <gtkmm/checkbutton.h> @@ -29,26 +28,35 @@ #include <gtkmm/liststore.h> #include <gtkmm/radiobutton.h> +#include <2geom/transforms.h> + #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" +#include "inkscape.h" +#include "message-stack.h" +#include "unclump.h" +#include "verbs.h" #include "display/cairo-utils.h" -#include "display/drawing.h" #include "display/drawing-context.h" -#include "document.h" -#include "document-undo.h" -#include "filter-chemistry.h" -#include "ui/widget/unit-menu.h" +#include "display/drawing.h" + #include "helper/window.h" -#include "inkscape.h" + +#include "object/sp-item.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" +#include "object/sp-use.h" + +#include "ui/icon-names.h" #include "ui/interface.h" -#include "message-stack.h" -#include "sp-namedview.h" +#include "ui/widget/spinbutton.h" +#include "ui/widget/unit-menu.h" + #include "svg/svg-color.h" #include "svg/svg.h" -#include "ui/icon-names.h" -#include "ui/widget/spinbutton.h" -#include "unclump.h" -#include "verbs.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h index db3049ef1..f42ef8fbe 100644 --- a/src/ui/dialog/clonetiler.h +++ b/src/ui/dialog/clonetiler.h @@ -14,7 +14,6 @@ #include "ui/dialog/desktop-tracker.h" #include "ui/widget/color-picker.h" -#include "sp-root.h" namespace Gtk { class CheckButton; @@ -22,6 +21,14 @@ namespace Gtk { class ToggleButton; } +class SPItem; +class SPObject; + +namespace Geom { + class Rect; + class Affine; +} + namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp index 37f2b4c30..efceeae11 100644 --- a/src/ui/dialog/cssdialog.cpp +++ b/src/ui/dialog/cssdialog.cpp @@ -12,10 +12,12 @@ */ #include "cssdialog.h" -#include "ui/widget/addtoicon.h" + #include "verbs.h" -#include "sp-object.h" #include "selection.h" + +#include "ui/widget/addtoicon.h" + #include "xml/attribute-record.h" namespace Inkscape { diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index c219603b4..e46f5ec6c 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -20,11 +20,12 @@ #include "document-metadata.h" #include "desktop.h" - #include "rdf.h" -#include "sp-namedview.h" -#include "ui/widget/entity-entry.h" #include "verbs.h" + +#include "object/sp-namedview.h" + +#include "ui/widget/entity-entry.h" #include "xml/node-event-vector.h" diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 6b213f99a..aae9ce867 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -22,29 +22,30 @@ # include <config.h> #endif -#include "ui/widget/notebook-page.h" -#include "document-properties.h" #include "display/canvas-grid.h" +#include "document-properties.h" +#include "rdf.h" +#include "verbs.h" #include "io/sys.h" -#include "ui/shape-editor.h" -#include "sp-root.h" -#include "sp-script.h" + +#include "object/sp-root.h" +#include "object/sp-script.h" #include "style.h" -#include "ui/tools-switch.h" -#include "ui/dialog/filedialog.h" -#include "verbs.h" -#include "xml/node-event-vector.h" -#include "rdf.h" +#include "ui/dialog/filedialog.h" +#include "ui/icon-names.h" +#include "ui/shape-editor.h" +#include "ui/tools-switch.h" #include "ui/widget/entity-entry.h" +#include "ui/widget/notebook-page.h" + +#include "xml/node-event-vector.h" #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "color-profile.h" +#include "object/color-profile.h" #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "ui/icon-names.h" - using std::pair; namespace Inkscape { diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index fc985aa44..380c8a9c4 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -30,35 +30,36 @@ #include <glibmm/i18n.h> #include <glibmm/miscutils.h> -#include "ui/widget/unit-menu.h" -#include "helper/window.h" -#include "inkscape.h" -#include "document.h" -#include "document-undo.h" +#include <gdl/gdl-dock-item.h> +#include "document-undo.h" +#include "document.h" #include "file.h" -#include "sp-namedview.h" -#include "selection-chemistry.h" - -#include "ui/dialog-events.h" +#include "inkscape.h" #include "preferences.h" +#include "selection-chemistry.h" #include "verbs.h" -#include "ui/interface.h" -#include "sp-root.h" -#include "extension/output.h" -#include "extension/db.h" +// required to set status message after export +#include "desktop.h" +#include "message-stack.h" + +#include "helper/png-write.h" +#include "helper/window.h" -#include "io/sys.h" #include "io/resource.h" +#include "io/sys.h" -#include "helper/png-write.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" -#include <gdl/gdl-dock-item.h> +#include "ui/dialog-events.h" +#include "ui/interface.h" +#include "ui/widget/unit-menu.h" + +#include "extension/db.h" +#include "extension/output.h" -// required to set status message after export -#include "desktop.h" -#include "message-stack.h" #ifdef WIN32 #include <windows.h> diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index 16a9a026b..f09546bdc 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -15,7 +15,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#include "ui/widget/notebook-page.h" #include "desktop-style.h" #include "document.h" @@ -23,15 +22,18 @@ #include "filter-chemistry.h" #include "inkscape.h" #include "preferences.h" -#include "style.h" +#include "verbs.h" + #include "svg/css-ostringstream.h" + #include "ui/icon-names.h" -#include "verbs.h" +#include "ui/view/view-widget.h" +#include "ui/widget/notebook-page.h" + #include "widgets/fill-style.h" #include "widgets/paint-selector.h" #include "widgets/stroke-style.h" -#include "ui/view/view-widget.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp index 7cec7dc01..ef702aba4 100644 --- a/src/ui/dialog/filter-editor.cpp +++ b/src/ui/dialog/filter-editor.cpp @@ -14,54 +14,53 @@ #include "config.h" #endif -#include "dialog-manager.h" +#include <string> +#include <gtkmm.h> #include <gdkmm/display.h> +#include <glibmm/convert.h> +#include <glibmm/error.h> +#include <glibmm/i18n.h> +#include <glibmm/main.h> +#include <glibmm/stringutils.h> + #if GTK_CHECK_VERSION(3, 20, 0) # include <gdkmm/seat.h> #else # include <gdkmm/devicemanager.h> #endif -#include "ui/widget/spinbutton.h" - -#include <glibmm/i18n.h> -#include <glibmm/stringutils.h> -#include <glibmm/main.h> -#include <glibmm/convert.h> -#include <glibmm/error.h> #include "desktop.h" - -#include "document.h" +#include "dialog-manager.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" #include "filter-editor.h" #include "filter-enums.h" #include "inkscape.h" -#include "filters/blend.h" -#include "filters/colormatrix.h" -#include "filters/componenttransfer.h" -#include "filters/componenttransfer-funcnode.h" -#include "filters/convolvematrix.h" -#include "filters/distantlight.h" -#include "filters/merge.h" -#include "filters/mergenode.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" - -#include "style.h" -#include "svg/svg-color.h" -#include "ui/dialog/filedialog.h" +#include "selection-chemistry.h" #include "verbs.h" #include "io/sys.h" #include "io/resource.h" -#include "selection-chemistry.h" -#include <string> +#include "object/filters/blend.h" +#include "object/filters/colormatrix.h" +#include "object/filters/componenttransfer.h" +#include "object/filters/componenttransfer-funcnode.h" +#include "object/filters/convolvematrix.h" +#include "object/filters/distantlight.h" +#include "object/filters/merge.h" +#include "object/filters/mergenode.h" +#include "object/filters/pointlight.h" +#include "object/filters/spotlight.h" +#include "style.h" -#include <gtkmm.h> +#include "svg/svg-color.h" + +#include "ui/dialog/filedialog.h" +#include "ui/widget/spinbutton.h" using namespace Inkscape::Filters; using namespace Inkscape::IO::Resource; diff --git a/src/ui/dialog/filter-editor.h b/src/ui/dialog/filter-editor.h index 6acb83f02..5bf16dc10 100644 --- a/src/ui/dialog/filter-editor.h +++ b/src/ui/dialog/filter-editor.h @@ -12,10 +12,6 @@ #ifndef INKSCAPE_UI_DIALOG_FILTER_EDITOR_H #define INKSCAPE_UI_DIALOG_FILTER_EDITOR_H -#include "attributes.h" -#include "ui/widget/panel.h" -#include "sp-filter.h" - #include <gtkmm/notebook.h> #include <gtkmm/sizegroup.h> #include <gtkmm/builder.h> @@ -28,6 +24,9 @@ #include <gtkmm/scrolledwindow.h> #include <gtkmm/treeview.h> +#include "ui/widget/panel.h" + + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 41797b1e7..e62d309c5 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -19,17 +19,19 @@ #include "config.h" #endif -#include "dialog-manager.h" #include <gtkmm/imagemenuitem.h> #include <gdkmm/display.h> +#include <gdkmm/general.h> +#include <gtkmm/checkbutton.h> +#include <gtkmm/colorbutton.h> +#include <gtkmm/eventbox.h> #if GTK_CHECK_VERSION(3, 20, 0) # include <gdkmm/seat.h> #else # include <gdkmm/devicemanager.h> #endif -#include "ui/widget/spinbutton.h" #include <glibmm/i18n.h> #include <glibmm/stringutils.h> @@ -37,36 +39,35 @@ #include <glibmm/convert.h> #include "desktop.h" - -#include "document.h" +#include "dialog-manager.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" #include "filter-effects-dialog.h" #include "filter-enums.h" #include "inkscape.h" -#include "filters/blend.h" -#include "filters/colormatrix.h" -#include "filters/componenttransfer.h" -#include "filters/componenttransfer-funcnode.h" -#include "filters/convolvematrix.h" -#include "filters/distantlight.h" -#include "filters/merge.h" -#include "filters/mergenode.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" +#include "selection-chemistry.h" +#include "verbs.h" +#include "object/filters/blend.h" +#include "object/filters/colormatrix.h" +#include "object/filters/componenttransfer.h" +#include "object/filters/componenttransfer-funcnode.h" +#include "object/filters/convolvematrix.h" +#include "object/filters/distantlight.h" +#include "object/filters/merge.h" +#include "object/filters/mergenode.h" +#include "object/filters/pointlight.h" +#include "object/filters/spotlight.h" #include "style.h" + #include "svg/svg-color.h" + #include "ui/dialog/filedialog.h" -#include "verbs.h" +#include "ui/widget/spinbutton.h" #include "io/sys.h" -#include "selection-chemistry.h" -#include <gtkmm/colorbutton.h> -#include <gdkmm/general.h> -#include <gtkmm/checkbutton.h> -#include <gtkmm/eventbox.h> using namespace Inkscape::Filters; diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 73d23bd37..d7bfff7d2 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -16,21 +16,23 @@ #include <memory> -#include "attributes.h" -#include "ui/widget/panel.h" -#include "sp-filter.h" -#include "ui/widget/combo-enums.h" - -#include "ui/widget/spin-scale.h" -#include "xml/helper-observer.h" -#include "ui/dialog/desktop-tracker.h" - #include <gtkmm/notebook.h> #include <gtkmm/sizegroup.h> #include <gtkmm/paned.h> #include <gtkmm/scrolledwindow.h> +#include "attributes.h" + +#include "ui/dialog/desktop-tracker.h" +#include "ui/widget/combo-enums.h" +#include "ui/widget/panel.h" +#include "ui/widget/spin-scale.h" + +#include "xml/helper-observer.h" + +class SPFilter; + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index 0f327d6d1..d172eca57 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -17,43 +17,44 @@ #include "find.h" #include <gtkmm/entry.h> +#include <glibmm/i18n.h> +#include <glibmm/regex.h> +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "inkscape.h" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "text-editing.h" #include "verbs.h" -#include "message-stack.h" #include "helper/window.h" -#include "inkscape.h" -#include "desktop.h" -#include "document.h" -#include "document-undo.h" +#include "object/sp-defs.h" +#include "object/sp-ellipse.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-line.h" +#include "object/sp-offset.h" +#include "object/sp-path.h" +#include "object/sp-polyline.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-spiral.h" +#include "object/sp-star.h" +#include "object/sp-text.h" +#include "object/sp-tref.h" +#include "object/sp-tspan.h" +#include "object/sp-use.h" #include "ui/dialog-events.h" #include "ui/interface.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-flowdiv.h" -#include "text-editing.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "selection-chemistry.h" -#include "sp-defs.h" -#include "sp-rect.h" -#include "sp-ellipse.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-path.h" -#include "sp-line.h" -#include "sp-polyline.h" -#include "sp-item-group.h" -#include "sp-image.h" -#include "sp-offset.h" -#include "sp-root.h" -#include "xml/node-iterators.h" + #include "xml/attribute-record.h" +#include "xml/node-iterators.h" -#include <glibmm/i18n.h> -#include <glibmm/regex.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index ad035aa8d..a07a7b7b3 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -10,37 +10,35 @@ #include "config.h" #endif +#include <set> + +#include <glibmm/i18n.h> +#include <glibmm/regex.h> + #include <gtkmm/messagedialog.h> #include <gtkmm/checkbutton.h> #include <gtkmm/scrolledwindow.h> #include <gtkmm/textview.h> -#include <set> #include "font-substitution.h" -#include "inkscape.h" #include "desktop.h" #include "document.h" - -#include "ui/dialog-events.h" - +#include "inkscape.h" #include "selection-chemistry.h" - -#include "sp-root.h" -#include "sp-text.h" -#include "sp-textpath.h" -#include "sp-flowtext.h" -#include "sp-flowdiv.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "style.h" #include "text-editing.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "object/sp-textpath.h" +#include "object/sp-flowtext.h" +#include "object/sp-flowdiv.h" +#include "object/sp-tspan.h" + #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" -#include <glibmm/i18n.h> -#include <glibmm/regex.h> +#include "ui/dialog-events.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp index c600d8e94..eb13700ec 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -19,15 +19,18 @@ #include <gtkmm/scrolledwindow.h> #include "desktop.h" -#include "document.h" // for SPDocumentUndo::done() #include "document-undo.h" -#include "libnrtype/font-instance.h" -#include "sp-flowtext.h" -#include "sp-text.h" +#include "document.h" // for SPDocumentUndo::done() +#include "selection.h" +#include "text-editing.h" #include "verbs.h" + +#include "libnrtype/font-instance.h" + +#include "object/sp-flowtext.h" +#include "object/sp-text.h" + #include "widgets/font-selector.h" -#include "text-editing.h" -#include "selection.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index 5dc64bb24..dd926296d 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -16,21 +16,26 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include "guides.h" -#include "display/guideline.h" +#include <glibmm/i18n.h> + #include "desktop.h" -#include "document.h" #include "document-undo.h" -#include "sp-guide.h" -#include "sp-namedview.h" +#include "document.h" +#include "message-context.h" +#include "verbs.h" + +#include "object/sp-guide.h" +#include "object/sp-namedview.h" +#include "display/guideline.h" + +#include "ui/dialog-events.h" #include "ui/tools/tool-base.h" + #include "widgets/desktop-widget.h" -#include <glibmm/i18n.h> -#include "ui/dialog-events.h" -#include "message-context.h" -#include "verbs.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index aeb56e563..47f6f3121 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -17,29 +17,30 @@ #include "config.h" #endif -#include <gtkmm/buttonbox.h> - #include <glibmm/i18n.h> #include <glibmm/timer.h> #include <glibmm/main.h> +#include <gtkmm/buttonbox.h> #include <gtkmm/checkbutton.h> #include <gtkmm/frame.h> -#include "ui/widget/frame.h" #include "desktop.h" +#include "document.h" +#include "inkscape.h" +#include "verbs.h" #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "document.h" -#include "inkscape.h" -#include "sp-namedview.h" -#include "sp-root.h" -#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-root.h" #include "icon-preview.h" +#include "ui/widget/frame.h" + extern "C" { // takes doc, drawing, icon, and icon name to produce pixels guchar * diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 2a50c14fc..96c446d0c 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -18,6 +18,7 @@ #endif #include "inkscape-preferences.h" + #include <glibmm/i18n.h> #include <glibmm/miscutils.h> #include <glibmm/markup.h> @@ -25,27 +26,31 @@ #include <gtkmm/recentmanager.h> #include <gtkmm/recentinfo.h> +#include "cms-system.h" +#include "document.h" +#include "enums.h" +#include "inkscape.h" +#include "message-stack.h" +#include "path-prefix.h" #include "preferences.h" -#include "verbs.h" #include "selcue.h" - -#include "extension/internal/gdkpixbuf-input.h" -#include "message-stack.h" -#include "style.h" -#include "selection.h" #include "selection-chemistry.h" -#include "ui/widget/style-swatch.h" -#include "display/nr-filter-gaussian.h" -#include "cms-system.h" -#include "color-profile.h" +#include "selection.h" +#include "shortcuts.h" +#include "verbs.h" + #include "display/canvas-grid.h" -#include "path-prefix.h" +#include "display/nr-filter-gaussian.h" + +#include "extension/internal/gdkpixbuf-input.h" + #include "io/resource.h" #include "io/sys.h" -#include "inkscape.h" -#include "shortcuts.h" -#include "document.h" +#include "object/color-profile.h" +#include "style.h" + +#include "ui/widget/style-swatch.h" #ifdef HAVE_ASPELL # include <aspell.h> diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index e16b1a0f5..6f609736a 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -14,25 +14,30 @@ #endif #include "layers.h" + #include <gtkmm/icontheme.h> #include <gtkmm/separatormenuitem.h> #include <glibmm/main.h> -#include "desktop.h" #include "desktop-style.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" -#include "helper/action.h" +#include "document.h" #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" +#include "selection-chemistry.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "object/sp-root.h" + #include "svg/css-ostringstream.h" + #include "ui/icon-names.h" -#include "ui/widget/imagetoggler.h" -#include "verbs.h" -#include "sp-root.h" #include "ui/tools/tool-base.h" -#include "selection-chemistry.h" +#include "ui/widget/imagetoggler.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index 24591d496..ec8ae4f31 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -18,25 +18,31 @@ #include "livepatheffect-editor.h" -#include "desktop.h" #include <gtkmm/expander.h> -#include "document.h" + +#include "desktop.h" #include "document-undo.h" -#include "helper/action.h" +#include "document.h" #include "inkscape.h" -#include "live_effects/effect.h" -#include "live_effects/lpeobject.h" -#include "live_effects/lpeobject-reference.h" +#include "livepatheffect-add.h" #include "path-chemistry.h" #include "selection-chemistry.h" -#include "sp-item-group.h" -#include "sp-path.h" -#include "sp-rect.h" -#include "sp-text.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "live_effects/effect.h" +#include "live_effects/lpeobject-reference.h" +#include "live_effects/lpeobject.h" + +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-use.h" +#include "object/sp-text.h" + #include "ui/icon-names.h" #include "ui/widget/imagetoggler.h" -#include "verbs.h" -#include "livepatheffect-add.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index 0facb9038..f3e93ded8 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -20,16 +20,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "ui/dialog/dialog-manager.h" -#include "desktop.h" +#include <glibmm/i18n.h> -#include "sp-anchor.h" -#include "sp-image.h" +#include "desktop.h" +#include "inkscape.h" #include "verbs.h" + +#include "object/sp-anchor.h" +#include "object/sp-image.h" + #include "ui/dialog/object-attributes.h" +#include "ui/dialog/dialog-manager.h" + #include "widgets/sp-attribute-widget.h" -#include "inkscape.h" -#include <glibmm/i18n.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index ad80a0171..2d2ee9e2c 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -27,18 +27,21 @@ */ #include "object-properties.h" -#include "widgets/sp-attribute-widget.h" -#include "document.h" -#include "document-undo.h" -#include "verbs.h" -#include "inkscape.h" -#include "desktop.h" -#include "sp-image.h" #include <glibmm/i18n.h> #include <gtkmm/grid.h> +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "inkscape.h" +#include "verbs.h" + +#include "object/sp-image.h" + +#include "widgets/sp-attribute-widget.h" + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index e01660ad1..c2ee66cd7 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -16,39 +16,44 @@ #endif #include "objects.h" + #include <gtkmm/icontheme.h> #include <gtkmm/imagemenuitem.h> #include <gtkmm/separatormenuitem.h> #include <glibmm/main.h> -#include "desktop.h" #include "desktop-style.h" -#include "ui/dialog-events.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" -#include "filters/blend.h" -#include "filters/gaussian-blur.h" -#include "helper/action.h" #include "inkscape.h" #include "layer-manager.h" #include "shortcuts.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-root.h" -#include "sp-shape.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "object/filters/blend.h" +#include "object/filters/gaussian-blur.h" +#include "object/sp-clippath.h" +#include "object/sp-mask.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" #include "style.h" -#include "ui/tools-switch.h" + +#include "ui/dialog-events.h" #include "ui/icon-names.h" #include "ui/selected-color.h" -#include "ui/widget/imagetoggler.h" -#include "ui/widget/layertypeicon.h" -#include "ui/widget/insertordericon.h" -#include "ui/widget/clipmaskicon.h" -#include "ui/widget/highlight-picker.h" +#include "ui/tools-switch.h" #include "ui/tools/node-tool.h" -#include "verbs.h" +#include "ui/widget/clipmaskicon.h" #include "ui/widget/color-notebook.h" +#include "ui/widget/highlight-picker.h" +#include "ui/widget/imagetoggler.h" +#include "ui/widget/insertordericon.h" +#include "ui/widget/layertypeicon.h" + #include "xml/node-observer.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index 3e6617cfe..d5f3de406 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -26,28 +26,30 @@ # include <glibmm/dispatcher.h> #endif // GLIBMM_DISABLE_DEPRECATED -#include "pixelartdialog.h" -#include <gtkmm/radiobutton.h> -#include <gtkmm/messagedialog.h> - #include <glibmm/i18n.h> +#include <gtkmm/messagedialog.h> +#include <gtkmm/radiobutton.h> -#include "ui/widget/spinbutton.h" -#include "ui/widget/frame.h" - -#include "desktop.h" #include "desktop-tracker.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "message-stack.h" +#include "pixelartdialog.h" #include "selection.h" -#include "sp-image.h" #include "display/cairo-utils.h" + #include "libdepixelize/kopftracer2011.h" -#include "document.h" -#include "svg/svg.h" -#include "svg/svg-color.h" + +#include "object/sp-image.h" + #include "svg/css-ostringstream.h" -#include "document-undo.h" +#include "svg/svg-color.h" +#include "svg/svg.h" + +#include "ui/widget/frame.h" +#include "ui/widget/spinbutton.h" #ifdef HAVE_OPENMP #include <omp.h> diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp index 2f18d5c0d..7f535092f 100644 --- a/src/ui/dialog/polar-arrange-tab.cpp +++ b/src/ui/dialog/polar-arrange-tab.cpp @@ -7,22 +7,24 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "ui/dialog/polar-arrange-tab.h" -#include "ui/dialog/tile.h" +#include <glibmm/i18n.h> +#include <gtkmm/messagedialog.h> #include <2geom/transforms.h> -#include <glibmm/i18n.h> -#include "verbs.h" -#include "preferences.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" +#include "preferences.h" +#include "verbs.h" + +#include "object/sp-ellipse.h" +#include "object/sp-item-transform.h" + +#include "ui/dialog/polar-arrange-tab.h" +#include "ui/dialog/tile.h" -#include "document.h" -#include "document-undo.h" -#include "desktop.h" -#include "sp-ellipse.h" -#include "sp-item-transform.h" -#include <gtkmm/messagedialog.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp index 46bf5cb11..1280cba87 100644 --- a/src/ui/dialog/prototype.cpp +++ b/src/ui/dialog/prototype.cpp @@ -9,14 +9,15 @@ * Released under the GNU GPL, read the file 'COPYING' for more information. */ -#include "ui/dialog/prototype.h" -#include "verbs.h" +#include "prototype.h" + #include "desktop.h" #include "document.h" #include "selection.h" +#include "verbs.h" // Only for use in demonstration widget. -#include "sp-root.h" +#include "object/sp-root.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index 3d91ad559..252782081 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -23,15 +23,20 @@ #include "ui/tools-switch.h" #include "ui/tools/text-tool.h" #include "ui/interface.h" -#include "sp-flowtext.h" #include "text-editing.h" -#include "sp-tref.h" -#include "sp-defs.h" #include "selection-chemistry.h" #include "display/curve.h" #include "document-undo.h" -#include "sp-root.h" #include "verbs.h" + +#include "object/sp-defs.h" +#include "object/sp-flowtext.h" +#include "object/sp-object.h" +#include "object/sp-root.h" +#include "object/sp-string.h" +#include "object/sp-text.h" +#include "object/sp-tref.h" + #include <glibmm/i18n.h> #ifdef WIN32 diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index e7563ad1e..aa89a7bdd 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -29,13 +29,17 @@ #include "ui/dialog/desktop-tracker.h" #include "ui/widget/panel.h" -#include "sp-text.h" + +#include "text-editing.h" #ifdef HAVE_ASPELL #include <aspell.h> #endif /* HAVE_ASPELL */ class SPDesktop; +class SPObject; +class SPItem; +class SPCanvasItem; namespace Inkscape { class Preferences; diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 76ab2c7d6..17850712f 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -12,16 +12,18 @@ */ #include "styledialog.h" -#include "ui/widget/addtoicon.h" #include "verbs.h" -#include "sp-object.h" #include "selection.h" -#include "xml/attribute-record.h" -#include "xml/node-observer.h" #include "attribute-rel-svg.h" #include "inkscape.h" #include "document-undo.h" + +#include "ui/widget/addtoicon.h" + +#include "xml/attribute-record.h" +#include "xml/node-observer.h" + #include <glibmm/i18n.h> #include <glibmm/regex.h> diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 5d0080443..19d67916a 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -25,16 +25,18 @@ #include "selection.h" #include "svg/svg.h" #include "xml/repr.h" -#include "sp-font-face.h" #include "desktop.h" #include <sstream> #include "display/nr-svgfonts.h" #include "verbs.h" -#include "sp-glyph.h" -#include "sp-missing-glyph.h" -#include "sp-font.h" -#include "sp-glyph-kerning.h" + +#include "object/sp-font-face.h" +#include "object/sp-glyph.h" +#include "object/sp-missing-glyph.h" +#include "object/sp-font.h" +#include "object/sp-glyph-kerning.h" +#include "object/sp-defs.h" #include <glibmm/i18n.h> #include <glibmm/stringutils.h> diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 5c0deda62..e57dde639 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -42,12 +42,15 @@ #include "io/resource.h" #include "message-context.h" #include "path-prefix.h" -#include "style.h" + #include "ui/previewholder.h" #include "widgets/desktop-widget.h" #include "widgets/gradient-vector.h" #include "display/cairo-utils.h" -#include "sp-gradient-reference.h" + +#include "object/sp-defs.h" +#include "object/sp-gradient-reference.h" + #include "dialog-manager.h" #include "verbs.h" #include "gradient-chemistry.h" diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 117e3da5d..0ef631a3a 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -39,10 +39,11 @@ #include "document.h" #include "inkscape.h" -#include "sp-root.h" -#include "sp-use.h" -#include "sp-defs.h" -#include "sp-symbol.h" + +#include "object/sp-root.h" +#include "object/sp-use.h" +#include "object/sp-defs.h" +#include "object/sp-symbol.h" #ifdef WITH_LIBVISIO #include <libvisio/libvisio.h> diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 0b0312220..5f341c3b1 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -18,11 +18,11 @@ #include "display/drawing.h" #include "ui/dialog/desktop-tracker.h" #include "ui/widget/panel.h" -#include "sp-symbol.h" -#include "sp-use.h" #include <vector> class SPObject; +class SPSymbol; +class SPUse; namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index 3df59bb31..24f167500 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -26,24 +26,20 @@ #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" -#include "sp-shape.h" + #include "svg/css-ostringstream.h" #include "ui/widget/layertypeicon.h" #include "ui/widget/addtoicon.h" #include "verbs.h" #include "xml/node-observer.h" -#include "sp-root.h" #include "ui/tools/tool-base.h" //"event-context.h" //#include "dialogs/dialog-events.h" #include "ui/widget/color-notebook.h" -#include "style.h" #include "filter-chemistry.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-tag.h" -#include "sp-defs.h" -#include "sp-tag-use.h" -#include "sp-tag-use-reference.h" + +#include "object/sp-item.h" +#include "object/sp-defs.h" +#include "object/sp-object-group.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 8aeaa4046..12c6b0298 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -14,14 +14,14 @@ #include <gtkmm/messagedialog.h> #include "desktop.h" - #include "document.h" #include "document-undo.h" #include "file.h" -#include "sp-namedview.h" -#include "extension/implementation/implementation.h" #include "inkscape.h" +#include "extension/implementation/implementation.h" + +#include "object/sp-namedview.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 8ada1b3b9..7ce39695e 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -21,7 +21,9 @@ #endif #include "text-edit.h" -#include <libnrtype/font-instance.h> + +#include <glibmm/i18n.h> +#include <glibmm/markup.h> #ifdef WITH_GTKSPELL extern "C" { @@ -29,27 +31,32 @@ extern "C" { } #endif -#include <libnrtype/font-lister.h> - -#include "helper/window.h" -#include "inkscape.h" -#include "document.h" -#include "desktop.h" #include "desktop-style.h" - +#include "desktop.h" #include "document-undo.h" -#include "sp-text.h" -#include "sp-flowtext.h" +#include "document.h" +#include "inkscape.h" #include "text-editing.h" -#include "ui/icon-names.h" #include "verbs.h" -#include "ui/interface.h" + +#include "helper/window.h" + +#include <libnrtype/font-instance.h> +#include <libnrtype/font-lister.h> + +#include "object/sp-flowtext.h" +#include "object/sp-text.h" +#include "object/sp-textpath.h" + #include "svg/css-ostringstream.h" -#include "widgets/font-selector.h" -#include <glibmm/i18n.h> -#include <glibmm/markup.h> + +#include "ui/icon-names.h" +#include "ui/interface.h" + #include "util/units.h" -#include "sp-textpath.h" + +#include "widgets/font-selector.h" + namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index fc9fe271e..561a88a92 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -16,23 +16,26 @@ #endif #include <gtkmm/dialog.h> -#include <2geom/transforms.h> -#include "document.h" -#include "document-undo.h" -#include "desktop.h" +#include <2geom/transforms.h> -#include "transformation.h" #include "align-and-distribute.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" -#include "selection-chemistry.h" #include "message-stack.h" +#include "selection-chemistry.h" +#include "transformation.h" #include "verbs.h" -#include "sp-namedview.h" -#include "sp-item-transform.h" + +#include "object/sp-item-transform.h" +#include "object/sp-namedview.h" + #include "ui/icon-names.h" + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 11691deb4..e3975dfdc 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -17,26 +17,29 @@ */ #include "xml-tree.h" + #include <glibmm/i18n.h> -#include "desktop.h" -#include "ui/dialog-events.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" -#include "ui/tools/tool-base.h" -#include "helper/window.h" +#include "document.h" #include "inkscape.h" -#include "ui/interface.h" #include "message-context.h" #include "message-stack.h" #include "shortcuts.h" -#include "sp-root.h" -#include "sp-string.h" -#include "sp-tspan.h" -#include "ui/icon-names.h" #include "verbs.h" +#include "helper/window.h" + +#include "object/sp-root.h" +#include "object/sp-string.h" + +#include "ui/dialog-events.h" +#include "ui/icon-names.h" +#include "ui/interface.h" +#include "ui/tools/tool-base.h" + #include "widgets/sp-xmlview-attr-list.h" #include "widgets/sp-xmlview-content.h" #include "widgets/sp-xmlview-tree.h" diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 7df3502f7..0be3ef684 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -23,56 +23,63 @@ #include <config.h> #endif -#include "ui/dialog/dialog-manager.h" #include <gtkmm/icontheme.h> #include <gtkmm/radiomenuitem.h> #include <gtkmm/separatormenuitem.h> -#include "file.h" #include <glibmm/miscutils.h> +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "enums.h" +#include "file.h" +#include "gradient-drag.h" #include "inkscape.h" +#include "message-context.h" +#include "message-stack.h" +#include "preferences.h" +#include "selection-chemistry.h" +#include "shortcuts.h" +#include "svg-view-widget.h" + +#include "display/sp-canvas.h" + #include "extension/db.h" #include "extension/effect.h" +#include "extension/find_extension_by_mime.h" #include "extension/input.h" -#include "preferences.h" -#include "shortcuts.h" -#include "document.h" -#include "ui/interface.h" -#include "ui/monitor.h" -#include "desktop.h" -#include "selection-chemistry.h" -#include "svg-view-widget.h" -#include "widgets/desktop-widget.h" -#include "sp-item-group.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-namedview.h" -#include "sp-root.h" #include "helper/action.h" #include "helper/window.h" + #include "io/sys.h" -#include "ui/dialog-events.h" -#include "message-context.h" -#include "ui/uxmanager.h" -#include "ui/clipboard.h" -#include "display/sp-canvas.h" -#include "svg/svg-color.h" -#include "desktop-style.h" +#include "object/sp-anchor.h" +#include "object/sp-clippath.h" +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-item-group.h" +#include "object/sp-mask.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" #include "style.h" + +#include "svg/svg-color.h" + +#include "ui/clipboard.h" +#include "ui/dialog-events.h" +#include "ui/dialog/dialog-manager.h" +#include "ui/dialog/layer-properties.h" +#include "ui/interface.h" +#include "ui/monitor.h" #include "ui/tools/tool-base.h" -#include "gradient-drag.h" +#include "ui/uxmanager.h" + +#include "widgets/desktop-widget.h" #include "widgets/ege-paint-def.h" -#include "document-undo.h" -#include "sp-anchor.h" -#include "sp-clippath.h" -#include "sp-image.h" -#include "sp-mask.h" -#include "message-stack.h" -#include "ui/dialog/layer-properties.h" -#include "extension/find_extension_by_mime.h" using Inkscape::DocumentUndo; diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp index b2e41bac4..5fb677f27 100644 --- a/src/ui/shape-editor-knotholders.cpp +++ b/src/ui/shape-editor-knotholders.cpp @@ -15,25 +15,27 @@ #include <config.h> #endif -#include "sp-item.h" -#include "sp-rect.h" -#include "box3d.h" -#include "sp-ellipse.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-offset.h" -#include "sp-flowtext.h" +#include <glibmm/i18n.h> + #include "preferences.h" -#include "style.h" #include "desktop.h" - -#include "sp-namedview.h" -#include "live_effects/effect.h" -#include "sp-pattern.h" -#include <glibmm/i18n.h> #include "knotholder.h" #include "knot-holder-entity.h" +#include "live_effects/effect.h" + +#include "object/box3d.h" +#include "object/sp-ellipse.h" +#include "object/sp-flowtext.h" +#include "object/sp-item.h" +#include "object/sp-namedview.h" +#include "object/sp-offset.h" +#include "object/sp-pattern.h" +#include "object/sp-rect.h" +#include "object/sp-spiral.h" +#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))) class RectKnotHolder : public KnotHolder { diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp index 4851c413f..3a5aec056 100644 --- a/src/ui/shape-editor.cpp +++ b/src/ui/shape-editor.cpp @@ -17,9 +17,10 @@ #include "desktop.h" #include "document.h" #include "knotholder.h" -#include "sp-shape.h" -#include "sp-path.h" #include "inkscape.h" + +#include "object/sp-path.h" + #include "ui/shape-editor.h" #include "xml/node-event-vector.h" diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp index 8ab9fcbd7..005e60c62 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -7,16 +7,21 @@ */ #include <iostream> + #include <gdk/gdkkeysyms.h> #include <gdkmm.h> + #include <2geom/point.h> + #include "desktop.h" +#include "message-context.h" #include "display/sp-canvas.h" #include "display/snap-indicator.h" + +#include "object/sp-namedview.h" + #include "ui/tools/tool-base.h" -#include "message-context.h" -#include "sp-namedview.h" #include "ui/control-manager.h" #include "ui/tool/control-point.h" #include "ui/tool/event-utils.h" diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp index 908e18474..685823aaa 100644 --- a/src/ui/tool/curve-drag-point.cpp +++ b/src/ui/tool/curve-drag-point.cpp @@ -13,7 +13,9 @@ #include "ui/tool/event-utils.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/path-manipulator.h" -#include "sp-namedview.h" + +#include "object/sp-namedview.h" +#include "object/sp-path.h" namespace Inkscape { namespace UI { diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp index 9cfa4ed31..b982a622f 100644 --- a/src/ui/tool/multi-path-manipulator.cpp +++ b/src/ui/tool/multi-path-manipulator.cpp @@ -10,22 +10,25 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "node.h" +#include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> -#include "desktop.h" +#include "desktop.h" #include "document.h" #include "document-undo.h" -#include "live_effects/lpeobject.h" #include "message-stack.h" -#include "sp-path.h" +#include "node.h" +#include "verbs.h" + +#include "live_effects/lpeobject.h" + +#include "object/sp-path.h" + #include "ui/tool/control-point-selection.h" #include "ui/tool/event-utils.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/path-manipulator.h" -#include "verbs.h" -#include <gdk/gdkkeysyms.h> namespace Inkscape { namespace UI { diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index f9e9f0b86..94a80a882 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -9,23 +9,26 @@ #include <iostream> #include <stdexcept> #include <boost/utility.hpp> -#include "multi-path-manipulator.h" + #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> + #include <2geom/bezier-utils.h> + +#include "desktop.h" +#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 "desktop.h" -#include "snap.h" -#include "sp-namedview.h" #include "ui/control-manager.h" #include "ui/tool/control-point-selection.h" #include "ui/tool/event-utils.h" #include "ui/tool/path-manipulator.h" #include "ui/tools/node-tool.h" #include "ui/tools-switch.h" -#include <gdk/gdkkeysyms.h> namespace { diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index e7c595893..82cad419d 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -10,25 +10,31 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "live_effects/lpe-powerstroke.h" -#include "live_effects/lpe-bspline.h" #include <2geom/bezier-utils.h> #include <2geom/path-sink.h> -#include "ui/tool/path-manipulator.h" #include "display/sp-canvas.h" #include "display/sp-canvas-util.h" #include "display/curve.h" #include "display/canvas-bpath.h" + +#include "helper/geom.h" + #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" +#include "live_effects/lpe-powerstroke.h" +#include "live_effects/lpe-bspline.h" #include "live_effects/parameter/path.h" -#include "helper/geom.h" + +#include "object/sp-path.h" #include "style.h" + #include "ui/tool/control-point-selection.h" #include "ui/tool/curve-drag-point.h" #include "ui/tool/event-utils.h" #include "ui/tool/multi-path-manipulator.h" +#include "ui/tool/path-manipulator.h" + #include "xml/node-observer.h" namespace Inkscape { diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index 083a7d0ba..f64b9732e 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -11,22 +11,29 @@ #include <math.h> #include <algorithm> -#include "control-point.h" + #include <glib/gi18n.h> + #include <2geom/transforms.h> + +#include "control-point.h" #include "desktop.h" -#include "sp-namedview.h" +#include "pure-transform.h" +#include "seltrans.h" +#include "snap.h" #include "display/sodipodi-ctrlrect.h" -#include "pure-transform.h" + +#include "object/sp-namedview.h" + #include "ui/tool/commit-events.h" #include "ui/tool/control-point-selection.h" -#include "ui/tool/selectable-control-point.h" #include "ui/tool/event-utils.h" +#include "ui/tool/node.h" +#include "ui/tool/selectable-control-point.h" #include "ui/tool/transform-handle-set.h" #include "ui/tools/node-tool.h" -#include "ui/tool/node.h" -#include "seltrans.h" + // FIXME BRAIN DAMAGE WARNING: this is a global variable in select-context.cpp // It should be moved to a header diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp index e2803ccfd..5953887ce 100644 --- a/src/ui/tools-switch.cpp +++ b/src/ui/tools-switch.cpp @@ -20,15 +20,14 @@ #include "ui/tools-switch.h" -#include "box3d.h" -#include "sp-ellipse.h" -#include "sp-flowtext.h" -#include "sp-offset.h" -#include "sp-path.h" -#include "sp-rect.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-text.h" +#include "object/sp-rect.h" +#include "object/sp-ellipse.h" +#include "object/sp-flowtext.h" +#include "object/sp-offset.h" +#include "object/sp-path.h" +#include "object/sp-star.h" +#include "object/sp-spiral.h" +#include "object/sp-text.h" // TODO: How many of these are actually needed? #include "ui/tools/arc-tool.h" diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp index 33f323eb3..e620b7cb1 100644 --- a/src/ui/tools/arc-tool.cpp +++ b/src/ui/tools/arc-tool.cpp @@ -19,31 +19,35 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> -#include "macros.h" -#include <glibmm/i18n.h> -#include "display/sp-canvas.h" -#include "sp-ellipse.h" -#include "document.h" +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-undo.h" -#include "sp-namedview.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "preferences.h" #include "selection.h" +#include "snap.h" +#include "verbs.h" + +#include "display/sp-canvas.h" +#include "display/sp-canvas-item.h" + +#include "object/sp-ellipse.h" +#include "object/sp-namedview.h" #include "pixmaps/cursor-ellipse.xpm" -#include "xml/repr.h" -#include "xml/node-event-vector.h" -#include "preferences.h" -#include "message-context.h" -#include "desktop.h" -#include "desktop-style.h" -#include "context-fns.h" -#include "verbs.h" + +#include "ui/tools/arc-tool.h" #include "ui/shape-editor.h" #include "ui/tools/tool-base.h" -#include "ui/tools/arc-tool.h" -#include "display/sp-canvas-item.h" +#include "xml/repr.h" +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp index 09ee2cda9..52c66fb2b 100644 --- a/src/ui/tools/box3d-tool.cpp +++ b/src/ui/tools/box3d-tool.cpp @@ -16,30 +16,36 @@ */ #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "macros.h" -#include "display/sp-canvas.h" -#include "document.h" + +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-private.h" #include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "perspective-line.h" #include "selection-chemistry.h" +#include "selection.h" +#include "verbs.h" #include "display/sp-canvas-item.h" -#include "desktop.h" -#include "message-context.h" +#include "display/sp-canvas.h" + #include "pixmaps/cursor-3dbox.xpm" -#include "box3d.h" + +#include "object/box3d-side.h" +#include "object/box3d.h" +#include "object/sp-defs.h" +#include "object/sp-namedview.h" + +#include "ui/shape-editor.h" #include "ui/tools/box3d-tool.h" -#include <glibmm/i18n.h> + #include "xml/node-event-vector.h" -#include "context-fns.h" -#include "desktop-style.h" -#include "perspective-line.h" -#include "box3d-side.h" -#include "document-private.h" -#include "ui/shape-editor.h" -#include "verbs.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 2a29b25b0..ccf5e3be5 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -30,34 +30,38 @@ #include <cstring> #include <numeric> -#include "svg/svg.h" -#include "display/canvas-bpath.h" -#include "display/cairo-utils.h" #include <2geom/pathvector.h> #include <2geom/bezier-utils.h> #include <2geom/circle.h> -#include "display/curve.h" -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" -#include "desktop-events.h" -#include "desktop-style.h" -#include "message-context.h" -#include "pixmaps/cursor-calligraphy.xpm" #include "context-fns.h" +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" +#include "macros.h" +#include "message-context.h" +#include "selection.h" #include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" -#include "sp-text.h" -#include "display/sp-canvas.h" +#include "verbs.h" + +#include "display/cairo-utils.h" #include "display/canvas-arena.h" +#include "display/canvas-bpath.h" +#include "display/curve.h" +#include "display/sp-canvas.h" + #include "livarot/Shape.h" -#include "verbs.h" + +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-calligraphy.xpm" + +#include "svg/svg.h" + #include "ui/tools/calligraphic-tool.h" #include "ui/tools/freehand-base.h" diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index bb2e724ae..ec55ab80b 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -66,40 +66,45 @@ * */ - - -#include <gdk/gdkkeysyms.h> #include <string> #include <cstring> -#include "ui/tools/connector-tool.h" -#include "pixmaps/cursor-connector.xpm" -#include "xml/node-event-vector.h" -#include "svg/svg.h" -#include "desktop.h" -#include "desktop-style.h" +#include <glibmm/i18n.h> +#include <glibmm/stringutils.h> +#include <gdk/gdkkeysyms.h> -#include "document.h" +#include "context-fns.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-undo.h" +#include "document.h" +#include "inkscape.h" #include "message-context.h" #include "message-stack.h" #include "selection.h" -#include "inkscape.h" -#include "sp-path.h" -#include "display/sp-canvas.h" -#include "display/canvas-bpath.h" -#include <glibmm/i18n.h> -#include <glibmm/stringutils.h> #include "snap.h" -#include "sp-conn-end.h" -#include "libavoid/router.h" -#include "context-fns.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/curve.h" #include "verbs.h" +#include "display/canvas-bpath.h" +#include "display/curve.h" +#include "display/sp-canvas.h" + +#include "libavoid/router.h" + +#include "object/sp-conn-end.h" +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-connector.xpm" + +#include "svg/svg.h" + +#include "ui/tools/connector-tool.h" + +#include "xml/node-event-vector.h" + using Inkscape::DocumentUndo; namespace Inkscape { diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 7bde1b698..07fc4b719 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -18,33 +18,36 @@ #include <glibmm/i18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> + #include <2geom/transforms.h> #include <2geom/circle.h> +#include "color-rgba.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" #include "macros.h" +#include "message-context.h" +#include "preferences.h" +#include "selection.h" +#include "sp-cursor.h" +#include "verbs.h" + #include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "display/curve.h" #include "display/cairo-utils.h" -#include "svg/svg-color.h" -#include "color-rgba.h" -#include "desktop-style.h" -#include "preferences.h" -#include "sp-namedview.h" -#include "sp-cursor.h" -#include "desktop.h" -#include "selection.h" -#include "document-undo.h" +#include "object/sp-namedview.h" #include "pixmaps/cursor-dropper-f.xpm" #include "pixmaps/cursor-dropper-s.xpm" #include "pixmaps/cursor-dropping-f.xpm" #include "pixmaps/cursor-dropping-s.xpm" +#include "svg/svg-color.h" + #include "ui/tools/dropper-tool.h" -#include "message-context.h" -#include "verbs.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 7892e865b..01ae71413 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -24,48 +24,53 @@ #define noERASER_VERBOSE -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> #include <string> #include <cstring> #include <numeric> -#include "svg/svg.h" -#include "display/sp-canvas.h" -#include "display/canvas-bpath.h" +#include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + #include <2geom/bezier-utils.h> +#include <2geom/pathvector.h> -#include "macros.h" -#include "document.h" -#include "selection.h" -#include "desktop.h" +#include "context-fns.h" #include "desktop-events.h" - #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "layer-manager.h" +#include "layer-model.h" +#include "macros.h" #include "message-context.h" -#include "pixmaps/cursor-eraser.xpm" -#include "context-fns.h" +#include "path-chemistry.h" #include "rubberband.h" +#include "selection-chemistry.h" +#include "selection.h" #include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" -#include "sp-clippath.h" -#include "sp-rect.h" -#include "sp-text.h" -#include "sp-root.h" -#include "display/canvas-bpath.h" -#include "display/canvas-arena.h" -#include "document-undo.h" #include "verbs.h" -#include "style.h" -#include <2geom/pathvector.h> -#include "path-chemistry.h" -#include "selection-chemistry.h" + +#include "display/sp-canvas.h" +#include "display/canvas-arena.h" +#include "display/canvas-bpath.h" #include "display/curve.h" -#include "layer-model.h" -#include "layer-manager.h" + +#include "object/sp-clippath.h" +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" +#include "object/sp-use.h" +#include "style.h" + +#include "pixmaps/cursor-eraser.xpm" + +#include "svg/svg.h" + #include "ui/tools/eraser-tool.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index 401b50c1c..487f3f7d8 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -21,43 +21,53 @@ #include <config.h> #endif +#include "flood-tool.h" + #include <cmath> -#include "trace/potrace/inkscape-potrace.h" -#include <2geom/pathvector.h> -#include <gdk/gdkkeysyms.h> #include <queue> + +#include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> +#include <2geom/pathvector.h> + #include "color.h" #include "context-fns.h" +#include "desktop-style.h" #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" +#include "message-context.h" +#include "message-stack.h" +#include "rubberband.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" -#include "desktop-style.h" #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-image.h" #include "display/drawing.h" #include "display/sp-canvas.h" -#include "document.h" -#include "document-undo.h" -#include "ui/tools/flood-tool.h" + #include "livarot/Path.h" #include "livarot/Shape.h" -#include "macros.h" -#include "message-context.h" -#include "message-stack.h" -#include "rubberband.h" -#include "selection.h" -#include "ui/shape-editor.h" -#include "splivarot.h" -#include "sp-namedview.h" -#include "sp-root.h" + +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-root.h" + +#include "pixmaps/cursor-paintbucket.xpm" + #include "svg/svg.h" + #include "trace/imagemap.h" -#include "xml/node-event-vector.h" -#include "verbs.h" +#include "trace/potrace/inkscape-potrace.h" -#include "pixmaps/cursor-paintbucket.xpm" +#include "ui/shape-editor.h" + +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h index 100875f22..7eadeea34 100644 --- a/src/ui/tools/flood-tool.h +++ b/src/ui/tools/flood-tool.h @@ -11,14 +11,19 @@ * Released under GNU GPL */ +#include <vector> + #include <sigc++/connection.h> + #include "ui/tools/tool-base.h" -#include <vector> #define SP_FLOOD_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::FloodTool*>((Inkscape::UI::Tools::ToolBase*)obj)) #define SP_IS_FLOOD_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::FloodTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL) namespace Inkscape { + +class Selection; + namespace UI { namespace Tools { diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 8a078d510..26d812394 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -20,28 +20,33 @@ #include <config.h> #endif +#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 "live_effects/lpe-bendpath.h" #include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpe-simplify.h" #include "live_effects/lpe-powerstroke.h" -#include "display/canvas-bpath.h" + #include "svg/svg.h" -#include "display/curve.h" -#include "desktop-style.h" +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-use.h" +#include "style.h" + +#include "ui/clipboard.h" +#include "ui/control-manager.h" #include "ui/draw-anchor.h" -#include "macros.h" -#include "message-stack.h" +#include "ui/tools/lpe-tool.h" #include "ui/tools/pen-tool.h" #include "ui/tools/pencil-tool.h" -#include "ui/tools/lpe-tool.h" -#include "selection-chemistry.h" -#include "sp-item-group.h" -#include "sp-rect.h" -#include "style.h" -#include "ui/control-manager.h" -// clipboard support -#include "ui/clipboard.h" #define MIN_PRESSURE 0.0 #define MAX_PRESSURE 1.0 diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index 81d2f6a5b..b0c2a0185 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -16,31 +16,34 @@ #include <config.h> #endif - +#include <glibmm/i18n.h> #include <gdk/gdkkeysyms.h> -#include "macros.h" -#include "document.h" -#include "selection.h" #include "desktop.h" - -#include "message-context.h" -#include "message-stack.h" -#include "pixmaps/cursor-gradient.xpm" -#include "pixmaps/cursor-gradient-add.xpm" -#include "ui/tools/gradient-tool.h" +#include "document-undo.h" +#include "document.h" #include "gradient-chemistry.h" -#include <glibmm/i18n.h> #include "gradient-drag.h" -#include "display/sp-ctrlline.h" -#include "sp-stop.h" -#include "svg/css-ostringstream.h" -#include "snap.h" -#include "sp-namedview.h" +#include "macros.h" +#include "message-context.h" +#include "message-stack.h" #include "rubberband.h" -#include "document-undo.h" -#include "verbs.h" #include "selection-chemistry.h" +#include "selection.h" +#include "snap.h" +#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-stop.h" + +#include "display/sp-ctrlline.h" + +#include "pixmaps/cursor-gradient-add.xpm" +#include "pixmaps/cursor-gradient.xpm" + +#include "svg/css-ostringstream.h" + +#include "ui/tools/gradient-tool.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index ad3964f4a..f62a70c34 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -18,25 +18,29 @@ #include <config.h> #endif -#include <2geom/sbasis-geometric.h> - #include <glibmm/i18n.h> -#include "pixmaps/cursor-crosshairs.xpm" #include <gtk/gtk.h> + +#include <2geom/sbasis-geometric.h> + #include "desktop.h" +#include "document.h" #include "message-context.h" -#include "ui/shape-editor.h" +#include "message-stack.h" #include "selection.h" -#include "document.h" #include "display/curve.h" #include "display/canvas-bpath.h" #include "display/canvas-text.h" -#include "message-stack.h" -#include "sp-path.h" + +#include "object/sp-path.h" + +#include "pixmaps/cursor-crosshairs.xpm" + #include "util/units.h" #include "ui/tools/lpe-tool.h" +#include "ui/shape-editor.h" using Inkscape::Util::unit_table; using Inkscape::UI::Tools::PenTool; diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 8037a02a9..724e121d9 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -15,37 +15,47 @@ #endif #include <gtkmm.h> +#include <glibmm/i18n.h> + #include <boost/none_t.hpp> -#include "util/units.h" -#include "display/curve.h" -#include "display/sodipodi-ctrl.h" -#include "display/sp-ctrlline.h" -#include "display/sp-ctrlcurve.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-util.h" -#include "svg/svg.h" -#include "svg/svg-color.h" -#include "ui/tools/measure-tool.h" -#include "ui/tools/freehand-base.h" + #include <2geom/line.h> #include <2geom/path-intersection.h> -#include "ui/dialog/knot-properties.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-defs.h" -#include "sp-root.h" -#include "svg/stringstream.h" -#include "rubberband.h" -#include "path-chemistry.h" + +#include "desktop-style.h" #include "desktop.h" #include "document-undo.h" -#include "text-editing.h" -#include "pixmaps/cursor-measure.xpm" #include "inkscape.h" -#include "desktop-style.h" +#include "path-chemistry.h" +#include "rubberband.h" +#include "text-editing.h" #include "verbs.h" -#include <glibmm/i18n.h> + +#include "display/curve.h" +#include "display/sodipodi-ctrl.h" +#include "display/sp-canvas-util.h" +#include "display/sp-canvas.h" +#include "display/sp-ctrlcurve.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-defs.h" +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-measure.xpm" + +#include "svg/stringstream.h" +#include "svg/svg-color.h" +#include "svg/svg.h" + +#include "ui/dialog/knot-properties.h" +#include "ui/tools/freehand-base.h" +#include "ui/tools/measure-tool.h" + +#include "util/units.h" using Inkscape::ControlManager; using Inkscape::CTLINE_SECONDARY; diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 94d7eedfc..703e57ac8 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -27,33 +27,33 @@ // General #include "desktop.h" - -#include "document.h" #include "document-undo.h" +#include "document.h" +#include "gradient-drag.h" +#include "gradient-chemistry.h" #include "macros.h" #include "message-context.h" #include "message-stack.h" #include "rubberband.h" #include "selection.h" #include "snap.h" -#include "sp-namedview.h" #include "verbs.h" -#include "sp-text.h" -#include "sp-defs.h" + +#include "display/sp-ctrlcurve.h" +#include "display/curve.h" + +#include "object/sp-defs.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-namedview.h" +#include "object/sp-text.h" #include "style.h" -#include "ui/control-manager.h" -// Gradient specific -#include "gradient-drag.h" -#include "gradient-chemistry.h" #include "pixmaps/cursor-gradient.xpm" #include "pixmaps/cursor-gradient-add.xpm" -// Mesh specific +#include "ui/control-manager.h" #include "ui/tools/mesh-tool.h" -#include "sp-mesh-gradient.h" -#include "display/sp-ctrlcurve.h" -#include "display/curve.h" + using Inkscape::DocumentUndo; diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h index 1f012dc53..9c13ec30e 100644 --- a/src/ui/tools/mesh-tool.h +++ b/src/ui/tools/mesh-tool.h @@ -20,7 +20,8 @@ #include <stddef.h> #include <sigc++/sigc++.h> #include "ui/tools/tool-base.h" -#include "sp-mesh-array.h" + +#include "object/sp-mesh-array.h" #define SP_MESH_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeshTool*>((Inkscape::UI::Tools::ToolBase*)obj)) #define SP_IS_MESH_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::MeshTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL) diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 2b3de5203..6e586b0e9 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -10,41 +10,49 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "ui/tool/curve-drag-point.h" #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> + + + #include "desktop.h" +#include "document.h" +#include "message-context.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "snap.h" -#include "display/sp-canvas-group.h" #include "display/canvas-bpath.h" #include "display/curve.h" +#include "display/sp-canvas-group.h" #include "display/sp-canvas.h" -#include "document.h" + #include "live_effects/effect.h" #include "live_effects/lpeobject.h" -#include "message-context.h" -#include "selection.h" -#include "ui/shape-editor.h" // temporary! -#include "snap.h" -#include "sp-namedview.h" -#include "sp-clippath.h" -#include "sp-item-group.h" -#include "sp-mask.h" -#include "sp-text.h" + +#include "object/sp-clippath.h" +#include "object/sp-item-group.h" +#include "object/sp-mask.h" +#include "object/sp-namedview.h" +#include "object/sp-path.h" +#include "object/sp-shape.h" +#include "object/sp-text.h" + +#include "pixmaps/cursor-node-d.xpm" +#include "pixmaps/cursor-node.xpm" + #include "ui/control-manager.h" -#include "ui/tools/node-tool.h" -#include "ui/tools-switch.h" -#include "ui/tools/tool-base.h" +#include "ui/shape-editor.h" // temporary! #include "ui/tool/control-point-selection.h" +#include "ui/tool/curve-drag-point.h" #include "ui/tool/event-utils.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/path-manipulator.h" #include "ui/tool/selector.h" +#include "ui/tools-switch.h" +#include "ui/tools/node-tool.h" +#include "ui/tools/tool-base.h" -#include "pixmaps/cursor-node.xpm" -#include "pixmaps/cursor-node-d.xpm" -#include "selection-chemistry.h" - -#include <gdk/gdkkeysyms.h> /** @struct NodeTool * diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 0616ba013..7dd120077 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -16,42 +16,47 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "shortcuts.h" -#include "verbs.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "ui/tools/pen-tool.h" -#include "sp-namedview.h" -#include "desktop.h" +#include <2geom/curves.h> -#include "selection.h" -#include "selection-chemistry.h" -#include "ui/draw-anchor.h" -#include "message-stack.h" +#include "context-fns.h" +#include "desktop.h" +#include "macros.h" #include "message-context.h" -#include "display/sp-canvas.h" -#include "display/curve.h" -#include "pixmaps/cursor-pen.xpm" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "shortcuts.h" +#include "verbs.h" + #include "display/canvas-bpath.h" -#include "display/sp-ctrlline.h" +#include "display/curve.h" #include "display/sodipodi-ctrl.h" -#include <glibmm/i18n.h> -#include "macros.h" -#include "context-fns.h" -#include "ui/tools-switch.h" +#include "display/sp-canvas.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-path.h" + +#include "pixmaps/cursor-pen.xpm" + #include "ui/control-manager.h" +#include "ui/draw-anchor.h" +#include "ui/tools-switch.h" +#include "ui/tools/pen-tool.h" + // we include the necessary files for BSpline & Spiro #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" + #define INKSCAPE_LPE_SPIRO_C #include "live_effects/lpe-spiro.h" - -#include <2geom/curves.h> #include "helper/geom-nodetype.h" // For handling un-continuous paths: diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index 2f68688a1..590ef3634 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -17,37 +17,45 @@ */ #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + +#include <2geom/sbasis-to-bezier.h> +#include <2geom/bezier-utils.h> #include "ui/tools/pencil-tool.h" + + #include "desktop.h" #include "inkscape.h" -#include "selection.h" -#include "selection-chemistry.h" -#include "ui/draw-anchor.h" -#include "message-stack.h" +#include "context-fns.h" +#include "desktop-style.h" #include "message-context.h" -#include "sp-path.h" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "selection.h" #include "snap.h" -#include "pixmaps/cursor-pencil.xpm" -#include <2geom/sbasis-to-bezier.h> -#include <2geom/bezier-utils.h> + #include "display/canvas-bpath.h" -#include <glibmm/i18n.h> -#include "context-fns.h" -#include "sp-namedview.h" -#include "xml/node.h" -#include "xml/sp-css-attr.h" -#include "svg/svg.h" #include "display/curve.h" -#include "desktop-style.h" -#include "style.h" #include "display/sp-canvas.h" -#include "display/curve.h" + #include "live_effects/lpe-powerstroke.h" #include "live_effects/lpe-powerstroke-interpolators.h" + +#include "object/sp-path.h" +#include "style.h" + +#include "pixmaps/cursor-pencil.xpm" + +#include "svg/svg.h" + +#include "ui/draw-anchor.h" #include "ui/tool/event-utils.h" +#include "xml/node.h" +#include "xml/sp-css-attr.h" + namespace Inkscape { namespace UI { namespace Tools { diff --git a/src/ui/tools/pencil-tool.h b/src/ui/tools/pencil-tool.h index c361978cb..24f2c8bfc 100644 --- a/src/ui/tools/pencil-tool.h +++ b/src/ui/tools/pencil-tool.h @@ -6,12 +6,13 @@ */ #include "ui/tools/freehand-base.h" -#include "sp-shape.h" + #include <2geom/piecewise.h> #include <2geom/d2.h> #include <2geom/sbasis.h> #include <2geom/pathvector.h> +class SPShape; #define DDC_MIN_PRESSURE 0.0 #define DDC_MAX_PRESSURE 1.0 diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp index 655650ef4..60524b275 100644 --- a/src/ui/tools/rect-tool.cpp +++ b/src/ui/tools/rect-tool.cpp @@ -14,30 +14,35 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-rect.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" -#include "selection-chemistry.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" +#include "selection-chemistry.h" +#include "selection.h" +#include "verbs.h" + +#include "display/sp-canvas-item.h" +#include "display/sp-canvas.h" + +#include "object/sp-rect.h" +#include "object/sp-namedview.h" + #include "pixmaps/cursor-rect.xpm" + +#include "ui/shape-editor.h" #include "ui/tools/rect-tool.h" -#include <glibmm/i18n.h> + #include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" -#include "verbs.h" -#include "display/sp-canvas-item.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h index a22f1caa8..ac056668f 100644 --- a/src/ui/tools/rect-tool.h +++ b/src/ui/tools/rect-tool.h @@ -20,7 +20,7 @@ #include <2geom/point.h> #include "ui/tools/tool-base.h" -#include "sp-rect.h" +class SPRect; namespace Inkscape { namespace UI { diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 2468575c6..ddc6e2881 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -17,36 +17,43 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif + #include <cstring> #include <string> + #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> + +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "macros.h" +#include "message-stack.h" #include "rubberband.h" -#include "document.h" -#include "document-undo.h" +#include "selection-chemistry.h" +#include "selection-describer.h" #include "selection.h" +#include "seltrans.h" #include "sp-cursor.h" + +#include "display/drawing-item.h" +#include "display/sp-canvas.h" +#include "display/sp-canvas-item.h" + +#include "object/box3d.h" #include "style.h" -#include "pixmaps/cursor-select-m.xpm" + #include "pixmaps/cursor-select-d.xpm" +#include "pixmaps/cursor-select-m.xpm" #include "pixmaps/handles.xpm" -#include <glibmm/i18n.h> +#include "ui/tools-switch.h" #include "ui/tools/select-tool.h" -#include "selection-chemistry.h" + #ifdef WITH_DBUS #include "extension/dbus/document-interface.h" #endif -#include "desktop.h" -#include "sp-root.h" -#include "ui/tools-switch.h" -#include "message-stack.h" -#include "selection-describer.h" -#include "seltrans.h" -#include "box3d.h" -#include "display/sp-canvas.h" -#include "display/drawing-item.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp index bb8ce6356..7a1881295 100644 --- a/src/ui/tools/spiral-tool.cpp +++ b/src/ui/tools/spiral-tool.cpp @@ -14,29 +14,33 @@ * Released under GNU GPL */ -#include <gdk/gdkkeysyms.h> #include <cstring> #include <string> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-spiral.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" #include "pixmaps/cursor-spiral.xpm" -#include "ui/tools/spiral-tool.h" -#include <glibmm/i18n.h> -#include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" +#include "selection.h" #include "verbs.h" + #include "display/sp-canvas-item.h" +#include "display/sp-canvas.h" + +#include "object/sp-namedview.h" +#include "object/sp-spiral.h" + +#include "ui/shape-editor.h" +#include "ui/tools/spiral-tool.h" + +#include "xml/node-event-vector.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 5a68fa969..beb556dff 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -22,52 +22,49 @@ #include <numeric> -#include "ui/dialog/dialog-manager.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "svg/svg.h" +#include <2geom/circle.h> -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" -#include "desktop-events.h" -#include "message-context.h" -#include "pixmaps/cursor-spray.xpm" #include "context-fns.h" +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" #include "inkscape.h" - -#include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" +#include "macros.h" +#include "message-context.h" #include "path-chemistry.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" -// For color picking -#include "display/drawing.h" -#include "display/drawing-context.h" #include "display/cairo-utils.h" -#include "desktop-style.h" -#include "svg/svg-color.h" - -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/sp-canvas.h" #include "display/canvas-arena.h" #include "display/curve.h" +#include "display/drawing-context.h" +#include "display/drawing.h" +#include "display/sp-canvas.h" + +#include "helper/action.h" + #include "livarot/Shape.h" -#include <2geom/circle.h> -#include "box3d.h" -#include "sp-item-transform.h" -#include "filter-chemistry.h" + +#include "object/box3d.h" +#include "object/sp-item-transform.h" + +#include "pixmaps/cursor-spray.xpm" + +#include "svg/svg.h" +#include "svg/svg-color.h" #include "ui/tools/spray-tool.h" -#include "helper/action.h" -#include "verbs.h" +#include "ui/dialog/dialog-manager.h" -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> using Inkscape::DocumentUndo; using namespace std; diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp index ed25503c4..d6fcf0409 100644 --- a/src/ui/tools/star-tool.cpp +++ b/src/ui/tools/star-tool.cpp @@ -22,28 +22,31 @@ #include <string> #include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-star.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" - -#include "desktop.h" +#include "context-fns.h" #include "desktop-style.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "macros.h" #include "message-context.h" -#include "pixmaps/cursor-star.xpm" -#include <glibmm/i18n.h> -#include "xml/node-event-vector.h" -#include "context-fns.h" -#include "ui/shape-editor.h" +#include "selection.h" #include "verbs.h" + +#include "display/sp-canvas.h" #include "display/sp-canvas-item.h" +#include "object/sp-namedview.h" +#include "object/sp-star.h" + +#include "pixmaps/cursor-star.xpm" + +#include "ui/shape-editor.h" #include "ui/tools/star-tool.h" +#include "xml/node-event-vector.h" + using Inkscape::DocumentUndo; namespace Inkscape { diff --git a/src/ui/tools/star-tool.h b/src/ui/tools/star-tool.h index da3774e68..a697582d3 100644 --- a/src/ui/tools/star-tool.h +++ b/src/ui/tools/star-tool.h @@ -19,7 +19,7 @@ #include <2geom/point.h> #include "ui/tools/tool-base.h" -#include "sp-star.h" +class SPStar; namespace Inkscape { namespace UI { diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 692b65c44..8db6c323c 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -17,38 +17,42 @@ #include <config.h> #endif +#include <gdk/gdkkeysyms.h> #include <gtkmm/clipboard.h> +#include <glibmm/i18n.h> + #include <display/sp-ctrlline.h> #include <display/sodipodi-ctrlrect.h> #include <display/sp-ctrlquadr.h> -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> #include "context-fns.h" - #include "desktop-style.h" #include "desktop.h" -#include "document.h" #include "document-undo.h" +#include "document.h" #include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "pixmaps/cursor-text-insert.xpm" -#include "pixmaps/cursor-text.xpm" #include "rubberband.h" #include "selection-chemistry.h" #include "selection.h" -#include "ui/shape-editor.h" -#include "sp-flowtext.h" -#include "sp-namedview.h" -#include "sp-text.h" -#include "style.h" -#include "ui/tools/text-tool.h" #include "text-editing.h" -#include "ui/control-manager.h" #include "verbs.h" -#include "xml/node-event-vector.h" + +#include "object/sp-flowtext.h" +#include "object/sp-namedview.h" +#include "object/sp-text.h" +#include "style.h" + +#include "pixmaps/cursor-text-insert.xpm" +#include "pixmaps/cursor-text.xpm" + +#include "ui/control-manager.h" +#include "ui/shape-editor.h" +#include "ui/tools/text-tool.h" + #include "xml/attribute-record.h" +#include "xml/node-event-vector.h" #include "xml/sp-css-attr.h" using Inkscape::ControlManager; diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 83a084a60..9f9a155c2 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -18,11 +18,32 @@ #include <config.h> #endif -#include "widgets/desktop-widget.h" +#include <gdk/gdkkeysyms.h> +#include <glibmm/i18n.h> #include "shortcuts.h" #include "file.h" + + +#include "desktop-events.h" +#include "desktop-style.h" +#include "desktop.h" +#include "gradient-drag.h" +#include "knot-ptr.h" +#include "macros.h" +#include "message-context.h" +#include "rubberband.h" +#include "selcue.h" +#include "selection.h" +#include "sp-cursor.h" + +#include "display/sp-canvas.h" +#include "display/sp-canvas-group.h" +#include "display/canvas-rotate.h" + +#include "object/sp-guide.h" + #include "ui/contextmenu.h" #include "ui/interface.h" #include "ui/event-debug.h" @@ -36,27 +57,9 @@ #include "ui/tools/node-tool.h" #include "ui/tool/shape-record.h" -#include <gdk/gdkkeysyms.h> -#include <glibmm/i18n.h> +#include "widgets/desktop-widget.h" -#include "display/sp-canvas.h" -#include "display/sp-canvas-group.h" -#include "display/canvas-rotate.h" #include "xml/node-event-vector.h" -#include "sp-cursor.h" -#include "desktop.h" - -#include "desktop-events.h" -#include "desktop-style.h" -#include "sp-namedview.h" -#include "selection.h" -#include "macros.h" -#include "message-context.h" -#include "gradient-drag.h" -#include "rubberband.h" -#include "selcue.h" -#include "sp-guide.h" -#include "knot-ptr.h" // globals for temporary switching to selector by space static bool selector_toggled = FALSE; diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index 9348ef842..bcc30a74f 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -11,67 +11,67 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <numeric> + #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> -#include <numeric> - -#include "svg/svg.h" +#include <2geom/circle.h> -#include "macros.h" -#include "document.h" -#include "document-undo.h" -#include "selection.h" -#include "desktop.h" +#include "context-fns.h" #include "desktop-events.h" - #include "desktop-style.h" -#include "message-context.h" -#include "pixmaps/cursor-tweak-move.xpm" -#include "pixmaps/cursor-tweak-move-in.xpm" -#include "pixmaps/cursor-tweak-move-out.xpm" -#include "pixmaps/cursor-tweak-move-jitter.xpm" -#include "pixmaps/cursor-tweak-scale-up.xpm" -#include "pixmaps/cursor-tweak-scale-down.xpm" -#include "pixmaps/cursor-tweak-rotate-clockwise.xpm" -#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm" -#include "pixmaps/cursor-tweak-more.xpm" -#include "pixmaps/cursor-tweak-less.xpm" -#include "pixmaps/cursor-tweak-thin.xpm" -#include "pixmaps/cursor-tweak-thicken.xpm" -#include "pixmaps/cursor-tweak-attract.xpm" -#include "pixmaps/cursor-tweak-repel.xpm" -#include "pixmaps/cursor-tweak-push.xpm" -#include "pixmaps/cursor-tweak-roughen.xpm" -#include "pixmaps/cursor-tweak-color.xpm" -#include "context-fns.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" +#include "gradient-chemistry.h" #include "inkscape.h" -#include "splivarot.h" -#include "sp-item-group.h" -#include "sp-shape.h" -#include "sp-path.h" +#include "macros.h" +#include "message-context.h" #include "path-chemistry.h" -#include "sp-stop.h" -#include "sp-gradient-reference.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-mesh-array.h" -#include "gradient-chemistry.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "display/sp-canvas.h" +#include "selection.h" +#include "splivarot.h" +#include "verbs.h" + #include "display/canvas-arena.h" #include "display/curve.h" +#include "display/sp-canvas.h" + #include "livarot/Shape.h" -#include <2geom/circle.h> + +#include "object/box3d.h" +#include "object/filters/gaussian-blur.h" +#include "object/sp-flowtext.h" +#include "object/sp-item-transform.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-path.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" +#include "object/sp-text.h" #include "style.h" -#include "box3d.h" -#include "sp-item-transform.h" -#include "filter-chemistry.h" -#include "filters/gaussian-blur.h" -#include "verbs.h" + +#include "pixmaps/cursor-tweak-attract.xpm" +#include "pixmaps/cursor-tweak-color.xpm" +#include "pixmaps/cursor-tweak-less.xpm" +#include "pixmaps/cursor-tweak-more.xpm" +#include "pixmaps/cursor-tweak-move-in.xpm" +#include "pixmaps/cursor-tweak-move-jitter.xpm" +#include "pixmaps/cursor-tweak-move-out.xpm" +#include "pixmaps/cursor-tweak-move.xpm" +#include "pixmaps/cursor-tweak-push.xpm" +#include "pixmaps/cursor-tweak-repel.xpm" +#include "pixmaps/cursor-tweak-rotate-clockwise.xpm" +#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm" +#include "pixmaps/cursor-tweak-roughen.xpm" +#include "pixmaps/cursor-tweak-scale-down.xpm" +#include "pixmaps/cursor-tweak-scale-up.xpm" +#include "pixmaps/cursor-tweak-thicken.xpm" +#include "pixmaps/cursor-tweak-thin.xpm" + +#include "svg/svg.h" #include "ui/tools/tweak-tool.h" diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h index 1238798ef..e54116a67 100644 --- a/src/ui/widget/attr-widget.h +++ b/src/ui/widget/attr-widget.h @@ -12,7 +12,7 @@ #define INKSCAPE_UI_WIDGET_ATTR_WIDGET_H #include "attributes.h" -#include "sp-object.h" +#include "object/sp-object.h" #include "xml/node.h" namespace Inkscape { diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index aaf5ba5c2..32f99747a 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -2,26 +2,28 @@ #include "config.h" #endif +#include <set> + #include <gtkmm/adjustment.h> #include <glibmm/i18n.h> -#include <set> +#include "colorspace.h" +#include "document.h" +#include "inkscape.h" +#include "profile-manager.h" + +#include "svg/svg-icc-color.h" #include "ui/dialog-events.h" #include "ui/util.h" #include "ui/widget/color-icc-selector.h" #include "ui/widget/color-scales.h" #include "ui/widget/color-slider.h" -#include "svg/svg-icc-color.h" -#include "colorspace.h" -#include "document.h" -#include "inkscape.h" -#include "profile-manager.h" #define noDEBUG_LCMS #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "color-profile.h" +#include "object/color-profile.h" #include "cms-system.h" #include "color-profile-cms-fns.h" diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index cda41bdb7..308bb968e 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -24,14 +24,16 @@ #include <gtkmm/notebook.h> #include <gtkmm/radiobutton.h> -#include "preferences.h" -#include "widgets/spw-utilities.h" -#include "svg/svg-icc-color.h" -#include "inkscape.h" +#include "cms-system.h" #include "document.h" +#include "inkscape.h" +#include "preferences.h" #include "profile-manager.h" -#include "color-profile.h" -#include "cms-system.h" + +#include "object/color-profile.h" + +#include "svg/svg-icc-color.h" + #include "ui/dialog-events.h" #include "ui/tools-switch.h" #include "ui/tools/tool-base.h" @@ -41,6 +43,8 @@ #include "ui/widget/color-scales.h" #include "ui/widget/color-wheel-selector.h" +#include "widgets/spw-utilities.h" + using Inkscape::CMSSystem; #define XPAD 4 diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index fddd7ae1d..67412b1e0 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -17,19 +17,21 @@ #include <config.h> #endif +#include "entity-entry.h" + #include <gtkmm/scrolledwindow.h> #include <gtkmm/entry.h> -#include "inkscape.h" -#include "rdf.h" -#include "ui/widget/registry.h" -#include "sp-root.h" -#include "document-undo.h" #include "document-private.h" +#include "document-undo.h" +#include "inkscape.h" #include "preferences.h" +#include "rdf.h" #include "verbs.h" -#include "entity-entry.h" +#include "object/sp-root.h" + +#include "ui/widget/registry.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index e8ad78022..12c920264 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -13,13 +13,14 @@ #include <gtkmm.h> #include <glibmm/i18n.h> + #include <libnrtype/font-instance.h> #include "font-variants.h" // For updating from selection #include "desktop.h" -#include "sp-text.h" +#include "object/sp-text.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 7a3909975..c9b3664fc 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -25,11 +25,13 @@ #include <glibmm/i18n.h> +#include "verbs.h" #include "helper/action.h" -#include "sp-root.h" + +#include "object/sp-root.h" + #include "ui/widget/button.h" -#include "verbs.h" using std::pair; using Inkscape::Util::unit_table; diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index 345864a44..078aba9cf 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -14,27 +14,29 @@ #include <config.h> #endif +#include <glibmm/i18n.h> +#include <glibmm/convert.h> +#include <glibmm/regex.h> + #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/scale.h> #include <gtkmm/table.h> -#include "preferences.h" -#include "ui/widget/preferences-widget.h" -#include "verbs.h" -#include "selcue.h" -#include "io/sys.h" + #include "desktop.h" #include "inkscape.h" - #include "message-stack.h" -#include "style.h" +#include "preferences.h" +#include "selcue.h" #include "selection-chemistry.h" +#include "verbs.h" + +#include "io/sys.h" + #include "ui/dialog/filedialog.h" +#include "ui/widget/preferences-widget.h" -#include <glibmm/i18n.h> -#include <glibmm/convert.h> -#include <glibmm/regex.h> #ifdef WIN32 #include <windows.h> diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 209388146..753b72c2e 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -19,15 +19,17 @@ #include "registered-widget.h" -#include "widgets/spinbutton-events.h" +#include <gtkmm/radiobutton.h> + +#include "verbs.h" + +#include "object/sp-root.h" #include "svg/svg-color.h" #include "svg/stringstream.h" -#include "verbs.h" -#include "sp-root.h" +#include "widgets/spinbutton-events.h" -#include <gtkmm/radiobutton.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 765fa77b6..6064e9461 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -29,7 +29,7 @@ #include "document.h" #include "document-undo.h" #include "desktop.h" -#include "sp-namedview.h" +#include "object/sp-namedview.h" #include <gtkmm/checkbutton.h> diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 1c6556884..d317fa216 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -15,38 +15,43 @@ #include "selected-style.h" -#include "widgets/spw-utilities.h" -#include "ui/widget/color-preview.h" +#include <gtkmm/separatormenuitem.h> + +#include "desktop-style.h" +#include "document-undo.h" +#include "gradient-chemistry.h" +#include "message-context.h" #include "selection.h" +#include "sp-cursor.h" + +#include "display/sp-canvas.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-namedview.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" #include "style.h" -#include "desktop-style.h" -#include "sp-namedview.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-pattern.h" + +#include "pixmaps/cursor-adj-a.xpm" +#include "pixmaps/cursor-adj-h.xpm" +#include "pixmaps/cursor-adj-l.xpm" +#include "pixmaps/cursor-adj-s.xpm" + +#include "svg/css-ostringstream.h" +#include "svg/svg-color.h" + #include "ui/dialog/dialog-manager.h" #include "ui/dialog/fill-and-stroke.h" #include "ui/dialog/panel-dialog.h" -#include "document-undo.h" -#include "widgets/widget-sizes.h" -#include "widgets/spinbutton-events.h" -#include "widgets/gradient-image.h" -#include "svg/svg-color.h" -#include "svg/css-ostringstream.h" #include "ui/tools/tool-base.h" -#include "message-context.h" -#include <display/sp-canvas.h> -#include "pixmaps/cursor-adj-h.xpm" -#include "pixmaps/cursor-adj-s.xpm" -#include "pixmaps/cursor-adj-l.xpm" -#include "pixmaps/cursor-adj-a.xpm" -#include "sp-cursor.h" -#include "gradient-chemistry.h" +#include "ui/widget/color-preview.h" -#include <gtkmm/separatormenuitem.h> +#include "widgets/gradient-image.h" +#include "widgets/spinbutton-events.h" +#include "widgets/spw-utilities.h" +#include "widgets/widget-sizes.h" using Inkscape::Util::unit_table; diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp index a779e6feb..e23627080 100644 --- a/src/ui/widget/style-subject.cpp +++ b/src/ui/widget/style-subject.cpp @@ -5,14 +5,13 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#include "ui/widget/style-subject.h" +#include "style-subject.h" #include "desktop.h" -#include "xml/sp-css-attr.h" #include "desktop-style.h" - #include "selection.h" -#include "style.h" + +#include "xml/sp-css-attr.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h index 15a072f44..b75b3ffa7 100644 --- a/src/ui/widget/style-subject.h +++ b/src/ui/widget/style-subject.h @@ -12,10 +12,14 @@ #include <boost/optional.hpp> #include <2geom/rect.h> -#include "sp-item.h" #include <stddef.h> #include <sigc++/sigc++.h> +#include "object/sp-item.h" +#include "object/sp-tag.h" +#include "object/sp-tag-use.h" +#include "object/sp-tag-use-reference.h" + class SPDesktop; class SPObject; class SPCSSAttr; diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index 2dccb55c4..14a6c4502 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -13,22 +13,26 @@ #include "style-swatch.h" -#include "widgets/spw-utilities.h" -#include "ui/widget/color-preview.h" +#include <glibmm/i18n.h> +#include <gtkmm/grid.h> -#include "style.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-pattern.h" -#include "xml/sp-css-attr.h" -#include "widgets/widget-sizes.h" -#include "util/units.h" -#include "helper/action.h" #include "inkscape.h" #include "verbs.h" -#include <glibmm/i18n.h> -#include <gtkmm/grid.h> +#include "object/sp-linear-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" +#include "style.h" + +#include "helper/action.h" + +#include "ui/widget/color-preview.h" +#include "util/units.h" + +#include "widgets/spw-utilities.h" +#include "widgets/widget-sizes.h" + +#include "xml/sp-css-attr.h" enum { SS_FILL, diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index 47e646c34..d2c338571 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -12,24 +12,26 @@ #include <config.h> #endif +#include "tolerance-slider.h" + +#include "registry.h" + #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/radiobutton.h> #include <gtkmm/scale.h> -#include "xml/repr.h" -#include "svg/stringstream.h" - #include "inkscape.h" #include "document.h" #include "document-undo.h" #include "desktop.h" -#include "sp-namedview.h" +#include "object/sp-namedview.h" -#include "registry.h" -#include "tolerance-slider.h" +#include "svg/stringstream.h" + +#include "xml/repr.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h index 3d2548ebe..b77512c34 100644 --- a/src/ui/widget/tolerance-slider.h +++ b/src/ui/widget/tolerance-slider.h @@ -15,6 +15,8 @@ namespace Gtk { class RadioButton; class Scale; +class VBox; +class HBox; } namespace Inkscape { diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp index d36220b74..8be0f4262 100644 --- a/src/ui/widget/unit-tracker.cpp +++ b/src/ui/widget/unit-tracker.cpp @@ -12,9 +12,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "style-internal.h" #include "unit-tracker.h" -//#include "widgets/ege-select-one-action.h" + +#include <algorithm> #define COLUMN_STRING 0 diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h index 643ac4e51..8aefab1bb 100644 --- a/src/ui/widget/unit-tracker.h +++ b/src/ui/widget/unit-tracker.h @@ -16,7 +16,10 @@ #define INKSCAPE_UI_WIDGET_UNIT_TRACKER_H #include <map> +#include <vector> + #include "util/units.h" + #include "widgets/ege-select-one-action.h" using Inkscape::Util::Unit; diff --git a/src/unclump.cpp b/src/unclump.cpp index 55825cdd6..e461df701 100644 --- a/src/unclump.cpp +++ b/src/unclump.cpp @@ -13,11 +13,13 @@ #include <algorithm> #include <map> + #include <2geom/transforms.h> -#include "sp-item.h" + #include "unclump.h" -#include <glib.h> +#include "object/sp-item.h" + // Taking bbox of an item is an expensive operation, and we need to do it many times, so here we // cache the centers, widths, and heights of items diff --git a/src/unclump.h b/src/unclump.h index c6948f320..b758ec894 100644 --- a/src/unclump.h +++ b/src/unclump.h @@ -11,6 +11,9 @@ #ifndef SEEN_DIALOGS_UNCLUMP_H #define SEEN_DIALOGS_UNCLUMP_H +#include <vector> + +class SPItem; void unclump(std::vector<SPItem*> &items); diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp index 416f3673c..de4e834bd 100644 --- a/src/vanishing-point.cpp +++ b/src/vanishing-point.cpp @@ -18,15 +18,18 @@ #include "vanishing-point.h" #include "desktop.h" -#include "display/sp-canvas-item.h" -#include "display/sp-ctrlline.h" #include "document-undo.h" #include "perspective-line.h" #include "snap.h" -#include "sp-namedview.h" +#include "verbs.h" + +#include "display/sp-canvas-item.h" +#include "display/sp-ctrlline.h" + +#include "object/sp-namedview.h" + #include "ui/shape-editor.h" #include "ui/tools/tool-base.h" -#include "verbs.h" using Inkscape::CTLINE_PRIMARY; using Inkscape::CTLINE_SECONDARY; diff --git a/src/vanishing-point.h b/src/vanishing-point.h index f396225df..b4c2f7917 100644 --- a/src/vanishing-point.h +++ b/src/vanishing-point.h @@ -18,8 +18,10 @@ #include "knot.h" #include "selection.h" -#include "persp3d.h" -#include "box3d.h" + +#include "object/persp3d.h" +#include "object/box3d.h" + #include "ui/control-manager.h" // TODO break enums out separately class SPBox3D; diff --git a/src/verbs.cpp b/src/verbs.cpp index 2d33282c5..38eff98ea 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -35,38 +35,43 @@ // Note that gtkmm headers must be included before gtk+ C headers // in all files. The same applies for glibmm/glib etc. // If this is not done, then errors will be generate relating to Glib::Threads being undefined + #include <gtkmm/filechooserdialog.h> #include <gtkmm/messagedialog.h> #include "desktop.h" -#include "display/curve.h" -#include "display/sp-canvas.h" #include "document.h" -#include "ui/tools/freehand-base.h" -#include "extension/effect.h" #include "file.h" #include "gradient-drag.h" -#include "helper/action.h" #include "help.h" #include "inkscape.h" -#include "ui/interface.h" #include "layer-fns.h" #include "layer-manager.h" #include "message-stack.h" #include "path-chemistry.h" -#include "ui/tools/select-tool.h" #include "selection-chemistry.h" #include "seltrans.h" -#include "ui/shape-editor.h" #include "shortcuts.h" -#include "sp-defs.h" -#include "sp-flowtext.h" -#include "sp-guide.h" #include "splivarot.h" -#include "sp-namedview.h" #include "text-chemistry.h" -#include "ui/tools-switch.h" + +#include "display/curve.h" +#include "display/sp-canvas.h" + +#include "extension/effect.h" + +#include "helper/action.h" + +#include "live_effects/effect.h" +#include "live_effects/lpe-powerclip.h" +#include "live_effects/lpe-powermask.h" + +#include "object/sp-defs.h" +#include "object/sp-flowtext.h" +#include "object/sp-guide.h" +#include "object/sp-namedview.h" + #include "ui/dialog/align-and-distribute.h" #include "ui/dialog/clonetiler.h" #include "ui/dialog/dialog-manager.h" @@ -79,15 +84,17 @@ #include "ui/dialog/layers.h" #include "ui/dialog/new-from-template.h" #include "ui/dialog/object-properties.h" +#include "ui/dialog/save-template-dialog.h" +#include "ui/dialog/spellcheck.h" #include "ui/dialog/swatches.h" #include "ui/dialog/symbols.h" -#include "ui/dialog/spellcheck.h" #include "ui/icon-names.h" +#include "ui/interface.h" +#include "ui/shape-editor.h" +#include "ui/tools-switch.h" +#include "ui/tools/freehand-base.h" #include "ui/tools/node-tool.h" -#include "ui/dialog/save-template-dialog.h" -#include "live_effects/effect.h" -#include "live_effects/lpe-powerclip.h" -#include "live_effects/lpe-powermask.h" +#include "ui/tools/select-tool.h" using Inkscape::DocumentUndo; using Inkscape::UI::Dialog::ActionAlign; diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp index d4c36d516..cd4f4c4d3 100644 --- a/src/widgets/arc-toolbar.cpp +++ b/src/widgets/arc-toolbar.cpp @@ -28,28 +28,32 @@ #include <config.h> #endif -#include <glibmm/i18n.h> - #include "arc-toolbar.h" +#include <glibmm/i18n.h> + #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ege-output-action.h" #include "ink-action.h" #include "ink-radio-action.h" #include "mod360.h" #include "selection.h" -#include "sp-ellipse.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-ellipse.h" + #include "ui/icon-names.h" +#include "ui/tools/arc-tool.h" #include "ui/uxmanager.h" #include "ui/widget/ink-select-one-action.h" #include "ui/widget/unit-tracker.h" -#include "ui/tools/arc-tool.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ege-output-action.h" #include "widgets/spinbutton-events.h" #include "widgets/widget-sizes.h" + #include "xml/node-event-vector.h" using Inkscape::UI::Widget::UnitTracker; diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp index 29a447afd..4b944314d 100644 --- a/src/widgets/box3d-toolbar.cpp +++ b/src/widgets/box3d-toolbar.cpp @@ -28,23 +28,28 @@ #include <config.h> #endif +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include "box3d-toolbar.h" -#include "box3d.h" #include "desktop.h" #include "document-undo.h" #include "document.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ink-toggle-action.h" #include "inkscape.h" -#include "persp3d.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/box3d.h" +#include "object/persp3d.h" + #include "ui/icon-names.h" #include "ui/tools/box3d-tool.h" #include "ui/uxmanager.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ink-toggle-action.h" + #include "xml/node-event-vector.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp index 349163255..2030e7acb 100644 --- a/src/widgets/connector-toolbar.cpp +++ b/src/widgets/connector-toolbar.cpp @@ -35,19 +35,24 @@ #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" #include "enums.h" #include "graphlayout.h" #include "ink-action.h" #include "ink-toggle-action.h" #include "inkscape.h" -#include "sp-namedview.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-path.h" + #include "ui/icon-names.h" #include "ui/tools/connector-tool.h" #include "ui/uxmanager.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" #include "widgets/spinbutton-events.h" + #include "xml/node-event-vector.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp index 05f3ab44c..ed2dbe321 100644 --- a/src/widgets/dash-selector.cpp +++ b/src/widgets/dash-selector.cpp @@ -19,14 +19,19 @@ #include "dash-selector.h" #include <cstring> + #include <glibmm/i18n.h> + #include <2geom/coord.h> +#include "preferences.h" + +#include "display/cairo-utils.h" + #include "style.h" + #include "ui/dialog-events.h" -#include "preferences.h" #include "ui/widget/spinbutton.h" -#include "display/cairo-utils.h" gchar const *const SPDashSelector::_prefs_path = "/palette/dashes"; diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index ac2eac801..2e84313b1 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -24,50 +24,57 @@ # include "config.h" #endif +#include <gtkmm/cssprovider.h> +#include <gtkmm/messagedialog.h> +#include <gtkmm/paned.h> + #include <2geom/rect.h> -#include "ui/dialog/dialog-manager.h" -#include "ui/tools/box3d-tool.h" +#include "attributes.h" #include "cms-system.h" #include "conn-avoid-ref.h" -#include "desktop.h" #include "desktop-events.h" - #include "desktop-widget.h" -#include "display/sp-canvas.h" -#include "display/canvas-arena.h" +#include "desktop.h" #include "ege-color-prof-tracker.h" -#include "widgets/ege-select-one-action.h" -#include <extension/db.h> #include "file.h" +#include "inkscape-version.h" +#include "verbs.h" + +#include "display/canvas-arena.h" +#include "display/sp-canvas.h" + +#include "extension/db.h" + #include "helper/action.h" -#include "util/units.h" -#include "ui/widget/unit-tracker.h" -#include "ui/interface.h" -#include "sp-image.h" -#include "sp-namedview.h" + +#include "object/sp-image.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" + +#include "ui/dialog/dialog-manager.h" #include "ui/dialog/swatches.h" #include "ui/icon-names.h" +#include "ui/interface.h" +#include "ui/tools/box3d-tool.h" +#include "ui/uxmanager.h" #include "ui/widget/dock.h" #include "ui/widget/ink-select-one-action.h" #include "ui/widget/layer-selector.h" #include "ui/widget/selected-style.h" -#include "ui/uxmanager.h" +#include "ui/widget/unit-tracker.h" + #include "util/ege-appear-time-tracker.h" -#include "sp-root.h" -#include "attributes.h" +#include "util/units.h" + // We're in the "widgets" directory, so no need to explicitly prefix these: #include "button.h" +#include "ege-select-one-action.h" #include "gimp/ruler.h" #include "spinbutton-events.h" #include "spw-utilities.h" #include "toolbox.h" #include "widget-sizes.h" -#include "verbs.h" -#include <gtkmm/cssprovider.h> -#include <gtkmm/paned.h> -#include <gtkmm/messagedialog.h> -#include "inkscape-version.h" using Inkscape::UI::Widget::UnitTracker; using Inkscape::UI::UXManager; diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index c61a857e7..8b3a31516 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -25,27 +25,28 @@ #include <gtkmm/box.h> #include <glibmm/i18n.h> -#include "verbs.h" - -#include "desktop.h" -#include "selection.h" - #include "desktop-style.h" -#include "display/sp-canvas.h" +#include "desktop.h" #include "document-private.h" #include "document-undo.h" +#include "fill-n-stroke-factory.h" +#include "fill-style.h" #include "gradient-chemistry.h" #include "inkscape.h" -#include "sp-linear-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-pattern.h" -#include "sp-radial-gradient.h" -#include "sp-text.h" +#include "selection.h" +#include "verbs.h" + +#include "object/sp-defs.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-text.h" #include "style.h" -#include "widgets/paint-selector.h" -#include "fill-style.h" -#include "fill-n-stroke-factory.h" +#include "display/sp-canvas.h" + +#include "widgets/paint-selector.h" // These can be deleted once we sort out the libart dependence. diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp index 638cffda6..65b1a6733 100644 --- a/src/widgets/gradient-image.cpp +++ b/src/widgets/gradient-image.cpp @@ -11,17 +11,19 @@ */ #include <sigc++/sigc++.h> + #include <glibmm/refptr.h> #include <gdkmm/pixbuf.h> + #include <cairomm/surface.h> -#include "display/cairo-utils.h" #include "gradient-image.h" #include "macros.h" -#include "sp-gradient.h" -#include "sp-stop.h" -#define VBLOCK 16 +#include "display/cairo-utils.h" + +#include "object/sp-gradient.h" +#include "object/sp-stop.h" static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition); diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 99ef9f19b..db2d7f028 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -17,24 +17,25 @@ #include <config.h> #endif +#include <glibmm/i18n.h> #include <gtkmm/treeview.h> -#include "gradient-vector.h" - -#include "document.h" -#include "document-undo.h" #include "document-private.h" +#include "document-undo.h" +#include "document.h" #include "gradient-chemistry.h" +#include "gradient-vector.h" +#include "id-clash.h" #include "inkscape.h" -#include "verbs.h" -#include "helper/action.h" +#include "paint-selector.h" #include "preferences.h" +#include "verbs.h" -#include <glibmm/i18n.h> - -#include "paint-selector.h" +#include "object/sp-defs.h" #include "style.h" -#include "id-clash.h" + +#include "helper/action.h" + #include "ui/icon-names.h" enum { diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index e058c5112..93ef5d8c1 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -23,8 +23,8 @@ #include <gtkmm/scrolledwindow.h> #include <vector> -#include "sp-gradient-spread.h" -#include "sp-gradient-units.h" +#include "object/sp-gradient-spread.h" +#include "object/sp-gradient-units.h" class SPDocument; class SPGradient; diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 6a7d4b931..d5cc3fd11 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -16,13 +16,12 @@ #include <config.h> #endif -#include "ui/widget/color-preview.h" #include <glibmm/i18n.h> + #include "desktop.h" #include "document-undo.h" #include "document.h" -#include "widgets/ege-adjustment-action.h" #include "gradient-chemistry.h" #include "gradient-drag.h" #include "gradient-toolbar.h" @@ -31,17 +30,22 @@ #include "ink-toggle-action.h" #include "macros.h" #include "selection.h" -#include "sp-defs.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-stop.h" -#include "style.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-defs.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" +#include "style.h" + #include "ui/icon-names.h" -#include "ui/util.h" #include "ui/tools/gradient-tool.h" +#include "ui/util.h" +#include "ui/widget/color-preview.h" #include "ui/widget/ink-select-one-action.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" #include "widgets/gradient-image.h" #include "widgets/gradient-vector.h" diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index fdba2b56d..412f0b7e2 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -23,37 +23,47 @@ #include <config.h> #endif +#include <set> + #include <glibmm.h> -#include "gradient-vector.h" -#include "ui/widget/color-preview.h" -#include "verbs.h" -#include "macros.h" #include <glibmm/i18n.h> -#include <set> -#include "../widgets/gradient-image.h" -#include "../inkscape.h" -#include "../document-private.h" -#include "../gradient-chemistry.h" -#include "../helper/window.h" -#include "io/resource.h" -#include "xml/repr.h" -#include "../preferences.h" -#include "svg/css-ostringstream.h" -#include "sp-stop.h" -#include "selection-chemistry.h" -#include "style.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" + + +#include "document-private.h" +#include "gradient-chemistry.h" +#include "inkscape.h" +#include "preferences.h" #include "desktop.h" +#include "document-undo.h" +#include "gradient-vector.h" #include "layer-manager.h" +#include "macros.h" +#include "selection-chemistry.h" +#include "verbs.h" -#include "document-undo.h" +#include "helper/window.h" + +#include "io/resource.h" + +#include "object/sp-defs.h" +#include "object/sp-linear-gradient.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-root.h" +#include "object/sp-stop.h" +#include "style.h" + +#include "svg/css-ostringstream.h" #include "ui/dialog-events.h" #include "ui/selected-color.h" #include "ui/widget/color-notebook.h" +#include "ui/widget/color-preview.h" + +#include "widgets/gradient-image.h" + +#include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::UI::SelectedColor; diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp index 4c88b42d6..fb5e5428a 100644 --- a/src/widgets/mesh-toolbar.cpp +++ b/src/widgets/mesh-toolbar.cpp @@ -18,41 +18,40 @@ #include <config.h> #endif +#include <glibmm/i18n.h> #include <gtkmm.h> -#include "ui/widget/color-preview.h" -#include "toolbox.h" #include "mesh-toolbar.h" +#include "desktop-style.h" +#include "desktop.h" +#include "document-private.h" +#include "document-undo.h" +#include "gradient-chemistry.h" +#include "gradient-drag.h" +#include "ink-action.h" +#include "ink-radio-action.h" +#include "ink-toggle-action.h" +#include "inkscape.h" +#include "toolbox.h" #include "verbs.h" -#include "widgets/spinbutton-events.h" -#include "widgets/gradient-image.h" +#include "object/sp-defs.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-stop.h" #include "style.h" -#include "inkscape.h" -#include "document-private.h" -#include "document-undo.h" -#include "desktop.h" - -#include <glibmm/i18n.h> +#include "svg/css-ostringstream.h" +#include "ui/icon-names.h" #include "ui/tools/gradient-tool.h" #include "ui/tools/mesh-tool.h" +#include "ui/widget/color-preview.h" #include "ui/widget/ink-select-one-action.h" -#include "gradient-drag.h" -#include "sp-mesh-gradient.h" -#include "gradient-chemistry.h" -#include "ui/icon-names.h" #include "widgets/ege-adjustment-action.h" -#include "ink-action.h" -#include "ink-radio-action.h" -#include "ink-toggle-action.h" - -#include "sp-stop.h" -#include "svg/css-ostringstream.h" -#include "desktop-style.h" +#include "widgets/gradient-image.h" +#include "widgets/spinbutton-events.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp index b1346ed89..b1091ac69 100644 --- a/src/widgets/node-toolbar.cpp +++ b/src/widgets/node-toolbar.cpp @@ -28,24 +28,28 @@ #include <config.h> #endif -#include "ui/tool/multi-path-manipulator.h" #include <glibmm/i18n.h> -#include "node-toolbar.h" + #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" #include "ink-toggle-action.h" #include "ink-tool-menu-action.h" #include "inkscape.h" +#include "node-toolbar.h" #include "selection-chemistry.h" -#include "sp-namedview.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-namedview.h" + #include "ui/icon-names.h" #include "ui/tool/control-point-selection.h" +#include "ui/tool/multi-path-manipulator.h" #include "ui/tools/node-tool.h" #include "ui/widget/unit-tracker.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" #include "widgets/widget-sizes.h" using Inkscape::UI::Widget::UnitTracker; diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 557dc8da2..991d81d4a 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -25,30 +25,36 @@ #include <string> #include <vector> -#include "widgets/swatch-selector.h" -#include "sp-pattern.h" #include <glibmm/i18n.h> -#include "widgets/widget-sizes.h" -#include "xml/repr.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" -#include "sp-mesh-gradient.h" -#include "sp-stop.h" -/* fixme: Move it from dialogs to here */ +#include "desktop-style.h" +#include "document-private.h" #include "gradient-selector.h" -#include <inkscape.h> -#include <document-private.h> -#include <desktop-style.h> -#include <style.h> -#include "svg/css-ostringstream.h" +#include "inkscape.h" +#include "paint-selector.h" #include "path-prefix.h" -#include "io/sys.h" + #include "helper/stock-items.h" + +#include "style.h" + +#include "io/sys.h" + +#include "object/sp-linear-gradient.h" +#include "object/sp-mesh-gradient.h" +#include "object/sp-pattern.h" +#include "object/sp-radial-gradient.h" +#include "object/sp-stop.h" + +#include "svg/css-ostringstream.h" + #include "ui/icon-names.h" #include "ui/widget/color-notebook.h" -#include "paint-selector.h" +#include "widgets/swatch-selector.h" +#include "widgets/widget-sizes.h" + +#include "xml/repr.h" #ifdef SP_PS_VERBOSE #include "svg/svg-icc-color.h" diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index 3302632b8..8433d66f8 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -21,8 +21,10 @@ #include "color.h" #include "fill-or-stroke.h" -#include "sp-gradient-spread.h" -#include "sp-gradient-units.h" + +#include "object/sp-gradient-spread.h" +#include "object/sp-gradient-units.h" + #include "ui/selected-color.h" class SPGradient; diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index 14fb72f97..f26a4400c 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -32,26 +32,35 @@ #include <glibmm/i18n.h> #include "pencil-toolbar.h" + #include "desktop.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ege-select-one-action.h" +#include "selection.h" +#include "toolbox.h" + #include "ink-action.h" #include "ink-radio-action.h" #include "ink-toggle-action.h" -#include "toolbox.h" -#include "ui/tools-switch.h" + +#include "live_effects/lpe-bspline.h" +#include "live_effects/lpe-powerstroke.h" +#include "live_effects/lpe-simplify.h" +#include "live_effects/lpe-spiro.h" +#include "live_effects/lpeobject-reference.h" +#include "live_effects/lpeobject.h" + +#include "display/curve.h" + +#include "object/sp-shape.h" + #include "ui/icon-names.h" +#include "ui/tools-switch.h" #include "ui/tools/pen-tool.h" #include "ui/uxmanager.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ege-select-one-action.h" #include "widgets/spinbutton-events.h" -#include <selection.h> -#include "display/curve.h" -#include "live_effects/lpe-simplify.h" -#include "live_effects/lpe-powerstroke.h" -#include "live_effects/lpe-bspline.h" -#include "live_effects/lpe-spiro.h" -#include "live_effects/lpeobject.h" -#include "live_effects/lpeobject-reference.h" + using Inkscape::UI::UXManager; using Inkscape::UI::ToolboxFactory; diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp index 5b7362e09..df6abf9da 100644 --- a/src/widgets/rect-toolbar.cpp +++ b/src/widgets/rect-toolbar.cpp @@ -28,25 +28,30 @@ #include <config.h> #endif +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include "rect-toolbar.h" #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ege-output-action.h" -#include "widgets/ink-action.h" #include "inkscape.h" -#include "sp-namedview.h" -#include "sp-rect.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-rect.h" + #include "ui/icon-names.h" #include "ui/tools/rect-tool.h" #include "ui/uxmanager.h" #include "ui/widget/unit-tracker.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ege-output-action.h" +#include "widgets/ink-action.h" #include "widgets/widget-sizes.h" + #include "xml/node-event-vector.h" using Inkscape::UI::Widget::UnitTracker; diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index 0932589d2..df90d3d12 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -16,30 +16,36 @@ #include <config.h> #endif +#include <glibmm/i18n.h> + #include <2geom/rect.h> -#include "ui/widget/spinbutton.h" -#include <glibmm/i18n.h> #include "select-toolbar.h" #include "desktop.h" -#include "display/sp-canvas.h" #include "document-undo.h" #include "document.h" -#include "widgets/ege-adjustment-action.h" -#include "helper/action-context.h" -#include "helper/action.h" #include "ink-action.h" #include "ink-toggle-action.h" #include "inkscape.h" #include "message-stack.h" #include "selection-chemistry.h" -#include "sp-item-transform.h" -#include "sp-namedview.h" #include "toolbox.h" +#include "verbs.h" + +#include "display/sp-canvas.h" + +#include "helper/action-context.h" +#include "helper/action.h" + +#include "object/sp-item-transform.h" +#include "object/sp-namedview.h" + #include "ui/icon-names.h" +#include "ui/widget/spinbutton.h" #include "ui/widget/unit-tracker.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" #include "widgets/sp-widget.h" #include "widgets/widget-sizes.h" diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index 6116d3be5..d89e6296c 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -12,19 +12,21 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "sp-attribute-widget.h" - #include <glibmm/i18n.h> #include <gtkmm/entry.h> #include <gtkmm/grid.h> -#include "sp-object.h" -#include "xml/repr.h" +#include "sp-attribute-widget.h" + #include "macros.h" #include "document.h" #include "document-undo.h" #include "verbs.h" +#include "object/sp-object.h" + +#include "xml/repr.h" + using Inkscape::DocumentUndo; /** diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp index a2d5ec44e..79ea30e8e 100644 --- a/src/widgets/spiral-toolbar.cpp +++ b/src/widgets/spiral-toolbar.cpp @@ -28,22 +28,27 @@ #include <config.h> #endif +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include "spiral-toolbar.h" #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ege-output-action.h" -#include "widgets/ink-action.h" #include "selection.h" -#include "sp-spiral.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-spiral.h" + #include "ui/icon-names.h" #include "ui/uxmanager.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ege-output-action.h" +#include "widgets/ink-action.h" #include "widgets/spinbutton-events.h" + #include "xml/node-event-vector.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp index 13c4440ca..801cdf379 100644 --- a/src/widgets/star-toolbar.cpp +++ b/src/widgets/star-toolbar.cpp @@ -34,18 +34,22 @@ #include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" -#include "widgets/ege-output-action.h" -#include "widgets/ege-select-one-action.h" #include "ink-action.h" #include "ink-radio-action.h" #include "selection.h" -#include "sp-star.h" #include "toolbox.h" +#include "verbs.h" + +#include "object/sp-star.h" + #include "ui/icon-names.h" #include "ui/tools/star-tool.h" #include "ui/uxmanager.h" -#include "verbs.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ege-output-action.h" +#include "widgets/ege-select-one-action.h" + #include "xml/node-event-vector.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 51377fd41..95a8ce078 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -19,25 +19,25 @@ #include "stroke-marker-selector.h" #include <glibmm/i18n.h> - - -#include "style.h" -#include "ui/dialog-events.h" +#include <gtkmm/icontheme.h> #include "desktop-style.h" #include "path-prefix.h" -#include "io/sys.h" -#include "sp-marker.h" -#include "sp-defs.h" -#include "sp-root.h" -#include "ui/cache/svg_preview_cache.h" +#include "stroke-style.h" + #include "helper/stock-items.h" -#include <gtkmm/icontheme.h> -#include "ui/widget/spinbutton.h" -#include "ui/util.h" +#include "io/sys.h" -#include "stroke-style.h" +#include "object/sp-defs.h" +#include "object/sp-marker.h" +#include "object/sp-root.h" +#include "style.h" + +#include "ui/cache/svg_preview_cache.h" +#include "ui/dialog-events.h" +#include "ui/util.h" +#include "ui/widget/spinbutton.h" static Inkscape::UI::Cache::SvgPreview svg_preview_cache; diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h index fb68aad58..78e5569af 100644 --- a/src/widgets/stroke-marker-selector.h +++ b/src/widgets/stroke-marker-selector.h @@ -10,6 +10,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #include <vector> + #include <gtkmm/box.h> #include <gtkmm/combobox.h> #include <gtkmm/liststore.h> @@ -19,10 +20,13 @@ #include "desktop.h" #include "document.h" #include "inkscape.h" + #include "display/drawing.h" -#include "sp-marker.h" + +class SPMarker; namespace Gtk { + class Container; class Adjustment; } diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index fba6157e2..b127efcff 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -17,11 +17,19 @@ #define noSP_SS_VERBOSE +#include "desktop-widget.h" #include "stroke-style.h" -#include "sp-stop.h" + +#include "object/sp-marker.h" +#include "object/sp-namedview.h" +#include "object/sp-rect.h" +#include "object/sp-stop.h" +#include "object/sp-text.h" + #include "svg/svg-color.h" + #include "ui/widget/unit-menu.h" -#include "desktop-widget.h" + #include "widgets/style-utils.h" using Inkscape::DocumentUndo; diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index b8eaec8e8..034d385e7 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -21,49 +21,46 @@ # include "config.h" #endif -#include "widgets/dash-selector.h" -#include <gtkmm/radiobutton.h> -#include <gtkmm/grid.h> - #include <glibmm/i18n.h> +#include <gtkmm/grid.h> +#include <gtkmm/radiobutton.h> -#include "desktop.h" #include "desktop-style.h" -#include "ui/dialog-events.h" -#include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_* -#include "display/drawing.h" +#include "desktop.h" #include "document-private.h" #include "document-undo.h" +#include "fill-n-stroke-factory.h" +#include "fill-style.h" // to get sp_fill_style_widget_set_desktop #include "gradient-chemistry.h" -#include "helper/stock-items.h" + #include "inkscape.h" #include "io/sys.h" -#include "sp-marker.h" -#include "preferences.h" #include "path-prefix.h" +#include "preferences.h" #include "selection.h" -#include "sp-linear-gradient.h" -#include "sp-namedview.h" -#include "sp-pattern.h" -#include "sp-radial-gradient.h" -#include "sp-rect.h" -#include "sp-text.h" +#include "verbs.h" + +#include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_* +#include "display/drawing.h" + +#include "helper/stock-items.h" + #include "style.h" + #include "svg/css-ostringstream.h" + #include "ui/cache/svg_preview_cache.h" +#include "ui/dialog-events.h" #include "ui/icon-names.h" +#include "ui/widget/spinbutton.h" + +#include "widgets/dash-selector.h" #include "widgets/paint-selector.h" #include "widgets/sp-widget.h" #include "widgets/spw-utilities.h" -#include "ui/widget/spinbutton.h" -#include "xml/repr.h" +#include "widgets/stroke-marker-selector.h" -#include "stroke-style.h" -#include "stroke-marker-selector.h" -#include "fill-style.h" // to get sp_fill_style_widget_set_desktop -#include "fill-n-stroke-factory.h" - -#include "verbs.h" +#include "xml/repr.h" namespace Gtk { class Widget; diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp index b9cce1d19..3bfa83cd9 100644 --- a/src/widgets/swatch-selector.cpp +++ b/src/widgets/swatch-selector.cpp @@ -1,15 +1,21 @@ + #include "swatch-selector.h" + #include <glibmm/i18n.h> -#include "document.h" #include "document-undo.h" +#include "document.h" #include "gradient-chemistry.h" #include "gradient-selector.h" -#include "sp-stop.h" +#include "verbs.h" + +#include "object/sp-stop.h" + #include "svg/css-ostringstream.h" #include "svg/svg-color.h" -#include "verbs.h" + #include "ui/widget/color-notebook.h" + #include "xml/node.h" namespace Inkscape diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 184c9fd4b..6288999a6 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -30,35 +30,41 @@ #include <config.h> #endif -#include "libnrtype/font-lister.h" #include <glibmm/i18n.h> + #include "text-toolbar.h" #include "desktop-style.h" #include "desktop.h" #include "document-undo.h" #include "document.h" -#include "widgets/ege-adjustment-action.h" #include "ink-radio-action.h" #include "ink-toggle-action.h" -#include "widgets/ink-comboboxentry-action.h" -#include "widgets/style-utils.h" #include "inkscape.h" #include "selection-chemistry.h" -#include "sp-flowtext.h" -#include "sp-root.h" -#include "sp-text.h" -#include "sp-tspan.h" -#include "sp-flowdiv.h" -#include "style.h" -#include "svg/css-ostringstream.h" #include "text-editing.h" #include "toolbox.h" +#include "verbs.h" + +#include "libnrtype/font-lister.h" + +#include "object/sp-flowdiv.h" +#include "object/sp-flowtext.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "object/sp-tspan.h" +#include "style.h" + +#include "svg/css-ostringstream.h" + #include "ui/icon-names.h" #include "ui/tools/text-tool.h" -#include "ui/widget/unit-tracker.h" #include "ui/widget/ink-select-one-action.h" -#include "verbs.h" +#include "ui/widget/unit-tracker.h" + +#include "widgets/ege-adjustment-action.h" +#include "widgets/ink-comboboxentry-action.h" +#include "widgets/style-utils.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 11be3b15d..5894391ff 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -36,31 +36,38 @@ #include <gtkmm/toolitem.h> #include <glibmm/i18n.h> -#include "../desktop.h" -#include "../desktop-style.h" +#include "desktop-style.h" +#include "desktop.h" #include "document-undo.h" -#include "widgets/ege-adjustment-action.h" -#include "../helper/action.h" +#include "inkscape.h" +#include "shortcuts.h" +#include "verbs.h" + #include "ink-action.h" #include "ink-toggle-action.h" -#include "../inkscape.h" + +#include "helper/action.h" + +#include "io/resource.h" + +#include "object/sp-namedview.h" + +#include "ui/icon-names.h" #include "ui/interface.h" -#include "../shortcuts.h" -#include "../sp-namedview.h" #include "ui/tools-switch.h" -#include "../ui/icon-names.h" -#include "../ui/widget/style-swatch.h" -#include "../ui/widget/unit-tracker.h" -#include "../verbs.h" -#include "../widgets/button.h" -#include "../widgets/spinbutton-events.h" -#include "ui/widget/spinbutton.h" -#include "../widgets/spw-utilities.h" -#include "../widgets/widget-sizes.h" -#include "../xml/attribute-record.h" -#include "../xml/node-event-vector.h" #include "ui/uxmanager.h" -#include "io/resource.h" +#include "ui/widget/spinbutton.h" +#include "ui/widget/style-swatch.h" +#include "ui/widget/unit-tracker.h" + +#include "widgets/button.h" +#include "widgets/ege-adjustment-action.h" +#include "widgets/spinbutton-events.h" +#include "widgets/spw-utilities.h" +#include "widgets/widget-sizes.h" + +#include "xml/attribute-record.h" +#include "xml/node-event-vector.h" #include "arc-toolbar.h" #include "box3d-toolbar.h" diff --git a/src/xml/helper-observer.cpp b/src/xml/helper-observer.cpp index 6f1094e53..022cad965 100644 --- a/src/xml/helper-observer.cpp +++ b/src/xml/helper-observer.cpp @@ -1,5 +1,8 @@ + #include "helper-observer.h" +#include "object/sp-object.h" + namespace Inkscape { namespace XML { diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h index b06b61e9c..4b728d295 100644 --- a/src/xml/helper-observer.h +++ b/src/xml/helper-observer.h @@ -6,7 +6,8 @@ #include "node-observer.h" #include "node.h" -#include "sp-object.h" + +class SPObject; namespace Inkscape { namespace XML { diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp index e2af1afe2..072a9b6e4 100644 --- a/src/xml/rebase-hrefs.cpp +++ b/src/xml/rebase-hrefs.cpp @@ -1,13 +1,18 @@ -#include "xml/rebase-hrefs.h" -#include "dir-util.h" + +#include <glibmm/convert.h> +#include <glibmm/miscutils.h> +#include <glibmm/uriutils.h> + #include "../document.h" /* Unfortunately there's a separate xml/document.h. */ -#include "io/sys.h" -#include "sp-object.h" +#include "dir-util.h" #include "streq.h" + +#include "io/sys.h" + +#include "object/sp-object.h" + #include "xml/node.h" -#include <glibmm/miscutils.h> -#include <glibmm/convert.h> -#include <glibmm/uriutils.h> +#include "xml/rebase-hrefs.h" using Inkscape::XML::AttributeRecord; diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index 9121acaad..11c8bcf60 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -21,13 +21,16 @@ #include <cstring> #include <string> #include <sstream> + #include <glibmm/ustring.h> + +#include "libcroco/cr-declaration.h" + #include "svg/css-ostringstream.h" #include "xml/repr.h" #include "xml/simple-document.h" #include "xml/sp-css-attr.h" -#include "style.h" using Inkscape::Util::List; using Inkscape::XML::AttributeRecord; |