Mercurial > hg > svgui
diff layer/LayerFactory.cpp @ 1414:fa986b91d77f
Merge from branch fix-static-analysis
author | Chris Cannam |
---|---|
date | Wed, 09 Jan 2019 15:24:51 +0000 |
parents | c8a6fd3f9dff |
children | 62e908518c71 |
line wrap: on
line diff
--- a/layer/LayerFactory.cpp Wed Jan 09 14:41:52 2019 +0000 +++ b/layer/LayerFactory.cpp Wed Jan 09 15:24:51 2019 +0000 @@ -371,7 +371,7 @@ } else if (layerType == Image) { return new ImageModel(baseModel->getSampleRate(), 1, true); } else { - return 0; + return nullptr; } } @@ -407,7 +407,7 @@ Layer * LayerFactory::createLayer(LayerType type) { - Layer *layer = 0; + Layer *layer = nullptr; switch (type) {