Merge pull request #327 from Martchus/coding-style

Improve coding style

src/GlView.cpp

@@ -32,7 +32,7 @@
 #include <QOpenGLFunctions_1_1>
 #include <QPaintEngine>
 
-#include <math.h>
+#include <cmath>
 
 #include "QtWindow.h"
 #include "GlView.h"

src/Notation.h

@@ -29,7 +29,7 @@
 #ifndef __NOTATION_H__
 #define __NOTATION_H__
 
-#include <assert.h>
+#include <cassert>
 
 #include "MidiFile.h"
 #include "Queue.h"

src/Rating.cpp

@@ -75,8 +75,7 @@ void CRating::calculateAccuracy()
             {0.00f, 0.015f, -0.02f, CColor(1.0, 0.4, 0.2)}
         };
 
-        size_t i;
-        for (i = 0; i< arraySize(accuracyTable); i++)
+        for (auto i = 0; i< arraySize(accuracyTable); i++)
         {
             if (m_currentAccuracy >= accuracyTable[i].value  || i+1 == arraySize(accuracyTable))
             {
@@ -93,7 +92,7 @@ void CRating::calculateAccuracy()
 
         m_goodAccuracyFlag = false;
 
-        for (i = 0; i< arraySize(accuracyTable); i++)
+        for (auto i = 0; i< arraySize(accuracyTable); i++)
         {
             if (m_currentAccuracy >= accuracyTable[i].value || i+1 == arraySize(accuracyTable))
             {

src/Util.cpp

@@ -250,7 +250,7 @@ void benchMarkInit()
     s_previousTime = 0;
     s_previousFrameTime = 0;
 
-    for (unsigned int i=0; i <  arraySize( s_benchData ); i++)
+    for (int i=0; i <  arraySize( s_benchData ); i++)
         benchMarkReset(&s_benchData[i]);
     benchMarkReset(&s_frameRate);
     s_frameRate.msg = " *** Frame Rate ***";