# HG changeset patch
# User Chris Cannam
# Date 1252409246 0
# Node ID e43368ec5ff0b7d6960babbf32c2687be7b798a4
# Parent  02d9664906e8c9a5be1856b860113c8611de7093
* Fix session save bug reported by Jeff Smith (entities not encoded in
  label attributes for points in layers)

diff -r 02d9664906e8 -r e43368ec5ff0 data/model/SparseOneDimensionalModel.h
--- a/data/model/SparseOneDimensionalModel.h	Mon Aug 24 16:07:23 2009 +0000
+++ b/data/model/SparseOneDimensionalModel.h	Tue Sep 08 11:27:26 2009 +0000
@@ -40,7 +40,8 @@
                QString extraAttributes = "") const
     {
         stream << QString("%1<point frame=\"%2\" label=\"%3\" %4/>\n")
-	    .arg(indent).arg(frame).arg(label).arg(extraAttributes);
+	    .arg(indent).arg(frame).arg(XmlExportable::encodeEntities(label))
+            .arg(extraAttributes);
     }
 
     QString toDelimitedDataString(QString delimiter, size_t sampleRate) const
diff -r 02d9664906e8 -r e43368ec5ff0 data/model/SparseTimeValueModel.h
--- a/data/model/SparseTimeValueModel.h	Mon Aug 24 16:07:23 2009 +0000
+++ b/data/model/SparseTimeValueModel.h	Tue Sep 08 11:27:26 2009 +0000
@@ -45,7 +45,8 @@
                QString extraAttributes = "") const
     {
         stream << QString("%1<point frame=\"%2\" value=\"%3\" label=\"%4\" %5/>\n")
-	    .arg(indent).arg(frame).arg(value).arg(label).arg(extraAttributes);
+	    .arg(indent).arg(frame).arg(value).arg(XmlExportable::encodeEntities(label))
+            .arg(extraAttributes);
     }
 
     QString toDelimitedDataString(QString delimiter, size_t sampleRate) const
diff -r 02d9664906e8 -r e43368ec5ff0 data/model/WritableWaveFileModel.cpp
--- a/data/model/WritableWaveFileModel.cpp	Mon Aug 24 16:07:23 2009 +0000
+++ b/data/model/WritableWaveFileModel.cpp	Tue Sep 08 11:27:26 2009 +0000
@@ -234,6 +234,7 @@
     Model::toXml
         (out, indent,
          QString("type=\"writablewavefile\" file=\"%1\" channels=\"%2\" %3")
-         .arg(m_writer->getPath()).arg(m_model->getChannelCount()).arg(extraAttributes));
+         .arg(encodeEntities(m_writer->getPath()))
+         .arg(m_model->getChannelCount()).arg(extraAttributes));
 }