Add missing braces around single-line statements

11 files changed, 46 insertions, 25 deletions

diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
index 0ad618c0bd..0563a5a73f 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
@@ -160,10 +160,11 @@ void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev
             glRotatef(90.0f, 0.0f, 0.0f, 1.0f);
             glScalef(-1.0f, 1.0f, 1.0f);
         }
-        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignRight)
+        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignRight) {
             glOrtho(firstVisualIndex, lastVisualIndex, 0.0, 255.0, -10.0, 10.0);
-        else
+        } else {
             glOrtho(firstVisualIndex, lastVisualIndex, 255.0, 0.0, -10.0, 10.0);
+        }
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
index 041353ff7c..55f6fe7ef1 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
@@ -129,10 +129,11 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even
             glRotatef(90.0f, 0.0f, 0.0f, 1.0f);
             glScalef(-1.0f, 1.0f, 1.0f);
         }
-        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignRight)
+        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignRight) {
             glOrtho(firstVisualIndex, lastVisualIndex, 0.0, 255.0, -10.0, 10.0);
-        else
+        } else {
             glOrtho(firstVisualIndex, lastVisualIndex, 255.0, 0.0, -10.0, 10.0);
+        }
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
diff --git a/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
index 2552db3979..b87c2a76f3 100644
--- a/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
@@ -145,8 +145,9 @@ int QtWaveformRendererFilteredSignal::buildPolygon() {
     //NOTE(vrince) Please help me find a better name for "channelSeparation"
     //this variable stand for merged channel ... 1 = merged & 2 = separated
     int channelSeparation = 2;
-    if (m_alignment != Qt::AlignCenter)
+    if (m_alignment != Qt::AlignCenter) {
         channelSeparation = 1;
+    }
 
     for (int channel = 0; channel < channelSeparation; ++channel) {
         int startPixel = 0;
@@ -155,8 +156,9 @@ int QtWaveformRendererFilteredSignal::buildPolygon() {
         double direction = 1.0;
 
         // Reverse display for merged bottom/left channel
-        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignLeft)
+        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignLeft) {
             direction = -1.0;
+        }
 
         if (channel == 1) {
             startPixel = m_waveformRenderer->getLength() - 1;
@@ -273,8 +275,9 @@ int QtWaveformRendererFilteredSignal::buildPolygon() {
 
 void QtWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*event*/) {
     const TrackPointer pTrack = m_waveformRenderer->getTrackInfo();
-    if (!pTrack)
+    if (!pTrack) {
         return;
+    }
 
     PainterScope PainterScope(painter);
 
diff --git a/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp b/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
index 0669422b84..7fcd262807 100644
--- a/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
+++ b/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
@@ -105,8 +105,9 @@ void QtWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even
     //NOTE(vrince) Please help me find a better name for "channelSeparation"
     //this variable stand for merged channel ... 1 = merged & 2 = separated
     int channelSeparation = 2;
-    if (m_alignment != Qt::AlignCenter)
+    if (m_alignment != Qt::AlignCenter) {
         channelSeparation = 1;
+    }
 
     for (int channel = 0; channel < channelSeparation; ++channel) {
         int startPixel = 0;
@@ -115,8 +116,9 @@ void QtWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even
         double direction = 1.0;
 
         // Reverse display for merged bottom/left channel
-        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignLeft)
+        if (m_alignment == Qt::AlignBottom || m_alignment == Qt::AlignLeft) {
             direction = -1.0;
+        }
 
         if (channel == 1) {
             startPixel = m_waveformRenderer->getLength() - 1;
diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp
index ae18d45144..e9b3227caf 100644
--- a/src/waveform/renderers/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/waveformrenderbeat.cpp
@@ -27,16 +27,19 @@ void WaveformRenderBeat::setup(const QDomNode& node, const SkinContext& context)
 void WaveformRenderBeat::draw(QPainter* painter, QPaintEvent* /*event*/) {
     TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
 
-    if (!trackInfo)
+    if (!trackInfo) {
         return;
+    }
 
     mixxx::BeatsPointer trackBeats = trackInfo->getBeats();
-    if (!trackBeats)
+    if (!trackBeats) {
         return;
+    }
 
     int alpha = m_waveformRenderer->getBeatGridAlpha();
-    if (alpha == 0)
+    if (alpha == 0) {
         return;
+    }
     m_beatColor.setAlphaF(alpha/100.0);
 
     const int trackSamples = m_waveformRenderer->getTrackSamples();
diff --git a/src/waveform/renderers/waveformrendererhsv.cpp b/src/waveform/renderers/waveformrendererhsv.cpp
index 751754f07f..afbc0fed90 100644
--- a/src/waveform/renderers/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/waveformrendererhsv.cpp
@@ -154,9 +154,9 @@ void WaveformRendererHSV::draw(QPainter* painter,
                 // Normalize low and high (mid not need, because it not change the color)
                 lo = (maxLow[0] + maxLow[1]) / total;
                 hi = (maxHigh[0] + maxHigh[1]) / total;
-            }
-            else
+            } else {
                 lo = hi = 0.0;
+            }
 
             // Set color
             color.setHsvF(h, 1.0-hi, 1.0-lo);
diff --git a/src/waveform/renderers/waveformrenderersignalbase.cpp b/src/waveform/renderers/waveformrenderersignalbase.cpp
index 5373ff5f77..3764b93407 100644
--- a/src/waveform/renderers/waveformrenderersignalbase.cpp
+++ b/src/waveform/renderers/waveformrenderersignalbase.cpp
@@ -54,20 +54,27 @@ WaveformRendererSignalBase::~WaveformRendererSignalBase() {
 }
 
 void WaveformRendererSignalBase::deleteControls() {
-    if (m_pEQEnabled)
+    if (m_pEQEnabled) {
         delete m_pEQEnabled;
-    if (m_pLowFilterControlObject)
+    }
+    if (m_pLowFilterControlObject) {
         delete m_pLowFilterControlObject;
-    if (m_pMidFilterControlObject)
+    }
+    if (m_pMidFilterControlObject) {
         delete m_pMidFilterControlObject;
-    if (m_pHighFilterControlObject)
+    }
+    if (m_pHighFilterControlObject) {
         delete m_pHighFilterControlObject;
-    if (m_pLowKillControlObject)
+    }
+    if (m_pLowKillControlObject) {
         delete m_pLowKillControlObject;
-    if (m_pMidKillControlObject)
+    }
+    if (m_pMidKillControlObject) {
         delete m_pMidKillControlObject;
-    if (m_pHighKillControlObject)
+    }
+    if (m_pHighKillControlObject) {
         delete m_pHighKillControlObject;
+    }
 }
 
 bool WaveformRendererSignalBase::init() {
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 9db05c61db..e277503ceb 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -45,8 +45,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     painter->setWorldMatrixEnabled(false);
 
     for (auto& pMark: m_marks) {
-        if (!pMark->isValid())
+        if (!pMark->isValid()) {
             continue;
+        }
 
         if (pMark->hasVisible() && !pMark->isVisible()) {
             continue;
diff --git a/src/waveform/renderers/waveformrendermarkrange.cpp b/src/waveform/renderers/waveformrendermarkrange.cpp
index bf6b2991cf..a4fe88ad97 100644
--- a/src/waveform/renderers/waveformrendermarkrange.cpp
+++ b/src/waveform/renderers/waveformrendermarkrange.cpp
@@ -66,8 +66,9 @@ void WaveformRenderMarkRange::draw(QPainter *painter, QPaintEvent * /*event*/) {
         double endPosition = m_waveformRenderer->transformSamplePositionInRendererWorld(endSample);
 
         //range not in the current display
-        if (startPosition > m_waveformRenderer->getLength() || endPosition < 0)
+        if (startPosition > m_waveformRenderer->getLength() || endPosition < 0) {
             continue;
+        }
 
         QImage* selectedImage = NULL;
 
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index c8756e0f9a..fcf79d2f48 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -69,8 +69,9 @@ WaveformWidgetRenderer::WaveformWidgetRenderer(const QString& group)
 WaveformWidgetRenderer::~WaveformWidgetRenderer() {
     //qDebug() << "~WaveformWidgetRenderer";
 
-    for (int i = 0; i < m_rendererStack.size(); ++i)
+    for (int i = 0; i < m_rendererStack.size(); ++i) {
         delete m_rendererStack[i];
+    }
 
     delete m_pRateRatioCO;
     delete m_pGainControlObject;
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index 0f16ecece7..e3e3805d26 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -582,8 +582,9 @@ void WaveformWidgetFactory::setDisplayBeatGridAlpha(int alpha) {
 
 void WaveformWidgetFactory::setVisualGain(FilterIndex index, double gain) {
     m_visualGain[index] = gain;
-    if (m_config)
+    if (m_config) {
         m_config->set(ConfigKey("[Waveform]","VisualGain_" + QString::number(index)), QString::number(m_visualGain[index]));
+    }
 }
 
 double WaveformWidgetFactory::getVisualGain(FilterIndex index) const {