diff options
Diffstat (limited to 'src')
32 files changed, 15 insertions, 44 deletions
diff --git a/src/attribute-rel-util.h b/src/attribute-rel-util.h index 449a66d9e..3a6661965 100644 --- a/src/attribute-rel-util.h +++ b/src/attribute-rel-util.h @@ -9,7 +9,6 @@ */ #include "glibmm/ustring.h" -#include "xml/node.h" #include "xml/sp-css-attr.h" using Inkscape::XML::Node; diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp index 7b5ddc00e..dfccb63bf 100644 --- a/src/box3d-side.cpp +++ b/src/box3d-side.cpp @@ -19,6 +19,7 @@ #include "attributes.h" #include "inkscape.h" #include "persp3d.h" +#include "persp3d-reference.h" #include "ui/tools/box3d-tool.h" #include "preferences.h" #include "desktop-style.h" diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h index 669c39a86..c93a2338b 100644 --- a/src/composite-undo-stack-observer.h +++ b/src/composite-undo-stack-observer.h @@ -11,7 +11,6 @@ #define SEEN_COMPOSITE_UNDO_COMMIT_OBSERVER_H #include "gc-alloc.h" -#include "gc-managed.h" #include "undo-stack-observer.h" #include <list> diff --git a/src/display/sp-ctrlquadr.h b/src/display/sp-ctrlquadr.h index 9fdfd29b3..1dfb06456 100644 --- a/src/display/sp-ctrlquadr.h +++ b/src/display/sp-ctrlquadr.h @@ -12,9 +12,7 @@ * Released under GNU GPL */ -#include "sp-canvas.h" - - +#include <2geom/geom.h> #define SP_TYPE_CTRLQUADR (sp_ctrlquadr_get_type ()) #define SP_CTRLQUADR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLQUADR, SPCtrlQuadr)) diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h index 92f496b90..795f5a65a 100644 --- a/src/extension/execution-env.h +++ b/src/extension/execution-env.h @@ -17,8 +17,6 @@ #include <gtkmm/dialog.h> -#include "extension.h" - namespace Inkscape { namespace UI { diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index c2ef2b27c..c120df719 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -29,6 +29,7 @@ #include "selection.h" #include "sp-object.h" #include "util/glib-list-iterators.h" +#include "2geom/geom.h" #include "svg/path-string.h" diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp index c7ae53370..1d419a6a0 100644 --- a/src/extension/internal/metafile-inout.cpp +++ b/src/extension/internal/metafile-inout.cpp @@ -17,6 +17,7 @@ #include <glib.h> #include <glibmm/miscutils.h> +#include "display/curve.h" #include "extension/internal/metafile-inout.h" // picks up PNG #include "extension/print.h" #include "path-prefix.h" diff --git a/src/gradient-drag.h b/src/gradient-drag.h index c92a5c22f..4ed13b9f7 100644 --- a/src/gradient-drag.h +++ b/src/gradient-drag.h @@ -25,7 +25,6 @@ #include <2geom/point.h> -#include "knot-enums.h" #include "sp-gradient.h" // TODO refactor enums to external .h file #include "sp-mesh-array.h" diff --git a/src/knotholder.h b/src/knotholder.h index 25557bef2..fc91a56fc 100644 --- a/src/knotholder.h +++ b/src/knotholder.h @@ -18,7 +18,6 @@ */ #include <glib.h> -#include "knot-enums.h" #include <2geom/forward.h> #include <list> #include <sigc++/connection.h> diff --git a/src/line-geometry.h b/src/line-geometry.h index 48baad265..d7be9570c 100644 --- a/src/line-geometry.h +++ b/src/line-geometry.h @@ -16,8 +16,7 @@ #include "glib.h" #include "axis-manip.h" // FIXME: This is only for Box3D::epsilon; move that to a better location #include "2geom/point.h" -#include "document.h" -#include "ui/view/view.h" +#include "persp3d.h" class SPDesktop; diff --git a/src/marker.h b/src/marker.h index 21ad63a41..585615476 100644 --- a/src/marker.h +++ b/src/marker.h @@ -29,7 +29,6 @@ struct SPMarkerView; #include "svg/svg-length.h" #include "enums.h" #include "sp-item-group.h" -#include "sp-marker-loc.h" #include "uri-references.h" #include "viewbox.h" diff --git a/src/persp3d.h b/src/persp3d.h index 4690c0582..bd3777a19 100644 --- a/src/persp3d.h +++ b/src/persp3d.h @@ -18,10 +18,10 @@ #include <list> #include <vector> #include <map> -#include "sp-item.h" #include "transf_mat_3x4.h" #include "document.h" -#include "inkscape.h" +#include "inkscape.h" // for SP_ACTIVE_DOCUMENT +#include "sp-object.h" class SPBox3D; diff --git a/src/selection.h b/src/selection.h index 373167a33..ba38bec08 100644 --- a/src/selection.h +++ b/src/selection.h @@ -23,9 +23,7 @@ #include "gc-finalized.h" #include "gc-anchored.h" #include "gc-soft-ptr.h" -#include "util/list.h" #include "sp-item.h" -#include "snapped-point.h" class SPDesktop; diff --git a/src/snapper.h b/src/snapper.h index d9f3ab797..c609239cf 100644 --- a/src/snapper.h +++ b/src/snapper.h @@ -20,7 +20,6 @@ #include "snapped-point.h" #include "snapped-line.h" #include "snapped-curve.h" -#include "snap-preferences.h" #include "snap-candidate.h" struct IntermSnapResults { diff --git a/src/sp-image.h b/src/sp-image.h index 50eb731d7..17262d74f 100644 --- a/src/sp-image.h +++ b/src/sp-image.h @@ -17,7 +17,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <glibmm/ustring.h> #include "svg/svg-length.h" -#include "sp-shape.h" +#include "display/curve.h" +#include "sp-item.h" #include "viewbox.h" #define SP_IMAGE(obj) (dynamic_cast<SPImage*>((SPObject*)obj)) diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h index 89c4f6b1b..02e2f10ec 100644 --- a/src/sp-paint-server.h +++ b/src/sp-paint-server.h @@ -18,7 +18,6 @@ #include <cairo.h> #include <2geom/rect.h> #include "sp-object.h" -#include "uri-references.h" #define SP_PAINT_SERVER(obj) (dynamic_cast<SPPaintServer*>((SPObject*)obj)) #define SP_IS_PAINT_SERVER(obj) (dynamic_cast<const SPPaintServer*>((SPObject*)obj) != NULL) diff --git a/src/sp-root.h b/src/sp-root.h index 0e5d87133..a25e8030c 100644 --- a/src/sp-root.h +++ b/src/sp-root.h @@ -16,7 +16,6 @@ #include "version.h" #include "svg/svg-length.h" -#include "enums.h" #include "sp-item-group.h" #include "viewbox.h" diff --git a/src/sp-script.h b/src/sp-script.h index 95b56e79c..36072a0ca 100644 --- a/src/sp-script.h +++ b/src/sp-script.h @@ -12,7 +12,8 @@ * Released under GNU GPL version 2 or later, read the file 'COPYING' for more information */ -#include "sp-item.h" +#include "sp-object.h" +#include "document.h" #define SP_SCRIPT(obj) (dynamic_cast<SPScript*>((SPObject*)obj)) #define SP_IS_SCRIPT(obj) (dynamic_cast<const SPScript*>((SPObject*)obj) != NULL) diff --git a/src/sp-symbol.h b/src/sp-symbol.h index d1e62e923..a2e769cc2 100644 --- a/src/sp-symbol.h +++ b/src/sp-symbol.h @@ -22,8 +22,6 @@ #define SP_IS_SYMBOL(obj) (dynamic_cast<const SPSymbol*>((SPObject*)obj) != NULL) #include <2geom/affine.h> -#include "svg/svg-length.h" -#include "enums.h" #include "sp-item-group.h" #include "viewbox.h" diff --git a/src/sp-text.h b/src/sp-text.h index f7cf5a3aa..5f0485083 100644 --- a/src/sp-text.h +++ b/src/sp-text.h @@ -16,8 +16,8 @@ #include <glib.h> #include <stddef.h> #include <sigc++/sigc++.h> +#include "sp-string.h" // Provides many other headers with SP_IS_STRING #include "sp-item.h" -#include "sp-string.h" #include "text-tag-attributes.h" #include "libnrtype/Layout-TNG.h" diff --git a/src/sp-use.h b/src/sp-use.h index 604040d59..215eb44d7 100644 --- a/src/sp-use.h +++ b/src/sp-use.h @@ -17,6 +17,7 @@ #include <sigc++/sigc++.h> #include "svg/svg-length.h" #include "sp-item.h" +#include "enums.h" #define SP_USE(obj) (dynamic_cast<SPUse*>((SPObject*)obj)) #define SP_IS_USE(obj) (dynamic_cast<const SPUse*>((SPObject*)obj) != NULL) diff --git a/src/style.h b/src/style.h index 7366c2a24..5f1f3932a 100644 --- a/src/style.h +++ b/src/style.h @@ -19,9 +19,8 @@ #include "sp-marker-loc.h" #include "sp-filter.h" #include "sp-filter-reference.h" -#include "uri-references.h" -#include "uri.h" #include "sp-paint-server-reference.h" +#include "uri.h" #include <stddef.h> #include <sigc++/connection.h> diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h index 6f0c2f26e..8d2389b15 100644 --- a/src/ui/widget/filter-effect-chooser.h +++ b/src/ui/widget/filter-effect-chooser.h @@ -25,7 +25,6 @@ #include "combo-enums.h" #include "filter-enums.h" -#include "spin-slider.h" #include "spin-scale.h" namespace Inkscape { diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index 6da58a2dd..23ecbdfda 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -27,7 +27,6 @@ #include <gtkmm/enums.h> #include "desktop.h" -#include "button.h" #include "preferences.h" struct SPStyle; diff --git a/src/vanishing-point.h b/src/vanishing-point.h index 17e3a4aa9..53366fe66 100644 --- a/src/vanishing-point.h +++ b/src/vanishing-point.h @@ -16,11 +16,8 @@ #include <2geom/point.h> #include "knot.h" #include "selection.h" -#include "axis-manip.h" -#include "inkscape.h" #include "persp3d.h" #include "box3d.h" -#include "persp3d-reference.h" #include "ui/control-manager.h" // TODO break enums out separately class SPBox3D; diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index c88666b06..1f58de2e4 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -37,7 +37,6 @@ #include "sp-gradient.h" #include "sp-gradient-spread.h" #include "sp-gradient-units.h" -#include "gradient-image.h" class SPGradient; diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h index 3eb12222c..f63ab0853 100644 --- a/src/widgets/sp-color-icc-selector.h +++ b/src/widgets/sp-color-icc-selector.h @@ -4,7 +4,6 @@ #include <glib.h> #include <gtk/gtk.h> -#include "../color.h" #include "sp-color-selector.h" namespace Inkscape { diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h index 8e0dc6cea..bbd377422 100644 --- a/src/widgets/sp-color-wheel-selector.h +++ b/src/widgets/sp-color-wheel-selector.h @@ -4,7 +4,6 @@ #include <glib.h> #include <gtk/gtk.h> -#include "../color.h" #include "sp-color-slider.h" #include "sp-color-selector.h" diff --git a/src/widgets/sp-xmlview-attr-list.h b/src/widgets/sp-xmlview-attr-list.h index 8b1dae49b..367ef1a12 100644 --- a/src/widgets/sp-xmlview-attr-list.h +++ b/src/widgets/sp-xmlview-attr-list.h @@ -14,8 +14,6 @@ #include <stdio.h> #include <gtk/gtk.h> -#include "../xml/repr.h" - #define SP_TYPE_XMLVIEW_ATTR_LIST (sp_xmlview_attr_list_get_type ()) diff --git a/src/widgets/sp-xmlview-content.h b/src/widgets/sp-xmlview-content.h index 941ef0be1..8b1342c5e 100644 --- a/src/widgets/sp-xmlview-content.h +++ b/src/widgets/sp-xmlview-content.h @@ -13,16 +13,11 @@ */ #include <config.h> - #include <stdio.h> - #include <gtk/gtk.h> -#include "../xml/repr.h" - #include <glib.h> - #define SP_TYPE_XMLVIEW_CONTENT (sp_xmlview_content_get_type ()) #define SP_XMLVIEW_CONTENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_XMLVIEW_CONTENT, SPXMLViewContent)) #define SP_IS_XMLVIEW_CONTENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_XMLVIEW_CONTENT)) diff --git a/src/widgets/sp-xmlview-tree.h b/src/widgets/sp-xmlview-tree.h index 50fcb3bc8..69228fa88 100644 --- a/src/widgets/sp-xmlview-tree.h +++ b/src/widgets/sp-xmlview-tree.h @@ -13,12 +13,9 @@ */ #include <gtk/gtk.h> -#include "../xml/repr.h" - #include <glib.h> - #define SP_TYPE_XMLVIEW_TREE (sp_xmlview_tree_get_type ()) #define SP_XMLVIEW_TREE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_XMLVIEW_TREE, SPXMLViewTree)) #define SP_IS_XMLVIEW_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_XMLVIEW_TREE)) diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index d140cfb21..dbfb1bcd2 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -24,6 +24,7 @@ #include "svg/svg-color.h" #include "util/units.h" #include "ui/widget/unit-menu.h" +#include "desktop-widget.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; |