From be604f252f3f917a4b9fba73867980f81b3c8530 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 15 Mar 2013 01:08:49 +0000
Subject: Fix remaining forward declaration tags (except for unavoidable
 internal errors in Gtkmm headers)

(bzr r12208)
---
 src/libnrtype/font-lister.cpp |  1 -
 src/livarot/Path.h            | 10 +++++-----
 src/livarot/Shape.h           |  2 +-
 src/ui/dialog/glyphs.h        |  2 +-
 src/ui/dialog/text-edit.h     |  2 +-
 src/ui/tool/control-point.cpp |  2 +-
 src/widgets/paint-selector.h  |  2 +-
 src/widgets/swatch-selector.h |  6 ++----
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 712c17915..90900baba 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#include <gtkmm.h>
 #include <libnrtype/font-instance.h>
 #include <libnrtype/TextWrapper.h>
 #include <libnrtype/one-glyph.h>
diff --git a/src/livarot/Path.h b/src/livarot/Path.h
index cd939bf7d..a109298a2 100644
--- a/src/livarot/Path.h
+++ b/src/livarot/Path.h
@@ -14,11 +14,11 @@
 #include <2geom/point.h>
 
 struct PathDescr;
-class PathDescrLineTo;
-class PathDescrArcTo;
-class PathDescrCubicTo;
-class PathDescrBezierTo;
-class PathDescrIntermBezierTo;
+struct PathDescrLineTo;
+struct PathDescrArcTo;
+struct PathDescrCubicTo;
+struct PathDescrBezierTo;
+struct PathDescrIntermBezierTo;
 
 struct SPStyle;
 
diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h
index 9d1de74e9..dcd172da2 100644
--- a/src/livarot/Shape.h
+++ b/src/livarot/Shape.h
@@ -22,7 +22,7 @@ class Path;
 class FloatLigne;
 
 class SweepTree;
-struct SweepTreeList;
+class SweepTreeList;
 class SweepEventQueue;
 
 enum {
diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h
index 6571af0a4..3d0571244 100644
--- a/src/ui/dialog/glyphs.h
+++ b/src/ui/dialog/glyphs.h
@@ -20,7 +20,7 @@ class Label;
 class ListStore;
 }
 
-class SPFontSelector;
+struct SPFontSelector;
 class font_instance;
 
 
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index 3fdeea05d..f27fdfc87 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -30,7 +30,7 @@
 #include "ui/dialog/desktop-tracker.h"
 
 class SPItem;
-class SPFontSelector;
+struct SPFontSelector;
 class font_instance;
 class SPCSSAttr;
 
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 8c4924f26..069dcc67b 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -7,8 +7,8 @@
  */
 
 #include <iostream>
+#include <gdk/gdkkeysyms.h>
 #include <gdkmm.h>
-#include <gtkmm.h>
 #include <2geom/point.h>
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index d3b3f4116..a66758434 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -22,7 +22,7 @@
 
 class SPGradient;
 class SPDesktop;
-class SPPattern;
+struct SPPattern;
 struct SPStyle;
 
 #define SP_TYPE_PAINT_SELECTOR (sp_paint_selector_get_type ())
diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h
index b97aac4f1..4b7aa483f 100644
--- a/src/widgets/swatch-selector.h
+++ b/src/widgets/swatch-selector.h
@@ -1,14 +1,12 @@
 #ifndef SEEN_SP_SWATCH_SELECTOR_H
 #define SEEN_SP_SWATCH_SELECTOR_H
 
-
-
 #include <gtkmm/box.h>
 
 class SPDocument;
 class SPGradient;
-class SPColorSelector;
-class SPGradientSelector;
+struct SPColorSelector;
+struct SPGradientSelector;
 
 namespace Inkscape
 {
-- 
cgit v1.2.3