comparison layer/ImageLayer.cpp @ 1417:2487521e857b

Merge

 QMutex
 ImageLayer::m_imageMapMutex;
 
 ImageLayer::ImageLayer() :
     Layer(),
-    m_model(0),
+    m_model(nullptr),
     m_editing(false),
     m_originalPoint(0, "", ""),
     m_editingPoint(0, "", ""),
-    m_editingCommand(0)
+    m_editingCommand(nullptr)
 {
 }
 
 ImageLayer::~ImageLayer()
 {

     } else {
         m_editingCommand->deletePoint(m_editingPoint);
     }
 
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 bool
 ImageLayer::addImage(sv_frame_t frame, QString url)

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

 
     if (m_editingCommand) {
         finish(m_editingCommand);
     }
     
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
 bool
 ImageLayer::editOpen(LayerGeometryProvider *v, QMouseEvent *e)