Renamed CSS to Style (finally)

2 files changed, 8 insertions, 4 deletions

diff --git a/src/core/CSS.cpp b/src/core/model/Style.cpp
index c42cf6c..b01b0c7 100644
--- a/src/core/CSS.cpp
+++ b/src/core/model/Style.cpp
@@ -16,9 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "CSS.hpp"
+#include "Style.hpp"
 
 namespace ousia {
+namespace model {
 
 void RuleSet::merge(Rooted<RuleSet> other){
 	for(auto& o : other->rules){
@@ -140,3 +141,4 @@ std::vector<Rooted<SelectorNode>> SelectorNode::append(Handle<SelectorNode> node
 	return append(new SelectorEdge{this->getManager(), node});
 }
 }
+}
diff --git a/src/core/CSS.hpp b/src/core/model/Style.hpp
index 75ac73f..673f51e 100644
--- a/src/core/CSS.hpp
+++ b/src/core/model/Style.hpp
@@ -17,12 +17,12 @@
 */
 
 /**
- * @file CSS.hpp
+ * @file Style.hpp
  
  * @author Benjamin Paaßen (bpaassen@techfak.uni-bielefeld.de)
  */
-#ifndef _OUSIA_CSS_HPP_
-#define _OUSIA_CSS_HPP_
+#ifndef _OUSIA_STYLE_HPP_
+#define _OUSIA_STYLE_HPP_
 
 #include <map>
 #include <vector>
@@ -33,6 +33,7 @@
 #include <core/model/Node.hpp>
 
 namespace ousia {
+namespace model {
 
 /*
  * The Specificity or Precedence of a CSS RuleSet, which decides which
@@ -402,4 +403,5 @@ public:
 	void setAccepting(bool accepting) { this->accepting = accepting; }
 };
 }
+}
 #endif