Removed unused includes, decrease compilation time

(bzr r15025)

36 files changed, 22 insertions, 132 deletions

diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index 10294125d..465423fc2 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -9,7 +9,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "ui/widget/addtoicon.h"
@@ -19,9 +19,7 @@
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
 #include "ui/icon-names.h"
-#include "preferences.h"
 #include "layertypeicon.h"
-#include "addtoicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index df00b786a..acf8aff79 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "ui/widget/anchor-selector.h"
-#include <iostream>
 #include "widgets/icon.h"
 #include "ui/icon-names.h"
 
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 421f1df1e..8715fdede 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "ui/widget/clipmaskicon.h"
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index e4f58fe8a..52c6ed2e3 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -2,14 +2,11 @@
 #include "config.h"
 #endif
 
-#include <math.h>
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
 #include <gtk/gtk.h>
-#include <map>
 #include <set>
-#include <vector>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-icc-selector.h"
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 6d7ada734..6634d8dad 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -20,10 +20,6 @@
 #endif
 
 #include "widgets/icon.h"
-#include <cstring>
-#include <string>
-#include <cstdlib>
-#include <cstddef>
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
 #include <gtkmm/notebook.h>
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 48a2693bc..832bc3a62 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -3,15 +3,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <math.h>
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 #include <gtk/gtk.h>
 
-#include "svg/svg-icc-color.h"
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index 0c9586a67..bf2156628 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -12,11 +12,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <gdkmm/cursor.h>
-#include <gdkmm/screen.h>
 #include <gdkmm/general.h>
 #include <gtkmm/adjustment.h>
 #if WITH_GTKMM_3_0
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 22c616325..decb02b4f 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -1,18 +1,14 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "color-wheel-selector.h"
 
-#include <math.h>
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
-#include "svg/svg-icc-color.h"
 #include "ui/dialog-events.h"
-#include "ui/selected-color.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "ui/widget/gimpcolorwheel.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 8d960ddc3..910135fc1 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -9,16 +9,13 @@
 
 #include "ui/widget/dock.h"
 
-#include "dock-item.h"
 #include "desktop.h"
 #include "inkscape.h"
-#include "preferences.h"
 #include "ui/icon-names.h"
 #include "widgets/icon.h"
 
 #include <gtkmm/icontheme.h>
 #include <gtkmm/stockitem.h>
-#include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index a8de2f384..381f0a2e1 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -14,14 +14,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
 
 #include "inkscape.h"
-#include "sp-object.h"
 #include "rdf.h"
 #include "ui/widget/registry.h"
 #include "sp-root.h"
diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp
index 64d28119a..b1dd9ae8e 100644
--- a/src/ui/widget/entry.cpp
+++ b/src/ui/widget/entry.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "entry.h"
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 242a99073..ae2f3e7c2 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -10,12 +10,8 @@
  */
 
 #include "filter-effect-chooser.h"
-#include <glibmm/i18n.h>
-
-#include "desktop.h"
 
 #include "document.h"
-#include "inkscape.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index 62598dead..aca85f246 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -8,26 +8,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
 #include <libnrtype/font-instance.h>
-#include <iostream>
 
 #include "font-variants.h"
 
 // For updating from selection
 #include "desktop.h"
-#include "selection.h"
-#include "style.h"
 #include "sp-text.h"
-#include "sp-tspan.h"
-#include "sp-tref.h"
-#include "sp-textpath.h"
-#include "sp-item-group.h"
-#include "xml/repr.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp
index eaa4336bb..65d10dcc4 100644
--- a/src/ui/widget/frame.cpp
+++ b/src/ui/widget/frame.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "frame.h"
diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index 09999b52d..c1068c9b2 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -14,9 +14,6 @@
 
 #include "highlight-picker.h"
 #include "widgets/icon.h"
-#include "widgets/toolbox.h"
-#include "ui/icon-names.h"
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index df261b69a..7d7fb2d3b 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -15,12 +15,9 @@
 
 
 #include "imageicon.h"
-#include <sys/stat.h>
 #include "svg-view-widget.h"
 #include "document.h"
 #include "inkscape.h"
-#include <glibmm/convert.h>
-#include <glibmm/fileutils.h>
 
 
 namespace Inkscape
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 1a9ce617f..7ee34f3b3 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include <cstring>
@@ -25,9 +25,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "layer-manager.h"
-#include "sp-item.h"
 #include "ui/icon-names.h"
-#include "ui/widget/layer-selector.h"
 #include "util/filter-list.h"
 #include "util/reverse-list.h"
 #include "verbs.h"
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 672c607e5..e281d982a 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "ui/widget/layertypeicon.h"
@@ -18,7 +18,6 @@
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
 #include "ui/icon-names.h"
-#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index d21e848f2..6acb5a4c7 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -13,7 +13,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
 #endif
 
 #include "licensor.h"
@@ -27,7 +26,6 @@
 #include "document-undo.h"
 #include "document-private.h"
 #include "verbs.h"
-#include <gtkmm/radiobutton.h>
 
 
 namespace Inkscape {
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 8acf083d0..c8ac20c54 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -14,8 +14,6 @@
 
 #include "ui/widget/object-composite-settings.h"
 
-#include <glibmm/i18n.h>
-
 #include "desktop.h"
 
 #include "desktop-style.h"
@@ -23,17 +21,12 @@
 #include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
-#include "selection.h"
 #include "style.h"
-#include "sp-item.h"
 #include "svg/css-ostringstream.h"
 #include "verbs.h"
-#include "xml/repr.h"
 #include "widgets/icon.h"
-#include "ui/icon-names.h"
 #include "display/sp-canvas.h"
 #include "ui/widget/style-subject.h"
-#include "ui/widget/gimpspinscale.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 19ab1a280..4a1fe9ac6 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -18,35 +18,18 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "page-sizer.h"
 
-#include <cmath>
-#include <string>
-#include <string.h>
-#include <sstream>
-#include <vector>
-
 #include <glibmm/i18n.h>
 
-#include <2geom/transforms.h>
-
 
-#include "document.h"
-#include "desktop.h"
 #include "helper/action.h"
-#include "helper/action-context.h"
-#include "util/units.h"
-#include "inkscape.h"
-#include "sp-namedview.h"
 #include "sp-root.h"
 #include "ui/widget/button.h"
-#include "ui/widget/scalar-unit.h"
 #include "verbs.h"
-#include "xml/node.h"
-#include "xml/repr.h"
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index ab13577d7..6ccd8b81a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -12,20 +12,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/radiomenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
 
-#include <gtk/gtk.h>
-
 #include "panel.h"
 #include "icon-size.h"
 #include "preferences.h"
diff --git a/src/ui/widget/point.cpp b/src/ui/widget/point.cpp
index 6aa6196bb..2c2eb5e8a 100644
--- a/src/ui/widget/point.cpp
+++ b/src/ui/widget/point.cpp
@@ -12,14 +12,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 
 #include "ui/widget/point.h"
-#include "ui/widget/labelled.h"
-#include "ui/widget/scalar.h"
-#include <gtkmm/box.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index d56506d62..b4c09cc0f 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/box.h>
@@ -26,19 +26,14 @@
 #include "verbs.h"
 #include "selcue.h"
 #include "io/sys.h"
-#include <iostream>
 #include "desktop.h"
-#include "enums.h"
 #include "inkscape.h"
 
 #include "message-stack.h"
 #include "style.h"
-#include "selection.h"
 #include "selection-chemistry.h"
 #include "ui/dialog/filedialog.h"
-#include "xml/repr.h"
 
-#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 
 #ifdef WIN32
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 1d2d77699..cb192bf58 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -19,7 +19,6 @@
 # include <config.h>
 #endif
 
-#include <iostream>
 #include <vector>
 
 #include <gtkmm/filechooserbutton.h>
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 0a646b6fb..b6ea16b89 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 572845668..af59fe1a0 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -14,29 +14,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "registered-widget.h"
-#include <gtkmm/radiobutton.h>
 
-#include "ui/widget/color-picker.h"
-#include "ui/widget/registry.h"
-#include "ui/widget/scalar-unit.h"
-#include "ui/widget/point.h"
-#include "ui/widget/random.h"
 #include "widgets/spinbutton-events.h"
 
-#include "xml/repr.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "verbs.h"
 
 // for interruptability bug:
-#include "display/sp-canvas.h"
-
-#include "desktop.h"
 
 
 #include "sp-root.h"
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 837387f7b..220731b7e 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm.h>
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 5e938dee6..e0de22335 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -8,12 +8,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
-#include <glibmm/i18n.h>
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 #include "rotateable.h"
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index f7fd63f51..299b904c6 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -10,11 +10,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "selected-style.h"
-#include <gtkmm/separatormenuitem.h>
 
 #include "widgets/spw-utilities.h"
 #include "ui/widget/color-preview.h"
@@ -31,19 +30,14 @@
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/fill-and-stroke.h"
 #include "ui/dialog/panel-dialog.h"
-#include "xml/repr.h"
-#include "document.h"
 #include "document-undo.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/gradient-image.h"
-#include "sp-gradient.h"
 #include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "ui/tools/tool-base.h"
 #include "message-context.h"
-#include "verbs.h"
-#include "color.h"
 #include <display/sp-canvas.h>
 #include "pixmaps/cursor-adj-h.xpm"
 #include "pixmaps/cursor-adj-s.xpm"
@@ -51,7 +45,6 @@
 #include "pixmaps/cursor-adj-a.xpm"
 #include "sp-cursor.h"
 #include "gradient-chemistry.h"
-#include "util/units.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index bb08d67df..cb95e7405 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -8,9 +8,7 @@
 
 #include "spin-scale.h"
 
-#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
 
 #include "ui/widget/gimpspinscale.h"
 
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index 9b361ae78..4242d8c7d 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -11,7 +11,6 @@
 #include "spin-slider.h"
 
 #include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index d7669d4e5..d1776e630 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "spinbutton.h"
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index da3bbcd20..811ed2221 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -8,7 +8,6 @@
 #include "ui/widget/style-subject.h"
 
 #include "desktop.h"
-#include "sp-object.h"
 #include "xml/sp-css-attr.h"
 #include "desktop-style.h"
 
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 188be705d..2952a3f97 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -13,9 +13,6 @@
 
 #include "style-swatch.h"
 
-#include <cstring>
-#include <string>
-
 #include "widgets/spw-utilities.h"
 #include "ui/widget/color-preview.h"
 
@@ -23,13 +20,10 @@
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 #include "sp-pattern.h"
-#include "xml/repr.h"
 #include "xml/sp-css-attr.h"
 #include "widgets/widget-sizes.h"
 #include "util/units.h"
 #include "helper/action.h"
-#include "helper/action-context.h"
-#include "preferences.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index ced811c57..e904666cc 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <gtkmm/adjustment.h>