comparison framework/Document.h @ 236:dd14baa45847

Merge from branch "templating"
author Chris Cannam
date Sun, 26 Jun 2011 19:53:34 +0100
parents 2c827ac7c8e7
children 40a0fa9af6b4
comparison
equal deleted inserted replaced
233:8aace2d9f1c2 236:dd14baa45847
212 * the main model has changed since they were calculated. 212 * the main model has changed since they were calculated.
213 */ 213 */
214 void alignModels(); 214 void alignModels();
215 215
216 void toXml(QTextStream &, QString indent, QString extraAttributes) const; 216 void toXml(QTextStream &, QString indent, QString extraAttributes) const;
217 void toXmlAsTemplate(QTextStream &, QString indent, QString extraAttributes) const;
217 218
218 signals: 219 signals:
219 void layerAdded(Layer *); 220 void layerAdded(Layer *);
220 void layerRemoved(Layer *); 221 void layerRemoved(Layer *);
221 void layerAboutToBeDeleted(Layer *); 222 void layerAboutToBeDeleted(Layer *);
332 void writeBackwardCompatibleDerivation(QTextStream &, QString, Model *, 333 void writeBackwardCompatibleDerivation(QTextStream &, QString, Model *,
333 const ModelRecord &) const; 334 const ModelRecord &) const;
334 335
335 static TransformId getAlignmentTransformName(); 336 static TransformId getAlignmentTransformName();
336 337
338 void toXml(QTextStream &, QString, QString, bool asTemplate) const;
339 void writePlaceholderMainModel(QTextStream &, QString) const;
340
337 /** 341 /**
338 * And these are the layers. We also control the lifespans of 342 * And these are the layers. We also control the lifespans of
339 * these (usually through the commands used to add and remove them). 343 * these (usually through the commands used to add and remove them).
340 */ 344 */
341 typedef std::set<Layer *> LayerSet; 345 typedef std::set<Layer *> LayerSet;