diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-25 18:51:51 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-25 18:51:51 +0100 |
commit | be66642ba83c1e238ba89d8cb562eb0e4b5c280c (patch) | |
tree | dc8bc8542074491047418ff3aad393acb7323ca4 /src/core/model/Domain.cpp | |
parent | 3292b5f8165982d45802b318dae8566532e76e13 (diff) |
deleted "model" namespace
Diffstat (limited to 'src/core/model/Domain.cpp')
-rw-r--r-- | src/core/model/Domain.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp index c7afd22..516bdde 100644 --- a/src/core/model/Domain.cpp +++ b/src/core/model/Domain.cpp @@ -24,7 +24,6 @@ #include "Domain.hpp" namespace ousia { -namespace model { /* Class FieldDescriptor */ @@ -540,21 +539,21 @@ Rooted<AnnotationClass> Domain::createAnnotationClass( return Rooted<AnnotationClass>{new AnnotationClass( getManager(), std::move(name), this, attributesDescriptor)}; } -} + /* Type registrations */ namespace RttiTypes { const Rtti FieldDescriptor = - RttiBuilder<model::FieldDescriptor>("FieldDescriptor").parent(&Node); + RttiBuilder<ousia::FieldDescriptor>("FieldDescriptor").parent(&Node); const Rtti Descriptor = - RttiBuilder<model::Descriptor>("Descriptor").parent(&Node); + RttiBuilder<ousia::Descriptor>("Descriptor").parent(&Node); const Rtti StructuredClass = - RttiBuilder<model::StructuredClass>("StructuredClass") + RttiBuilder<ousia::StructuredClass>("StructuredClass") .parent(&Descriptor) .composedOf(&FieldDescriptor); const Rtti AnnotationClass = - RttiBuilder<model::AnnotationClass>("AnnotationClass").parent(&Descriptor); -const Rtti Domain = RttiBuilder<model::Domain>("Domain") + RttiBuilder<ousia::AnnotationClass>("AnnotationClass").parent(&Descriptor); +const Rtti Domain = RttiBuilder<ousia::Domain>("Domain") .parent(&Node) .composedOf({&StructuredClass, &AnnotationClass}); } |