From f1015f8a6aaaff3f0115153bc09051257badf710 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 28 Dec 2005 20:45:55 +0100
Subject: [PATCH] Make files include dom/string.h instead of util/string.h
 directly

---
 src/dom/css/scanner.c  | 2 +-
 src/dom/node.c         | 2 +-
 src/dom/scanner.c      | 2 +-
 src/dom/select.c       | 2 +-
 src/dom/sgml/parser.c  | 4 ++--
 src/dom/sgml/scanner.c | 6 +++---
 src/dom/sgml/sgml.c    | 2 +-
 src/dom/stack.c        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/dom/css/scanner.c b/src/dom/css/scanner.c
index d745b553..32bdaaaf 100644
--- a/src/dom/css/scanner.c
+++ b/src/dom/css/scanner.c
@@ -11,8 +11,8 @@
 
 #include "dom/css/scanner.h"
 #include "dom/scanner.h"
+#include "dom/string.h"
 #include "util/error.h"
-#include "util/string.h"
 
 
 /* Bitmap entries for the CSS character groups used in the scanner table */
diff --git a/src/dom/node.c b/src/dom/node.c
index 7c19f90a..89117962 100644
--- a/src/dom/node.c
+++ b/src/dom/node.c
@@ -10,9 +10,9 @@
 #include "elinks.h"
 
 #include "dom/node.h"
+#include "dom/string.h"
 #include "util/hash.h"
 #include "util/memory.h"
-#include "util/string.h"
 
 
 static void done_dom_node_data(struct dom_node *node);
diff --git a/src/dom/scanner.c b/src/dom/scanner.c
index 4ba3aad1..9af0bad4 100644
--- a/src/dom/scanner.c
+++ b/src/dom/scanner.c
@@ -10,8 +10,8 @@
 #include "elinks.h"
 
 #include "dom/scanner.h"
+#include "dom/string.h"
 #include "util/error.h"
-#include "util/string.h"
 
 
 int
diff --git a/src/dom/select.c b/src/dom/select.c
index c4d7cf0c..26095aa5 100644
--- a/src/dom/select.c
+++ b/src/dom/select.c
@@ -12,8 +12,8 @@
 #include "dom/scanner.h"
 #include "dom/select.h"
 #include "dom/stack.h"
+#include "dom/string.h"
 #include "util/memory.h"
-#include "util/string.h"
 
 
 /* Selector parsing: */
diff --git a/src/dom/sgml/parser.c b/src/dom/sgml/parser.c
index 46d9a124..bb9b154b 100644
--- a/src/dom/sgml/parser.c
+++ b/src/dom/sgml/parser.c
@@ -10,13 +10,13 @@
 #include "elinks.h"
 
 #include "dom/node.h"
-#include "dom/stack.h"
 #include "dom/sgml/parser.h"
 #include "dom/sgml/scanner.h"
 #include "dom/sgml/sgml.h"
+#include "dom/stack.h"
+#include "dom/string.h"
 #include "util/error.h"
 #include "util/memory.h"
-#include "util/string.h"
 
 
 static struct sgml_parsing_state *
diff --git a/src/dom/sgml/scanner.c b/src/dom/sgml/scanner.c
index 7987a513..90095506 100644
--- a/src/dom/sgml/scanner.c
+++ b/src/dom/sgml/scanner.c
@@ -9,10 +9,10 @@
 
 #include "elinks.h"
 
-#include "dom/sgml/scanner.h"
-#include "util/error.h"
 #include "dom/scanner.h"
-#include "util/string.h"
+#include "dom/sgml/scanner.h"
+#include "dom/string.h"
+#include "util/error.h"
 
 
 /* Bitmap entries for the SGML character groups used in the scanner table */
diff --git a/src/dom/sgml/sgml.c b/src/dom/sgml/sgml.c
index 236bd6c5..b5181a72 100644
--- a/src/dom/sgml/sgml.c
+++ b/src/dom/sgml/sgml.c
@@ -11,8 +11,8 @@
 
 #include "dom/node.h"
 #include "dom/sgml/sgml.h"
+#include "dom/string.h"
 #include "util/error.h"
-#include "util/string.h"
 
 /* Backend includes: */
 
diff --git a/src/dom/stack.c b/src/dom/stack.c
index f140a816..e4ab2d6e 100644
--- a/src/dom/stack.c
+++ b/src/dom/stack.c
@@ -11,8 +11,8 @@
 
 #include "dom/node.h"
 #include "dom/stack.h"
+#include "dom/string.h"
 #include "util/memory.h"
-#include "util/string.h"
 
 
 /* Navigator states */