mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-06-16 12:33:19 +02:00
Arranged name properties in Element.cpp.
This commit is contained in:
+9
-2
@@ -32,14 +32,21 @@ Element::Element(uid id, UidAllocator* allocator) : _name(""), _isLocked(false),
|
||||
}
|
||||
// Assign id.
|
||||
_id = id;
|
||||
// Reset name.
|
||||
unsetName();
|
||||
}
|
||||
|
||||
Element::~Element() {
|
||||
_allocator->free(_id);
|
||||
}
|
||||
|
||||
void Element::setName(const QString& name)
|
||||
{
|
||||
if (name != _name)
|
||||
{
|
||||
_name = name;
|
||||
_emitPropertyChanged("name");
|
||||
}
|
||||
}
|
||||
|
||||
void Element::setLocked(bool locked)
|
||||
{
|
||||
if (locked != _isLocked)
|
||||
|
||||
@@ -35,7 +35,7 @@ class Element : public Serializable
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY(uid id READ getId)
|
||||
Q_PROPERTY(QString name READ getName WRITE setName RESET unsetName)
|
||||
Q_PROPERTY(QString name READ getName WRITE setName)
|
||||
Q_PROPERTY(bool locked READ isLocked WRITE setLocked)
|
||||
Q_PROPERTY(float opacity READ getOpacity WRITE setOpacity NOTIFY propertyChanged)
|
||||
Q_PROPERTY(QIcon icon READ getIcon)
|
||||
@@ -48,9 +48,8 @@ public:
|
||||
|
||||
uid getId() const { return _id; }
|
||||
|
||||
void setName(const QString& name) { _name = name; }
|
||||
void setName(const QString& name);
|
||||
QString getName() const { return _name; }
|
||||
virtual void unsetName() { _name = _id; }
|
||||
|
||||
float getOpacity() const { return _opacity; }
|
||||
void setOpacity(float opacity);
|
||||
|
||||
Reference in New Issue
Block a user