Mercurial > hg > svcore
diff data/model/NoteModel.h @ 742:c10cb8782576 coreaudio_tests
Merge from branch "default"
| author | Chris Cannam |
|---|---|
| date | Sun, 01 Jul 2012 11:53:00 +0100 |
| parents | e22b6e89a7f7 |
| children | d6bd5751b8f6 |
line wrap: on
line diff
--- a/data/model/NoteModel.h Mon Nov 29 12:45:39 2010 +0000 +++ b/data/model/NoteModel.h Sun Jul 01 11:53:00 2012 +0100 @@ -56,7 +56,8 @@ { stream << QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" level=\"%5\" label=\"%6\" %7/>\n") - .arg(indent).arg(frame).arg(value).arg(duration).arg(level).arg(label).arg(extraAttributes); + .arg(indent).arg(frame).arg(value).arg(duration).arg(level) + .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes); } QString toDelimitedDataString(QString delimiter, size_t sampleRate) const @@ -195,9 +196,9 @@ (row, column, value, role); } - if (role != Qt::EditRole) return false; + if (role != Qt::EditRole) return 0; PointListConstIterator i = getPointListIteratorForRow(row); - if (i == m_points.end()) return false; + if (i == m_points.end()) return 0; EditCommand *command = new EditCommand(this, tr("Edit Data")); Point point(*i);