diff -r 1de2b8d64e9f -r 98906a94732f src/linetypes/object.h --- a/src/linetypes/object.h Tue Jan 28 23:34:49 2020 +0200 +++ b/src/linetypes/object.h Thu Jan 30 19:20:11 2020 +0200 @@ -6,7 +6,7 @@ #include "colors.h" #include "gl/common.h" -namespace linetypes +namespace ldraw { struct GetPolygonsContext; enum class Property; @@ -17,7 +17,7 @@ class DocumentManager; -struct linetypes::GetPolygonsContext +struct ldraw::GetPolygonsContext { ::DocumentManager* documents; }; @@ -25,7 +25,7 @@ /** * @brief Different properties that can be queried with getProperty */ -enum class linetypes::Property +enum class ldraw::Property { Color, // Color of the object Text, // Text contained in a comment @@ -41,7 +41,7 @@ ErrorMessage // For error lines, why parsing failed }; -class linetypes::Object +class ldraw::Object { public: enum class SetPropertyResult @@ -66,21 +66,21 @@ virtual void invert() {} }; -class linetypes::ColoredObject : public Object +class ldraw::ColoredObject : public Object { public: - ColoredObject(const Color colorIndex = colors::main); + ColoredObject(const Color colorIndex = ldraw::mainColor); bool hasColor() const override final; QVariant getProperty(Property id) const override; SetPropertyResult setProperty(Property id, const QVariant& value) override; protected: - Color colorIndex = colors::main; + Color colorIndex = ldraw::mainColor; }; /** * @brief Represents an empty line. */ -class linetypes::Empty : public Object +class ldraw::Empty : public Object { QString textRepresentation() const override; };