comparison layer/Layer.cpp @ 316:c0b9eec70639

* Make XmlExportable::toXml the function that is universally overridden (and
  pure virtual) instead of toXmlString.  Tidies up some classes, notably the
  model classes, significantly.  Closes #1794561.

 
 #include <iostream>
 
 #include <QMutexLocker>
 #include <QMouseEvent>
+#include <QTextStream>
 
 #include "LayerFactory.h"
 #include "base/PlayParameterRepository.h"
 
 #include <cmath>

     } else {
         return pixrect.y() < mr.pixrect.y();
     }
 }
 
-QString
-Layer::MeasureRect::toXmlString(QString indent) const
-{
-    QString s;
-
-    s += indent;
-    s += QString("<measurement ");
+void
+Layer::MeasureRect::toXml(QTextStream &stream, QString indent) const
+{
+    stream << indent;
+    stream << QString("<measurement ");
 
     if (haveFrames) {
-        s += QString("startFrame=\"%1\" endFrame=\"%2\" ")
+        stream << QString("startFrame=\"%1\" endFrame=\"%2\" ")
             .arg(startFrame).arg(endFrame);
     } else {
-        s += QString("startX=\"%1\" endX=\"%2\" ")
-            .arg(pixrect.x()).arg(pixrect.x() + pixrect.width());
-    }
-
-    s += QString("startY=\"%1\" endY=\"%2\"/>\n")
+        stream << QString("startX=\"%1\" endX=\"%2\" ")
+            .arg(pixrect.x()).arg(pixrect.x() << pixrect.width());
+    }
+
+    stream << QString("startY=\"%1\" endY=\"%2\"/>\n")
         .arg(startY).arg(endY);
-
-    return s;
 }
 
 void
 Layer::addMeasurementRect(const QXmlAttributes &attributes)
 {

     }
 
     v->drawMeasurementRect(paint, this, r.pixrect.normalized(), focus);
 }
 
-QString
-Layer::toXmlString(QString indent, QString extraAttributes) const
-{
-    QString s;
-    
-    s += indent;
-
-    s += QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5")
+void
+Layer::toXml(QTextStream &stream,
+             QString indent, QString extraAttributes) const
+{
+    stream << indent;
+
+    stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5")
 	.arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
 	.arg(getObjectExportId(this))
 	.arg(encodeEntities(objectName()))
 	.arg(getObjectExportId(getModel()))
 	.arg(extraAttributes);
 
     if (m_measureRects.empty()) {
-        s += QString("/>\n");
-        return s;
-    }
-
-    s += QString(">\n");
+        stream << QString("/>\n");
+        return;
+    }
+
+    stream << QString(">\n");
 
     for (MeasureRectSet::const_iterator i = m_measureRects.begin();
          i != m_measureRects.end(); ++i) {
-        s += i->toXmlString(indent + "  ");
-    }
-
-    s += QString("</layer>\n");
-
-    return s;
-}
-
-QString
-Layer::toBriefXmlString(QString indent, QString extraAttributes) const
-{
-    QString s;
-    
-    s += indent;
-
-    s += QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n")
+        i->toXml(stream, indent + "  ");
+    }
+
+    stream << QString("</layer>\n");
+}
+
+void
+Layer::toBriefXml(QTextStream &stream,
+                  QString indent, QString extraAttributes) const
+{
+    stream << indent;
+
+    stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n")
 	.arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName
                             (LayerFactory::getInstance()->getLayerType(this))))
 	.arg(getObjectExportId(this))
 	.arg(encodeEntities(objectName()))
 	.arg(getObjectExportId(getModel()))
         .arg(extraAttributes);
-
-    return s;
-}
-
+}
+