comparison layer/SpectrumLayer.cpp @ 1417:2487521e857b

Merge

 #include <QPainter>
 #include <QTextStream>
 
 
 SpectrumLayer::SpectrumLayer() :
-    m_originModel(0),
+    m_originModel(nullptr),
     m_channel(-1),
     m_channelSet(false),
     m_windowSize(4096),
     m_windowType(HanningWindow),
     m_windowHopLevel(3),

 SpectrumLayer::~SpectrumLayer()
 {
     Model *m = const_cast<Model *>
         (static_cast<const Model *>(m_sliceableModel));
     if (m) m->aboutToDelete();
-    m_sliceableModel = 0;
+    m_sliceableModel = nullptr;
     delete m;
 }
 
 void
 SpectrumLayer::setModel(DenseTimeValueModel *model)

 
     if (m_sliceableModel) {
         Model *m = const_cast<Model *>
             (static_cast<const Model *>(m_sliceableModel));
         m->aboutToDelete();
-        setSliceableModel(0);
+        setSliceableModel(nullptr);
         delete m;
     }
 
     m_newFFTNeeded = true;
 

 {
     if (m_sliceableModel) {
         Model *m = const_cast<Model *>
             (static_cast<const Model *>(m_sliceableModel));
         m->aboutToDelete();
-        setSliceableModel(0);
+        setSliceableModel(nullptr);
         delete m;
     }
 
     if (!m_originModel) {
         return;