Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

21 files changed, 47 insertions, 38 deletions

diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index 42447a141..8a359dd2d 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -5,13 +5,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "widgets/desktop-widget.h"
 #include <glib-object.h>
 
 #include "desktop-tracker.h"
 
 #include "inkscape.h"
 #include "desktop.h"
-#include "widgets/desktop-widget.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index 1b76133b6..47cfae19a 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -13,14 +13,15 @@
 #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
-#include "ui/widget/panel.h"
-#include "ui/dialog/desktop-tracker.h"
-#include "widgets/sp-attribute-widget.h"
-
+#include <gtkmm/entry.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/textview.h>
 
+#include "ui/widget/panel.h"
+#include "ui/dialog/desktop-tracker.h"
+#include "widgets/sp-attribute-widget.h"
+
 class SPDesktop;
 class SPItem;
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1b43d36c5..56d209886 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -32,6 +32,11 @@
 #include "sp-font-face.h"
 #include "desktop-handles.h"
 #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"
 
 SvgFontDrawingArea::SvgFontDrawingArea():
     _x(0),
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index ab4209e22..ba7646d28 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -18,6 +18,8 @@
 #include <algorithm>
 #include <set>
 
+#include <gtkmm/radiomenuitem.h>
+
 #include "swatches.h"
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
@@ -51,6 +53,7 @@
 #include "sp-gradient-reference.h"
 #include "dialog-manager.h"
 #include "selection.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index 6233a1f70..b39a78979 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -10,12 +10,12 @@
  */
 
 #include <boost/none.hpp>
+#include "ui/tool/selectable-control-point.h"
 #include <2geom/transforms.h>
 #include "desktop.h"
 #include "preferences.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/transform-handle-set.h"
 #include "ui/tool/node.h"
 
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 4e1a1db3a..f37ff1451 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -11,18 +11,19 @@
 #ifndef SEEN_UI_TOOL_CONTROL_POINT_H
 #define SEEN_UI_TOOL_CONTROL_POINT_H
 
+#include <gdkmm/pixbuf.h>
 #include <boost/utility.hpp>
 #include <stddef.h>
-#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
+#include <sigc++/trackable.h>
 #include <2geom/point.h>
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
-#include "event-context.h"
 
 #include <gtkmm/enums.h>
-#include <gdkmm/pixbuf.h>
 
 class SPDesktop;
+class SPEventContext;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 3cc571585..e932c022d 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/tool/curve-drag-point.h"
 #include <glib/gi18n.h>
 #include <2geom/bezier-curve.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
-#include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
diff --git a/src/ui/tool/manipulator.cpp b/src/ui/tool/manipulator.cpp
index 49e601797..11dd220f4 100644
--- a/src/ui/tool/manipulator.cpp
+++ b/src/ui/tool/manipulator.cpp
@@ -8,8 +8,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/tool/manipulator.h"
 #include "ui/tool/node.h"
+#include "ui/tool/manipulator.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 62710031f..597a151c0 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -13,6 +13,7 @@
 #include <boost/shared_ptr.hpp>
 #include <glib.h>
 #include <glibmm/i18n.h>
+#include "node.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
@@ -23,7 +24,6 @@
 #include "sp-path.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/node.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "util/unordered-containers.h"
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 2e890ecb2..2c05a1252 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -13,12 +13,12 @@
 
 #include <stddef.h>
 #include <sigc++/connection.h>
-#include "ui/tool/commit-events.h"
-#include "ui/tool/manipulator.h"
-#include "ui/tool/modifier-tracker.h"
-#include "ui/tool/node.h"
-#include "ui/tool/node-types.h"
-#include "ui/tool/shape-record.h"
+#include "node.h"
+#include "commit-events.h"
+#include "manipulator.h"
+#include "modifier-tracker.h"
+#include "node-types.h"
+#include "shape-record.h"
 
 struct SPCanvasGroup;
 
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 167b1c2ff..3c1e7de71 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include "curve-drag-point.h"
 #include <glib/gi18n.h>
 #include "desktop.h"
 #include "desktop-handles.h"
@@ -31,7 +31,6 @@
 #include "sp-text.h"
 #include "ui/tool/node-tool.h"
 #include "ui/tool/control-point-selection.h"
-#include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/manipulator.h"
 #include "ui/tool/multi-path-manipulator.h"
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 1285741ca..8e39ec05a 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <boost/utility.hpp>
-#include <glib.h>
+#include "multi-path-manipulator.h"
 #include <glib/gi18n.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/transforms.h>
@@ -29,7 +29,6 @@
 #include "sp-namedview.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
 #include <gdk/gdkkeysyms.h>
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 88f5b8882..94b67da59 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -11,18 +11,15 @@
 #ifndef SEEN_UI_TOOL_NODE_H
 #define SEEN_UI_TOOL_NODE_H
 
-#include <glib.h>
 #include <iterator>
 #include <iosfwd>
 #include <stdexcept>
 #include <cstddef>
 #include <tr1/functional>
-#include <boost/utility.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/operators.hpp>
-#include "snapped-point.h"
 #include "ui/tool/selectable-control-point.h"
+#include "snapped-point.h"
 #include "ui/tool/node-types.h"
 
 
diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp
index e9a8bcbd6..c92dcaaae 100644
--- a/src/ui/tool/selectable-control-point.cpp
+++ b/src/ui/tool/selectable-control-point.cpp
@@ -8,9 +8,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/selectable-control-point.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index 1b8bd46cc..9467aef74 100644
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -11,7 +11,6 @@
 #ifndef SEEN_UI_TOOL_SELECTABLE_CONTROL_POINT_H
 #define SEEN_UI_TOOL_SELECTABLE_CONTROL_POINT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "ui/tool/control-point.h"
 
 namespace Inkscape {
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index a0051cdcc..25d22ecdc 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -8,12 +8,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "control-point.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "display/sodipodi-ctrlrect.h"
 #include "event-context.h"
 #include "preferences.h"
-#include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
 
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index e44ae3f1b..2cf6fe55a 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -10,9 +10,8 @@
 
 #include <math.h>
 #include <algorithm>
-#include <glib.h>
+#include "control-point.h"
 #include <glib/gi18n.h>
-#include <gdk/gdk.h>
 #include <2geom/transforms.h>
 #include "desktop.h"
 #include "desktop-handles.h"
@@ -22,7 +21,6 @@
 #include "snap-candidate.h"
 #include "sp-namedview.h"
 #include "ui/tool/commit-events.h"
-#include "ui/tool/control-point.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/selectable-control-point.h"
 #include "ui/tool/event-utils.h"
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 05a40bd42..051df691e 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -13,13 +13,13 @@
 # include "config.h"
 #endif
 
+#include "widgets/desktop-widget.h"
 #include <algorithm>
 
 #include "uxmanager.h"
 #include "desktop.h"
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
-#include "widgets/desktop-widget.h"
 #include "preferences.h"
 #include "gdkmm/screen.h"
 
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index ba29d6225..2426fa5b1 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -13,9 +13,16 @@
 #define INKSCAPE_UI_VIEW_EDIT_WIDGET_IFACE_H
 
 #include "message.h"
-#include <gtkmm/window.h>
 #include <2geom/point.h>
 
+namespace Gtk {
+class Window;
+}
+
+namespace Glib {
+class ustring;
+}
+
 namespace Inkscape { namespace UI { namespace Widget { class Dock; } } }
 
 namespace Inkscape {
diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h
index aa4c7e11d..f89e0ea42 100644
--- a/src/ui/widget/color-preview.h
+++ b/src/ui/widget/color-preview.h
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/eventbox.h>
+#include <gtkmm/widget.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index a0ad3b391..0f734938e 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -20,9 +20,9 @@
 
 #include <glibmm/i18n.h>
 
-#include "helper/units.h"
-#include "widgets/ruler.h"
 #include "ui/widget/ruler.h"
+#include "widgets/ruler.h"
+#include "helper/units.h"
 
 #include "xml/repr.h"
 #include "display/sp-canvas.h"