comparison data/model/Model.h @ 890:4cbf8c6a462d tony_integration

Merge from branch tonioni
author Chris Cannam
date Tue, 11 Mar 2014 17:30:35 +0000
parents d81c16e47e22
children defbe5bc47b7 59e7fe1b1003
comparison
equal deleted inserted replaced
874:862fe7b20df7 890:4cbf8c6a462d
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();