diff layer/FlexiNoteLayer.cpp @ 1417:2487521e857b

Merge

--- a/layer/FlexiNoteLayer.cpp	Mon Jan 21 10:08:26 2019 +0000
+++ b/layer/FlexiNoteLayer.cpp	Wed Jan 23 14:44:16 2019 +0000
@@ -62,7 +62,7 @@
     // m_scaleMinimum(0),
     // m_scaleMaximum(0)
 
-    m_model(0),
+    m_model(nullptr),
     m_editing(false),
     m_intelligentActions(true),
     m_dragPointX(0),
@@ -73,7 +73,7 @@
     m_editingPoint(0, 0.0, 0, 1.f, tr("New Point")),
     m_greatestLeftNeighbourFrame(0),
     m_smallestRightNeighbourFrame(0),
-    m_editingCommand(0),
+    m_editingCommand(nullptr),
     m_verticalScale(AutoAlignScale),
     m_editMode(DragNote),
     m_scaleMinimum(34), 
@@ -387,7 +387,7 @@
 RangeMapper *
 FlexiNoteLayer::getNewVerticalZoomRangeMapper() const
 {
-    if (!m_model) return 0;
+    if (!m_model) return nullptr;
     
     RangeMapper *mapper;
 
@@ -396,7 +396,7 @@
     QString unit;
     getValueExtents(min, max, logarithmic, unit);
 
-    if (min == max) return 0;
+    if (min == max) return nullptr;
     
     if (logarithmic) {
         mapper = new LogRangeMapper(0, 100, min, max, unit);
@@ -1017,7 +1017,7 @@
 //    SVDEBUG << "FlexiNoteLayer::drawEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
@@ -1030,7 +1030,7 @@
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
@@ -1057,7 +1057,7 @@
     m_editingCommand->deletePoint(m_editingPoint);
 
     finish(m_editingCommand);
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
@@ -1081,7 +1081,7 @@
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
@@ -1227,7 +1227,7 @@
         finish(m_editingCommand);
     }
 
-    m_editingCommand = 0;
+    m_editingCommand = nullptr;
     m_editing = false;
 }
 
@@ -1246,7 +1246,7 @@
 
     if (m_editingCommand) {
         finish(m_editingCommand);
-        m_editingCommand = 0;
+        m_editingCommand = nullptr;
     }
 
     m_editing = true;
@@ -1276,7 +1276,7 @@
 void
 FlexiNoteLayer::splitNotesAt(LayerGeometryProvider *v, sv_frame_t frame)
 {
-    splitNotesAt(v, frame, 0);
+    splitNotesAt(v, frame, nullptr);
 }
 
 void
@@ -1380,7 +1380,7 @@
         }
     }
     cerr << "FlexiNoteLayer::getAssociatedPitchModel: failed to find a model" << endl;
-    return 0;
+    return nullptr;
 }
 
 void