Clean up all remaining false warnings from Gtkmm

(bzr r11018)

12 files changed, 37 insertions, 43 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index e851571ef..0b1fe1160 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -13,33 +13,6 @@
 # include "config.h"
 #endif
 
-#include "xml/node-event-vector.h"
-#include "sp-object.h"
-#include "attributes.h"
-#include "message-stack.h"
-#include "desktop.h"
-#include "inkscape.h"
-#include "document.h"
-#include "document-private.h"
-#include "xml/document.h"
-#include <glibmm/i18n.h>
-#include "pen-context.h"
-#include "tools-switch.h"
-#include "message-stack.h"
-#include "desktop.h"
-#include "knotholder.h"
-#include "sp-lpe-item.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/parameter/parameter.h"
-#include <glibmm/ustring.h>
-#include "display/curve.h"
-
-#include <exception>
-
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/affine.h>
-#include <2geom/pathvector.h>
-
 // include effects:
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-bendpath.h"
@@ -76,6 +49,33 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-clone-original.h"
 
+#include "xml/node-event-vector.h"
+#include "sp-object.h"
+#include "attributes.h"
+#include "message-stack.h"
+#include "desktop.h"
+#include "inkscape.h"
+#include "document.h"
+#include "document-private.h"
+#include "xml/document.h"
+#include <glibmm/i18n.h>
+#include "pen-context.h"
+#include "tools-switch.h"
+#include "message-stack.h"
+#include "desktop.h"
+#include "knotholder.h"
+#include "sp-lpe-item.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/parameter/parameter.h"
+#include <glibmm/ustring.h>
+#include "display/curve.h"
+
+#include <exception>
+
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/affine.h>
+#include <2geom/pathvector.h>
+
 
 namespace Inkscape {
 
diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h
index 636b5e20b..f95e33b0b 100644
--- a/src/live_effects/lpe-lattice.h
+++ b/src/live_effects/lpe-lattice.h
@@ -17,11 +17,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/point.h"
-#include "live_effects/parameter/enum.h"
-#include "live_effects/parameter/bool.h"
-
 #include "live_effects/lpegroupbbox.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h
index feac395b7..d154ab165 100644
--- a/src/live_effects/lpe-powerstroke.h
+++ b/src/live_effects/lpe-powerstroke.h
@@ -12,10 +12,10 @@
 #ifndef INKSCAPE_LPE_POWERSTROKE_H
 #define INKSCAPE_LPE_POWERSTROKE_H
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/bool.h"
 #include "live_effects/parameter/powerstrokepointarray.h"
-#include "live_effects/parameter/enum.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 50f50d0ae..a6fdde02a 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -13,6 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/scalar.h"
 #include "live_effects/lpe-rough-hatches.h"
 
 #include "sp-item.h"
@@ -30,7 +31,6 @@
 #include <2geom/d2.h>
 #include <2geom/affine.h>
 
-#include "ui/widget/scalar.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h
index 0c72f1637..497398e22 100644
--- a/src/live_effects/lpe-ruler.h
+++ b/src/live_effects/lpe-ruler.h
@@ -16,9 +16,7 @@
  */
 
 #include "live_effects/effect.h"
-#include "live_effects/parameter/text.h"
 #include "live_effects/parameter/enum.h"
-#include "live_effects/parameter/bool.h"
 #include "live_effects/parameter/unit.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h
index 4fcd9eaaa..f3cdbda79 100644
--- a/src/live_effects/lpe-spiro.h
+++ b/src/live_effects/lpe-spiro.h
@@ -8,10 +8,6 @@
  */
 
 #include "live_effects/effect.h"
-#include "live_effects/parameter/parameter.h"
-#include "live_effects/parameter/point.h"
-#include "ui/widget/registered-widget.h"
-
 
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 93a836b90..6dbe2918f 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -6,12 +6,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/bool.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "helper-fns.h"
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 4a8bfb78a..e5c16943c 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -4,11 +4,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gtkmm/box.h>
 #include "live_effects/parameter/originalpath.h"
 
 #include "widgets/icon.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 16883deda..186cfff9a 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -42,6 +42,8 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/shape-record.h"
 
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 7f387fe24..e3731fdcf 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -6,13 +6,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/point.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "ui/widget/point.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "knotholder.h"
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 4e70a1ad0..13440798b 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -10,12 +10,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/text.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "display/canvas-text.h"
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index e9ddc756c..e8725c4b2 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -6,13 +6,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/vector.h"
 #include "sp-lpe-item.h"
 #include "knotholder.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 
-#include "ui/widget/registered-widget.h"
 #include "live_effects/effect.h"
 #include "desktop.h"
 #include "verbs.h"