diff options
Diffstat (limited to 'src/ui')
137 files changed, 77 insertions, 770 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index d581dbf7e..09ba9a1a9 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -27,9 +27,6 @@ // TODO: reduce header bloat if possible #include "file.h" // for file_import, used in _pasteImage -#include <list> -#include <algorithm> -#include <glibmm/ustring.h> #include <glibmm/i18n.h> #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste #include "inkgc/gc-core.h" @@ -41,7 +38,6 @@ #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle #include "document.h" #include "document-private.h" -#include "selection.h" #include "message-stack.h" #include "context-fns.h" #include "ui/tools/dropper-tool.h" // used in copy() @@ -50,17 +46,13 @@ #include "extension/input.h" #include "extension/output.h" #include "selection-chemistry.h" -#include <2geom/rect.h> #include <2geom/transforms.h> #include "box3d.h" #include "gradient-drag.h" #include "sp-marker.h" -#include "sp-item.h" #include "sp-item-transform.h" // for sp_item_scale_rel, used in _pasteSize #include "sp-path.h" #include "sp-pattern.h" -#include "sp-shape.h" -#include "sp-gradient.h" #include "sp-gradient-reference.h" #include "sp-linear-gradient.h" #include "sp-radial-gradient.h" @@ -68,8 +60,6 @@ #include "sp-mask.h" #include "sp-textpath.h" #include "sp-rect.h" -#include "sp-use.h" -#include "sp-symbol.h" #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" @@ -83,9 +73,7 @@ #include "helper/png-write.h" #include "svg/svg-color.h" #include "sp-namedview.h" -#include "snap.h" #include "persp3d.h" -#include "preferences.h" /// Made up mimetype to represent Gdk::Pixbuf clipboard contents. #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf" diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index a2c977533..973625574 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -17,7 +17,6 @@ #include <glib-object.h> #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL -#include "display/sp-canvas-item.h" #include "display/sp-ctrlline.h" #include "display/sp-ctrlcurve.h" #include "preferences.h" diff --git a/src/ui/dialog-events.cpp b/src/ui/dialog-events.cpp index 8856631c0..d7d56fa50 100644 --- a/src/ui/dialog-events.cpp +++ b/src/ui/dialog-events.cpp @@ -12,17 +12,14 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <gtkmm/entry.h> #include <gtkmm/window.h> -#include <gdk/gdkkeysyms.h> #include "macros.h" -#include <gtk/gtk.h> #include "desktop.h" #include "inkscape.h" -#include "preferences.h" #include "ui/tools/tool-base.h" #include "ui/dialog-events.h" diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 8f87932b8..f269d1cb9 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -18,7 +18,7 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "align-and-distribute.h" @@ -27,13 +27,10 @@ #include "unclump.h" #include "document.h" -#include "enums.h" #include "graphlayout.h" #include "inkscape.h" -#include "macros.h" #include "preferences.h" #include "removeoverlap.h" -#include "selection.h" #include "sp-flowtext.h" #include "sp-item-transform.h" #include "sp-text.h" diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index b727c87ee..bdb826384 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -15,13 +15,11 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include "clonetiler.h" -#include <climits> - #include <glibmm/i18n.h> #include <2geom/transforms.h> #include <gtkmm/adjustment.h> @@ -31,23 +29,15 @@ #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "display/drawing-item.h" #include "document.h" #include "document-undo.h" #include "filter-chemistry.h" #include "ui/widget/unit-menu.h" -#include "util/units.h" #include "helper/window.h" #include "inkscape.h" #include "ui/interface.h" -#include "macros.h" #include "message-stack.h" -#include "preferences.h" -#include "selection.h" -#include "sp-filter.h" #include "sp-namedview.h" -#include "sp-use.h" -#include "style.h" #include "svg/svg-color.h" #include "svg/svg.h" #include "ui/icon-names.h" @@ -55,8 +45,6 @@ #include "unclump.h" #include "verbs.h" #include "widgets/icon.h" -#include "xml/repr.h" -#include "sp-root.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 34cdb92e3..df4ab6485 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -12,15 +12,13 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <errno.h> #include <gtkmm/label.h> #include <glibmm/i18n.h> -#include <cairo.h> -#include <gtk/gtk.h> #include "color-item.h" @@ -34,16 +32,10 @@ #include "io/resource.h" #include "io/sys.h" #include "message-context.h" -#include "sp-gradient.h" -#include "sp-item.h" #include "svg/svg-color.h" -#include "xml/node.h" -#include "xml/repr.h" #include "verbs.h" #include "widgets/gradient-vector.h" -#include "color.h" // for SP_RGBA32_U_COMPOSE - namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index d127261c0..d5ce6a160 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -10,13 +10,12 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <gtkmm/box.h> #include <gtkmm/dialog.h> #include <gtkmm/textview.h> -#include <gtkmm/button.h> #include <gtkmm/menubar.h> #include <gtkmm/scrolledwindow.h> #include <glibmm/i18n.h> diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp index 0659de67b..c18711a55 100644 --- a/src/ui/dialog/desktop-tracker.cpp +++ b/src/ui/dialog/desktop-tracker.cpp @@ -6,7 +6,6 @@ */ #include "widgets/desktop-widget.h" -#include <glib-object.h> #include "desktop-tracker.h" diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 49853277c..c53112656 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "ui/dialog/dialog-manager.h" @@ -45,11 +45,8 @@ #include "ui/dialog/panel-dialog.h" #include "ui/dialog/layers.h" #include "ui/dialog/icon-preview.h" -#include "ui/dialog/floating-behavior.h" -#include "ui/dialog/dock-behavior.h" //#include "ui/dialog/print-colors-preview-dialog.h" #include "util/ege-appear-time-tracker.h" -#include "preferences.h" #include "ui/dialog/object-attributes.h" #include "ui/dialog/object-properties.h" #include "ui/dialog/text-edit.h" diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index 27d88bae7..d0b618c65 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "dialog-manager.h" @@ -27,13 +27,10 @@ #include "desktop.h" #include "shortcuts.h" -#include "preferences.h" #include "ui/interface.h" #include "verbs.h" #include "ui/tool/event-utils.h" -#include <gtk/gtk.h> - #define MIN_ONSCREEN_DISTANCE 50 diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp index 50a6db208..ec630c08f 100644 --- a/src/ui/dialog/dock-behavior.cpp +++ b/src/ui/dialog/dock-behavior.cpp @@ -12,7 +12,7 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "dock-behavior.h" @@ -23,15 +23,11 @@ #include "ui/widget/dock.h" #include "verbs.h" #include "dialog.h" -#include "preferences.h" #include "ui/dialog-events.h" #include <gtkmm/invisible.h> -#include <gtkmm/label.h> #include <gtkmm/stock.h> -#include <gtk/gtk.h> - namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index da1facc08..40495456b 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -15,13 +15,12 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "document-metadata.h" #include "desktop.h" -#include "inkscape.h" #include "rdf.h" #include "sp-namedview.h" #include "ui/widget/entity-entry.h" diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 589973162..b2c6c6d9f 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -25,27 +25,17 @@ #include "ui/widget/notebook-page.h" #include "document-properties.h" #include "display/canvas-grid.h" -#include "document.h" -#include "desktop.h" -#include "inkscape.h" #include "io/sys.h" -#include "preferences.h" #include "ui/shape-editor.h" -#include "sp-namedview.h" #include "sp-root.h" #include "sp-script.h" #include "style.h" -#include "svg/stringstream.h" #include "ui/tools-switch.h" -#include "ui/widget/color-picker.h" -#include "ui/widget/scalar-unit.h" #include "ui/dialog/filedialog.h" #include "verbs.h" #include "widgets/icon.h" #include "xml/node-event-vector.h" -#include "xml/repr.h" -#include <algorithm> // std::min #include "rdf.h" #include "ui/widget/entity-entry.h" @@ -54,11 +44,8 @@ #include "color-profile.h" #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include <gtkmm/imagemenuitem.h> #include <gtkmm/stock.h> -#include <gtkmm/table.h> -#include <2geom/transforms.h> #include "ui/icon-names.h" using std::pair; diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 2fb5f9e3b..2e78be8ac 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -24,37 +24,28 @@ #include <gtkmm/buttonbox.h> #include <gtkmm/dialog.h> #include <gtkmm/entry.h> -#include <gtkmm/image.h> -#include <gtkmm/label.h> #include <gtkmm/spinbutton.h> #include <gtkmm/stock.h> -#include <gtkmm/stockid.h> + #if WITH_GTKMM_3_0 # include <gtkmm/grid.h> #else # include <gtkmm/table.h> #endif -#include <gtkmm/togglebutton.h> -#include <gtkmm/widget.h> #ifdef WITH_GNOME_VFS # include <libgnomevfs/gnome-vfs-init.h> // gnome_vfs_initialized #endif #include <glibmm/i18n.h> -#include <glibmm/miscutils.h> #include "ui/widget/unit-menu.h" -#include "util/units.h" #include "helper/window.h" #include "inkscape.h" #include "document.h" #include "document-undo.h" -#include "sp-item.h" -#include "selection.h" #include "file.h" -#include "macros.h" #include "sp-namedview.h" #include "selection-chemistry.h" @@ -89,17 +80,12 @@ #include <glibmm/fileutils.h> #endif -#include <gtk/gtk.h> - #define SP_EXPORT_MIN_SIZE 1.0 #define DPI_BASE Inkscape::Util::Quantity::convert(1, "in", "px") #define EXPORT_COORD_PRECISION 3 -#include "../../document.h" -#include "../../document-undo.h" -#include "verbs.h" #include "export.h" using Inkscape::Util::unit_table; diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index 9bdddc0e0..84840f22d 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -12,14 +12,13 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "extension-editor.h" #include <glibmm/i18n.h> #include <gtkmm/frame.h> -#include <gtkmm/scrolledwindow.h> #include <gtkmm/alignment.h> #include <gtkmm/notebook.h> @@ -27,7 +26,6 @@ #include "preferences.h" #include "ui/interface.h" -#include "extension/extension.h" #include "extension/db.h" namespace Inkscape { diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp index 4e4b0278a..ee673aecf 100644 --- a/src/ui/dialog/filedialog.cpp +++ b/src/ui/dialog/filedialog.cpp @@ -17,14 +17,9 @@ #include "filedialogimpl-win32.h" #include "filedialogimpl-gtkmm.h" -#include "filedialog.h" -#include "inkgc/gc-core.h" #include "ui/dialog-events.h" #include "extension/output.h" -#include "preferences.h" - -#include <glibmm/convert.h> namespace Inkscape { diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index 8141f7696..fa69851e4 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -22,7 +22,6 @@ #include "fill-and-stroke.h" #include "filter-chemistry.h" #include "inkscape.h" -#include "selection.h" #include "preferences.h" #include "style.h" #include "svg/css-ostringstream.h" @@ -32,12 +31,9 @@ #include "widgets/icon.h" #include "widgets/paint-selector.h" #include "widgets/stroke-style.h" -#include "xml/repr.h" #include "ui/view/view-widget.h" -#include <gtkmm/table.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 d3ad5d1da..e733d1b72 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "dialog-manager.h" @@ -28,57 +28,36 @@ #include "ui/widget/spinbutton.h" -#include <glibmm/convert.h> #include <glibmm/i18n.h> -#include <glibmm/main.h> -#include <glibmm/stringutils.h> #include "desktop.h" -#include "dir-util.h" #include "document.h" #include "document-undo.h" #include "filter-chemistry.h" #include "filter-effects-dialog.h" #include "filter-enums.h" #include "inkscape.h" -#include "path-prefix.h" -#include "preferences.h" -#include "selection.h" #include "filters/blend.h" #include "filters/colormatrix.h" #include "filters/componenttransfer.h" #include "filters/componenttransfer-funcnode.h" -#include "filters/composite.h" #include "filters/convolvematrix.h" -#include "filters/displacementmap.h" #include "filters/distantlight.h" -#include "filters/gaussian-blur.h" #include "filters/merge.h" #include "filters/mergenode.h" -#include "filters/offset.h" #include "filters/pointlight.h" #include "filters/spotlight.h" -#include "sp-filter-primitive.h" #include "style.h" #include "svg/svg-color.h" -#include "svg/stringstream.h" #include "ui/dialog/filedialog.h" #include "verbs.h" -#include "xml/node.h" -#include "xml/node-observer.h" -#include "xml/repr.h" -#include <sstream> #include "io/sys.h" -#include <iostream> #include "selection-chemistry.h" -#include <gtkmm/checkbutton.h> #include <gtkmm/colorbutton.h> -#include <gtkmm/paned.h> -#include <gtkmm/scrolledwindow.h> #include <gtkmm/stock.h> #include <gdkmm/general.h> diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index 0f368c5ac..aa26342df 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -11,30 +11,25 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "find.h" #include <gtkmm/entry.h> -#include <gtkmm/widget.h> #include "verbs.h" #include "message-stack.h" #include "helper/window.h" -#include "macros.h" #include "inkscape.h" #include "desktop.h" #include "document.h" #include "document-undo.h" -#include "selection.h" #include "ui/dialog-events.h" -#include "verbs.h" #include "ui/interface.h" -#include "preferences.h" #include "sp-text.h" #include "sp-flowtext.h" #include "sp-flowdiv.h" @@ -51,16 +46,13 @@ #include "sp-line.h" #include "sp-polyline.h" #include "sp-item-group.h" -#include "sp-use.h" #include "sp-image.h" #include "sp-offset.h" #include "sp-root.h" -#include "xml/repr.h" #include "xml/node-iterators.h" #include "xml/attribute-record.h" #include <glibmm/i18n.h> -#include <glibmm/regex.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 55ef0c5bb..2a4a6c028 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -11,13 +11,11 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <gtkmm/dialog.h> #include <gtkmm/stock.h> -#include <glibmm/main.h> -#include <gtk/gtk.h> #include "floating-behavior.h" #include "dialog.h" @@ -26,7 +24,6 @@ #include "desktop.h" #include "ui/dialog-events.h" #include "ui/interface.h" -#include "preferences.h" #include "verbs.h" namespace Inkscape { diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index f219f3db6..0a96188ca 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <gtkmm/messagedialog.h> @@ -21,16 +21,11 @@ #include "inkscape.h" #include "desktop.h" #include "document.h" -#include "selection.h" #include "ui/dialog-events.h" #include "selection-chemistry.h" -#include "preferences.h" -#include "xml/repr.h" - -#include "sp-defs.h" #include "sp-root.h" #include "sp-text.h" #include "sp-textpath.h" @@ -45,7 +40,6 @@ #include "libnrtype/font-instance.h" #include <glibmm/i18n.h> -#include <glibmm/regex.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp index 56b001291..7ce3eabfc 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -14,9 +14,7 @@ #include <glibmm/i18n.h> #include <gtkmm/alignment.h> #include <gtkmm/comboboxtext.h> -#include <gtkmm/entry.h> #include <gtkmm/iconview.h> -#include <gtkmm/label.h> #include <gtkmm/liststore.h> #include <gtkmm/scrolledwindow.h> @@ -26,9 +24,6 @@ # include <gtkmm/table.h> #endif -#include <gtkmm/treemodelcolumn.h> -#include <gtkmm/widget.h> - #include "desktop.h" #include "document.h" // for SPDocumentUndo::done() #include "document-undo.h" diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp index 639e463ea..8d83814b4 100644 --- a/src/ui/dialog/grid-arrange-tab.cpp +++ b/src/ui/dialog/grid-arrange-tab.cpp @@ -16,14 +16,12 @@ //#define DEBUG_GRID_ARRANGE 1 #include "ui/dialog/grid-arrange-tab.h" -#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include <gtkmm/stock.h> #if WITH_GTKMM_3_0 # include <gtkmm/grid.h> #else -# include <gtkmm/table.h> #endif #include <2geom/transforms.h> @@ -32,10 +30,8 @@ #include "preferences.h" #include "inkscape.h" -#include "selection.h" #include "document.h" #include "document-undo.h" -#include "sp-item.h" #include "widgets/icon.h" #include "desktop.h" //#include "sp-item-transform.h" FIXME diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index 556d77a28..469bd5155 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "guides.h" @@ -30,12 +30,8 @@ #include <glibmm/i18n.h> #include "ui/dialog-events.h" #include "message-context.h" -#include "xml/repr.h" #include "verbs.h" -#include <2geom/point.h> -#include <2geom/angle.h> - #include <gtkmm/stock.h> namespace Inkscape { diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index 83656a1f2..8709a5855 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -14,15 +14,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <gtkmm/buttonbox.h> #include <boost/scoped_ptr.hpp> #include <glibmm/i18n.h> -#include <glibmm/main.h> -#include <glibmm/timer.h> #include <gtkmm/alignment.h> #include <gtkmm/checkbutton.h> @@ -35,10 +33,7 @@ #include "display/drawing.h" #include "document.h" #include "inkscape.h" -#include "preferences.h" -#include "selection.h" #include "sp-root.h" -#include "xml/repr.h" #include "verbs.h" #include "icon-preview.h" diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 6dd62d3bb..d53e3dd73 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -19,30 +19,20 @@ #include "inkscape-preferences.h" #include <glibmm/i18n.h> -#include <glibmm/markup.h> -#include <glibmm/miscutils.h> #include <gtkmm/main.h> -#include <gtkmm/frame.h> -#include <gtkmm/scrolledwindow.h> #include <gtkmm/alignment.h> #include "preferences.h" #include "verbs.h" #include "selcue.h" -#include "util/units.h" -#include <iostream> -#include "enums.h" #include "extension/internal/gdkpixbuf-input.h" #include "message-stack.h" #include "style.h" #include "selection.h" #include "selection-chemistry.h" -#include "xml/repr.h" #include "ui/widget/style-swatch.h" -#include "ui/widget/spinbutton.h" #include "display/nr-filter-gaussian.h" -#include "display/nr-filter-types.h" #include "cms-system.h" #include "color-profile.h" #include "display/canvas-grid.h" diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index d1abcfc58..ea8ccf8fb 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -19,7 +19,6 @@ # include "config.h" #endif -#include <iostream> #include <vector> #include "ui/widget/preferences-widget.h" #include "ui/widget/button.h" diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index 8343cd6fe..1bfb59ae5 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -15,18 +15,12 @@ #include "ui/widget/panel.h" #include "ui/widget/frame.h" -#include <glib/gprintf.h> #include <glibmm/i18n.h> -#include <gtkmm/alignment.h> #include <gtkmm/buttonbox.h> #include <gtkmm/cellrenderercombo.h> #include <gtkmm/checkbutton.h> #include <gtkmm/comboboxtext.h> -#include <gtkmm/enums.h> -#include <gtkmm/eventbox.h> -#include <gtkmm/frame.h> -#include <gtkmm/image.h> #include <gtkmm/liststore.h> #include <gtkmm/menubar.h> #include <gtkmm/notebook.h> @@ -40,10 +34,7 @@ # include <gtkmm/table.h> #endif -#include <gtkmm/treemodel.h> -#include <gtkmm/treemodelcolumn.h> #include <gtkmm/treestore.h> -#include <gtkmm/treeview.h> #include "device-manager.h" #include "preferences.h" diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp index a91a09a4f..133ed6f4c 100644 --- a/src/ui/dialog/knot-properties.cpp +++ b/src/ui/dialog/knot-properties.cpp @@ -14,12 +14,10 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "ui/dialog/knot-properties.h" #include <boost/lexical_cast.hpp> -#include <gtkmm/stock.h> -#include <glibmm/main.h> #include <glibmm/i18n.h> #include "inkscape.h" #include "util/units.h" @@ -27,15 +25,8 @@ #include "document.h" #include "document-undo.h" #include "layer-manager.h" -#include "message-stack.h" -#include "sp-object.h" -#include "sp-item.h" -#include "verbs.h" -#include "selection.h" #include "selection-chemistry.h" -#include "ui/icon-names.h" -#include "ui/widget/imagetoggler.h" //#include "event-context.h" diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index 5d550ed48..9af91eb92 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -15,7 +15,6 @@ #include "layer-properties.h" #include <gtkmm/stock.h> -#include <glibmm/main.h> #include <glibmm/i18n.h> #include "inkscape.h" #include "desktop.h" @@ -24,10 +23,7 @@ #include "layer-manager.h" #include "message-stack.h" -#include "sp-object.h" -#include "sp-item.h" #include "verbs.h" -#include "selection.h" #include "selection-chemistry.h" #include "ui/icon-names.h" #include "ui/widget/imagetoggler.h" diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 1c022ecad..ce4fbeedc 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -10,36 +10,25 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "layers.h" -#include <gtkmm/widget.h> #include <gtkmm/icontheme.h> -#include <gtkmm/imagemenuitem.h> -#include <gtkmm/separatormenuitem.h> - -#include <glibmm/i18n.h> -#include <glibmm/main.h> #include "desktop.h" #include "desktop-style.h" #include "document.h" #include "document-undo.h" #include "helper/action.h" -#include "helper/action-context.h" #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" -#include "preferences.h" -#include "sp-item.h" -#include "sp-object.h" #include "svg/css-ostringstream.h" #include "ui/icon-names.h" #include "ui/widget/imagetoggler.h" #include "verbs.h" #include "widgets/icon.h" -#include "xml/repr.h" #include "sp-root.h" #include "ui/tools/tool-base.h" #include "selection-chemistry.h" diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index c558eddaf..3602b04df 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "livepatheffect-add.h" @@ -17,7 +17,6 @@ #include <gtkmm/stock.h> #include "desktop.h" -#include "live_effects/effect-enum.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index 422ec10ae..ac64143f1 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -13,20 +13,16 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "livepatheffect-editor.h" -#include <glibmm/i18n.h> #include <gtkmm/stock.h> -#include <gtkmm/toolbar.h> -#include <vector> #include "desktop.h" #include "document.h" #include "document-undo.h" -#include "gtkmm/widget.h" #include "helper/action.h" #include "inkscape.h" #include "live_effects/effect.h" @@ -34,19 +30,14 @@ #include "live_effects/lpeobject-reference.h" #include "path-chemistry.h" #include "selection-chemistry.h" -#include "selection.h" #include "sp-item-group.h" -#include "sp-lpe-item.h" #include "sp-path.h" #include "sp-rect.h" -#include "sp-use.h" #include "sp-text.h" -#include "sp-shape.h" #include "ui/icon-names.h" #include "ui/widget/imagetoggler.h" #include "verbs.h" #include "widgets/icon.h" -#include "xml/node.h" #include "livepatheffect-add.h" namespace Inkscape { diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index b0cc91868..d33ee758d 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -5,30 +5,20 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <gtkmm.h> #include "lpe-fillet-chamfer-properties.h" #include <boost/lexical_cast.hpp> -#include <glibmm/main.h> #include <glibmm/i18n.h> #include "inkscape.h" #include "desktop.h" -#include "document.h" #include "document-undo.h" #include "layer-manager.h" #include "message-stack.h" -#include "sp-object.h" -#include "sp-item.h" -#include "verbs.h" -#include "selection.h" #include "selection-chemistry.h" -#include "ui/icon-names.h" -#include "ui/widget/imagetoggler.h" -#include "live_effects/parameter/parameter.h" -#include <cmath> //#include "event-context.h" diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp index a6dcce907..d5b3bb30d 100644 --- a/src/ui/dialog/lpe-powerstroke-properties.cpp +++ b/src/ui/dialog/lpe-powerstroke-properties.cpp @@ -14,29 +14,18 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "lpe-powerstroke-properties.h" #include <boost/lexical_cast.hpp> -#include <gtkmm/stock.h> -#include <glibmm/main.h> #include <glibmm/i18n.h> #include "inkscape.h" #include "desktop.h" -#include "document.h" #include "document-undo.h" #include "layer-manager.h" -#include "message-stack.h" -#include "sp-object.h" -#include "sp-item.h" -#include "verbs.h" -#include "selection.h" #include "selection-chemistry.h" -#include "ui/icon-names.h" -#include "ui/widget/imagetoggler.h" -#include "live_effects/parameter/parameter.h" //#include "event-context.h" namespace Inkscape { diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp index c0bc884fa..f2813d4ce 100644 --- a/src/ui/dialog/memory.cpp +++ b/src/ui/dialog/memory.cpp @@ -11,11 +11,10 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "ui/dialog/memory.h" -#include <glibmm/main.h> #include <glibmm/i18n.h> #include <gtkmm/liststore.h> #include <gtkmm/treeview.h> diff --git a/src/ui/dialog/messages.cpp b/src/ui/dialog/messages.cpp index df02215fe..3a8e7338d 100644 --- a/src/ui/dialog/messages.cpp +++ b/src/ui/dialog/messages.cpp @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "messages.h" diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp index 74ec7111e..96fa72791 100644 --- a/src/ui/dialog/new-from-template.cpp +++ b/src/ui/dialog/new-from-template.cpp @@ -9,14 +9,13 @@ */ #if HAVE_CONFIG_H - #include "config.h" +#include "config.h" #endif #include "new-from-template.h" #include "file.h" #include <gtkmm/alignment.h> -#include <glibmm/i18n.h> namespace Inkscape { diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index 1bc570f43..72520d3d0 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -23,15 +23,12 @@ #include "ui/dialog/dialog-manager.h" #include "desktop.h" -#include "macros.h" #include "sp-anchor.h" #include "sp-image.h" #include "verbs.h" -#include "xml/repr.h" #include "ui/dialog/object-attributes.h" #include "widgets/sp-attribute-widget.h" #include "inkscape.h" -#include "selection.h" #include <glibmm/i18n.h> namespace Inkscape { diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index be46129c4..545c240fc 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -33,11 +33,8 @@ #include "document-undo.h" #include "verbs.h" #include "inkscape.h" -#include "selection.h" #include "desktop.h" -#include "sp-item.h" #include "sp-image.h" -#include "xml/repr.h" #include <glibmm/i18n.h> #if WITH_GTKMM_3_0 diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index 27694a9ac..007c48b71 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -10,19 +10,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "objects.h" -#include <gtkmm/widget.h> #include <gtkmm/icontheme.h> -#include <gtkmm/imagemenuitem.h> -#include <gtkmm/separatormenuitem.h> #include <gtkmm/stock.h> -#include <glibmm/i18n.h> -#include <glibmm/main.h> - #include "desktop.h" #include "desktop-style.h" #include "ui/dialog-events.h" @@ -34,12 +28,8 @@ #include "helper/action.h" #include "inkscape.h" #include "layer-manager.h" -#include "preferences.h" -#include "selection.h" #include "sp-clippath.h" #include "sp-mask.h" -#include "sp-item.h" -#include "sp-object.h" #include "sp-root.h" #include "sp-shape.h" #include "style.h" @@ -52,13 +42,10 @@ #include "ui/widget/clipmaskicon.h" #include "ui/widget/highlight-picker.h" #include "ui/tools/node-tool.h" -#include "ui/tools/tool-base.h" #include "verbs.h" #include "ui/widget/color-notebook.h" #include "widgets/icon.h" -#include "xml/node.h" #include "xml/node-observer.h" -#include "xml/repr.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index f2ee79d06..e271f190e 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -18,16 +18,10 @@ #include "ocaldialogs.h" -#include <stdio.h> // rename() -#include <unistd.h> // close() -#include <errno.h> // errno -#include <string.h> // strerror() - #include "path-prefix.h" #include "filedialogimpl-gtkmm.h" #include "ui/interface.h" #include "inkgc/gc-core.h" -#include "ui/dialog-events.h" #include "io/sys.h" #include "preferences.h" @@ -37,12 +31,7 @@ #include <gdkmm/general.h> #include <libxml/tree.h> -#include <glibmm/convert.h> -#include <glibmm/fileutils.h> #include <glibmm/i18n.h> -#include <glibmm/main.h> -#include <glibmm/markup.h> -#include <glibmm/miscutils.h> #include "ui/icon-names.h" namespace Inkscape diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index f557ff0fc..62e6bf591 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -31,7 +31,6 @@ #include <gtkmm/stock.h> #include <gtkmm/messagedialog.h> -#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include "ui/widget/spinbutton.h" @@ -41,18 +40,13 @@ #include "desktop-tracker.h" #include "message-stack.h" #include "selection.h" -#include "preferences.h" #include "sp-image.h" #include "display/cairo-utils.h" #include "libdepixelize/kopftracer2011.h" -#include <algorithm> #include "document.h" -#include "xml/repr.h" -#include "xml/document.h" #include "svg/svg.h" #include "svg/svg-color.h" -#include "color.h" #include "svg/css-ostringstream.h" #include "document-undo.h" diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp index 5ec1285c1..da914dcd4 100644 --- a/src/ui/dialog/polar-arrange-tab.cpp +++ b/src/ui/dialog/polar-arrange-tab.cpp @@ -17,10 +17,8 @@ #include "preferences.h" #include "inkscape.h" -#include "selection.h" #include "document.h" #include "document-undo.h" -#include "sp-item.h" #include "widgets/icon.h" #include "desktop.h" #include "sp-ellipse.h" diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp index c44d645a5..9ebbf040c 100644 --- a/src/ui/dialog/print.cpp +++ b/src/ui/dialog/print.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <gtkmm.h> @@ -26,7 +26,6 @@ #include "extension/internal/cairo-render-context.h" #include "extension/internal/cairo-renderer.h" -#include "ui/widget/rendering-options.h" #include "document.h" #include "util/units.h" diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index 6da8acb20..61fa4c22b 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -17,25 +17,18 @@ #include "message-stack.h" #include "helper/window.h" -#include "macros.h" #include "inkscape.h" #include "document.h" -#include "selection.h" #include "desktop.h" #include "ui/tools-switch.h" #include "ui/tools/text-tool.h" #include "ui/interface.h" -#include "preferences.h" -#include "sp-text.h" #include "sp-flowtext.h" #include "text-editing.h" -#include "sp-tspan.h" #include "sp-tref.h" #include "sp-defs.h" #include "selection-chemistry.h" -#include <xml/repr.h> -#include "display/canvas-bpath.h" #include "display/curve.h" #include "document-undo.h" #include "sp-root.h" @@ -47,7 +40,7 @@ #endif #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 08ebbcf14..c940931ed 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -12,21 +12,18 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "svg-fonts-dialog.h" #include "document-private.h" #include "document-undo.h" #include <gtkmm/notebook.h> -#include <gtkmm/imagemenuitem.h> #include <gtkmm/scale.h> #include <gtkmm/stock.h> #include <message-stack.h> #include "selection.h" -#include <string.h> #include "svg/svg.h" -#include "xml/node.h" #include "xml/repr.h" #include "sp-font-face.h" #include "desktop.h" @@ -39,7 +36,6 @@ #include "sp-glyph-kerning.h" #include <glibmm/i18n.h> -#include <glibmm/stringutils.h> SvgFontDrawingArea::SvgFontDrawingArea(): _x(0), diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 6577c8d4e..fdc8efe1b 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -22,9 +22,6 @@ #include <gtkmm/radiomenuitem.h> #include <glibmm/i18n.h> -#include <glibmm/main.h> -#include <glibmm/timer.h> -#include <gdkmm/pixbuf.h> #include "color-item.h" #include "desktop.h" @@ -35,28 +32,20 @@ #include "document-undo.h" #include "extension/db.h" #include "inkscape.h" -#include "inkscape.h" #include "io/sys.h" #include "io/resource.h" #include "message-context.h" #include "path-prefix.h" -#include "preferences.h" -#include "sp-item.h" -#include "sp-gradient.h" -#include "sp-gradient-vector.h" #include "style.h" #include "ui/previewholder.h" #include "widgets/desktop-widget.h" #include "widgets/gradient-vector.h" -#include "widgets/eek-preview.h" #include "display/cairo-utils.h" #include "sp-gradient-reference.h" #include "dialog-manager.h" -#include "selection.h" #include "verbs.h" #include "gradient-chemistry.h" #include "helper/action.h" -#include "helper/action-context.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 06c17611f..8433073a6 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -15,7 +15,6 @@ #include <iostream> #include <algorithm> #include <locale> -#include <functional> #include <sstream> #include <gtkmm/buttonbox.h> @@ -32,10 +31,6 @@ #include <gtkmm/comboboxtext.h> #include <gtkmm/iconview.h> #include <gtkmm/liststore.h> -#include <gtkmm/treemodelcolumn.h> -#include <gtkmm/clipboard.h> -#include <glibmm/stringutils.h> -#include <glibmm/markup.h> #include <glibmm/i18n.h> #include "path-prefix.h" #include "io/sys.h" @@ -76,8 +71,6 @@ #include "verbs.h" #include "helper/action.h" -#include "helper/action-context.h" -#include "xml/repr.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index c99c1bff3..d03c781f3 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -10,17 +10,11 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "tags.h" -#include <gtkmm/widget.h> #include <gtkmm/icontheme.h> -#include <gtkmm/imagemenuitem.h> -#include <gtkmm/separatormenuitem.h> - -#include <glibmm/main.h> -#include <glibmm/i18n.h> #include "desktop.h" #include "desktop-style.h" @@ -30,28 +24,19 @@ #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" -#include "preferences.h" -#include "sp-item.h" -#include "sp-object.h" #include "sp-shape.h" #include "svg/css-ostringstream.h" -#include "ui/icon-names.h" #include "ui/widget/layertypeicon.h" #include "ui/widget/addtoicon.h" #include "verbs.h" #include "widgets/icon.h" -#include "xml/node.h" #include "xml/node-observer.h" -#include "xml/repr.h" #include "sp-root.h" #include "ui/tools/tool-base.h" //"event-context.h" -#include "selection.h" //#include "dialogs/dialog-events.h" #include "ui/widget/color-notebook.h" #include "style.h" #include "filter-chemistry.h" -#include "filters/blend.h" -#include "filters/gaussian-blur.h" #include "sp-clippath.h" #include "sp-mask.h" #include "sp-tag.h" diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp index 7eb04ff79..780da4ce3 100644 --- a/src/ui/dialog/template-load-tab.cpp +++ b/src/ui/dialog/template-load-tab.cpp @@ -9,28 +9,17 @@ */ #include "template-widget.h" -#include "template-load-tab.h" #include "new-from-template.h" #include <gtkmm/messagedialog.h> #include <gtkmm/scrolledwindow.h> -#include <glibmm/i18n.h> -#include <glibmm/fileutils.h> -#include <glibmm/miscutils.h> -#include <glibmm/stringutils.h> #include <iostream> -#include <list> #include "extension/db.h" -#include "extension/effect.h" #include "inkscape.h" #include "ui/interface.h" #include "file.h" #include "path-prefix.h" -#include "preferences.h" -#include "xml/repr.h" -#include "xml/document.h" -#include "xml/node.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 0d110d853..93b44fefe 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -11,14 +11,8 @@ #include "template-widget.h" #include <gtkmm/alignment.h> -#include <gtkmm/button.h> -#include <gtkmm/label.h> #include <gtkmm/messagedialog.h> -#include <glibmm/i18n.h> -#include <glibmm/miscutils.h> - -#include "template-load-tab.h" #include "desktop.h" #include "document.h" diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index c01da8864..73d2cd042 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -22,7 +22,6 @@ #include "text-edit.h" #include <libnrtype/font-instance.h> -#include <gtk/gtk.h> #ifdef WITH_GTKSPELL extern "C" { @@ -31,11 +30,8 @@ extern "C" { #endif #include <gtkmm/stock.h> -#include <libnrtype/font-instance.h> #include <libnrtype/font-lister.h> -#include <xml/repr.h> -#include "macros.h" #include "helper/window.h" #include "inkscape.h" #include "document.h" @@ -43,20 +39,16 @@ extern "C" { #include "desktop-style.h" #include "document-undo.h" -#include "selection.h" -#include "style.h" #include "sp-text.h" #include "sp-flowtext.h" #include "text-editing.h" #include "ui/icon-names.h" -#include "preferences.h" #include "verbs.h" #include "ui/interface.h" #include "svg/css-ostringstream.h" #include "widgets/icon.h" #include "widgets/font-selector.h" #include <glibmm/i18n.h> -#include <glibmm/markup.h> #include "util/units.h" #include "sp-textpath.h" diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp index 11e75391b..a264d83c8 100644 --- a/src/ui/dialog/tracedialog.cpp +++ b/src/ui/dialog/tracedialog.cpp @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "tracedialog.h" @@ -20,10 +20,8 @@ #include <gtkmm/frame.h> #include "ui/widget/spinbutton.h" #include "ui/widget/frame.h" -#include <gtkmm/radiobutton.h> #include <gtkmm/stock.h> -#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include "desktop.h" diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index b7638e8c1..031bc5ae1 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <gtkmm/dialog.h> @@ -26,15 +26,11 @@ #include "transformation.h" #include "align-and-distribute.h" #include "inkscape.h" -#include "selection.h" #include "selection-chemistry.h" #include "message-stack.h" #include "verbs.h" -#include "preferences.h" #include "sp-namedview.h" #include "sp-item-transform.h" -#include "macros.h" -#include "sp-item.h" #include "ui/icon-names.h" #include "widgets/icon.h" diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp index a50a169eb..38fab8f07 100644 --- a/src/ui/dialog/undo-history.cpp +++ b/src/ui/dialog/undo-history.cpp @@ -12,18 +12,14 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include "undo-history.h" -#include <glibmm/i18n.h> -#include <stddef.h> -#include <sigc++/sigc++.h> #include "document.h" #include "document-undo.h" #include "inkscape.h" -#include "verbs.h" #include "util/signal-blocker.h" diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 99a4acc69..c2711bb02 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -18,7 +18,6 @@ #include "xml-tree.h" #include "widgets/icon.h" -#include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> #include <gtkmm/stock.h> @@ -31,18 +30,14 @@ #include "helper/window.h" #include "inkscape.h" #include "ui/interface.h" -#include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "preferences.h" -#include "selection.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 "widgets/icon.h" #include "widgets/sp-xmlview-attr-list.h" #include "widgets/sp-xmlview-content.h" diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index ab29471ed..16fc5c474 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "ui/dialog/dialog-manager.h" @@ -35,25 +35,20 @@ #include "extension/input.h" #include "widgets/icon.h" #include "preferences.h" -#include "path-prefix.h" #include "shortcuts.h" #include "document.h" #include "ui/interface.h" #include "desktop.h" -#include "selection.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-gradient.h" #include "sp-flowtext.h" #include "sp-namedview.h" #include "sp-root.h" -#include "ui/view/view.h" #include "helper/action.h" -#include "helper/action-context.h" #include "helper/gnome-utils.h" #include "helper/window.h" #include "io/sys.h" @@ -63,7 +58,6 @@ #include "ui/clipboard.h" #include "display/sp-canvas.h" -#include "color.h" #include "svg/svg-color.h" #include "desktop-style.h" #include "style.h" @@ -74,7 +68,6 @@ #include "sp-anchor.h" #include "sp-clippath.h" #include "sp-image.h" -#include "sp-item.h" #include "sp-mask.h" #include "message-stack.h" #include "ui/dialog/layer-properties.h" @@ -83,10 +76,6 @@ #include "widgets/image-menu-item.h" #endif -#include <gdk/gdkkeysyms.h> - -#include <glibmm/miscutils.h> - using Inkscape::DocumentUndo; /* Drag and Drop */ diff --git a/src/ui/object-edit.cpp b/src/ui/object-edit.cpp index 459acf002..90676dc5f 100644 --- a/src/ui/object-edit.cpp +++ b/src/ui/object-edit.cpp @@ -12,11 +12,9 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif - - #include "sp-item.h" #include "sp-rect.h" #include "box3d.h" @@ -32,12 +30,10 @@ #include "sp-namedview.h" #include "live_effects/effect.h" #include "sp-pattern.h" -#include "sp-path.h" #include <glibmm/i18n.h> #include "ui/object-edit.h" -#include "xml/repr.h" -#include <2geom/math-utils.h> #include "knot-holder-entity.h" +#include <gdk/gdk.h> #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m))) diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index 5e75179a3..ac1369ced 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -12,7 +12,6 @@ #include "previewholder.h" -#include "preferences.h" #include <gtkmm/scrolledwindow.h> #include <gtkmm/sizegroup.h> diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 846d50a5b..08f4bd979 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <glibmm/ustring.h> diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp index aec5cde27..98320ed8c 100644 --- a/src/ui/shape-editor.cpp +++ b/src/ui/shape-editor.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include <string.h> @@ -16,11 +16,8 @@ #include "desktop.h" #include "document.h" -#include "gc-anchored.h" #include "knotholder.h" #include "ui/object-edit.h" -#include "sp-item.h" -#include "sp-object.h" #include "ui/shape-editor.h" #include "xml/node-event-vector.h" diff --git a/src/ui/tool-factory.cpp b/src/ui/tool-factory.cpp index c6c579c9e..f101e5a24 100644 --- a/src/ui/tool-factory.cpp +++ b/src/ui/tool-factory.cpp @@ -27,14 +27,12 @@ #include "ui/tools/mesh-tool.h" #include "ui/tools/node-tool.h" #include "ui/tools/pencil-tool.h" -#include "ui/tools/pen-tool.h" #include "ui/tools/rect-tool.h" #include "ui/tools/select-tool.h" #include "ui/tools/spiral-tool.h" #include "ui/tools/spray-tool.h" #include "ui/tools/star-tool.h" #include "ui/tools/text-tool.h" -#include "ui/tools/tool-base.h" #include "ui/tools/tweak-tool.h" #include "ui/tools/zoom-tool.h" diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp index f36ad7374..a5611addc 100644 --- a/src/ui/tool/control-point-selection.cpp +++ b/src/ui/tool/control-point-selection.cpp @@ -13,7 +13,6 @@ #include "ui/tool/selectable-control-point.h" #include <2geom/transforms.h> #include "desktop.h" -#include "preferences.h" #include "ui/tool/control-point-selection.h" #include "ui/tool/event-utils.h" #include "ui/tool/transform-handle-set.h" diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp index 636595016..d9374c790 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -16,8 +16,6 @@ #include "display/snap-indicator.h" #include "ui/tools/tool-base.h" #include "message-context.h" -#include "preferences.h" -#include "snap-preferences.h" #include "sp-namedview.h" #include "ui/control-manager.h" #include "ui/tool/control-point.h" diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp index e460b0fb7..908e18474 100644 --- a/src/ui/tool/curve-drag-point.cpp +++ b/src/ui/tool/curve-drag-point.cpp @@ -8,15 +8,12 @@ #include "ui/tool/curve-drag-point.h" #include <glib/gi18n.h> -#include <2geom/bezier-curve.h> #include "desktop.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 "ui/tool/node.h" #include "sp-namedview.h" -#include "snap.h" namespace Inkscape { namespace UI { diff --git a/src/ui/tool/manipulator.cpp b/src/ui/tool/manipulator.cpp index 11dd220f4..82ff014e4 100644 --- a/src/ui/tool/manipulator.cpp +++ b/src/ui/tool/manipulator.cpp @@ -8,8 +8,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "ui/tool/node.h" -#include "ui/tool/manipulator.h" +//#include "ui/tool/node.h" +//#include "ui/tool/manipulator.h" namespace Inkscape { namespace UI { diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp index cc4e4d0b2..f502acab2 100644 --- a/src/ui/tool/modifier-tracker.cpp +++ b/src/ui/tool/modifier-tracker.cpp @@ -12,7 +12,6 @@ #include <gdk/gdkkeysyms.h> #include "ui/tool/event-utils.h" #include "ui/tool/modifier-tracker.h" -#include <gtk/gtk.h> namespace Inkscape { namespace UI { diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp index 9ec6f733f..f30c7e349 100644 --- a/src/ui/tool/multi-path-manipulator.cpp +++ b/src/ui/tool/multi-path-manipulator.cpp @@ -19,13 +19,11 @@ #include "document-undo.h" #include "live_effects/lpeobject.h" #include "message-stack.h" -#include "preferences.h" #include "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 "util/unordered-containers.h" #include "verbs.h" #include <gdk/gdkkeysyms.h> diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index 9268d9730..0e5a9279d 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -12,25 +12,20 @@ #include "multi-path-manipulator.h" #include <glib/gi18n.h> #include <2geom/bezier-utils.h> -#include <2geom/transforms.h> #include "display/sp-ctrlline.h" #include "display/sp-canvas.h" #include "display/sp-canvas-util.h" #include "desktop.h" -#include "preferences.h" #include "snap.h" -#include "snap-preferences.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/node.h" #include "ui/tool/path-manipulator.h" #include "ui/tools/node-tool.h" #include "ui/tools-switch.h" #include <gdk/gdkkeysyms.h> -#include <cmath> namespace { diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index de071dad3..f316bea38 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -13,36 +13,23 @@ #include "live_effects/lpe-powerstroke.h" #include "live_effects/lpe-bspline.h" #include "live_effects/lpe-fillet-chamfer.h" -#include <string> -#include <sstream> -#include <deque> -#include <stdexcept> -#include <boost/shared_ptr.hpp> -#include <2geom/bezier-curve.h> #include <2geom/bezier-utils.h> #include <2geom/path-sink.h> -#include <glibmm/i18n.h> #include "ui/tool/path-manipulator.h" -#include "desktop.h" #include "display/sp-canvas.h" #include "display/sp-canvas-util.h" #include "display/curve.h" #include "display/canvas-bpath.h" -#include "document.h" -#include "live_effects/effect.h" #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" -#include "sp-path.h" #include "helper/geom.h" -#include "preferences.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 "xml/node.h" #include "xml/node-observer.h" namespace Inkscape { diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp index 9acf7de88..84e96173d 100644 --- a/src/ui/tool/selector.cpp +++ b/src/ui/tool/selector.cpp @@ -14,7 +14,6 @@ #include "display/sodipodi-ctrlrect.h" #include "ui/tools/tool-base.h" -#include "preferences.h" #include "ui/tool/event-utils.h" #include "ui/tool/selector.h" diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index 748b9d4cc..33015fe11 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -18,11 +18,7 @@ #include "sp-namedview.h" #include "display/sodipodi-ctrlrect.h" -#include "preferences.h" #include "pure-transform.h" -#include "snap.h" -#include "snap-candidate.h" -#include "sp-namedview.h" #include "ui/tool/commit-events.h" #include "ui/tool/control-point-selection.h" #include "ui/tool/selectable-control-point.h" diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp index ea0431b0a..d87bcc51d 100644 --- a/src/ui/tools-switch.cpp +++ b/src/ui/tools-switch.cpp @@ -13,16 +13,11 @@ #include <gtkmm.h> // prevents deprecation warnings -#include <cstring> -#include <string> - #include "inkscape.h" #include "desktop.h" #include <glibmm/i18n.h> -#include <xml/repr.h> - #include "ui/tools-switch.h" #include "box3d.h" @@ -52,7 +47,6 @@ #include "ui/tools/measure-tool.h" #include "ui/tools/mesh-tool.h" #include "ui/tools/node-tool.h" -#include "ui/tools/pen-tool.h" #include "ui/tools/pencil-tool.h" #include "ui/tools/rect-tool.h" #include "ui/tools/select-tool.h" diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp index c6a9bb23a..6652f7ab5 100644 --- a/src/ui/tools/arc-tool.cpp +++ b/src/ui/tools/arc-tool.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gdk/gdkkeysyms.h> @@ -30,7 +30,6 @@ #include "sp-namedview.h" #include "selection.h" -#include "snap.h" #include "pixmaps/cursor-ellipse.xpm" #include "xml/repr.h" #include "xml/node-event-vector.h" diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp index 27e755add..9b5b264bc 100644 --- a/src/ui/tools/box3d-tool.cpp +++ b/src/ui/tools/box3d-tool.cpp @@ -15,8 +15,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "config.h" - #include <gdk/gdkkeysyms.h> #include "macros.h" @@ -27,8 +25,6 @@ #include "selection.h" #include "selection-chemistry.h" -#include "snap.h" -#include "display/curve.h" #include "display/sp-canvas-item.h" #include "desktop.h" #include "message-context.h" @@ -36,17 +32,12 @@ #include "box3d.h" #include "ui/tools/box3d-tool.h" #include <glibmm/i18n.h> -#include "xml/repr.h" #include "xml/node-event-vector.h" -#include "preferences.h" #include "context-fns.h" #include "desktop-style.h" -#include "transf_mat_3x4.h" #include "perspective-line.h" -#include "persp3d.h" #include "box3d-side.h" #include "document-private.h" -#include "line-geometry.h" #include "ui/shape-editor.h" #include "verbs.h" diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 28195eb75..84c4adc89 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -23,8 +23,6 @@ #define noDYNA_DRAW_VERBOSE -#include "config.h" - #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> @@ -35,12 +33,10 @@ #include "svg/svg.h" #include "display/canvas-bpath.h" #include "display/cairo-utils.h" -#include <2geom/math-utils.h> #include <2geom/pathvector.h> #include <2geom/bezier-utils.h> #include <2geom/circle.h> #include "display/curve.h" -#include <glib.h> #include "macros.h" #include "document.h" #include "document-undo.h" @@ -50,20 +46,15 @@ #include "desktop-style.h" #include "message-context.h" -#include "preferences.h" #include "pixmaps/cursor-calligraphy.xpm" -#include "xml/repr.h" #include "context-fns.h" -#include "sp-item.h" #include "inkscape.h" -#include "color.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 "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "livarot/Shape.h" #include "verbs.h" diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 74f2664fe..605b573d7 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -75,7 +75,6 @@ #include "ui/tools/connector-tool.h" #include "pixmaps/cursor-connector.xpm" #include "xml/node-event-vector.h" -#include "xml/repr.h" #include "svg/svg.h" #include "desktop.h" #include "desktop-style.h" @@ -86,19 +85,13 @@ #include "message-stack.h" #include "selection.h" #include "inkscape.h" -#include "preferences.h" #include "sp-path.h" #include "display/sp-canvas.h" #include "display/canvas-bpath.h" -#include "display/sodipodi-ctrl.h" #include <glibmm/i18n.h> #include <glibmm/stringutils.h> #include "snap.h" -#include "knot.h" #include "sp-conn-end.h" -#include "sp-conn-end-pair.h" -#include "conn-avoid-ref.h" -#include "libavoid/vertices.h" #include "libavoid/router.h" #include "context-fns.h" #include "sp-namedview.h" diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index c838c27d5..4db720686 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <glibmm/i18n.h> @@ -27,7 +27,6 @@ #include "display/curve.h" #include "display/cairo-utils.h" #include "svg/svg-color.h" -#include "color.h" #include "color-rgba.h" #include "desktop-style.h" #include "preferences.h" @@ -36,7 +35,6 @@ #include "desktop.h" #include "selection.h" -#include "document.h" #include "document-undo.h" #include "pixmaps/cursor-dropper-f.xpm" @@ -45,7 +43,6 @@ #include "ui/tools/dropper-tool.h" #include "message-context.h" #include "verbs.h" -#include "ui/tools/tool-base.h" using Inkscape::DocumentUndo; diff --git a/src/ui/tools/dynamic-base.cpp b/src/ui/tools/dynamic-base.cpp index eb789d850..6627a470e 100644 --- a/src/ui/tools/dynamic-base.cpp +++ b/src/ui/tools/dynamic-base.cpp @@ -1,13 +1,7 @@ #include "ui/tools/dynamic-base.h" -#include <gtk/gtk.h> - -#include "config.h" - #include "message-context.h" -#include "streq.h" -#include "preferences.h" #include "display/sp-canvas-item.h" #include "desktop.h" #include "display/curve.h" diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 6b32b5901..838522b34 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -24,8 +24,6 @@ #define noERASER_VERBOSE -#include "config.h" - #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> @@ -38,7 +36,6 @@ #include "display/canvas-bpath.h" #include <2geom/bezier-utils.h> -#include <glib.h> #include "macros.h" #include "document.h" #include "selection.h" @@ -47,26 +44,18 @@ #include "desktop-style.h" #include "message-context.h" -#include "preferences.h" #include "pixmaps/cursor-eraser.xpm" -#include "xml/repr.h" #include "context-fns.h" -#include "sp-item.h" -#include "color.h" #include "rubberband.h" #include "splivarot.h" #include "sp-item-group.h" #include "sp-shape.h" #include "sp-path.h" #include "sp-text.h" -#include "display/canvas-bpath.h" #include "display/canvas-arena.h" -#include "livarot/Shape.h" #include "document-undo.h" #include "verbs.h" #include "style.h" -#include "style-enums.h" -#include <2geom/math-utils.h> #include <2geom/pathvector.h> #include "path-chemistry.h" #include "display/curve.h" diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index 748c82717..2f125e6ed 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -18,14 +18,13 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include "trace/potrace/inkscape-potrace.h" #include <2geom/pathvector.h> #include <gdk/gdkkeysyms.h> #include <queue> -#include <deque> #include <glibmm/i18n.h> #include "color.h" @@ -36,7 +35,6 @@ #include "display/cairo-utils.h" #include "display/drawing-context.h" #include "display/drawing-image.h" -#include "display/drawing-item.h" #include "display/drawing.h" #include "display/sp-canvas.h" #include "document.h" @@ -47,23 +45,15 @@ #include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "preferences.h" #include "rubberband.h" #include "selection.h" #include "ui/shape-editor.h" -#include "sp-defs.h" -#include "sp-item.h" #include "splivarot.h" #include "sp-namedview.h" -#include "sp-object.h" -#include "sp-path.h" -#include "sp-rect.h" #include "sp-root.h" #include "svg/svg.h" #include "trace/imagemap.h" -#include "trace/trace.h" #include "xml/node-event-vector.h" -#include "xml/repr.h" #include "verbs.h" #include "pixmaps/cursor-paintbucket.xpm" diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 7697cd59c..eb29ed88d 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -17,43 +17,29 @@ #define DRAW_VERBOSE #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "live_effects/lpe-bendpath.h" #include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpe-simplify.h" #include "display/canvas-bpath.h" -#include "xml/repr.h" #include "svg/svg.h" -#include <glibmm/i18n.h> #include "display/curve.h" -#include "desktop.h" #include "desktop-style.h" -#include "document.h" #include "ui/draw-anchor.h" #include "macros.h" #include "message-stack.h" #include "ui/tools/pen-tool.h" #include "ui/tools/lpe-tool.h" -#include "preferences.h" -#include "selection.h" #include "selection-chemistry.h" -#include "snap.h" -#include "sp-path.h" -#include "sp-use.h" #include "sp-item-group.h" -#include "sp-namedview.h" #include "live_effects/lpe-powerstroke.h" #include "style.h" #include "ui/control-manager.h" -#include "util/units.h" // clipboard support #include "ui/clipboard.h" -#include "ui/tools/freehand-base.h" - -#include <gdk/gdkkeysyms.h> using Inkscape::DocumentUndo; diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index 9d8101cc4..e4814c3de 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif @@ -31,17 +31,10 @@ #include "ui/tools/gradient-tool.h" #include "gradient-chemistry.h" #include <glibmm/i18n.h> -#include "preferences.h" #include "gradient-drag.h" -#include "gradient-chemistry.h" -#include "xml/repr.h" -#include "sp-item.h" #include "display/sp-ctrlline.h" -#include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" #include "sp-stop.h" #include "svg/css-ostringstream.h" -#include "svg/svg-color.h" #include "snap.h" #include "sp-namedview.h" #include "rubberband.h" diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index 9bbc1ac20..ee85dd28c 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -15,19 +15,16 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include <2geom/sbasis-geometric.h> -#include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> -#include "macros.h" #include "pixmaps/cursor-crosshairs.xpm" #include <gtk/gtk.h> #include "desktop.h" #include "message-context.h" -#include "preferences.h" #include "ui/shape-editor.h" #include "selection.h" diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 63e2460ec..c941b9bee 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -11,11 +11,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm.h> -#include <gdk/gdkkeysyms.h> #include <boost/none_t.hpp> #include "util/units.h" #include "display/curve.h" @@ -23,7 +22,6 @@ #include "display/sp-ctrlline.h" #include "display/sp-ctrlcurve.h" #include "display/sp-canvas.h" -#include "display/sp-canvas-item.h" #include "display/sp-canvas-util.h" #include "svg/svg.h" #include "svg/svg-color.h" @@ -31,34 +29,20 @@ #include "ui/tools/freehand-base.h" #include <2geom/line.h> #include <2geom/path-intersection.h> -#include <2geom/pathvector.h> -#include <2geom/crossing.h> -#include <2geom/angle.h> -#include <2geom/transforms.h> #include "ui/dialog/knot-properties.h" #include "sp-namedview.h" -#include "sp-shape.h" #include "sp-text.h" #include "sp-flowtext.h" #include "sp-defs.h" -#include "sp-item.h" #include "sp-root.h" -#include "macros.h" #include "svg/stringstream.h" #include "rubberband.h" #include "path-chemistry.h" #include "desktop.h" -#include "document.h" #include "document-undo.h" -#include "viewbox.h" -#include "snap.h" -#include "knot.h" #include "text-editing.h" #include "pixmaps/cursor-measure.xpm" -#include "preferences.h" #include "inkscape.h" -#include "enums.h" -#include "knot-enums.h" #include "desktop-style.h" #include "verbs.h" #include <glibmm/i18n.h> diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp index 47927667c..32e70bc19 100644 --- a/src/ui/tools/mesh-tool.cpp +++ b/src/ui/tools/mesh-tool.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif //#define DEBUG_MESH @@ -33,7 +33,6 @@ #include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "preferences.h" #include "rubberband.h" #include "selection.h" #include "snap.h" diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 23aaf6bb1..bf18d4a2e 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -24,25 +24,19 @@ #include "message-context.h" #include "selection.h" #include "ui/shape-editor.h" // temporary! -#include "live_effects/effect.h" -#include "display/curve.h" #include "snap.h" #include "sp-namedview.h" #include "sp-clippath.h" #include "sp-item-group.h" #include "sp-mask.h" -#include "sp-object-group.h" -#include "sp-path.h" #include "sp-text.h" #include "ui/control-manager.h" #include "ui/tools/node-tool.h" #include "ui/tool/control-point-selection.h" #include "ui/tool/event-utils.h" -#include "ui/tool/manipulator.h" #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/path-manipulator.h" #include "ui/tool/selector.h" -#include "ui/tool/shape-record.h" #include "pixmaps/cursor-node.xpm" #include "pixmaps/cursor-node-d.xpm" diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 18af8e105..49f28ad2c 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -32,8 +32,6 @@ #include "ui/draw-anchor.h" #include "message-stack.h" #include "message-context.h" -#include "preferences.h" -#include "sp-path.h" #include "display/sp-canvas.h" #include "display/curve.h" #include "pixmaps/cursor-pen.xpm" @@ -46,7 +44,6 @@ #include "ui/tools-switch.h" #include "ui/control-manager.h" // we include the necessary files for BSpline & Spiro -#include "live_effects/effect.h" #include "live_effects/lpeobject.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/parameter/path.h" @@ -54,25 +51,16 @@ #include "live_effects/lpe-spiro.h" -#include <typeinfo> -#include <2geom/pathvector.h> -#include <2geom/affine.h> #include <2geom/curves.h> #include "helper/geom-nodetype.h" -#include "helper/geom-curves.h" // For handling un-continuous paths: -#include "message-stack.h" #include "inkscape.h" -#include "desktop.h" #include "live_effects/spiro.h" #define INKSCAPE_LPE_BSPLINE_C #include "live_effects/lpe-bspline.h" -#include <2geom/nearest-time.h> - -#include "live_effects/effect.h" using Inkscape::ControlManager; diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index b029ca613..7cc695040 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -27,7 +27,6 @@ #include "message-stack.h" #include "message-context.h" #include "sp-path.h" -#include "preferences.h" #include "snap.h" #include "pixmaps/cursor-pencil.xpm" #include <2geom/sbasis-to-bezier.h> @@ -36,13 +35,9 @@ #include <glibmm/i18n.h> #include "context-fns.h" #include "sp-namedview.h" -#include "xml/repr.h" -#include "document.h" #include "desktop-style.h" -#include "macros.h" #include "display/sp-canvas.h" #include "display/curve.h" -#include "livarot/Path.h" #include "ui/tool/event-utils.h" namespace Inkscape { diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp index 844965c4d..00330ef57 100644 --- a/src/ui/tools/rect-tool.cpp +++ b/src/ui/tools/rect-tool.cpp @@ -14,8 +14,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "config.h" - #include <gdk/gdkkeysyms.h> #include <cstring> #include <string> @@ -29,16 +27,13 @@ #include "selection.h" #include "selection-chemistry.h" -#include "snap.h" #include "desktop.h" #include "desktop-style.h" #include "message-context.h" #include "pixmaps/cursor-rect.xpm" #include "ui/tools/rect-tool.h" #include <glibmm/i18n.h> -#include "xml/repr.h" #include "xml/node-event-vector.h" -#include "preferences.h" #include "context-fns.h" #include "ui/shape-editor.h" #include "verbs.h" diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index b5ec3d88e..5d802d4da 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <cstring> #include <string> @@ -40,14 +40,12 @@ #include "desktop.h" #include "sp-root.h" -#include "preferences.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/sp-canvas-item.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 833fef18d..0ba08853e 100644 --- a/src/ui/tools/spiral-tool.cpp +++ b/src/ui/tools/spiral-tool.cpp @@ -14,8 +14,6 @@ * Released under GNU GPL */ -#include "config.h" - #include <gdk/gdkkeysyms.h> #include <cstring> #include <string> @@ -28,16 +26,13 @@ #include "sp-namedview.h" #include "selection.h" -#include "snap.h" #include "desktop.h" #include "desktop-style.h" #include "message-context.h" #include "pixmaps/cursor-spiral.xpm" #include "ui/tools/spiral-tool.h" #include <glibmm/i18n.h> -#include "xml/repr.h" #include "xml/node-event-vector.h" -#include "preferences.h" #include "context-fns.h" #include "ui/shape-editor.h" #include "verbs.h" diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index 9adaf3879..3fafac2a7 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -19,15 +19,12 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "config.h" - #include <numeric> #include "ui/dialog/dialog-manager.h" #include "svg/svg.h" -#include <glib.h> #include "macros.h" #include "document.h" #include "document-undo.h" @@ -37,10 +34,7 @@ #include "message-context.h" #include "pixmaps/cursor-spray.xpm" -#include <boost/optional.hpp> -#include "xml/repr.h" #include "context-fns.h" -#include "sp-item.h" #include "inkscape.h" #include "splivarot.h" @@ -57,17 +51,12 @@ #include "svg/svg-color.h" #include "sp-text.h" -#include "sp-root.h" #include "sp-flowtext.h" #include "display/sp-canvas.h" -#include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "display/curve.h" #include "livarot/Shape.h" #include <2geom/circle.h> -#include <2geom/transforms.h> -#include "preferences.h" -#include "style.h" #include "box3d.h" #include "sp-item-transform.h" #include "filter-chemistry.h" @@ -76,9 +65,6 @@ #include "helper/action.h" #include "verbs.h" -#include <iostream> - -#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp index 9190ae57b..ddee08189 100644 --- a/src/ui/tools/star-tool.cpp +++ b/src/ui/tools/star-tool.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <cstring> @@ -31,14 +31,11 @@ #include "sp-namedview.h" #include "selection.h" -#include "snap.h" #include "desktop.h" #include "desktop-style.h" #include "message-context.h" #include "pixmaps/cursor-star.xpm" #include <glibmm/i18n.h> -#include "preferences.h" -#include "xml/repr.h" #include "xml/node-event-vector.h" #include "context-fns.h" #include "ui/shape-editor.h" diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 1888551cf..559187764 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/clipboard.h> @@ -23,7 +23,6 @@ #include <display/sp-ctrlquadr.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> -#include <sstream> #include "context-fns.h" @@ -36,7 +35,6 @@ #include "message-stack.h" #include "pixmaps/cursor-text-insert.xpm" #include "pixmaps/cursor-text.xpm" -#include "preferences.h" #include "rubberband.h" #include "selection-chemistry.h" #include "selection.h" @@ -50,8 +48,6 @@ #include "ui/control-manager.h" #include "verbs.h" #include "xml/node-event-vector.h" -#include "xml/repr.h" -#include <gtk/gtk.h> using Inkscape::ControlManager; using Inkscape::DocumentUndo; diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 72ba499de..735f5bd42 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "widgets/desktop-widget.h" @@ -24,12 +24,8 @@ #include "file.h" #include "ui/tools/tool-base.h" -#include <string.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> #include <glibmm/i18n.h> -#include <cstring> -#include <string> #include "display/sp-canvas.h" #include "xml/node-event-vector.h" @@ -43,18 +39,14 @@ #include "ui/interface.h" #include "macros.h" #include "ui/tools-switch.h" -#include "preferences.h" #include "message-context.h" #include "gradient-drag.h" -#include "attributes.h" #include "rubberband.h" #include "selcue.h" #include "ui/tools/lpe-tool.h" #include "ui/tool/control-point.h" #include "ui/shape-editor.h" #include "sp-guide.h" -#include "color.h" -#include "knot.h" #include "knot-ptr.h" // globals for temporary switching to selector by space diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index 39a7a3f0b..fbf1b2a0b 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -11,8 +11,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "config.h" - #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glibmm/i18n.h> @@ -21,7 +19,6 @@ #include "svg/svg.h" -#include <glib.h> #include "macros.h" #include "document.h" #include "document-undo.h" @@ -48,19 +45,13 @@ #include "pixmaps/cursor-push.xpm" #include "pixmaps/cursor-roughen.xpm" #include "pixmaps/cursor-color.xpm" -#include <boost/optional.hpp> -#include "xml/repr.h" #include "context-fns.h" -#include "sp-item.h" #include "inkscape.h" -#include "color.h" -#include "svg/svg-color.h" #include "splivarot.h" #include "sp-item-group.h" #include "sp-shape.h" #include "sp-path.h" #include "path-chemistry.h" -#include "sp-gradient.h" #include "sp-stop.h" #include "sp-gradient-reference.h" #include "sp-linear-gradient.h" @@ -69,13 +60,10 @@ #include "sp-text.h" #include "sp-flowtext.h" #include "display/sp-canvas.h" -#include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "display/curve.h" #include "livarot/Shape.h" -#include <2geom/transforms.h> #include <2geom/circle.h> -#include "preferences.h" #include "style.h" #include "box3d.h" #include "sp-item-transform.h" diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp index 13e097c18..ca42d2d6f 100644 --- a/src/ui/tools/zoom-tool.cpp +++ b/src/ui/tools/zoom-tool.cpp @@ -21,7 +21,6 @@ #include "desktop.h" #include "pixmaps/cursor-zoom.xpm" #include "pixmaps/cursor-zoom-out.xpm" -#include "preferences.h" #include "selection-chemistry.h" #include "ui/tools/zoom-tool.h" diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 036659661..cbce86cdb 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -10,18 +10,15 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "widgets/desktop-widget.h" -#include <algorithm> #include "uxmanager.h" #include "desktop.h" #include "util/ege-tags.h" #include "widgets/toolbox.h" -#include "preferences.h" -#include "gdkmm/screen.h" #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> diff --git a/src/ui/view/view.h b/src/ui/view/view.h index 21a5d0dfc..7ff14afd9 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -11,14 +11,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdk.h> -#include <stddef.h> #include <sigc++/connection.h> #include "message.h" #include "inkgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" #include <2geom/forward.h> +#include <glib.h> /** * Iterates until true or returns false. diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp index 10294125d..465423fc2 100644 --- a/src/ui/widget/addtoicon.cpp +++ b/src/ui/widget/addtoicon.cpp @@ -9,7 +9,7 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "ui/widget/addtoicon.h" @@ -19,9 +19,7 @@ #include "widgets/icon.h" #include "widgets/toolbox.h" #include "ui/icon-names.h" -#include "preferences.h" #include "layertypeicon.h" -#include "addtoicon.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index df00b786a..acf8aff79 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -8,7 +8,6 @@ */ #include "ui/widget/anchor-selector.h" -#include <iostream> #include "widgets/icon.h" #include "ui/icon-names.h" diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp index 421f1df1e..8715fdede 100644 --- a/src/ui/widget/clipmaskicon.cpp +++ b/src/ui/widget/clipmaskicon.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "ui/widget/clipmaskicon.h" diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index e4f58fe8a..52c6ed2e3 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -2,14 +2,11 @@ #include "config.h" #endif -#include <math.h> #include <gtkmm/adjustment.h> #include <glibmm/i18n.h> #include <gtk/gtk.h> -#include <map> #include <set> -#include <vector> #include "ui/dialog-events.h" #include "ui/widget/color-icc-selector.h" diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 6d7ada734..6634d8dad 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -20,10 +20,6 @@ #endif #include "widgets/icon.h" -#include <cstring> -#include <string> -#include <cstdlib> -#include <cstddef> #include <glibmm/i18n.h> #include <gtkmm/label.h> #include <gtkmm/notebook.h> diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 48a2693bc..832bc3a62 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -3,15 +3,13 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif -#include <math.h> #include <gtkmm/adjustment.h> #include <glibmm/i18n.h> #include <gtk/gtk.h> -#include "svg/svg-icc-color.h" #include "ui/dialog-events.h" #include "ui/widget/color-scales.h" #include "ui/widget/color-slider.h" diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp index 0c9586a67..bf2156628 100644 --- a/src/ui/widget/color-slider.cpp +++ b/src/ui/widget/color-slider.cpp @@ -12,11 +12,10 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include <gdkmm/cursor.h> -#include <gdkmm/screen.h> #include <gdkmm/general.h> #include <gtkmm/adjustment.h> #if WITH_GTKMM_3_0 diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index 22c616325..decb02b4f 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -1,18 +1,14 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include "color-wheel-selector.h" -#include <math.h> -#include <gtk/gtk.h> #include <glibmm/i18n.h> #include <gtkmm/adjustment.h> #include <gtkmm/label.h> #include <gtkmm/spinbutton.h> -#include "svg/svg-icc-color.h" #include "ui/dialog-events.h" -#include "ui/selected-color.h" #include "ui/widget/color-scales.h" #include "ui/widget/color-slider.h" #include "ui/widget/gimpcolorwheel.h" diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp index 8d960ddc3..910135fc1 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -9,16 +9,13 @@ #include "ui/widget/dock.h" -#include "dock-item.h" #include "desktop.h" #include "inkscape.h" -#include "preferences.h" #include "ui/icon-names.h" #include "widgets/icon.h" #include <gtkmm/icontheme.h> #include <gtkmm/stockitem.h> -#include <glibmm/exceptionhandler.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index a8de2f384..381f0a2e1 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -14,14 +14,13 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/scrolledwindow.h> #include <gtkmm/entry.h> #include "inkscape.h" -#include "sp-object.h" #include "rdf.h" #include "ui/widget/registry.h" #include "sp-root.h" diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp index 64d28119a..b1dd9ae8e 100644 --- a/src/ui/widget/entry.cpp +++ b/src/ui/widget/entry.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "entry.h" diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index 242a99073..ae2f3e7c2 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -10,12 +10,8 @@ */ #include "filter-effect-chooser.h" -#include <glibmm/i18n.h> - -#include "desktop.h" #include "document.h" -#include "inkscape.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index 62598dead..aca85f246 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -8,26 +8,18 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm.h> #include <glibmm/i18n.h> #include <libnrtype/font-instance.h> -#include <iostream> #include "font-variants.h" // For updating from selection #include "desktop.h" -#include "selection.h" -#include "style.h" #include "sp-text.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "sp-textpath.h" -#include "sp-item-group.h" -#include "xml/repr.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp index eaa4336bb..65d10dcc4 100644 --- a/src/ui/widget/frame.cpp +++ b/src/ui/widget/frame.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "frame.h" diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp index 09999b52d..c1068c9b2 100644 --- a/src/ui/widget/highlight-picker.cpp +++ b/src/ui/widget/highlight-picker.cpp @@ -14,9 +14,6 @@ #include "highlight-picker.h" #include "widgets/icon.h" -#include "widgets/toolbox.h" -#include "ui/icon-names.h" -#include <glibmm/i18n.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp index df261b69a..7d7fb2d3b 100644 --- a/src/ui/widget/imageicon.cpp +++ b/src/ui/widget/imageicon.cpp @@ -15,12 +15,9 @@ #include "imageicon.h" -#include <sys/stat.h> #include "svg-view-widget.h" #include "document.h" #include "inkscape.h" -#include <glibmm/convert.h> -#include <glibmm/fileutils.h> namespace Inkscape diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 1a9ce617f..7ee34f3b3 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <cstring> @@ -25,9 +25,7 @@ #include "document.h" #include "document-undo.h" #include "layer-manager.h" -#include "sp-item.h" #include "ui/icon-names.h" -#include "ui/widget/layer-selector.h" #include "util/filter-list.h" #include "util/reverse-list.h" #include "verbs.h" diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp index 672c607e5..e281d982a 100644 --- a/src/ui/widget/layertypeicon.cpp +++ b/src/ui/widget/layertypeicon.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "ui/widget/layertypeicon.h" @@ -18,7 +18,6 @@ #include "widgets/icon.h" #include "widgets/toolbox.h" #include "ui/icon-names.h" -#include "layertypeicon.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp index d21e848f2..6acb5a4c7 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -13,7 +13,6 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> #endif #include "licensor.h" @@ -27,7 +26,6 @@ #include "document-undo.h" #include "document-private.h" #include "verbs.h" -#include <gtkmm/radiobutton.h> namespace Inkscape { diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 8acf083d0..c8ac20c54 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -14,8 +14,6 @@ #include "ui/widget/object-composite-settings.h" -#include <glibmm/i18n.h> - #include "desktop.h" #include "desktop-style.h" @@ -23,17 +21,12 @@ #include "document-undo.h" #include "filter-chemistry.h" #include "inkscape.h" -#include "selection.h" #include "style.h" -#include "sp-item.h" #include "svg/css-ostringstream.h" #include "verbs.h" -#include "xml/repr.h" #include "widgets/icon.h" -#include "ui/icon-names.h" #include "display/sp-canvas.h" #include "ui/widget/style-subject.h" -#include "ui/widget/gimpspinscale.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 19ab1a280..4a1fe9ac6 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -18,35 +18,18 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "page-sizer.h" -#include <cmath> -#include <string> -#include <string.h> -#include <sstream> -#include <vector> - #include <glibmm/i18n.h> -#include <2geom/transforms.h> - -#include "document.h" -#include "desktop.h" #include "helper/action.h" -#include "helper/action-context.h" -#include "util/units.h" -#include "inkscape.h" -#include "sp-namedview.h" #include "sp-root.h" #include "ui/widget/button.h" -#include "ui/widget/scalar-unit.h" #include "verbs.h" -#include "xml/node.h" -#include "xml/repr.h" using std::pair; using Inkscape::Util::unit_table; diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index ab13577d7..6ccd8b81a 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -12,20 +12,15 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <gtkmm/menu.h> #include <gtkmm/stock.h> -#include <gtkmm/radiobutton.h> -#include <gtkmm/radiomenuitem.h> -#include <gtkmm/separatormenuitem.h> #include <glibmm/i18n.h> -#include <gtk/gtk.h> - #include "panel.h" #include "icon-size.h" #include "preferences.h" diff --git a/src/ui/widget/point.cpp b/src/ui/widget/point.cpp index 6aa6196bb..2c2eb5e8a 100644 --- a/src/ui/widget/point.cpp +++ b/src/ui/widget/point.cpp @@ -12,14 +12,11 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "ui/widget/point.h" -#include "ui/widget/labelled.h" -#include "ui/widget/scalar.h" -#include <gtkmm/box.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index d56506d62..b4c09cc0f 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/box.h> @@ -26,19 +26,14 @@ #include "verbs.h" #include "selcue.h" #include "io/sys.h" -#include <iostream> #include "desktop.h" -#include "enums.h" #include "inkscape.h" #include "message-stack.h" #include "style.h" -#include "selection.h" #include "selection-chemistry.h" #include "ui/dialog/filedialog.h" -#include "xml/repr.h" -#include <glibmm/convert.h> #include <glibmm/i18n.h> #ifdef WIN32 diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 1d2d77699..cb192bf58 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -19,7 +19,6 @@ # include <config.h> #endif -#include <iostream> #include <vector> #include <gtkmm/filechooserbutton.h> diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp index 0a646b6fb..b6ea16b89 100644 --- a/src/ui/widget/random.cpp +++ b/src/ui/widget/random.cpp @@ -10,7 +10,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 572845668..af59fe1a0 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -14,29 +14,19 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "registered-widget.h" -#include <gtkmm/radiobutton.h> -#include "ui/widget/color-picker.h" -#include "ui/widget/registry.h" -#include "ui/widget/scalar-unit.h" -#include "ui/widget/point.h" -#include "ui/widget/random.h" #include "widgets/spinbutton-events.h" -#include "xml/repr.h" #include "svg/svg-color.h" #include "svg/stringstream.h" #include "verbs.h" // for interruptability bug: -#include "display/sp-canvas.h" - -#include "desktop.h" #include "sp-root.h" diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp index 837387f7b..220731b7e 100644 --- a/src/ui/widget/rendering-options.cpp +++ b/src/ui/widget/rendering-options.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm.h> diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp index 5e938dee6..e0de22335 100644 --- a/src/ui/widget/rotateable.cpp +++ b/src/ui/widget/rotateable.cpp @@ -8,12 +8,11 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include <gtkmm/box.h> #include <gtkmm/eventbox.h> -#include <glibmm/i18n.h> #include <2geom/point.h> #include "ui/tools/tool-base.h" #include "rotateable.h" diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index f7fd63f51..299b904c6 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -10,11 +10,10 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "selected-style.h" -#include <gtkmm/separatormenuitem.h> #include "widgets/spw-utilities.h" #include "ui/widget/color-preview.h" @@ -31,19 +30,14 @@ #include "ui/dialog/dialog-manager.h" #include "ui/dialog/fill-and-stroke.h" #include "ui/dialog/panel-dialog.h" -#include "xml/repr.h" -#include "document.h" #include "document-undo.h" #include "widgets/widget-sizes.h" #include "widgets/spinbutton-events.h" #include "widgets/gradient-image.h" -#include "sp-gradient.h" #include "svg/svg-color.h" #include "svg/css-ostringstream.h" #include "ui/tools/tool-base.h" #include "message-context.h" -#include "verbs.h" -#include "color.h" #include <display/sp-canvas.h> #include "pixmaps/cursor-adj-h.xpm" #include "pixmaps/cursor-adj-s.xpm" @@ -51,7 +45,6 @@ #include "pixmaps/cursor-adj-a.xpm" #include "sp-cursor.h" #include "gradient-chemistry.h" -#include "util/units.h" using Inkscape::Util::unit_table; diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp index bb08d67df..cb95e7405 100644 --- a/src/ui/widget/spin-scale.cpp +++ b/src/ui/widget/spin-scale.cpp @@ -8,9 +8,7 @@ #include "spin-scale.h" -#include <gtkmm/adjustment.h> #include <glibmm/i18n.h> -#include <glibmm/stringutils.h> #include "ui/widget/gimpspinscale.h" diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index 9b361ae78..4242d8c7d 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -11,7 +11,6 @@ #include "spin-slider.h" #include <glibmm/i18n.h> -#include <glibmm/stringutils.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp index d7669d4e5..d1776e630 100644 --- a/src/ui/widget/spinbutton.cpp +++ b/src/ui/widget/spinbutton.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include "spinbutton.h" diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp index da3bbcd20..811ed2221 100644 --- a/src/ui/widget/style-subject.cpp +++ b/src/ui/widget/style-subject.cpp @@ -8,7 +8,6 @@ #include "ui/widget/style-subject.h" #include "desktop.h" -#include "sp-object.h" #include "xml/sp-css-attr.h" #include "desktop-style.h" diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index 188be705d..2952a3f97 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -13,9 +13,6 @@ #include "style-swatch.h" -#include <cstring> -#include <string> - #include "widgets/spw-utilities.h" #include "ui/widget/color-preview.h" @@ -23,13 +20,10 @@ #include "sp-linear-gradient.h" #include "sp-radial-gradient.h" #include "sp-pattern.h" -#include "xml/repr.h" #include "xml/sp-css-attr.h" #include "widgets/widget-sizes.h" #include "util/units.h" #include "helper/action.h" -#include "helper/action-context.h" -#include "preferences.h" #include "inkscape.h" #include "verbs.h" #include <glibmm/i18n.h> diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index ced811c57..e904666cc 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gtkmm/adjustment.h> |