Purging some forward.h files.

(bzr r10664)

22 files changed, 49 insertions, 143 deletions

diff --git a/src/document.h b/src/document.h
index 83cb57eea..efb14123a 100644
--- a/src/document.h
+++ b/src/document.h
@@ -43,6 +43,7 @@ struct SPItem;
 struct SPObject;
 struct SPGroup;
 struct SPRoot;
+struct SPUnit;
 
 namespace Inkscape {
     struct Application;
diff --git a/src/helper/action.h b/src/helper/action.h
index 7e4da3312..e7c799992 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -14,9 +14,11 @@
 
 #include <sigc++/sigc++.h>
 #include <glibmm/ustring.h>
-#include "helper/helper-forward.h"
 #include "forward.h"
 
+struct SPAction;
+struct SPActionClass;
+
 #define SP_TYPE_ACTION (sp_action_get_type())
 #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction))
 #define SP_ACTION_CLASS(o) (G_TYPE_CHECK_CLASS_CAST((o), SP_TYPE_ACTION, SPActionClass))
diff --git a/src/helper/helper-forward.h b/src/helper/helper-forward.h
deleted file mode 100644
index f9b7f985b..000000000
--- a/src/helper/helper-forward.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __HELPER_FORWARD_H__
-#define __HELPER_FORWARD_H__
-
-/*
- * Forward declarations
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 2002 Lauris Kaplinski
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-
-struct SPAction;
-struct SPActionClass;
-struct SPActionEventVector;
-
-struct SPUnit;
-struct SPUnitSelector;
-struct SPUnitSelectorClass;
-
-#endif
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
index 919873c58..b495a3c15 100644
--- a/src/helper/unit-menu.h
+++ b/src/helper/unit-menu.h
@@ -1,5 +1,5 @@
-#ifndef __SP_UNIT_MENU_H__
-#define __SP_UNIT_MENU_H__
+#ifndef SP_UNIT_MENU_H
+#define SP_UNIT_MENU_H
 
 /*
  * SPUnitMenu
@@ -13,8 +13,9 @@
 #include <glib/gtypes.h>
 #include <gtk/gtk.h>
 
-#include <helper/helper-forward.h>
-
+struct SPUnit;
+struct SPUnitSelector;
+struct SPUnitSelectorClass;
 
 /* Unit selector Widget */
 
@@ -45,7 +46,7 @@ void sp_unit_selector_set_value_in_pixels(SPUnitSelector *selector, GtkAdjustmen
 
 
 
-#endif
+#endif // SP_UNIT_MENU_H
 
 /*
   Local Variables:
diff --git a/src/libnrtype/font-glyph.h b/src/libnrtype/font-glyph.h
index 14da5025b..b6954a482 100644
--- a/src/libnrtype/font-glyph.h
+++ b/src/libnrtype/font-glyph.h
@@ -2,7 +2,6 @@
 #define SEEN_LIBNRTYPE_FONT_GLYPH_H
 
 #include <libnrtype/nrtype-forward.h>
-#include <livarot/livarot-forward.h>
 #include <2geom/forward.h>
 
 // the info for a glyph in a font. it's totally resolution- and fontsize-independent
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 3ca3feee4..b66230d87 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -9,7 +9,6 @@
 
 #include <libnrtype/nrtype-forward.h>
 #include <libnrtype/font-style.h>
-#include <livarot/livarot-forward.h>
 #include <2geom/d2.h>
 
 // the font_instance are the template of several raster_font; they provide metrics and outlines
diff --git a/src/libnrtype/font-style.h b/src/libnrtype/font-style.h
index abfac2737..810fc72cf 100644
--- a/src/libnrtype/font-style.h
+++ b/src/libnrtype/font-style.h
@@ -3,10 +3,12 @@
 
 #include <2geom/affine.h>
 #include <livarot/LivarotDefs.h>
-#include <livarot/livarot-forward.h>
 
 // structure that holds data describing how to render glyphs of a font
 
+class Path;
+class Shape;
+
 // Different raster styles.
 struct font_style {
     Geom::Affine  transform; // the ctm. contains the font-size
diff --git a/src/livarot/Path.h b/src/livarot/Path.h
index 22d989778..1f0e7a244 100644
--- a/src/livarot/Path.h
+++ b/src/livarot/Path.h
@@ -11,9 +11,15 @@
 
 #include <vector>
 #include "LivarotDefs.h"
-#include "livarot/livarot-forward.h"
 #include <2geom/point.h>
 
+struct PathDescr;
+class PathDescrLineTo;
+class PathDescrArcTo;
+class PathDescrCubicTo;
+class PathDescrBezierTo;
+class PathDescrIntermBezierTo;
+
 struct SPStyle;
 
 /*
diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h
index 158977897..5077a6da1 100644
--- a/src/livarot/Shape.h
+++ b/src/livarot/Shape.h
@@ -16,9 +16,11 @@
 #include <vector>
 #include <2geom/point.h>
 
-#include "livarot/livarot-forward.h"
 #include "livarot/LivarotDefs.h"
 
+class Path;
+class FloatLigne;
+
 struct SweepTree;
 struct SweepTreeList;
 struct SweepEventQueue;
diff --git a/src/livarot/int-line.h b/src/livarot/int-line.h
index afd4d2f04..1d3bbd9d2 100644
--- a/src/livarot/int-line.h
+++ b/src/livarot/int-line.h
@@ -1,13 +1,15 @@
 #ifndef INKSCAPE_LIVAROT_INT_LINE_H
 #define INKSCAPE_LIVAROT_INT_LINE_H
 
-#include "livarot/livarot-forward.h"
 #include "livarot/LivarotDefs.h"
 
 /** \file
  * Coverage with integer boundaries.
  */
 
+class BitLigne;
+class FloatLigne;
+
 /// A run with integer boundaries.
 struct int_ligne_run {
     int st;
diff --git a/src/livarot/livarot-forward.h b/src/livarot/livarot-forward.h
deleted file mode 100644
index 9705b18e0..000000000
--- a/src/livarot/livarot-forward.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SEEN_LIVAROT_FORWARD_H
-#define SEEN_LIVAROT_FORWARD_H
-
-class Path;
-class Shape;
-struct float_ligne_run;
-class FloatLigne;
-class BitLigne;
-class PathDescr;
-class PathDescrLineTo;
-class PathDescrArcTo;
-class PathDescrCubicTo;
-class PathDescrBezierTo;
-class PathDescrIntermBezierTo;
-
-
-#endif /* !SEEN_LIVAROT_FORWARD_H */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/preferences.h b/src/preferences.h
index 64bb6ac4f..86142d28b 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -19,7 +19,6 @@
 #include <climits>
 #include <cfloat>
 #include <glibmm/ustring.h>
-#include "xml/xml-forward.h"
 #include "xml/repr.h"
 
 class SPCSSAttr;
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index 86b16a557..1c9c9e879 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -20,13 +20,14 @@
 #define SP_IS_NAMEDVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_NAMEDVIEW))
 #define SP_IS_NAMEDVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_NAMEDVIEW))
 
-#include "helper/helper-forward.h"
 #include "sp-object-group.h"
 #include "sp-metric.h"
 #include "snap.h"
 #include "display/canvas-grid.h"
 #include "document.h"
 
+struct SPUnit;
+
 namespace Inkscape {
 class CanvasGrid;
 }
diff --git a/src/verbs.h b/src/verbs.h
index 224a809b0..364a9a598 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -21,10 +21,11 @@
 #include <string.h>
 #include "config.h"
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
-#include "helper/helper-forward.h"
 #include "forward.h"
 #include <glibmm/ustring.h>
 
+struct SPAction;
+
 /** \brief This anonymous enum is used to provide a list of the Verbs
            which are defined staticly in the verb files.  There may be
            other verbs which are defined dynamically also. */
diff --git a/src/xml/document.h b/src/xml/document.h
index 3bf0a63a6..efbc9bff7 100644
--- a/src/xml/document.h
+++ b/src/xml/document.h
@@ -15,7 +15,6 @@
 #ifndef SEEN_INKSCAPE_XML_SP_REPR_DOC_H
 #define SEEN_INKSCAPE_XML_SP_REPR_DOC_H
 
-#include "xml/xml-forward.h"
 #include "xml/node.h"
 
 namespace Inkscape {
diff --git a/src/xml/event.h b/src/xml/event.h
index 18dc47865..c2865b8c4 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -26,7 +26,6 @@
 #include "util/share.h"
 #include "util/forward-pointer-iterator.h"
 #include "gc-managed.h"
-#include "xml/xml-forward.h"
 #include "xml/node.h"
 
 namespace Inkscape {
diff --git a/src/xml/log-builder.h b/src/xml/log-builder.h
index 264c2ced7..aa8f2c1c6 100644
--- a/src/xml/log-builder.h
+++ b/src/xml/log-builder.h
@@ -15,12 +15,14 @@
 #define SEEN_INKSCAPE_XML_LOG_BUILDER_H
 
 #include "gc-managed.h"
-#include "xml/xml-forward.h"
 #include "xml/node-observer.h"
 
 namespace Inkscape {
 namespace XML {
 
+class Event;
+class Node;
+
 /**
  * @brief Event log builder
  *
diff --git a/src/xml/node-observer.h b/src/xml/node-observer.h
index c3ec437b5..59142be8c 100644
--- a/src/xml/node-observer.h
+++ b/src/xml/node-observer.h
@@ -20,7 +20,6 @@
 
 #include <glib/gquark.h>
 #include "util/share.h"
-#include "xml/xml-forward.h"
 
 #ifndef INK_UNUSED
 #define INK_UNUSED(x) ((void)(x))
@@ -29,6 +28,8 @@
 namespace Inkscape {
 namespace XML {
 
+class Node;
+
 /**
  * @brief Interface for XML node observers
  *
diff --git a/src/xml/node.h b/src/xml/node.h
index 17479e50b..8b7dea203 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -21,11 +21,16 @@
 #include <glib/gtypes.h>
 #include "gc-anchored.h"
 #include "util/list.h"
-#include "xml/xml-forward.h"
 
 namespace Inkscape {
 namespace XML {
 
+struct AttributeRecord;
+struct Document;
+class  Event;
+class  NodeObserver;
+struct NodeEventVector;
+
 /**
  * @brief Enumeration containing all supported node types.
  */
diff --git a/src/xml/repr-sorting.h b/src/xml/repr-sorting.h
index d560dfa26..dddb8588c 100644
--- a/src/xml/repr-sorting.h
+++ b/src/xml/repr-sorting.h
@@ -7,7 +7,14 @@
 #ifndef SEEN_XML_REPR_SORTING_H
 #define SEEN_XML_REPR_SORTING_H
 
-#include "xml/xml-forward.h"
+namespace Inkscape {
+namespace XML {
+
+class Node;
+
+} // namespace XML
+} // namespace Inkscape
+
 
 Inkscape::XML::Node *LCA(Inkscape::XML::Node *a, Inkscape::XML::Node *b);
 Inkscape::XML::Node const *LCA(Inkscape::XML::Node const *a, Inkscape::XML::Node const *b);
diff --git a/src/xml/subtree.h b/src/xml/subtree.h
index deee0cab1..11bf515f1 100644
--- a/src/xml/subtree.h
+++ b/src/xml/subtree.h
@@ -16,7 +16,6 @@
 #define SEEN_INKSCAPE_XML_SUBTREE_H
 
 #include "gc-managed.h"
-#include "xml/xml-forward.h"
 #include "xml/composite-node-observer.h"
 
 namespace Inkscape {
diff --git a/src/xml/xml-forward.h b/src/xml/xml-forward.h
deleted file mode 100644
index bc7b8a405..000000000
--- a/src/xml/xml-forward.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef __SEEN_XML_FORWARD_H__
-#define __SEEN_XML_FORWARD_H__
-
-/** @file
- * @brief Forward declarations for the XML namespace.
- */
-/* Authors:
- *   Krzysztof Kosiński <tweenk.pl@gmail.com>
- *
- * Copyright (C) 2008 Authors
- *
- * Released under GNU GPL.  Read the file 'COPYING' for more information.
- */
-
-namespace Inkscape {
-namespace XML {
-
-/* Copied from the relevant Doxygen page */
-
-struct AttributeRecord;
-struct CommentNode;
-class  CompositeNodeObserver;
-struct Document;
-class  ElementNode;
-class  Event;
-class  EventAdd;
-class  EventDel;
-class  EventChgAttr;
-class  EventChgContent;
-class  EventChgOrder;
-class  InvalidOperationException;
-class  LogBuilder;
-struct NodeEventVector;
-struct NodeSiblingIteratorStrategy;
-struct NodeParentIteratorStrategy;
-class  NodeObserver;
-class  Node;
-struct PINode;
-class  SimpleDocument;
-class  SimpleNode;
-class  Subtree;
-struct TextNode;
-
-} // namespace XML
-} // namespace Inkscape
-
-#endif // __SEEN_XML_FORWARD_H__
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :