comparison layer/TextLayer.cpp @ 1417:2487521e857b

Merge

 #include <iostream>
 #include <cmath>
 
 TextLayer::TextLayer() :
     SingleColourLayer(),
-    m_model(0),
+    m_model(nullptr),
     m_editing(false),
     m_originalPoint(0, 0.0, tr("Empty Label")),
     m_editingPoint(0, 0.0, tr("Empty Label")),
-    m_editingCommand(0)
+    m_editingCommand(nullptr)
 {
     
 }
 
 void

     } else {
         m_editingCommand->deletePoint(m_editingPoint);
     }
 
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 void
 TextLayer::eraseStart(LayerGeometryProvider *v, QMouseEvent *e)

 
     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;
 }
 

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

     m_editOrigin = e->pos();
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
 }
 

 
         m_editingCommand->setName(newName);
         finish(m_editingCommand);
     }
     
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 bool
 TextLayer::editOpen(LayerGeometryProvider *v, QMouseEvent *e)