Purging some forward.h files.

(bzr r10664)

8 files changed, 19 insertions, 65 deletions

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 :