Mercurial > hg > svgui
diff layer/Layer.cpp @ 1266:a34a2a25907c
Untabify
author | Chris Cannam |
---|---|
date | Thu, 01 Mar 2018 18:02:22 +0000 |
parents | 4fe7a09be0fe |
children | 1d7921b1852f |
line wrap: on
line diff
--- a/layer/Layer.cpp Thu Mar 01 14:43:53 2018 +0000 +++ b/layer/Layer.cpp Thu Mar 01 18:02:22 2018 +0000 @@ -52,10 +52,10 @@ this, SIGNAL(modelChanged())); connect(model, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)), - this, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t))); + this, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t))); connect(model, SIGNAL(completionChanged()), - this, SIGNAL(modelCompletionChanged())); + this, SIGNAL(modelCompletionChanged())); connect(model, SIGNAL(alignmentCompletionChanged()), this, SIGNAL(modelAlignmentCompletionChanged())); @@ -65,7 +65,7 @@ Layer::getPropertyContainerIconName() const { return LayerFactory::getInstance()->getLayerIconName - (LayerFactory::getInstance()->getLayerType(this)); + (LayerFactory::getInstance()->getLayerType(this)); } void @@ -85,14 +85,14 @@ QString modelName; if (getModel()) modelName = getModel()->objectName(); - + QString text; if (modelName != "") { - text = QString("%1: %2").arg(modelName).arg(layerName); + text = QString("%1: %2").arg(modelName).arg(layerName); } else { - text = layerName; + text = layerName; } - + return text; } @@ -109,7 +109,7 @@ // cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << endl; const Model *model = getModel(); if (model) { - return PlayParameterRepository::getInstance()->getPlayParameters(model); + return PlayParameterRepository::getInstance()->getPlayParameters(model); } return 0; } @@ -600,12 +600,12 @@ } stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5") - .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName + .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName (LayerFactory::getInstance()->getLayerType(this)))) - .arg(getObjectExportId(this)) - .arg(encodeEntities(objectName())) - .arg(getObjectExportId(getModel())) - .arg(extraAttributes); + .arg(getObjectExportId(this)) + .arg(encodeEntities(objectName())) + .arg(getObjectExportId(getModel())) + .arg(extraAttributes); if (m_measureRects.empty()) { stream << QString("/>\n"); @@ -634,11 +634,11 @@ } stream << QString("<layer id=\"%2\" type=\"%1\" name=\"%3\" model=\"%4\" %5/>\n") - .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName + .arg(encodeEntities(LayerFactory::getInstance()->getLayerTypeName (LayerFactory::getInstance()->getLayerType(this)))) - .arg(getObjectExportId(this)) - .arg(encodeEntities(objectName())) - .arg(getObjectExportId(getModel())) + .arg(getObjectExportId(this)) + .arg(encodeEntities(objectName())) + .arg(getObjectExportId(getModel())) .arg(extraAttributes); }