Mercurial > hg > svgui
diff layer/TimeInstantLayer.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/TimeInstantLayer.cpp Wed Jan 09 14:41:52 2019 +0000 +++ b/layer/TimeInstantLayer.cpp Wed Jan 09 15:24:51 2019 +0000 @@ -41,10 +41,10 @@ TimeInstantLayer::TimeInstantLayer() : SingleColourLayer(), - m_model(0), + m_model(nullptr), m_editing(false), m_editingPoint(0, tr("New Point")), - m_editingCommand(0), + m_editingCommand(nullptr), m_plotStyle(PlotInstants) { } @@ -522,7 +522,7 @@ .toText(false).c_str()); m_editingCommand->setName(newName); finish(m_editingCommand); - m_editingCommand = 0; + m_editingCommand = nullptr; m_editing = false; } @@ -538,7 +538,7 @@ if (m_editingCommand) { finish(m_editingCommand); - m_editingCommand = 0; + m_editingCommand = nullptr; } m_editing = true; @@ -566,7 +566,7 @@ m_editingCommand->deletePoint(m_editingPoint); finish(m_editingCommand); - m_editingCommand = 0; + m_editingCommand = nullptr; m_editing = false; } @@ -586,7 +586,7 @@ if (m_editingCommand) { finish(m_editingCommand); - m_editingCommand = 0; + m_editingCommand = nullptr; } m_editing = true; @@ -630,7 +630,7 @@ m_editingCommand->setName(newName); finish(m_editingCommand); } - m_editingCommand = 0; + m_editingCommand = nullptr; m_editing = false; }