Mercurial > hg > svapp
comparison framework/Document.cpp @ 347:b3609adae921 tony_integration
Merge from tonioni branch
| author | Chris Cannam |
|---|---|
| date | Wed, 07 May 2014 15:12:35 +0100 |
| parents | 93cf23bfa1cb |
| children | f5c914661f6f 0876ea394902 |
comparison
equal
deleted
inserted
replaced
| 346:0e4332efcc7d | 347:b3609adae921 |
|---|---|
| 103 emit modelAboutToBeDeleted(m_mainModel); | 103 emit modelAboutToBeDeleted(m_mainModel); |
| 104 } | 104 } |
| 105 | 105 |
| 106 emit mainModelChanged(0); | 106 emit mainModelChanged(0); |
| 107 delete m_mainModel; | 107 delete m_mainModel; |
| 108 | |
| 109 } | 108 } |
| 110 | 109 |
| 111 Layer * | 110 Layer * |
| 112 Document::createLayer(LayerFactory::LayerType type) | 111 Document::createLayer(LayerFactory::LayerType type) |
| 113 { | 112 { |