comparison layer/RegionLayer.cpp @ 1417:2487521e857b

Merge

 #include <iostream>
 #include <cmath>
 
 RegionLayer::RegionLayer() :
     SingleColourLayer(),
-    m_model(0),
+    m_model(nullptr),
     m_editing(false),
     m_dragPointX(0),
     m_dragPointY(0),
     m_dragStartX(0),
     m_dragStartY(0),
     m_originalPoint(0, 0.0, 0, tr("New Region")),
     m_editingPoint(0, 0.0, 0, tr("New Region")),
-    m_editingCommand(0),
+    m_editingCommand(nullptr),
     m_verticalScale(EqualSpaced),
     m_colourMap(0),
     m_colourInverted(false),
     m_plotStyle(PlotLines)
 {

 void
 RegionLayer::drawEnd(LayerGeometryProvider *, QMouseEvent *)
 {
     if (!m_model || !m_editing) return;
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 
     recalcSpacing();
 }
 

 
     if (!getPointToDrag(v, e->x(), e->y(), m_editingPoint)) return;
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
     recalcSpacing();
 }

         (m_model, tr("Erase Region"));
 
     m_editingCommand->deletePoint(m_editingPoint);
 
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
     recalcSpacing();
 }
 
 void

 
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
     m_dragStartX = e->x();
     m_dragStartY = e->y();

 
         m_editingCommand->setName(newName);
         finish(m_editingCommand);
     }
 
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
     recalcSpacing();
 }
 
 bool