From: Ted Gould <ted@canonical.com>
Date: Fri, 31 Oct 2008 21:31:40 +0000 (-0500)
Subject: Making it so that including simple-node.h will generate an error
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f4c06c59e82cee390f68adb66a05acaca307566f;p=inkscape.git

Making it so that including simple-node.h will generate an error
---

diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index ac9064713..34c839c6f 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -18,7 +18,7 @@
 #include "libavoid/polyutil.h"
 #include "libavoid/router.h"
 #include "libavoid/connector.h"
-#include "xml/simple-node.h"
+#include "xml/node.h"
 #include "document.h"
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 964eb85d8..70b006d31 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -38,6 +38,7 @@
 #include "dialogs/dialog-events.h"
 #include "application/application.h"
 #include "xml/node.h"
+#include "xml/attribute-record.h"
 
 #include "util/glib-list-iterators.h"
 
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 3cca393d2..7ecdc1b83 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <glib/gstrfuncs.h>
 
+#include "xml/node.h"
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index 044068eb1..67070d0fc 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -11,6 +11,10 @@
  * See the file COPYING for details.
  */
 
+#ifndef SEEN_INKSCAPE_XML_NODE_H
+#error  You have included xml/simple-node.h in your document, which is an implementation.  Chances are that you want xml/node.h.  Please fix that.
+#endif
+
 #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H