Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

14 files changed, 66 insertions, 35 deletions

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 {