From 06caba8f2caeb07011e492d7218f0b8f6b28e801 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 24 Jul 2016 17:05:29 +0200 Subject: Fises to toggle button and coding style (bzr r15021) --- src/ui/widget/registered-widget.cpp | 6 ++---- src/ui/widget/registered-widget.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/ui/widget') diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 298377af3..572845668 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -113,10 +113,8 @@ RegisteredToggleButton::~RegisteredToggleButton() _toggled_connection.disconnect(); } -RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *active_str, char const *inactive_str) +RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *icon_active, char const *icon_inactive) : RegisteredWidget() - , _active_str(active_str) - , _inactive_str(inactive_str) { init_parent(key, wr, repr_in, doc_in); setProgrammatically = false; @@ -149,7 +147,7 @@ RegisteredToggleButton::on_toggled() return; _wr->setUpdating (true); - write_to_xml(get_active() ? _active_str : _inactive_str); + write_to_xml(get_active() ? "true" : "false"); //The slave button is greyed out if the master button is untoggled for (std::list::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); ++i) { (*i)->set_sensitive(get_active()); diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 9d2489712..ab2e4c8e4 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -166,7 +166,7 @@ protected: class RegisteredToggleButton : public RegisteredWidget { public: virtual ~RegisteredToggleButton(); - RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *active_str = "true", char const *inactive_str = "false"); + RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *icon_active = "true", char const *icon_inactive = "false"); void setActive (bool); @@ -183,7 +183,6 @@ public: // if a callback checks it, it must reset it back to false protected: - char const *_active_str, *_inactive_str; sigc::connection _toggled_connection; void on_toggled(); }; -- cgit v1.2.3 From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/ui/widget/addtoicon.cpp | 4 +--- src/ui/widget/anchor-selector.cpp | 1 - src/ui/widget/clipmaskicon.cpp | 2 +- src/ui/widget/color-icc-selector.cpp | 3 --- src/ui/widget/color-notebook.cpp | 4 ---- src/ui/widget/color-scales.cpp | 4 +--- src/ui/widget/color-slider.cpp | 3 +-- src/ui/widget/color-wheel-selector.cpp | 6 +----- src/ui/widget/dock-item.cpp | 3 --- src/ui/widget/entity-entry.cpp | 3 +-- src/ui/widget/entry.cpp | 2 +- src/ui/widget/filter-effect-chooser.cpp | 4 ---- src/ui/widget/font-variants.cpp | 10 +--------- src/ui/widget/frame.cpp | 2 +- src/ui/widget/highlight-picker.cpp | 3 --- src/ui/widget/imageicon.cpp | 3 --- src/ui/widget/layer-selector.cpp | 4 +--- src/ui/widget/layertypeicon.cpp | 3 +-- src/ui/widget/licensor.cpp | 2 -- src/ui/widget/object-composite-settings.cpp | 7 ------- src/ui/widget/page-sizer.cpp | 19 +------------------ src/ui/widget/panel.cpp | 7 +------ src/ui/widget/point.cpp | 5 +---- src/ui/widget/preferences-widget.cpp | 7 +------ src/ui/widget/preferences-widget.h | 1 - src/ui/widget/random.cpp | 2 +- src/ui/widget/registered-widget.cpp | 12 +----------- src/ui/widget/rendering-options.cpp | 2 +- src/ui/widget/rotateable.cpp | 3 +-- src/ui/widget/selected-style.cpp | 9 +-------- src/ui/widget/spin-scale.cpp | 2 -- src/ui/widget/spin-slider.cpp | 1 - src/ui/widget/spinbutton.cpp | 2 +- src/ui/widget/style-subject.cpp | 1 - src/ui/widget/style-swatch.cpp | 6 ------ src/ui/widget/tolerance-slider.cpp | 2 +- 36 files changed, 22 insertions(+), 132 deletions(-) (limited to 'src/ui/widget') 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 +#include #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 #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 +#include #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 #include #include #include -#include #include -#include #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 -#include -#include -#include #include #include #include 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 #endif -#include #include #include #include -#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 #endif #include -#include #include #include #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 #endif #include "color-wheel-selector.h" -#include -#include #include #include #include #include -#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 #include -#include 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 +#include #endif #include #include #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 +#include #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 - -#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 +#include #endif #include #include #include -#include #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 +#include #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 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 #include "svg-view-widget.h" #include "document.h" #include "inkscape.h" -#include -#include 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 #endif #include @@ -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 +#include #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 #endif #include "licensor.h" @@ -27,7 +26,6 @@ #include "document-undo.h" #include "document-private.h" #include "verbs.h" -#include 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 - #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 +#include #endif #include "page-sizer.h" -#include -#include -#include -#include -#include - #include -#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 +#include #endif #include // for Gtk::RESPONSE_* #include #include -#include -#include -#include #include -#include - #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 +#include #endif #include "ui/widget/point.h" -#include "ui/widget/labelled.h" -#include "ui/widget/scalar.h" -#include 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 +#include #endif #include @@ -26,19 +26,14 @@ #include "verbs.h" #include "selcue.h" #include "io/sys.h" -#include #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 #include #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 #endif -#include #include #include 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 +#include #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 +#include #endif #include "registered-widget.h" -#include -#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 +#include #endif #include 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 #endif #include #include -#include #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 +#include #endif #include "selected-style.h" -#include #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 #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 #include -#include #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 -#include 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 +#include #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 -#include - #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 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 +#include #endif #include -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/ui/widget/addtoicon.cpp | 4 +++- src/ui/widget/anchor-selector.cpp | 1 + src/ui/widget/clipmaskicon.cpp | 2 +- src/ui/widget/color-icc-selector.cpp | 3 +++ src/ui/widget/color-notebook.cpp | 4 ++++ src/ui/widget/color-scales.cpp | 4 +++- src/ui/widget/color-slider.cpp | 3 ++- src/ui/widget/color-wheel-selector.cpp | 6 +++++- src/ui/widget/dock-item.cpp | 3 +++ src/ui/widget/entity-entry.cpp | 3 ++- src/ui/widget/entry.cpp | 2 +- src/ui/widget/filter-effect-chooser.cpp | 4 ++++ src/ui/widget/font-variants.cpp | 10 +++++++++- src/ui/widget/frame.cpp | 2 +- src/ui/widget/highlight-picker.cpp | 3 +++ src/ui/widget/imageicon.cpp | 3 +++ src/ui/widget/layer-selector.cpp | 4 +++- src/ui/widget/layertypeicon.cpp | 3 ++- src/ui/widget/licensor.cpp | 2 ++ src/ui/widget/object-composite-settings.cpp | 7 +++++++ src/ui/widget/page-sizer.cpp | 19 ++++++++++++++++++- src/ui/widget/panel.cpp | 7 ++++++- src/ui/widget/point.cpp | 5 ++++- src/ui/widget/preferences-widget.cpp | 7 ++++++- src/ui/widget/preferences-widget.h | 1 + src/ui/widget/random.cpp | 2 +- src/ui/widget/registered-widget.cpp | 12 +++++++++++- src/ui/widget/rendering-options.cpp | 2 +- src/ui/widget/rotateable.cpp | 3 ++- src/ui/widget/selected-style.cpp | 9 ++++++++- src/ui/widget/spin-scale.cpp | 2 ++ src/ui/widget/spin-slider.cpp | 1 + src/ui/widget/spinbutton.cpp | 2 +- src/ui/widget/style-subject.cpp | 1 + src/ui/widget/style-swatch.cpp | 6 ++++++ src/ui/widget/tolerance-slider.cpp | 2 +- 36 files changed, 132 insertions(+), 22 deletions(-) (limited to 'src/ui/widget') diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp index 465423fc2..10294125d 100644 --- a/src/ui/widget/addtoicon.cpp +++ b/src/ui/widget/addtoicon.cpp @@ -9,7 +9,7 @@ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ui/widget/addtoicon.h" @@ -19,7 +19,9 @@ #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 acf8aff79..df00b786a 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -8,6 +8,7 @@ */ #include "ui/widget/anchor-selector.h" +#include #include "widgets/icon.h" #include "ui/icon-names.h" diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp index 8715fdede..421f1df1e 100644 --- a/src/ui/widget/clipmaskicon.cpp +++ b/src/ui/widget/clipmaskicon.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #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 52c6ed2e3..e4f58fe8a 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -2,11 +2,14 @@ #include "config.h" #endif +#include #include #include #include +#include #include +#include #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 6634d8dad..6d7ada734 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -20,6 +20,10 @@ #endif #include "widgets/icon.h" +#include +#include +#include +#include #include #include #include diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 832bc3a62..48a2693bc 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -3,13 +3,15 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif +#include #include #include #include +#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 bf2156628..0c9586a67 100644 --- a/src/ui/widget/color-slider.cpp +++ b/src/ui/widget/color-slider.cpp @@ -12,10 +12,11 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include +#include #include #include #if WITH_GTKMM_3_0 diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index decb02b4f..22c616325 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -1,14 +1,18 @@ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "color-wheel-selector.h" +#include +#include #include #include #include #include +#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 910135fc1..8d960ddc3 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -9,13 +9,16 @@ #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 #include +#include namespace Inkscape { namespace UI { diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index 381f0a2e1..a8de2f384 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -14,13 +14,14 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #include #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 b1dd9ae8e..64d28119a 100644 --- a/src/ui/widget/entry.cpp +++ b/src/ui/widget/entry.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "entry.h" diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index ae2f3e7c2..242a99073 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -10,8 +10,12 @@ */ #include "filter-effect-chooser.h" +#include + +#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 aca85f246..62598dead 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -8,18 +8,26 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #include #include +#include #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 65d10dcc4..eaa4336bb 100644 --- a/src/ui/widget/frame.cpp +++ b/src/ui/widget/frame.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "frame.h" diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp index c1068c9b2..09999b52d 100644 --- a/src/ui/widget/highlight-picker.cpp +++ b/src/ui/widget/highlight-picker.cpp @@ -14,6 +14,9 @@ #include "highlight-picker.h" #include "widgets/icon.h" +#include "widgets/toolbox.h" +#include "ui/icon-names.h" +#include namespace Inkscape { namespace UI { diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp index 7d7fb2d3b..df261b69a 100644 --- a/src/ui/widget/imageicon.cpp +++ b/src/ui/widget/imageicon.cpp @@ -15,9 +15,12 @@ #include "imageicon.h" +#include #include "svg-view-widget.h" #include "document.h" #include "inkscape.h" +#include +#include namespace Inkscape diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 7ee34f3b3..1a9ce617f 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif #include @@ -25,7 +25,9 @@ #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 e281d982a..672c607e5 100644 --- a/src/ui/widget/layertypeicon.cpp +++ b/src/ui/widget/layertypeicon.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ui/widget/layertypeicon.h" @@ -18,6 +18,7 @@ #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 6acb5a4c7..d21e848f2 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -13,6 +13,7 @@ */ #ifdef HAVE_CONFIG_H +# include #endif #include "licensor.h" @@ -26,6 +27,7 @@ #include "document-undo.h" #include "document-private.h" #include "verbs.h" +#include namespace Inkscape { diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index c8ac20c54..8acf083d0 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -14,6 +14,8 @@ #include "ui/widget/object-composite-settings.h" +#include + #include "desktop.h" #include "desktop-style.h" @@ -21,12 +23,17 @@ #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 4a1fe9ac6..19ab1a280 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -18,18 +18,35 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "page-sizer.h" +#include +#include +#include +#include +#include + #include +#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 6ccd8b81a..ab13577d7 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -12,15 +12,20 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include // for Gtk::RESPONSE_* #include #include +#include +#include +#include #include +#include + #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 2c2eb5e8a..6aa6196bb 100644 --- a/src/ui/widget/point.cpp +++ b/src/ui/widget/point.cpp @@ -12,11 +12,14 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ui/widget/point.h" +#include "ui/widget/labelled.h" +#include "ui/widget/scalar.h" +#include namespace Inkscape { namespace UI { diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index b4c09cc0f..d56506d62 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -26,14 +26,19 @@ #include "verbs.h" #include "selcue.h" #include "io/sys.h" +#include #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 #include #ifdef WIN32 diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index cb192bf58..1d2d77699 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -19,6 +19,7 @@ # include #endif +#include #include #include diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp index b6ea16b89..0a646b6fb 100644 --- a/src/ui/widget/random.cpp +++ b/src/ui/widget/random.cpp @@ -10,7 +10,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index af59fe1a0..572845668 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -14,19 +14,29 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "registered-widget.h" +#include +#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 220731b7e..837387f7b 100644 --- a/src/ui/widget/rendering-options.cpp +++ b/src/ui/widget/rendering-options.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp index e0de22335..5e938dee6 100644 --- a/src/ui/widget/rotateable.cpp +++ b/src/ui/widget/rotateable.cpp @@ -8,11 +8,12 @@ */ #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif #include #include +#include #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 299b904c6..f7fd63f51 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -10,10 +10,11 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "selected-style.h" +#include #include "widgets/spw-utilities.h" #include "ui/widget/color-preview.h" @@ -30,14 +31,19 @@ #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 #include "pixmaps/cursor-adj-h.xpm" #include "pixmaps/cursor-adj-s.xpm" @@ -45,6 +51,7 @@ #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 cb95e7405..bb08d67df 100644 --- a/src/ui/widget/spin-scale.cpp +++ b/src/ui/widget/spin-scale.cpp @@ -8,7 +8,9 @@ #include "spin-scale.h" +#include #include +#include #include "ui/widget/gimpspinscale.h" diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index 4242d8c7d..9b361ae78 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -11,6 +11,7 @@ #include "spin-slider.h" #include +#include namespace Inkscape { namespace UI { diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp index d1776e630..d7669d4e5 100644 --- a/src/ui/widget/spinbutton.cpp +++ b/src/ui/widget/spinbutton.cpp @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "spinbutton.h" diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp index 811ed2221..da3bbcd20 100644 --- a/src/ui/widget/style-subject.cpp +++ b/src/ui/widget/style-subject.cpp @@ -8,6 +8,7 @@ #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 2952a3f97..188be705d 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -13,6 +13,9 @@ #include "style-swatch.h" +#include +#include + #include "widgets/spw-utilities.h" #include "ui/widget/color-preview.h" @@ -20,10 +23,13 @@ #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 diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index e904666cc..ced811c57 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -9,7 +9,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/ui/widget/addtoicon.cpp | 4 +--- src/ui/widget/anchor-selector.cpp | 1 - src/ui/widget/clipmaskicon.cpp | 2 +- src/ui/widget/color-icc-selector.cpp | 3 --- src/ui/widget/color-notebook.cpp | 4 ---- src/ui/widget/color-scales.cpp | 4 +--- src/ui/widget/color-slider.cpp | 3 +-- src/ui/widget/color-wheel-selector.cpp | 6 +----- src/ui/widget/dock-item.cpp | 2 -- src/ui/widget/entity-entry.cpp | 3 +-- src/ui/widget/entry.cpp | 2 +- src/ui/widget/filter-effect-chooser.cpp | 4 ---- src/ui/widget/font-variants.cpp | 10 +--------- src/ui/widget/frame.cpp | 2 +- src/ui/widget/highlight-picker.cpp | 3 --- src/ui/widget/imageicon.cpp | 7 +------ src/ui/widget/layer-selector.cpp | 4 +--- src/ui/widget/layertypeicon.cpp | 3 +-- src/ui/widget/licensor.cpp | 4 ++-- src/ui/widget/object-composite-settings.cpp | 7 ------- src/ui/widget/page-sizer.cpp | 19 +------------------ src/ui/widget/panel.cpp | 6 ++---- src/ui/widget/point.cpp | 5 +---- src/ui/widget/preferences-widget.cpp | 8 ++------ src/ui/widget/random.cpp | 2 +- src/ui/widget/registered-widget.cpp | 18 +++--------------- src/ui/widget/rendering-options.cpp | 2 +- src/ui/widget/rotateable.cpp | 3 +-- src/ui/widget/selected-style.cpp | 11 +++-------- src/ui/widget/spin-scale.cpp | 1 - src/ui/widget/spinbutton.cpp | 2 +- src/ui/widget/style-subject.cpp | 1 - src/ui/widget/style-swatch.cpp | 6 ------ src/ui/widget/tolerance-slider.cpp | 2 +- 34 files changed, 31 insertions(+), 133 deletions(-) (limited to 'src/ui/widget') 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 +#include #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 #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 +#include #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 #include #include #include -#include #include -#include #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 -#include -#include -#include #include #include #include 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 #endif -#include #include #include #include -#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 #endif #include -#include #include #include #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 #endif #include "color-wheel-selector.h" -#include -#include #include #include #include #include -#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..1b3490ffe 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -9,10 +9,8 @@ #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" 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 +#include #endif #include #include #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 +#include #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 - -#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 +#include #endif #include #include #include -#include #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 +#include #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 namespace Inkscape { namespace UI { diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp index df261b69a..8e7df7a68 100644 --- a/src/ui/widget/imageicon.cpp +++ b/src/ui/widget/imageicon.cpp @@ -11,17 +11,12 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ - - - #include "imageicon.h" -#include #include "svg-view-widget.h" #include "document.h" #include "inkscape.h" -#include #include - +#include 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 #endif #include @@ -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 +#include #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..09f3fac8d 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -13,12 +13,13 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include "licensor.h" #include +#include #include "ui/widget/entity-entry.h" #include "ui/widget/registry.h" @@ -27,7 +28,6 @@ #include "document-undo.h" #include "document-private.h" #include "verbs.h" -#include 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 - #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 +#include #endif #include "page-sizer.h" -#include -#include -#include -#include -#include - #include -#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..98d9d41f3 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -12,20 +12,18 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include // for Gtk::RESPONSE_* #include #include -#include +#include #include #include #include -#include - #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 +#include #endif #include "ui/widget/point.h" -#include "ui/widget/labelled.h" -#include "ui/widget/scalar.h" -#include namespace Inkscape { namespace UI { diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index d56506d62..e0eba3934 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include @@ -26,20 +26,16 @@ #include "verbs.h" #include "selcue.h" #include "io/sys.h" -#include #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 #include +#include #ifdef WIN32 #include 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 +#include #endif diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 572845668..7dc5abc75 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -14,33 +14,21 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include "registered-widget.h" -#include -#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" +#include + namespace Inkscape { namespace UI { namespace Widget { 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 +#include #endif #include 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 #endif #include #include -#include #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..7bbfa08db 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -10,11 +10,10 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include "selected-style.h" -#include #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 #include "pixmaps/cursor-adj-h.xpm" #include "pixmaps/cursor-adj-s.xpm" @@ -51,7 +45,8 @@ #include "pixmaps/cursor-adj-a.xpm" #include "sp-cursor.h" #include "gradient-chemistry.h" -#include "util/units.h" + +#include using Inkscape::Util::unit_table; diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp index bb08d67df..d6b34a5b4 100644 --- a/src/ui/widget/spin-scale.cpp +++ b/src/ui/widget/spin-scale.cpp @@ -8,7 +8,6 @@ #include "spin-scale.h" -#include #include #include 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 +#include #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 -#include - #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 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 +#include #endif #include -- cgit v1.2.3