LibHTML: Create some subdirectories.

awesomekling · awesomekling · commit 1f51c2b7daf5 · 2019-06-15T23:41:15.000+02:00
diff --git a/LibHTML/DOM/Document.cpp b/LibHTML/DOM/Document.cpp
@@ -1,6 +1,6 @@
-#include <LibHTML/Document.h>
-#include <LibHTML/Element.h>
-#include <LibHTML/LayoutDocument.h>
+#include <LibHTML/DOM/Document.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/Layout/LayoutDocument.h>
 #include <stdio.h>
 
 Document::Document()
diff --git a/LibHTML/DOM/Document.h b/LibHTML/DOM/Document.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/AKString.h>
-#include <LibHTML/ParentNode.h>
+#include <LibHTML/DOM/ParentNode.h>
 
 class LayoutNode;
 
diff --git a/LibHTML/DOM/Element.cpp b/LibHTML/DOM/Element.cpp
@@ -1,6 +1,6 @@
-#include <LibHTML/Element.h>
-#include <LibHTML/LayoutBlock.h>
-#include <LibHTML/LayoutInline.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/Layout/LayoutBlock.h>
+#include <LibHTML/Layout/LayoutInline.h>
 
 Element::Element(const String& tag_name)
     : ParentNode(NodeType::ELEMENT_NODE)
diff --git a/LibHTML/DOM/Element.h b/LibHTML/DOM/Element.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibHTML/ParentNode.h>
+#include <LibHTML/DOM/ParentNode.h>
 #include <AK/AKString.h>
 
 class Attribute {
diff --git a/LibHTML/DOM/Node.cpp b/LibHTML/DOM/Node.cpp
@@ -1,5 +1,5 @@
-#include <LibHTML/Node.h>
-#include <LibHTML/LayoutNode.h>
+#include <LibHTML/DOM/Node.h>
+#include <LibHTML/Layout/LayoutNode.h>
 
 Node::Node(NodeType type)
     : m_type(type)
diff --git a/LibHTML/DOM/Node.h b/LibHTML/DOM/Node.h
diff --git a/LibHTML/DOM/ParentNode.cpp b/LibHTML/DOM/ParentNode.cpp
@@ -1,4 +1,4 @@
-#include <LibHTML/ParentNode.h>
+#include <LibHTML/DOM/ParentNode.h>
 
 void ParentNode::append_child(Retained<Node> node)
 {
diff --git a/LibHTML/DOM/ParentNode.h b/LibHTML/DOM/ParentNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibHTML/Node.h>
+#include <LibHTML/DOM/Node.h>
 
 class ParentNode : public Node {
 public:
diff --git a/LibHTML/DOM/Text.cpp b/LibHTML/DOM/Text.cpp
@@ -1,5 +1,5 @@
-#include <LibHTML/Text.h>
-#include <LibHTML/LayoutText.h>
+#include <LibHTML/DOM/Text.h>
+#include <LibHTML/Layout/LayoutText.h>
 
 Text::Text(const String& data)
     : Node(NodeType::TEXT_NODE)
diff --git a/LibHTML/DOM/Text.h b/LibHTML/DOM/Text.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/AKString.h>
-#include <LibHTML/Node.h>
+#include <LibHTML/DOM/Node.h>
 
 class Text final : public Node {
 public:
diff --git a/LibHTML/Dump.cpp b/LibHTML/Dump.cpp
@@ -1,9 +1,9 @@
-#include <LibHTML/Document.h>
+#include <LibHTML/DOM/Document.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/DOM/Text.h>
 #include <LibHTML/Dump.h>
-#include <LibHTML/Element.h>
-#include <LibHTML/LayoutNode.h>
-#include <LibHTML/LayoutText.h>
-#include <LibHTML/Text.h>
+#include <LibHTML/Layout/LayoutNode.h>
+#include <LibHTML/Layout/LayoutText.h>
 #include <stdio.h>
 
 void dump_tree(const Node& node)
diff --git a/LibHTML/Layout/LayoutBlock.cpp b/LibHTML/Layout/LayoutBlock.cpp
@@ -1,5 +1,5 @@
-#include <LibHTML/Element.h>
-#include <LibHTML/LayoutBlock.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/Layout/LayoutBlock.h>
 
 LayoutBlock::LayoutBlock(Element& element)
     : LayoutNode(&element)
diff --git a/LibHTML/Layout/LayoutBlock.h b/LibHTML/Layout/LayoutBlock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibHTML/LayoutNode.h>
+#include <LibHTML/Layout/LayoutNode.h>
 
 class Element;
 
diff --git a/LibHTML/Layout/LayoutDocument.cpp b/LibHTML/Layout/LayoutDocument.cpp
@@ -1,4 +1,4 @@
-#include <LibHTML/LayoutDocument.h>
+#include <LibHTML/Layout/LayoutDocument.h>
 
 LayoutDocument::LayoutDocument(const Document& document)
     : LayoutNode(&document)
diff --git a/LibHTML/Layout/LayoutDocument.h b/LibHTML/Layout/LayoutDocument.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <LibHTML/LayoutNode.h>
-#include <LibHTML/Document.h>
+#include <LibHTML/Layout/LayoutNode.h>
+#include <LibHTML/DOM/Document.h>
 
 class LayoutDocument : public LayoutNode {
 public:
diff --git a/LibHTML/Layout/LayoutInline.cpp b/LibHTML/Layout/LayoutInline.cpp
@@ -1,5 +1,5 @@
-#include <LibHTML/Element.h>
-#include <LibHTML/LayoutInline.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/Layout/LayoutInline.h>
 
 LayoutInline::LayoutInline(Element& element)
     : LayoutNode(&element)
diff --git a/LibHTML/Layout/LayoutInline.h b/LibHTML/Layout/LayoutInline.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibHTML/LayoutNode.h>
+#include <LibHTML/Layout/LayoutNode.h>
 
 class Element;
 
diff --git a/LibHTML/Layout/LayoutNode.cpp b/LibHTML/Layout/LayoutNode.cpp
@@ -1,4 +1,4 @@
-#include <LibHTML/LayoutNode.h>
+#include <LibHTML/Layout/LayoutNode.h>
 
 LayoutNode::LayoutNode(const Node* node)
     : m_node(node)
diff --git a/LibHTML/Layout/LayoutNode.h b/LibHTML/Layout/LayoutNode.h
diff --git a/LibHTML/Layout/LayoutText.cpp b/LibHTML/Layout/LayoutText.cpp
@@ -1,4 +1,4 @@
-#include <LibHTML/LayoutText.h>
+#include <LibHTML/Layout/LayoutText.h>
 #include <ctype.h>
 
 LayoutText::LayoutText(const Text& text)
diff --git a/LibHTML/Layout/LayoutText.h b/LibHTML/Layout/LayoutText.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <LibHTML/LayoutNode.h>
-#include <LibHTML/Text.h>
+#include <LibHTML/Layout/LayoutNode.h>
+#include <LibHTML/DOM/Text.h>
 
 class LayoutText : public LayoutNode {
 public:
diff --git a/LibHTML/Makefile b/LibHTML/Makefile
@@ -1,17 +1,17 @@
 include ../Makefile.common
 
 LIBHTML_OBJS = \
-    Node.o \
-    ParentNode.o \
-    Element.o \
-    Document.o \
-    Text.o \
-    Parser.o \
-    LayoutNode.o \
-    LayoutText.o \
-    LayoutBlock.o \
-    LayoutInline.o \
-    LayoutDocument.o \
+    DOM/Node.o \
+    DOM/ParentNode.o \
+    DOM/Element.o \
+    DOM/Document.o \
+    DOM/Text.o \
+    Parser/Parser.o \
+    Layout/LayoutNode.o \
+    Layout/LayoutText.o \
+    Layout/LayoutBlock.o \
+    Layout/LayoutInline.o \
+    Layout/LayoutDocument.o \
     Dump.o
 
 TEST_OBJS = test.o
diff --git a/LibHTML/Parser/Parser.cpp b/LibHTML/Parser/Parser.cpp
@@ -1,6 +1,6 @@
-#include <LibHTML/Element.h>
-#include <LibHTML/Parser.h>
-#include <LibHTML/Text.h>
+#include <LibHTML/DOM/Element.h>
+#include <LibHTML/DOM/Text.h>
+#include <LibHTML/Parser/Parser.h>
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/LibHTML/Parser/Parser.h b/LibHTML/Parser/Parser.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Retained.h>
-#include <LibHTML/Document.h>
+#include <LibHTML/DOM/Document.h>
 
 Retained<Document> parse(const String& html);
 
diff --git a/LibHTML/test.cpp b/LibHTML/test.cpp
@@ -1,7 +1,6 @@
 #include <LibCore/CFile.h>
 #include <LibHTML/Dump.h>
-#include <LibHTML/Element.h>
-#include <LibHTML/Parser.h>
+#include <LibHTML/Parser/Parser.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <LibHTML/ParentNode.h>`
	`1`	`+#include <LibHTML/DOM/ParentNode.h>`
`2`	`2`
`3`	`3`	`void ParentNode::append_child(Retained<Node> node)`
`4`	`4`	`{`