Mercurial > hg > svapp
comparison framework/Document.h @ 340:c11701af6bb4 tony_integration
Merge from branch tonioni
| author | Chris Cannam |
|---|---|
| date | Wed, 02 Apr 2014 08:51:51 +0100 |
| parents | dd07d48d7d4f |
| children | f5c914661f6f |
comparison
equal
deleted
inserted
replaced
| 338:b2ca08d16293 | 340:c11701af6bb4 |
|---|---|
| 375 | 375 |
| 376 protected: | 376 protected: |
| 377 Document *m_d; | 377 Document *m_d; |
| 378 View *m_view; // I don't own this | 378 View *m_view; // I don't own this |
| 379 Layer *m_layer; // Document owns this, but I determine its lifespan | 379 Layer *m_layer; // Document owns this, but I determine its lifespan |
| 380 bool m_wasDormant; | |
| 380 QString m_name; | 381 QString m_name; |
| 381 bool m_added; | 382 bool m_added; |
| 382 }; | 383 }; |
| 383 | 384 |
| 384 typedef std::map<Layer *, std::set<View *> > LayerViewMap; | 385 typedef std::map<Layer *, std::set<View *> > LayerViewMap; |