diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-06-15 23:41:15 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-06-15 23:41:15 +0200 |
commit | 1f51c2b7daf5444467b83bb8b01805227494c125 (patch) | |
tree | 32cd4bae49bed1aec0810133421c8978ec356d24 /LibHTML | |
parent | 0522a8f71c027b1ae19a81cfc81ad0a01cc667d2 (diff) | |
download | serenity-1f51c2b7daf5444467b83bb8b01805227494c125.zip |
LibHTML: Create some subdirectories.
Diffstat (limited to 'LibHTML')
-rw-r--r-- | LibHTML/DOM/Document.cpp (renamed from LibHTML/Document.cpp) | 6 | ||||
-rw-r--r-- | LibHTML/DOM/Document.h (renamed from LibHTML/Document.h) | 2 | ||||
-rw-r--r-- | LibHTML/DOM/Element.cpp (renamed from LibHTML/Element.cpp) | 6 | ||||
-rw-r--r-- | LibHTML/DOM/Element.h (renamed from LibHTML/Element.h) | 2 | ||||
-rw-r--r-- | LibHTML/DOM/Node.cpp (renamed from LibHTML/Node.cpp) | 4 | ||||
-rw-r--r-- | LibHTML/DOM/Node.h (renamed from LibHTML/Node.h) | 0 | ||||
-rw-r--r-- | LibHTML/DOM/ParentNode.cpp (renamed from LibHTML/ParentNode.cpp) | 2 | ||||
-rw-r--r-- | LibHTML/DOM/ParentNode.h (renamed from LibHTML/ParentNode.h) | 2 | ||||
-rw-r--r-- | LibHTML/DOM/Text.cpp (renamed from LibHTML/Text.cpp) | 4 | ||||
-rw-r--r-- | LibHTML/DOM/Text.h (renamed from LibHTML/Text.h) | 2 | ||||
-rw-r--r-- | LibHTML/Dump.cpp | 10 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutBlock.cpp (renamed from LibHTML/LayoutBlock.cpp) | 4 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutBlock.h (renamed from LibHTML/LayoutBlock.h) | 2 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutDocument.cpp (renamed from LibHTML/LayoutDocument.cpp) | 2 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutDocument.h (renamed from LibHTML/LayoutDocument.h) | 4 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutInline.cpp (renamed from LibHTML/LayoutInline.cpp) | 4 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutInline.h (renamed from LibHTML/LayoutInline.h) | 2 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutNode.cpp (renamed from LibHTML/LayoutNode.cpp) | 2 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutNode.h (renamed from LibHTML/LayoutNode.h) | 0 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutText.cpp (renamed from LibHTML/LayoutText.cpp) | 2 | ||||
-rw-r--r-- | LibHTML/Layout/LayoutText.h (renamed from LibHTML/LayoutText.h) | 4 | ||||
-rw-r--r-- | LibHTML/Makefile | 22 | ||||
-rw-r--r-- | LibHTML/Parser/Parser.cpp (renamed from LibHTML/Parser.cpp) | 6 | ||||
-rw-r--r-- | LibHTML/Parser/Parser.h (renamed from LibHTML/Parser.h) | 2 | ||||
-rw-r--r-- | LibHTML/test.cpp | 3 |
25 files changed, 49 insertions, 50 deletions
diff --git a/LibHTML/Document.cpp b/LibHTML/DOM/Document.cpp index 721000e38f..e1ca034b16 100644 --- a/LibHTML/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/Document.h b/LibHTML/DOM/Document.h index b06e5cdc9c..2b2f697f51 100644 --- a/LibHTML/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/Element.cpp b/LibHTML/DOM/Element.cpp index 66473fe0c4..d6128cc9f2 100644 --- a/LibHTML/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/Element.h b/LibHTML/DOM/Element.h index 08a87e7233..416e59e424 100644 --- a/LibHTML/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/Node.cpp b/LibHTML/DOM/Node.cpp index b7c4e3747d..54880e68b4 100644 --- a/LibHTML/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/Node.h b/LibHTML/DOM/Node.h index 3867bddbac..3867bddbac 100644 --- a/LibHTML/Node.h +++ b/LibHTML/DOM/Node.h diff --git a/LibHTML/ParentNode.cpp b/LibHTML/DOM/ParentNode.cpp index 23c46692e7..7eb2a950c8 100644 --- a/LibHTML/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/ParentNode.h b/LibHTML/DOM/ParentNode.h index a28ef494ba..9bdc1e3668 100644 --- a/LibHTML/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/Text.cpp b/LibHTML/DOM/Text.cpp index c21a0f54b0..1f13e37092 100644 --- a/LibHTML/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/Text.h b/LibHTML/DOM/Text.h index 76e7d7bca4..37742b8063 100644 --- a/LibHTML/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 index 41f964e299..21339e39b1 100644 --- 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/LayoutBlock.cpp b/LibHTML/Layout/LayoutBlock.cpp index 65a94f7d9b..45191bcbe4 100644 --- a/LibHTML/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/LayoutBlock.h b/LibHTML/Layout/LayoutBlock.h index e953642d67..3b039c537e 100644 --- a/LibHTML/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/LayoutDocument.cpp b/LibHTML/Layout/LayoutDocument.cpp index 738227c604..e3ca9a2241 100644 --- a/LibHTML/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/LayoutDocument.h b/LibHTML/Layout/LayoutDocument.h index 3cee3b341e..370834eb62 100644 --- a/LibHTML/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/LayoutInline.cpp b/LibHTML/Layout/LayoutInline.cpp index bd9c88acde..04c1fa12e7 100644 --- a/LibHTML/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/LayoutInline.h b/LibHTML/Layout/LayoutInline.h index bb8637aecd..cf3075921f 100644 --- a/LibHTML/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/LayoutNode.cpp b/LibHTML/Layout/LayoutNode.cpp index ececf68096..587d813868 100644 --- a/LibHTML/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/LayoutNode.h b/LibHTML/Layout/LayoutNode.h index cc83db6fd9..cc83db6fd9 100644 --- a/LibHTML/LayoutNode.h +++ b/LibHTML/Layout/LayoutNode.h diff --git a/LibHTML/LayoutText.cpp b/LibHTML/Layout/LayoutText.cpp index 8c1feb5f91..4682220ba2 100644 --- a/LibHTML/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/LayoutText.h b/LibHTML/Layout/LayoutText.h index f9964b29c4..8169dd17c3 100644 --- a/LibHTML/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 index 66b48fd839..1ff51e33a0 100644 --- 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.cpp b/LibHTML/Parser/Parser.cpp index 53541570ff..db16fe28b5 100644 --- a/LibHTML/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.h b/LibHTML/Parser/Parser.h index db593dae2d..453f9833fa 100644 --- a/LibHTML/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 index 7e55b5a869..56b3305fc5 100644 --- 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) |