MaskItems: add m_maskName

GUI/Model/Device/MaskItems.cpp

@@ -177,12 +177,12 @@ void MaskContainerItem::readFrom(QXmlStreamReader* r, MessageService*)
 
 QString MaskItem::maskName() const
 {
-    return itemName();
+    return m_maskName;
 }
 
 void MaskItem::setMaskName(const QString& name)
 {
-    setItemName(name);
+    m_maskName = name;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -215,17 +215,17 @@ void MaskItem::writeTo(QXmlStreamWriter* w) const
 
     // name
     w->writeStartElement(Tag::Name);
-    XML::writeAttribute(w, XML::Attrib::value, maskName());
+    XML::writeAttribute(w, XML::Attrib::value, m_maskName);
     w->writeEndElement();
 
     // mask value
     w->writeStartElement(Tag::MaskValue);
-    XML::writeAttribute(w, XML::Attrib::value, maskValue());
+    XML::writeAttribute(w, XML::Attrib::value, m_maskValue);
     w->writeEndElement();
 
     // is visible?
     w->writeStartElement(Tag::IsVisible);
-    XML::writeAttribute(w, XML::Attrib::value, isVisibleValue());
+    XML::writeAttribute(w, XML::Attrib::value, m_isVisible);
     w->writeEndElement();
 }
 
@@ -239,23 +239,17 @@ void MaskItem::readFrom(QXmlStreamReader* r)
 
         // name
         if (tag == Tag::Name) {
-            QString name;
-            XML::readAttribute(r, XML::Attrib::value, &name);
-            setMaskName(name);
+            XML::readAttribute(r, XML::Attrib::value, &m_maskName);
             XML::gotoEndElementOfTag(r, tag);
 
             // mask value
         } else if (tag == Tag::MaskValue) {
-            bool maskValue = true;
-            XML::readAttribute(r, XML::Attrib::value, &maskValue);
-            setMaskValue(maskValue);
+            XML::readAttribute(r, XML::Attrib::value, &m_maskValue);
             XML::gotoEndElementOfTag(r, tag);
 
             // is visible?
         } else if (tag == Tag::IsVisible) {
-            bool isVisible = true;
-            XML::readAttribute(r, XML::Attrib::value, &isVisible);
-            setIsVisibleValue(isVisible);
+            XML::readAttribute(r, XML::Attrib::value, &m_isVisible);
             XML::gotoEndElementOfTag(r, tag);
 
         } else

GUI/Model/Device/MaskItems.h

@@ -56,6 +56,7 @@ public:
 
 protected:
     explicit MaskItem(const QString& name);
+    QString m_maskName = "nameless by default";
     bool m_maskValue = true;
     bool m_isVisible = true;
 };