follow up xml

GUI/Model/Mask/MaskItems.cpp

@@ -161,22 +161,22 @@ void RectangleItem::writeTo(QXmlStreamWriter* w) const
 
     // x low
     w->writeStartElement(Tag::XLow);
-    XML::writeAttribute(w, XML::Attrib::value, m_xLow);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_xLow);
     w->writeEndElement();
 
     // y low
     w->writeStartElement(Tag::YLow);
-    XML::writeAttribute(w, XML::Attrib::value, m_yLow);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_yLow);
     w->writeEndElement();
 
     // x up
     w->writeStartElement(Tag::XUp);
-    XML::writeAttribute(w, XML::Attrib::value, m_xUp);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_xUp);
     w->writeEndElement();
 
     // y up
     w->writeStartElement(Tag::YUp);
-    XML::writeAttribute(w, XML::Attrib::value, m_yUp);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_yUp);
     w->writeEndElement();
 }
 
@@ -195,22 +195,22 @@ void RectangleItem::readFrom(QXmlStreamReader* r)
 
             // x low
         } else if (tag == Tag::XLow) {
-            XML::readAttribute(r, XML::Attrib::value, &m_xLow);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_xLow);
             XML::gotoEndElementOfTag(r, tag);
 
             // y low
         } else if (tag == Tag::YLow) {
-            XML::readAttribute(r, XML::Attrib::value, &m_yLow);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_yLow);
             XML::gotoEndElementOfTag(r, tag);
 
             // x up
         } else if (tag == Tag::XUp) {
-            XML::readAttribute(r, XML::Attrib::value, &m_xUp);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_xUp);
             XML::gotoEndElementOfTag(r, tag);
 
             // y up
         } else if (tag == Tag::YUp) {
-            XML::readAttribute(r, XML::Attrib::value, &m_yUp);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_yUp);
             XML::gotoEndElementOfTag(r, tag);
 
         } else
@@ -388,7 +388,7 @@ void VerticalLineItem::writeTo(QXmlStreamWriter* w) const
 
     // x position
     w->writeStartElement(Tag::XPosition);
-    XML::writeAttribute(w, XML::Attrib::value, m_posX);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_posX);
     w->writeEndElement();
 }
 
@@ -407,7 +407,7 @@ void VerticalLineItem::readFrom(QXmlStreamReader* r)
 
             // x position
         } else if (tag == Tag::XPosition) {
-            XML::readAttribute(r, XML::Attrib::value, &m_posX);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_posX);
             XML::gotoEndElementOfTag(r, tag);
 
         } else
@@ -444,7 +444,7 @@ void HorizontalLineItem::writeTo(QXmlStreamWriter* w) const
 
     // y position
     w->writeStartElement(Tag::YPosition);
-    XML::writeAttribute(w, XML::Attrib::value, m_posY);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_posY);
     w->writeEndElement();
 }
 
@@ -463,7 +463,7 @@ void HorizontalLineItem::readFrom(QXmlStreamReader* r)
 
             // y position
         } else if (tag == Tag::YPosition) {
-            XML::readAttribute(r, XML::Attrib::value, &m_posY);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_posY);
             XML::gotoEndElementOfTag(r, tag);
 
         } else
@@ -526,27 +526,27 @@ void EllipseItem::writeTo(QXmlStreamWriter* w) const
 
     // x center
     w->writeStartElement(Tag::XCenter);
-    XML::writeAttribute(w, XML::Attrib::value, m_xCenter);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_xCenter);
     w->writeEndElement();
 
     // y center
     w->writeStartElement(Tag::YCenter);
-    XML::writeAttribute(w, XML::Attrib::value, m_yCenter);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_yCenter);
     w->writeEndElement();
 
     // x radius
     w->writeStartElement(Tag::XRadius);
-    XML::writeAttribute(w, XML::Attrib::value, m_xRadius);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_xRadius);
     w->writeEndElement();
 
     // y radius
     w->writeStartElement(Tag::YRadius);
-    XML::writeAttribute(w, XML::Attrib::value, m_yRadius);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_yRadius);
     w->writeEndElement();
 
     // rotation angle
     w->writeStartElement(Tag::Angle);
-    XML::writeAttribute(w, XML::Attrib::value, m_angle);
+    XML::writeAttribute(w, XML::Attrib::xvalue, m_angle);
     w->writeEndElement();
 }
 
@@ -565,27 +565,27 @@ void EllipseItem::readFrom(QXmlStreamReader* r)
 
             // x center
         } else if (tag == Tag::XCenter) {
-            XML::readAttribute(r, XML::Attrib::value, &m_xCenter);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_xCenter);
             XML::gotoEndElementOfTag(r, tag);
 
             // y center
         } else if (tag == Tag::YCenter) {
-            XML::readAttribute(r, XML::Attrib::value, &m_yCenter);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_yCenter);
             XML::gotoEndElementOfTag(r, tag);
 
             // x radius
         } else if (tag == Tag::XRadius) {
-            XML::readAttribute(r, XML::Attrib::value, &m_xRadius);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_xRadius);
             XML::gotoEndElementOfTag(r, tag);
 
             // y radius
         } else if (tag == Tag::YRadius) {
-            XML::readAttribute(r, XML::Attrib::value, &m_yRadius);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_yRadius);
             XML::gotoEndElementOfTag(r, tag);
 
             // rotation angle
         } else if (tag == Tag::Angle) {
-            XML::readAttribute(r, XML::Attrib::value, &m_angle);
+            XML::readAttribute(r, XML::Attrib::xvalue, &m_angle);
             XML::gotoEndElementOfTag(r, tag);
 
         } else