Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

22 files changed, 78 insertions, 62 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index 6d1ddbbbd..1df8002ad 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "prefdialog.h"
 #include "inkscape-private.h"
 #include "helper/action.h"
 #include "ui/view/view.h"
 #include "desktop-handles.h"
-#include "prefdialog.h"
 #include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 16c814d26..e0b643b6d 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -17,13 +17,13 @@
 #include <ostream>
 #include <fstream>
 #include <vector>
-#include <gtkmm/widget.h>
-#include <gtkmm/table.h>
 #include <glibmm/ustring.h>
 #include "xml/repr.h"
 
 namespace Gtk {
+	class Table;
 	class VBox;
+	class Widget;
 }
 
 /** The key that is used to identify that the I/O should be autodetected */
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f2775f8f2..d7dd641b0 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -19,15 +19,15 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/main.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <gtkmm/main.h>
-#include <gtkmm/messagedialog.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/textview.h>
 
 #include "ui/view/view.h"
 #include "desktop-handles.h"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index b455bd2b2..8b1b3fbfd 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -20,6 +20,7 @@
 
 #ifdef HAVE_CAIRO_PDF
 
+#include "cairo-ps.h"
 #include "cairo-ps-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index ceebc2727..e321f67f1 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-//#include "inkscape.h"
 #include "sp-root.h"
 #include "sp-path.h"
 #include "style.h"
@@ -40,6 +39,7 @@
 #include "display/drawing-item.h"
 #include "unit-constants.h"
 #include "clear-n_.h"
+#include "document.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index d24761c53..d5e44e702 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-//#include <string.h>
-//#include <signal.h>
-//#include <errno.h>
 
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
@@ -38,35 +35,20 @@
 #include <2geom/hvlinesegment.h>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
-//#include "display/canvas-bpath.h"
 #include "sp-item.h"
 
-//#include "glib.h"
-//#include "gtk/gtk.h"
-
-//#include "glibmm/i18n.h"
-//#include "enums.h"
-//#include "document.h"
 #include "style.h"
-//#include "sp-paint-server.h"
 #include "inkscape-version.h"
 #include "sp-root.h"
 
-//#include "libnrtype/FontFactory.h"
-//#include "libnrtype/font-instance.h"
-//#include "libnrtype/font-style-to-pos.h"
-
 #include "emf-win32-print.h"
 
 #include "unit-constants.h"
 
-//#include "extension/extension.h"
 #include "extension/system.h"
 #include "extension/print.h"
+#include "document.h"
 
-//#include "io/sys.h"
-
-//#include "macros.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index d1b784251..bdf95f941 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -31,6 +31,7 @@
 #include "sp-item.h"
 #include "style.h"
 #include "document.h"
+#include <cstring>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 0f2857570..8862c1d4a 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -48,6 +48,7 @@
 #include "extension/system.h"
 #include "extension/input.h"
 #include "document.h"
+#include <cstring>
 
 // Take a guess and fallback to 0.1.x if no configure has run
 #if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02)
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index bcb5b6e5b..ef0a06222 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -18,6 +18,7 @@
 #include "../extension.h"
 #include "bool.h"
 #include "preferences.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h
index 11d06e1c0..5d190b9d3 100644
--- a/src/extension/param/bool.h
+++ b/src/extension/param/bool.h
@@ -8,12 +8,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 /**
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index f46e26286..9894965a9 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -8,13 +8,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include "xml/node.h"
-#include "document.h"
-#include <color.h>
-#include "extension/param/parameter.h"
+#include "parameter.h"
+
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
 
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamColor : public Parameter {
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index a598458c5..ac7d72abd 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 7188025da..0e1d1c22a 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -19,6 +19,7 @@
 #include "extension/extension.h"
 #include "preferences.h"
 #include "float.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index 24747b5f1..42b1698b1 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -9,12 +9,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamFloat : public Parameter {
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 461943a4c..440693eb1 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -19,6 +19,7 @@
 #include "extension/extension.h"
 #include "preferences.h"
 #include "int.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index 83fc67be9..3fd6cea9b 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -9,12 +9,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamInt : public Parameter {
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index 23058f465..3c90964fd 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 063ec32be..97e4f9d8c 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -19,6 +19,7 @@
 # define ESCAPE_DOLLAR_COMMANDLINE
 #endif
 
+#include <cstring>
 #include <xml/node.h>
 
 #include <extension/extension.h>
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index 8d80e6c40..d08efc554 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -13,15 +13,17 @@
 #ifndef SEEN_INK_EXTENSION_PARAM_H__
 #define SEEN_INK_EXTENSION_PARAM_H__
 
-#include <gtkmm/widget.h>
-#include <glibmm/i18n.h>
+class SPDocument;
 
-#include "xml/document.h"
-#include "xml/node.h"
-#include "document.h"
-#include <color.h>
+namespace Gtk {
+class Widget;
+}
 
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class Extension;
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index 957a5b9df..645faecaf 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 3f8d176a5..c5304106c 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -18,6 +18,7 @@
 #include "extension/extension.h"
 #include "string.h"
 #include "preferences.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index 8e7f093f7..3b137aeac 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -9,9 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
 namespace Inkscape {