diff -r 593a658cba8e -r 73e448b2943d src/objecttypes/modelobject.h --- a/src/objecttypes/modelobject.h Thu Oct 03 11:45:44 2019 +0300 +++ b/src/objecttypes/modelobject.h Thu Oct 03 23:44:28 2019 +0300 @@ -4,7 +4,6 @@ #include #include "main.h" #include "colors.h" -#include "uuid.h" #include "vertex.h" namespace modelobjects @@ -42,11 +41,15 @@ BaseObject(); BaseObject(const BaseObject&) = delete; virtual ~BaseObject(); - const Uuid id; + const unsigned int id; //virtual void toString(QTextStream &out) = 0; virtual bool hasColor() const; virtual QVariant getProperty(Property id) const; virtual SetPropertyResult setProperty(Property id, const QVariant& value); + virtual QString textRepresentation() const = 0; + virtual QBrush textRepresentationForeground() const; + virtual QBrush textRepresentationBackground() const; + virtual QFont textRepresentationFont() const; }; class modelobjects::ColoredBaseObject : public BaseObject @@ -59,3 +62,8 @@ private: Color color_index = colors::main; }; + +namespace modelobjects +{ + using Id = std::remove_const_t; +}