diff options
Diffstat (limited to 'src/ui/dialog')
39 files changed, 450 insertions, 357 deletions
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 4f094f876..7a87a75ad 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -21,7 +21,7 @@ # include <config.h> #endif -#include "ui/dialog/aboutbox.h" +#include "aboutbox.h" #include <fstream> @@ -32,15 +32,17 @@ #include <gtkmm/aspectframe.h> #include <gtkmm/textview.h> -#include "path-prefix.h" #include "document.h" +#include "inkscape-version.h" +#include "path-prefix.h" #include "svg-view-widget.h" -#include "sp-text.h" #include "text-editing.h" + +#include "object/sp-text.h" + #include "ui/icon-names.h" #include "util/units.h" -#include "inkscape-version.h" namespace Inkscape { diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 4314c9e89..d622b5e06 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -21,32 +21,34 @@ #include "config.h" #endif -#include "align-and-distribute.h" +#include <glibmm/i18n.h> + #include <2geom/transforms.h> -#include "ui/widget/spinbutton.h" -#include "unclump.h" +#include "align-and-distribute.h" + +#include "desktop.h" +#include "document-undo.h" #include "document.h" #include "graphlayout.h" #include "inkscape.h" #include "preferences.h" #include "removeoverlap.h" -#include "sp-flowtext.h" -#include "sp-item-transform.h" -#include "sp-text.h" #include "text-editing.h" -#include "ui/tools-switch.h" -#include "ui/icon-names.h" -#include "ui/tools/node-tool.h" -#include "ui/tool/multi-path-manipulator.h" -#include "ui/tool/control-point-selection.h" +#include "unclump.h" #include "verbs.h" -#include "sp-root.h" -#include "document-undo.h" -#include "desktop.h" -#include <glibmm/i18n.h> +#include "object/sp-flowtext.h" +#include "object/sp-item-transform.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "ui/icon-names.h" +#include "ui/tool/control-point-selection.h" +#include "ui/tool/multi-path-manipulator.h" +#include "ui/tools-switch.h" +#include "ui/tools/node-tool.h" +#include "ui/widget/spinbutton.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 59c9e4cd4..06f25c5ae 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -21,7 +21,6 @@ #include "clonetiler.h" #include <glibmm/i18n.h> -#include <2geom/transforms.h> #include <gtkmm/adjustment.h> #include <gtkmm/checkbutton.h> @@ -29,26 +28,35 @@ #include <gtkmm/liststore.h> #include <gtkmm/radiobutton.h> +#include <2geom/transforms.h> + #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "filter-chemistry.h" +#include "inkscape.h" +#include "message-stack.h" +#include "unclump.h" +#include "verbs.h" #include "display/cairo-utils.h" -#include "display/drawing.h" #include "display/drawing-context.h" -#include "document.h" -#include "document-undo.h" -#include "filter-chemistry.h" -#include "ui/widget/unit-menu.h" +#include "display/drawing.h" + #include "helper/window.h" -#include "inkscape.h" + +#include "object/sp-item.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" +#include "object/sp-use.h" + +#include "ui/icon-names.h" #include "ui/interface.h" -#include "message-stack.h" -#include "sp-namedview.h" +#include "ui/widget/spinbutton.h" +#include "ui/widget/unit-menu.h" + #include "svg/svg-color.h" #include "svg/svg.h" -#include "ui/icon-names.h" -#include "ui/widget/spinbutton.h" -#include "unclump.h" -#include "verbs.h" using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h index db3049ef1..f42ef8fbe 100644 --- a/src/ui/dialog/clonetiler.h +++ b/src/ui/dialog/clonetiler.h @@ -14,7 +14,6 @@ #include "ui/dialog/desktop-tracker.h" #include "ui/widget/color-picker.h" -#include "sp-root.h" namespace Gtk { class CheckButton; @@ -22,6 +21,14 @@ namespace Gtk { class ToggleButton; } +class SPItem; +class SPObject; + +namespace Geom { + class Rect; + class Affine; +} + namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp index 37f2b4c30..efceeae11 100644 --- a/src/ui/dialog/cssdialog.cpp +++ b/src/ui/dialog/cssdialog.cpp @@ -12,10 +12,12 @@ */ #include "cssdialog.h" -#include "ui/widget/addtoicon.h" + #include "verbs.h" -#include "sp-object.h" #include "selection.h" + +#include "ui/widget/addtoicon.h" + #include "xml/attribute-record.h" namespace Inkscape { diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index c219603b4..e46f5ec6c 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -20,11 +20,12 @@ #include "document-metadata.h" #include "desktop.h" - #include "rdf.h" -#include "sp-namedview.h" -#include "ui/widget/entity-entry.h" #include "verbs.h" + +#include "object/sp-namedview.h" + +#include "ui/widget/entity-entry.h" #include "xml/node-event-vector.h" diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 6b213f99a..aae9ce867 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -22,29 +22,30 @@ # include <config.h> #endif -#include "ui/widget/notebook-page.h" -#include "document-properties.h" #include "display/canvas-grid.h" +#include "document-properties.h" +#include "rdf.h" +#include "verbs.h" #include "io/sys.h" -#include "ui/shape-editor.h" -#include "sp-root.h" -#include "sp-script.h" + +#include "object/sp-root.h" +#include "object/sp-script.h" #include "style.h" -#include "ui/tools-switch.h" -#include "ui/dialog/filedialog.h" -#include "verbs.h" -#include "xml/node-event-vector.h" -#include "rdf.h" +#include "ui/dialog/filedialog.h" +#include "ui/icon-names.h" +#include "ui/shape-editor.h" +#include "ui/tools-switch.h" #include "ui/widget/entity-entry.h" +#include "ui/widget/notebook-page.h" + +#include "xml/node-event-vector.h" #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "color-profile.h" +#include "object/color-profile.h" #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) -#include "ui/icon-names.h" - using std::pair; namespace Inkscape { diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index fc985aa44..380c8a9c4 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -30,35 +30,36 @@ #include <glibmm/i18n.h> #include <glibmm/miscutils.h> -#include "ui/widget/unit-menu.h" -#include "helper/window.h" -#include "inkscape.h" -#include "document.h" -#include "document-undo.h" +#include <gdl/gdl-dock-item.h> +#include "document-undo.h" +#include "document.h" #include "file.h" -#include "sp-namedview.h" -#include "selection-chemistry.h" - -#include "ui/dialog-events.h" +#include "inkscape.h" #include "preferences.h" +#include "selection-chemistry.h" #include "verbs.h" -#include "ui/interface.h" -#include "sp-root.h" -#include "extension/output.h" -#include "extension/db.h" +// required to set status message after export +#include "desktop.h" +#include "message-stack.h" + +#include "helper/png-write.h" +#include "helper/window.h" -#include "io/sys.h" #include "io/resource.h" +#include "io/sys.h" -#include "helper/png-write.h" +#include "object/sp-namedview.h" +#include "object/sp-root.h" -#include <gdl/gdl-dock-item.h> +#include "ui/dialog-events.h" +#include "ui/interface.h" +#include "ui/widget/unit-menu.h" + +#include "extension/db.h" +#include "extension/output.h" -// required to set status message after export -#include "desktop.h" -#include "message-stack.h" #ifdef WIN32 #include <windows.h> diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index 16a9a026b..f09546bdc 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -15,7 +15,6 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#include "ui/widget/notebook-page.h" #include "desktop-style.h" #include "document.h" @@ -23,15 +22,18 @@ #include "filter-chemistry.h" #include "inkscape.h" #include "preferences.h" -#include "style.h" +#include "verbs.h" + #include "svg/css-ostringstream.h" + #include "ui/icon-names.h" -#include "verbs.h" +#include "ui/view/view-widget.h" +#include "ui/widget/notebook-page.h" + #include "widgets/fill-style.h" #include "widgets/paint-selector.h" #include "widgets/stroke-style.h" -#include "ui/view/view-widget.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp index 7cec7dc01..ef702aba4 100644 --- a/src/ui/dialog/filter-editor.cpp +++ b/src/ui/dialog/filter-editor.cpp @@ -14,54 +14,53 @@ #include "config.h" #endif -#include "dialog-manager.h" +#include <string> +#include <gtkmm.h> #include <gdkmm/display.h> +#include <glibmm/convert.h> +#include <glibmm/error.h> +#include <glibmm/i18n.h> +#include <glibmm/main.h> +#include <glibmm/stringutils.h> + #if GTK_CHECK_VERSION(3, 20, 0) # include <gdkmm/seat.h> #else # include <gdkmm/devicemanager.h> #endif -#include "ui/widget/spinbutton.h" - -#include <glibmm/i18n.h> -#include <glibmm/stringutils.h> -#include <glibmm/main.h> -#include <glibmm/convert.h> -#include <glibmm/error.h> #include "desktop.h" - -#include "document.h" +#include "dialog-manager.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" #include "filter-editor.h" #include "filter-enums.h" #include "inkscape.h" -#include "filters/blend.h" -#include "filters/colormatrix.h" -#include "filters/componenttransfer.h" -#include "filters/componenttransfer-funcnode.h" -#include "filters/convolvematrix.h" -#include "filters/distantlight.h" -#include "filters/merge.h" -#include "filters/mergenode.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" - -#include "style.h" -#include "svg/svg-color.h" -#include "ui/dialog/filedialog.h" +#include "selection-chemistry.h" #include "verbs.h" #include "io/sys.h" #include "io/resource.h" -#include "selection-chemistry.h" -#include <string> +#include "object/filters/blend.h" +#include "object/filters/colormatrix.h" +#include "object/filters/componenttransfer.h" +#include "object/filters/componenttransfer-funcnode.h" +#include "object/filters/convolvematrix.h" +#include "object/filters/distantlight.h" +#include "object/filters/merge.h" +#include "object/filters/mergenode.h" +#include "object/filters/pointlight.h" +#include "object/filters/spotlight.h" +#include "style.h" -#include <gtkmm.h> +#include "svg/svg-color.h" + +#include "ui/dialog/filedialog.h" +#include "ui/widget/spinbutton.h" using namespace Inkscape::Filters; using namespace Inkscape::IO::Resource; diff --git a/src/ui/dialog/filter-editor.h b/src/ui/dialog/filter-editor.h index 6acb83f02..5bf16dc10 100644 --- a/src/ui/dialog/filter-editor.h +++ b/src/ui/dialog/filter-editor.h @@ -12,10 +12,6 @@ #ifndef INKSCAPE_UI_DIALOG_FILTER_EDITOR_H #define INKSCAPE_UI_DIALOG_FILTER_EDITOR_H -#include "attributes.h" -#include "ui/widget/panel.h" -#include "sp-filter.h" - #include <gtkmm/notebook.h> #include <gtkmm/sizegroup.h> #include <gtkmm/builder.h> @@ -28,6 +24,9 @@ #include <gtkmm/scrolledwindow.h> #include <gtkmm/treeview.h> +#include "ui/widget/panel.h" + + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 41797b1e7..e62d309c5 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -19,17 +19,19 @@ #include "config.h" #endif -#include "dialog-manager.h" #include <gtkmm/imagemenuitem.h> #include <gdkmm/display.h> +#include <gdkmm/general.h> +#include <gtkmm/checkbutton.h> +#include <gtkmm/colorbutton.h> +#include <gtkmm/eventbox.h> #if GTK_CHECK_VERSION(3, 20, 0) # include <gdkmm/seat.h> #else # include <gdkmm/devicemanager.h> #endif -#include "ui/widget/spinbutton.h" #include <glibmm/i18n.h> #include <glibmm/stringutils.h> @@ -37,36 +39,35 @@ #include <glibmm/convert.h> #include "desktop.h" - -#include "document.h" +#include "dialog-manager.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" #include "filter-effects-dialog.h" #include "filter-enums.h" #include "inkscape.h" -#include "filters/blend.h" -#include "filters/colormatrix.h" -#include "filters/componenttransfer.h" -#include "filters/componenttransfer-funcnode.h" -#include "filters/convolvematrix.h" -#include "filters/distantlight.h" -#include "filters/merge.h" -#include "filters/mergenode.h" -#include "filters/pointlight.h" -#include "filters/spotlight.h" +#include "selection-chemistry.h" +#include "verbs.h" +#include "object/filters/blend.h" +#include "object/filters/colormatrix.h" +#include "object/filters/componenttransfer.h" +#include "object/filters/componenttransfer-funcnode.h" +#include "object/filters/convolvematrix.h" +#include "object/filters/distantlight.h" +#include "object/filters/merge.h" +#include "object/filters/mergenode.h" +#include "object/filters/pointlight.h" +#include "object/filters/spotlight.h" #include "style.h" + #include "svg/svg-color.h" + #include "ui/dialog/filedialog.h" -#include "verbs.h" +#include "ui/widget/spinbutton.h" #include "io/sys.h" -#include "selection-chemistry.h" -#include <gtkmm/colorbutton.h> -#include <gdkmm/general.h> -#include <gtkmm/checkbutton.h> -#include <gtkmm/eventbox.h> using namespace Inkscape::Filters; diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 73d23bd37..d7bfff7d2 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -16,21 +16,23 @@ #include <memory> -#include "attributes.h" -#include "ui/widget/panel.h" -#include "sp-filter.h" -#include "ui/widget/combo-enums.h" - -#include "ui/widget/spin-scale.h" -#include "xml/helper-observer.h" -#include "ui/dialog/desktop-tracker.h" - #include <gtkmm/notebook.h> #include <gtkmm/sizegroup.h> #include <gtkmm/paned.h> #include <gtkmm/scrolledwindow.h> +#include "attributes.h" + +#include "ui/dialog/desktop-tracker.h" +#include "ui/widget/combo-enums.h" +#include "ui/widget/panel.h" +#include "ui/widget/spin-scale.h" + +#include "xml/helper-observer.h" + +class SPFilter; + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index 0f327d6d1..d172eca57 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -17,43 +17,44 @@ #include "find.h" #include <gtkmm/entry.h> +#include <glibmm/i18n.h> +#include <glibmm/regex.h> +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "inkscape.h" +#include "message-stack.h" +#include "selection-chemistry.h" +#include "text-editing.h" #include "verbs.h" -#include "message-stack.h" #include "helper/window.h" -#include "inkscape.h" -#include "desktop.h" -#include "document.h" -#include "document-undo.h" +#include "object/sp-defs.h" +#include "object/sp-ellipse.h" +#include "object/sp-flowdiv.h" +#include "object/sp-flowtext.h" +#include "object/sp-image.h" +#include "object/sp-line.h" +#include "object/sp-offset.h" +#include "object/sp-path.h" +#include "object/sp-polyline.h" +#include "object/sp-rect.h" +#include "object/sp-root.h" +#include "object/sp-spiral.h" +#include "object/sp-star.h" +#include "object/sp-text.h" +#include "object/sp-tref.h" +#include "object/sp-tspan.h" +#include "object/sp-use.h" #include "ui/dialog-events.h" #include "ui/interface.h" -#include "sp-text.h" -#include "sp-flowtext.h" -#include "sp-flowdiv.h" -#include "text-editing.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "selection-chemistry.h" -#include "sp-defs.h" -#include "sp-rect.h" -#include "sp-ellipse.h" -#include "sp-star.h" -#include "sp-spiral.h" -#include "sp-path.h" -#include "sp-line.h" -#include "sp-polyline.h" -#include "sp-item-group.h" -#include "sp-image.h" -#include "sp-offset.h" -#include "sp-root.h" -#include "xml/node-iterators.h" + #include "xml/attribute-record.h" +#include "xml/node-iterators.h" -#include <glibmm/i18n.h> -#include <glibmm/regex.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index ad035aa8d..a07a7b7b3 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -10,37 +10,35 @@ #include "config.h" #endif +#include <set> + +#include <glibmm/i18n.h> +#include <glibmm/regex.h> + #include <gtkmm/messagedialog.h> #include <gtkmm/checkbutton.h> #include <gtkmm/scrolledwindow.h> #include <gtkmm/textview.h> -#include <set> #include "font-substitution.h" -#include "inkscape.h" #include "desktop.h" #include "document.h" - -#include "ui/dialog-events.h" - +#include "inkscape.h" #include "selection-chemistry.h" - -#include "sp-root.h" -#include "sp-text.h" -#include "sp-textpath.h" -#include "sp-flowtext.h" -#include "sp-flowdiv.h" -#include "sp-tspan.h" -#include "sp-tref.h" -#include "style.h" #include "text-editing.h" +#include "object/sp-root.h" +#include "object/sp-text.h" +#include "object/sp-textpath.h" +#include "object/sp-flowtext.h" +#include "object/sp-flowdiv.h" +#include "object/sp-tspan.h" + #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" -#include <glibmm/i18n.h> -#include <glibmm/regex.h> +#include "ui/dialog-events.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp index c600d8e94..eb13700ec 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -19,15 +19,18 @@ #include <gtkmm/scrolledwindow.h> #include "desktop.h" -#include "document.h" // for SPDocumentUndo::done() #include "document-undo.h" -#include "libnrtype/font-instance.h" -#include "sp-flowtext.h" -#include "sp-text.h" +#include "document.h" // for SPDocumentUndo::done() +#include "selection.h" +#include "text-editing.h" #include "verbs.h" + +#include "libnrtype/font-instance.h" + +#include "object/sp-flowtext.h" +#include "object/sp-text.h" + #include "widgets/font-selector.h" -#include "text-editing.h" -#include "selection.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index 5dc64bb24..dd926296d 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -16,21 +16,26 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include "guides.h" -#include "display/guideline.h" +#include <glibmm/i18n.h> + #include "desktop.h" -#include "document.h" #include "document-undo.h" -#include "sp-guide.h" -#include "sp-namedview.h" +#include "document.h" +#include "message-context.h" +#include "verbs.h" + +#include "object/sp-guide.h" +#include "object/sp-namedview.h" +#include "display/guideline.h" + +#include "ui/dialog-events.h" #include "ui/tools/tool-base.h" + #include "widgets/desktop-widget.h" -#include <glibmm/i18n.h> -#include "ui/dialog-events.h" -#include "message-context.h" -#include "verbs.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index aeb56e563..47f6f3121 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -17,29 +17,30 @@ #include "config.h" #endif -#include <gtkmm/buttonbox.h> - #include <glibmm/i18n.h> #include <glibmm/timer.h> #include <glibmm/main.h> +#include <gtkmm/buttonbox.h> #include <gtkmm/checkbutton.h> #include <gtkmm/frame.h> -#include "ui/widget/frame.h" #include "desktop.h" +#include "document.h" +#include "inkscape.h" +#include "verbs.h" #include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-context.h" -#include "document.h" -#include "inkscape.h" -#include "sp-namedview.h" -#include "sp-root.h" -#include "verbs.h" + +#include "object/sp-namedview.h" +#include "object/sp-root.h" #include "icon-preview.h" +#include "ui/widget/frame.h" + extern "C" { // takes doc, drawing, icon, and icon name to produce pixels guchar * diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 2a50c14fc..96c446d0c 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -18,6 +18,7 @@ #endif #include "inkscape-preferences.h" + #include <glibmm/i18n.h> #include <glibmm/miscutils.h> #include <glibmm/markup.h> @@ -25,27 +26,31 @@ #include <gtkmm/recentmanager.h> #include <gtkmm/recentinfo.h> +#include "cms-system.h" +#include "document.h" +#include "enums.h" +#include "inkscape.h" +#include "message-stack.h" +#include "path-prefix.h" #include "preferences.h" -#include "verbs.h" #include "selcue.h" - -#include "extension/internal/gdkpixbuf-input.h" -#include "message-stack.h" -#include "style.h" -#include "selection.h" #include "selection-chemistry.h" -#include "ui/widget/style-swatch.h" -#include "display/nr-filter-gaussian.h" -#include "cms-system.h" -#include "color-profile.h" +#include "selection.h" +#include "shortcuts.h" +#include "verbs.h" + #include "display/canvas-grid.h" -#include "path-prefix.h" +#include "display/nr-filter-gaussian.h" + +#include "extension/internal/gdkpixbuf-input.h" + #include "io/resource.h" #include "io/sys.h" -#include "inkscape.h" -#include "shortcuts.h" -#include "document.h" +#include "object/color-profile.h" +#include "style.h" + +#include "ui/widget/style-swatch.h" #ifdef HAVE_ASPELL # include <aspell.h> diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index e16b1a0f5..6f609736a 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -14,25 +14,30 @@ #endif #include "layers.h" + #include <gtkmm/icontheme.h> #include <gtkmm/separatormenuitem.h> #include <glibmm/main.h> -#include "desktop.h" #include "desktop-style.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" -#include "helper/action.h" +#include "document.h" #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" +#include "selection-chemistry.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "object/sp-root.h" + #include "svg/css-ostringstream.h" + #include "ui/icon-names.h" -#include "ui/widget/imagetoggler.h" -#include "verbs.h" -#include "sp-root.h" #include "ui/tools/tool-base.h" -#include "selection-chemistry.h" +#include "ui/widget/imagetoggler.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index 24591d496..ec8ae4f31 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -18,25 +18,31 @@ #include "livepatheffect-editor.h" -#include "desktop.h" #include <gtkmm/expander.h> -#include "document.h" + +#include "desktop.h" #include "document-undo.h" -#include "helper/action.h" +#include "document.h" #include "inkscape.h" -#include "live_effects/effect.h" -#include "live_effects/lpeobject.h" -#include "live_effects/lpeobject-reference.h" +#include "livepatheffect-add.h" #include "path-chemistry.h" #include "selection-chemistry.h" -#include "sp-item-group.h" -#include "sp-path.h" -#include "sp-rect.h" -#include "sp-text.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "live_effects/effect.h" +#include "live_effects/lpeobject-reference.h" +#include "live_effects/lpeobject.h" + +#include "object/sp-item-group.h" +#include "object/sp-path.h" +#include "object/sp-rect.h" +#include "object/sp-use.h" +#include "object/sp-text.h" + #include "ui/icon-names.h" #include "ui/widget/imagetoggler.h" -#include "verbs.h" -#include "livepatheffect-add.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index 0facb9038..f3e93ded8 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -20,16 +20,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "ui/dialog/dialog-manager.h" -#include "desktop.h" +#include <glibmm/i18n.h> -#include "sp-anchor.h" -#include "sp-image.h" +#include "desktop.h" +#include "inkscape.h" #include "verbs.h" + +#include "object/sp-anchor.h" +#include "object/sp-image.h" + #include "ui/dialog/object-attributes.h" +#include "ui/dialog/dialog-manager.h" + #include "widgets/sp-attribute-widget.h" -#include "inkscape.h" -#include <glibmm/i18n.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index ad80a0171..2d2ee9e2c 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -27,18 +27,21 @@ */ #include "object-properties.h" -#include "widgets/sp-attribute-widget.h" -#include "document.h" -#include "document-undo.h" -#include "verbs.h" -#include "inkscape.h" -#include "desktop.h" -#include "sp-image.h" #include <glibmm/i18n.h> #include <gtkmm/grid.h> +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "inkscape.h" +#include "verbs.h" + +#include "object/sp-image.h" + +#include "widgets/sp-attribute-widget.h" + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index e01660ad1..c2ee66cd7 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -16,39 +16,44 @@ #endif #include "objects.h" + #include <gtkmm/icontheme.h> #include <gtkmm/imagemenuitem.h> #include <gtkmm/separatormenuitem.h> #include <glibmm/main.h> -#include "desktop.h" #include "desktop-style.h" -#include "ui/dialog-events.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" +#include "document.h" #include "filter-chemistry.h" -#include "filters/blend.h" -#include "filters/gaussian-blur.h" -#include "helper/action.h" #include "inkscape.h" #include "layer-manager.h" #include "shortcuts.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-root.h" -#include "sp-shape.h" +#include "verbs.h" + +#include "helper/action.h" + +#include "object/filters/blend.h" +#include "object/filters/gaussian-blur.h" +#include "object/sp-clippath.h" +#include "object/sp-mask.h" +#include "object/sp-root.h" +#include "object/sp-shape.h" #include "style.h" -#include "ui/tools-switch.h" + +#include "ui/dialog-events.h" #include "ui/icon-names.h" #include "ui/selected-color.h" -#include "ui/widget/imagetoggler.h" -#include "ui/widget/layertypeicon.h" -#include "ui/widget/insertordericon.h" -#include "ui/widget/clipmaskicon.h" -#include "ui/widget/highlight-picker.h" +#include "ui/tools-switch.h" #include "ui/tools/node-tool.h" -#include "verbs.h" +#include "ui/widget/clipmaskicon.h" #include "ui/widget/color-notebook.h" +#include "ui/widget/highlight-picker.h" +#include "ui/widget/imagetoggler.h" +#include "ui/widget/insertordericon.h" +#include "ui/widget/layertypeicon.h" + #include "xml/node-observer.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index 3e6617cfe..d5f3de406 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -26,28 +26,30 @@ # include <glibmm/dispatcher.h> #endif // GLIBMM_DISABLE_DEPRECATED -#include "pixelartdialog.h" -#include <gtkmm/radiobutton.h> -#include <gtkmm/messagedialog.h> - #include <glibmm/i18n.h> +#include <gtkmm/messagedialog.h> +#include <gtkmm/radiobutton.h> -#include "ui/widget/spinbutton.h" -#include "ui/widget/frame.h" - -#include "desktop.h" #include "desktop-tracker.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "message-stack.h" +#include "pixelartdialog.h" #include "selection.h" -#include "sp-image.h" #include "display/cairo-utils.h" + #include "libdepixelize/kopftracer2011.h" -#include "document.h" -#include "svg/svg.h" -#include "svg/svg-color.h" + +#include "object/sp-image.h" + #include "svg/css-ostringstream.h" -#include "document-undo.h" +#include "svg/svg-color.h" +#include "svg/svg.h" + +#include "ui/widget/frame.h" +#include "ui/widget/spinbutton.h" #ifdef HAVE_OPENMP #include <omp.h> diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp index 2f18d5c0d..7f535092f 100644 --- a/src/ui/dialog/polar-arrange-tab.cpp +++ b/src/ui/dialog/polar-arrange-tab.cpp @@ -7,22 +7,24 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "ui/dialog/polar-arrange-tab.h" -#include "ui/dialog/tile.h" +#include <glibmm/i18n.h> +#include <gtkmm/messagedialog.h> #include <2geom/transforms.h> -#include <glibmm/i18n.h> -#include "verbs.h" -#include "preferences.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" +#include "preferences.h" +#include "verbs.h" + +#include "object/sp-ellipse.h" +#include "object/sp-item-transform.h" + +#include "ui/dialog/polar-arrange-tab.h" +#include "ui/dialog/tile.h" -#include "document.h" -#include "document-undo.h" -#include "desktop.h" -#include "sp-ellipse.h" -#include "sp-item-transform.h" -#include <gtkmm/messagedialog.h> namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp index 46bf5cb11..1280cba87 100644 --- a/src/ui/dialog/prototype.cpp +++ b/src/ui/dialog/prototype.cpp @@ -9,14 +9,15 @@ * Released under the GNU GPL, read the file 'COPYING' for more information. */ -#include "ui/dialog/prototype.h" -#include "verbs.h" +#include "prototype.h" + #include "desktop.h" #include "document.h" #include "selection.h" +#include "verbs.h" // Only for use in demonstration widget. -#include "sp-root.h" +#include "object/sp-root.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index 3d91ad559..252782081 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -23,15 +23,20 @@ #include "ui/tools-switch.h" #include "ui/tools/text-tool.h" #include "ui/interface.h" -#include "sp-flowtext.h" #include "text-editing.h" -#include "sp-tref.h" -#include "sp-defs.h" #include "selection-chemistry.h" #include "display/curve.h" #include "document-undo.h" -#include "sp-root.h" #include "verbs.h" + +#include "object/sp-defs.h" +#include "object/sp-flowtext.h" +#include "object/sp-object.h" +#include "object/sp-root.h" +#include "object/sp-string.h" +#include "object/sp-text.h" +#include "object/sp-tref.h" + #include <glibmm/i18n.h> #ifdef WIN32 diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index e7563ad1e..aa89a7bdd 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -29,13 +29,17 @@ #include "ui/dialog/desktop-tracker.h" #include "ui/widget/panel.h" -#include "sp-text.h" + +#include "text-editing.h" #ifdef HAVE_ASPELL #include <aspell.h> #endif /* HAVE_ASPELL */ class SPDesktop; +class SPObject; +class SPItem; +class SPCanvasItem; namespace Inkscape { class Preferences; diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 76ab2c7d6..17850712f 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -12,16 +12,18 @@ */ #include "styledialog.h" -#include "ui/widget/addtoicon.h" #include "verbs.h" -#include "sp-object.h" #include "selection.h" -#include "xml/attribute-record.h" -#include "xml/node-observer.h" #include "attribute-rel-svg.h" #include "inkscape.h" #include "document-undo.h" + +#include "ui/widget/addtoicon.h" + +#include "xml/attribute-record.h" +#include "xml/node-observer.h" + #include <glibmm/i18n.h> #include <glibmm/regex.h> diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 5d0080443..19d67916a 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -25,16 +25,18 @@ #include "selection.h" #include "svg/svg.h" #include "xml/repr.h" -#include "sp-font-face.h" #include "desktop.h" #include <sstream> #include "display/nr-svgfonts.h" #include "verbs.h" -#include "sp-glyph.h" -#include "sp-missing-glyph.h" -#include "sp-font.h" -#include "sp-glyph-kerning.h" + +#include "object/sp-font-face.h" +#include "object/sp-glyph.h" +#include "object/sp-missing-glyph.h" +#include "object/sp-font.h" +#include "object/sp-glyph-kerning.h" +#include "object/sp-defs.h" #include <glibmm/i18n.h> #include <glibmm/stringutils.h> diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 5c0deda62..e57dde639 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -42,12 +42,15 @@ #include "io/resource.h" #include "message-context.h" #include "path-prefix.h" -#include "style.h" + #include "ui/previewholder.h" #include "widgets/desktop-widget.h" #include "widgets/gradient-vector.h" #include "display/cairo-utils.h" -#include "sp-gradient-reference.h" + +#include "object/sp-defs.h" +#include "object/sp-gradient-reference.h" + #include "dialog-manager.h" #include "verbs.h" #include "gradient-chemistry.h" diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 117e3da5d..0ef631a3a 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -39,10 +39,11 @@ #include "document.h" #include "inkscape.h" -#include "sp-root.h" -#include "sp-use.h" -#include "sp-defs.h" -#include "sp-symbol.h" + +#include "object/sp-root.h" +#include "object/sp-use.h" +#include "object/sp-defs.h" +#include "object/sp-symbol.h" #ifdef WITH_LIBVISIO #include <libvisio/libvisio.h> diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 0b0312220..5f341c3b1 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -18,11 +18,11 @@ #include "display/drawing.h" #include "ui/dialog/desktop-tracker.h" #include "ui/widget/panel.h" -#include "sp-symbol.h" -#include "sp-use.h" #include <vector> class SPObject; +class SPSymbol; +class SPUse; namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index 3df59bb31..24f167500 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -26,24 +26,20 @@ #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" -#include "sp-shape.h" + #include "svg/css-ostringstream.h" #include "ui/widget/layertypeicon.h" #include "ui/widget/addtoicon.h" #include "verbs.h" #include "xml/node-observer.h" -#include "sp-root.h" #include "ui/tools/tool-base.h" //"event-context.h" //#include "dialogs/dialog-events.h" #include "ui/widget/color-notebook.h" -#include "style.h" #include "filter-chemistry.h" -#include "sp-clippath.h" -#include "sp-mask.h" -#include "sp-tag.h" -#include "sp-defs.h" -#include "sp-tag-use.h" -#include "sp-tag-use-reference.h" + +#include "object/sp-item.h" +#include "object/sp-defs.h" +#include "object/sp-object-group.h" //#define DUMP_LAYERS 1 diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 8aeaa4046..12c6b0298 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -14,14 +14,14 @@ #include <gtkmm/messagedialog.h> #include "desktop.h" - #include "document.h" #include "document-undo.h" #include "file.h" -#include "sp-namedview.h" -#include "extension/implementation/implementation.h" #include "inkscape.h" +#include "extension/implementation/implementation.h" + +#include "object/sp-namedview.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 8ada1b3b9..7ce39695e 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -21,7 +21,9 @@ #endif #include "text-edit.h" -#include <libnrtype/font-instance.h> + +#include <glibmm/i18n.h> +#include <glibmm/markup.h> #ifdef WITH_GTKSPELL extern "C" { @@ -29,27 +31,32 @@ extern "C" { } #endif -#include <libnrtype/font-lister.h> - -#include "helper/window.h" -#include "inkscape.h" -#include "document.h" -#include "desktop.h" #include "desktop-style.h" - +#include "desktop.h" #include "document-undo.h" -#include "sp-text.h" -#include "sp-flowtext.h" +#include "document.h" +#include "inkscape.h" #include "text-editing.h" -#include "ui/icon-names.h" #include "verbs.h" -#include "ui/interface.h" + +#include "helper/window.h" + +#include <libnrtype/font-instance.h> +#include <libnrtype/font-lister.h> + +#include "object/sp-flowtext.h" +#include "object/sp-text.h" +#include "object/sp-textpath.h" + #include "svg/css-ostringstream.h" -#include "widgets/font-selector.h" -#include <glibmm/i18n.h> -#include <glibmm/markup.h> + +#include "ui/icon-names.h" +#include "ui/interface.h" + #include "util/units.h" -#include "sp-textpath.h" + +#include "widgets/font-selector.h" + namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index fc9fe271e..561a88a92 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -16,23 +16,26 @@ #endif #include <gtkmm/dialog.h> -#include <2geom/transforms.h> -#include "document.h" -#include "document-undo.h" -#include "desktop.h" +#include <2geom/transforms.h> -#include "transformation.h" #include "align-and-distribute.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" #include "inkscape.h" -#include "selection-chemistry.h" #include "message-stack.h" +#include "selection-chemistry.h" +#include "transformation.h" #include "verbs.h" -#include "sp-namedview.h" -#include "sp-item-transform.h" + +#include "object/sp-item-transform.h" +#include "object/sp-namedview.h" + #include "ui/icon-names.h" + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 11691deb4..e3975dfdc 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -17,26 +17,29 @@ */ #include "xml-tree.h" + #include <glibmm/i18n.h> -#include "desktop.h" -#include "ui/dialog-events.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" -#include "ui/tools/tool-base.h" -#include "helper/window.h" +#include "document.h" #include "inkscape.h" -#include "ui/interface.h" #include "message-context.h" #include "message-stack.h" #include "shortcuts.h" -#include "sp-root.h" -#include "sp-string.h" -#include "sp-tspan.h" -#include "ui/icon-names.h" #include "verbs.h" +#include "helper/window.h" + +#include "object/sp-root.h" +#include "object/sp-string.h" + +#include "ui/dialog-events.h" +#include "ui/icon-names.h" +#include "ui/interface.h" +#include "ui/tools/tool-base.h" + #include "widgets/sp-xmlview-attr-list.h" #include "widgets/sp-xmlview-content.h" #include "widgets/sp-xmlview-tree.h" |