comparison layer/TimeInstantLayer.cpp @ 1417:2487521e857b

Merge

 
 //#define DEBUG_TIME_INSTANT_LAYER 1
 
 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)
 {
 }
 
 TimeInstantLayer::~TimeInstantLayer()

         .arg(RealTime::frame2RealTime(m_editingPoint.frame,
                                       m_model->getSampleRate())
              .toText(false).c_str());
     m_editingCommand->setName(newName);
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 void
 TimeInstantLayer::eraseStart(LayerGeometryProvider *v, QMouseEvent *e)

 
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
 }
 

         (m_model, tr("Erase Point"));
 
     m_editingCommand->deletePoint(m_editingPoint);
 
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 void
 TimeInstantLayer::editStart(LayerGeometryProvider *v, QMouseEvent *e)

 
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
 }
 

                                           m_model->getSampleRate())
                  .toText(false).c_str());
         m_editingCommand->setName(newName);
         finish(m_editingCommand);
     }
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 bool
 TimeInstantLayer::editOpen(LayerGeometryProvider *v, QMouseEvent *e)