Mercurial > hg > svcore
comparison data/model/Model.h @ 906:654990320867
Merge from 899:bc0ff66102a8
author | Chris Cannam |
---|---|
date | Wed, 07 May 2014 15:17:51 +0100 |
parents | 69cc0454ed72 |
children | defbe5bc47b7 59e7fe1b1003 |
comparison
equal
deleted
inserted
replaced
905:1f94f3776158 | 906:654990320867 |
---|---|
214 QString extraAttributes = "") const; | 214 QString extraAttributes = "") const; |
215 | 215 |
216 virtual QString toDelimitedDataString(QString delimiter) const { | 216 virtual QString toDelimitedDataString(QString delimiter) const { |
217 return toDelimitedDataString(delimiter, getStartFrame(), getEndFrame()); | 217 return toDelimitedDataString(delimiter, getStartFrame(), getEndFrame()); |
218 } | 218 } |
219 virtual QString toDelimitedDataString(QString, size_t f0, size_t f1) const { | 219 virtual QString toDelimitedDataString(QString, size_t /* f0 */, size_t /* f1 */) const { |
220 return ""; | 220 return ""; |
221 } | 221 } |
222 | 222 |
223 public slots: | 223 public slots: |
224 void aboutToDelete(); | 224 void aboutToDelete(); |