Mercurial > hg > svgui
diff layer/LayerFactory.cpp @ 803:5d2966b7c201 tony_integration
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 12:55:10 +0100 |
parents | ddae586bc47b |
children | 1d526ba11a24 |
line wrap: on
line diff
--- a/layer/LayerFactory.cpp Fri May 09 17:15:50 2014 +0100 +++ b/layer/LayerFactory.cpp Tue Jun 17 12:55:10 2014 +0100 @@ -164,7 +164,7 @@ types.insert(Notes); } - // NOTE: GF: types is a set, so order of insertion does not matter + // NOTE: GF: types is a set, so order of insertion does not matter if (dynamic_cast<FlexiNoteModel *>(model)) { types.insert(FlexiNotes); } @@ -316,7 +316,7 @@ if (trySetModel<NoteLayer, NoteModel>(layer, model)) return; - // GF: added FlexiNoteLayer + // GF: added FlexiNoteLayer if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(layer, model)) return;