Replace null pointer constants (e.g. NULL, 0) with nullptr

4 files changed, 24 insertions, 19 deletions

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 91642192f6..9374bf4950 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -543,11 +543,11 @@ bool BpmControl::getBeatContext(const mixxx::BeatsPointer& pBeats,
         return false;
     }
 
-    if (dpPrevBeat != NULL) {
+    if (dpPrevBeat != nullptr) {
         *dpPrevBeat = dPrevBeat;
     }
 
-    if (dpNextBeat != NULL) {
+    if (dpNextBeat != nullptr) {
         *dpNextBeat = dNextBeat;
     }
 
@@ -567,11 +567,11 @@ bool BpmControl::getBeatContextNoLookup(
     }
 
     double dBeatLength = dNextBeat - dPrevBeat;
-    if (dpBeatLength != NULL) {
+    if (dpBeatLength != nullptr) {
         *dpBeatLength = dBeatLength;
     }
 
-    if (dpBeatPercentage != NULL) {
+    if (dpBeatPercentage != nullptr) {
         *dpBeatPercentage = dBeatLength == 0.0 ? 0.0 :
                 (dPosition - dPrevBeat) / dBeatLength;
         // Because findNext and findPrev have an epsilon built in, sometimes
@@ -613,15 +613,20 @@ double BpmControl::getNearestPositionInPhase(
         }
         // This happens if dThisPosition is the target position of a requested
         // seek command
-        if (!getBeatContext(pBeats, dThisPosition,
-                            &dThisPrevBeat, &dThisNextBeat,
-                            &dThisBeatLength, NULL)) {
+        if (!getBeatContext(pBeats,
+                    dThisPosition,
+                    &dThisPrevBeat,
+                    &dThisNextBeat,
+                    &dThisBeatLength,
+                    nullptr)) {
             return dThisPosition;
         }
     } else {
         if (!getBeatContextNoLookup(dThisPosition,
-                                    dThisPrevBeat, dThisNextBeat,
-                                    &dThisBeatLength, NULL)) {
+                    dThisPrevBeat,
+                    dThisNextBeat,
+                    &dThisBeatLength,
+                    nullptr)) {
             return dThisPosition;
         }
     }
@@ -660,9 +665,9 @@ double BpmControl::getNearestPositionInPhase(
 
         if (!BpmControl::getBeatContext(otherBeats,
                     dOtherPosition,
-                    NULL,
-                    NULL,
-                    NULL,
+                    nullptr,
+                    nullptr,
+                    nullptr,
                     &dOtherBeatFraction)) {
             return dThisPosition;
         }
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 00c8bf6f56..fe1eb01982 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -367,14 +367,14 @@ void CueControl::detachCue(HotcueControl* pControl) {
     if (!pCue) {
         return;
     }
-    disconnect(pCue.get(), 0, this, 0);
+    disconnect(pCue.get(), nullptr, this, nullptr);
     pControl->resetCue();
 }
 
 void CueControl::trackLoaded(TrackPointer pNewTrack) {
     QMutexLocker lock(&m_mutex);
     if (m_pLoadedTrack) {
-        disconnect(m_pLoadedTrack.get(), 0, this, 0);
+        disconnect(m_pLoadedTrack.get(), nullptr, this, nullptr);
         for (const auto& pControl : qAsConst(m_hotcueControls)) {
             detachCue(pControl);
         }
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index d0c5af9407..83d0b9d981 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -48,8 +48,8 @@ LoopingControl::LoopingControl(const QString& group,
     m_oldLoopSamples = { kNoTrigger, kNoTrigger, false };
     m_loopSamples.setValue(m_oldLoopSamples);
     m_currentSample.setValue(0.0);
-    m_pActiveBeatLoop = NULL;
-    m_pRateControl = NULL;
+    m_pActiveBeatLoop = nullptr;
+    m_pRateControl = nullptr;
     //Create loop-in, loop-out, loop-exit, and reloop/exit ControlObjects
     m_pLoopInButton = new ControlPushButton(ConfigKey(group, "loop_in"));
     connect(m_pLoopInButton, &ControlObject::valueChanged,
@@ -1088,7 +1088,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
             // If running reverse, move the loop one loop size to the left.
             // Thus, the loops end will be closest to the current position
             bool reverse = false;
-            if (m_pRateControl != NULL) {
+            if (m_pRateControl != nullptr) {
                 reverse = m_pRateControl->isReverseButtonPressed();
             }
             if (reverse) {
diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp
index e32580d30a..404f55eb8b 100644
--- a/src/engine/controls/ratecontrol.cpp
+++ b/src/engine/controls/ratecontrol.cpp
@@ -34,7 +34,7 @@ const double RateControl::kPausedJogMultiplier = 18.0;
 RateControl::RateControl(const QString& group,
         UserSettingsPointer pConfig)
         : EngineControl(group, pConfig),
-          m_pBpmControl(NULL),
+          m_pBpmControl(nullptr),
           m_bTempStarted(false),
           m_tempRateRatio(0.0),
           m_dRateTempRampChange(0.0) {
@@ -465,7 +465,7 @@ double RateControl::calculateSpeed(double baserate, double speed, bool paused,
             // If master sync is on, respond to it -- but vinyl and scratch mode always override.
             if (getSyncMode() == SYNC_FOLLOWER && !paused &&
                     !bVinylControlEnabled && !useScratch2Value) {
-                if (m_pBpmControl == NULL) {
+                if (m_pBpmControl == nullptr) {
                     qDebug() << "ERROR: calculateRate m_pBpmControl is null during master sync";
                     return 1.0;
                 }