From f1d432892ce158490bb564ba3d01982772439a81 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Mon, 26 Jan 2015 23:55:41 +0100
Subject: Renamed CSS to Style (finally)

---
 src/plugins/css/CSSParser.hpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/plugins/css/CSSParser.hpp')

diff --git a/src/plugins/css/CSSParser.hpp b/src/plugins/css/CSSParser.hpp
index c6594f6..2f37e6a 100644
--- a/src/plugins/css/CSSParser.hpp
+++ b/src/plugins/css/CSSParser.hpp
@@ -32,8 +32,8 @@
 #include <utility>
 
 #include <core/CodeTokenizer.hpp>
-#include <core/CSS.hpp>
 #include <core/common/CharReader.hpp>
+#include <core/model/Style.hpp>
 #include <core/parser/Parser.hpp>
 
 namespace ousia {
@@ -71,42 +71,44 @@ private:
 	/**
 	 * Implements the DOC Nonterminal
 	 */
-	void parseDocument(Rooted<SelectorNode> root, CodeTokenizer &tokenizer,
-	                   ParserContext &ctx);
+	void parseDocument(Rooted<model::SelectorNode> root,
+	                   CodeTokenizer &tokenizer, ParserContext &ctx);
 	/**
 	 * Implements the SELECTORS Nonterminal and adds all leaf nodes of the
 	 * resulting SelectorTree to the input leafList so that a parsed RuleSet can
 	 * be inserted there.
 	 */
-	void parseSelectors(Rooted<SelectorNode> root, CodeTokenizer &tokenizer,
-	                    std::vector<Rooted<SelectorNode>> &leafList,
+	void parseSelectors(Rooted<model::SelectorNode> root,
+	                    CodeTokenizer &tokenizer,
+	                    std::vector<Rooted<model::SelectorNode>> &leafList,
 	                    ParserContext &ctx);
 	/**
 	 * Implements the SELECT Nonterminal, which in effect parses a SelectorPath
 	 * of the SelectorTree and returns the beginning node of the path as first
 	 * element as well as the leaf of the path as second tuple element.
 	 */
-	std::pair<Rooted<SelectorNode>, Rooted<SelectorNode>> parseSelector(
-	    CodeTokenizer &tokenizer, ParserContext &ctx);
+	std::pair<Rooted<model::SelectorNode>, Rooted<model::SelectorNode>>
+	parseSelector(CodeTokenizer &tokenizer, ParserContext &ctx);
 
 	/**
 	 * Implements the SELECT' Nonterminal, which parses a single Selector with
 	 * its PseudoSelector and returns it.
 	 */
-	Rooted<SelectorNode> parsePrimitiveSelector(CodeTokenizer &tokenizer,
-	                                            ParserContext &ctx);
+	Rooted<model::SelectorNode> parsePrimitiveSelector(CodeTokenizer &tokenizer,
+	                                                   ParserContext &ctx);
 
 	/**
 	 * Implements the RULESET Nonterminal, which parses an entire RuleSet. Note
 	 * that we do not require RuleSets to be parsed. It is permitted to just
 	 * insert Selector expressions.
 	 */
-	Rooted<RuleSet> parseRuleSet(CodeTokenizer &tokenizer, ParserContext &ctx);
+	Rooted<model::RuleSet> parseRuleSet(CodeTokenizer &tokenizer,
+	                                    ParserContext &ctx);
 
 	/**
 	 * Implements the RULES Nonterminal, which parses CSSRules inside a RuleSet.
 	 */
-	void parseRules(CodeTokenizer &tokenizer, Rooted<RuleSet> ruleSet,
+	void parseRules(CodeTokenizer &tokenizer, Rooted<model::RuleSet> ruleSet,
 	                ParserContext &ctx);
 
 	/**
-- 
cgit v1.2.3