Merge pull request #6 from Larpon/fix/more-old-style-cast-warnings

WIP: Fix old-style cast warnings

Author: herace

src/gui/TimeLineWidget.cpp

@@ -43,7 +43,7 @@ void TimeLineWidget::setPlayBackActivity(bool aIsActive)
 {
     if (aIsActive)
     {
-        mTimer.setInterval((int)getOneFrameTime());
+        mTimer.setInterval(static_cast<int>(getOneFrameTime()));
         mTimer.start();
         mElapsed.start();
         mBeginFrame = currentFrame();
@@ -140,41 +140,41 @@ void TimeLineWidget::onPlayBackUpdated()
     {
         const double oneFrameTime = getOneFrameTime();
         const core::Frame curFrame = currentFrame();
-        double nextFrame = curFrame.getDecimal() + 1.0;
+        double nextFrame = static_cast<double>(curFrame.getDecimal()) + 1.0;
 
         if (mDoesLoop && nextFrame > mInner->maxFrame())
         {
             nextFrame = 0.0;
             mBeginFrame.set(0);
             mElapsed.restart();
-            mTimer.setInterval((int)oneFrameTime);
+            mTimer.setInterval(static_cast<int>(oneFrameTime));
         }
         else
         {
             if (mLastFrame == curFrame)
             {
                 const int elapsedTime = mElapsed.elapsed();
                 const double elapsedFrame = elapsedTime / oneFrameTime;
-                nextFrame = mBeginFrame.getDecimal() + elapsedFrame;
+                nextFrame = static_cast<double>(mBeginFrame.getDecimal()) + elapsedFrame;
 
-                const double nextUpdateTime = oneFrameTime * ((int)elapsedFrame + 1);
+                const double nextUpdateTime = oneFrameTime * (static_cast<int>(elapsedFrame) + 1);
                 const double intervalTime = nextUpdateTime - elapsedTime;
-                mTimer.setInterval(std::max((int)intervalTime, 1));
+                mTimer.setInterval(std::max(static_cast<int>(intervalTime), 1));
             }
             else
             {
                 mBeginFrame = curFrame;
                 mElapsed.restart();
-                mTimer.setInterval((int)oneFrameTime);
+                mTimer.setInterval(static_cast<int>(oneFrameTime));
             }
         }
 
 #if 0
         setFrame(core::Frame::fromDecimal(nextFrame));
         mLastFrame = core::Frame::fromDecimal(nextFrame);
 #else
-        setFrame(core::Frame((int)nextFrame));
-        mLastFrame = core::Frame((int)nextFrame);
+        setFrame(core::Frame(static_cast<int>(nextFrame)));
+        mLastFrame = core::Frame(static_cast<int>(nextFrame));
 #endif
     }
 }
@@ -230,8 +230,8 @@ void TimeLineWidget::wheelEvent(QWheelEvent* aEvent)
     mInner->updateWheel(aEvent);
 
     const QRect rectNext = mInner->rect();
-    const double scale = (double)rectNext.width() / rectPrev.width();
-    viewTrans.setX(cursor.x() + scale * (viewTrans.x() - cursor.x()));
+    const double scale = static_cast<double>(rectNext.width() / rectPrev.width());
+    viewTrans.setX(static_cast<int>(cursor.x() + scale * (viewTrans.x() - cursor.x())));
     setScrollBarValue(viewTrans);
     updateCamera();
 }