From f832283e71d16e035daffef9eef65860c615e16e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 26 Apr 2011 12:39:27 +0000 Subject: [PATCH] Fix compile warnings, based on: http://kdenlive.org/mantis/view.php?id=2077 svn path=/trunk/kdenlive/; revision=5556 --- src/audioscopes/ffttools.cpp | 6 +++--- src/beziercurve/beziersplineeditor.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/audioscopes/ffttools.cpp b/src/audioscopes/ffttools.cpp index 4b34430b..b16106f2 100644 --- a/src/audioscopes/ffttools.cpp +++ b/src/audioscopes/ffttools.cpp @@ -245,7 +245,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in float x; float x_prev = 0; - int xi; + uint xi; uint i; if (((float) (right-left))/targetSize < 2) { for (i = 0; i < targetSize; i++) { @@ -266,7 +266,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in // Use linear interpolation in order to get smoother display - if (xi == 0 || xi == in.size()-1) { + if (xi == 0 || xi == (uint) in.size()-1) { // ... except if we are at the left or right border of the input sigal. // Special case here since we consider previous and future values as well for // the actual interpolation (not possible here). @@ -309,7 +309,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in out[i] = fill; - for (; src < xi && src < in.size(); src++) { + for (; src < xi && src < (uint) in.size(); src++) { if (out[i] < in[src]) { out[i] = in[src]; } diff --git a/src/beziercurve/beziersplineeditor.cpp b/src/beziercurve/beziersplineeditor.cpp index 888fbf3d..67097872 100644 --- a/src/beziercurve/beziersplineeditor.cpp +++ b/src/beziercurve/beziersplineeditor.cpp @@ -444,7 +444,7 @@ void BezierSplineEditor::mouseMoveEvent(QMouseEvent* event) } } -void BezierSplineEditor::mouseDoubleClickEvent(QMouseEvent* event) +void BezierSplineEditor::mouseDoubleClickEvent(QMouseEvent* /*event*/) { if (m_currentPointIndex >= 0) { BPoint p = m_spline.getPoint(m_currentPointIndex); @@ -462,7 +462,7 @@ void BezierSplineEditor::leaveEvent(QEvent* event) int BezierSplineEditor::nearestPointInRange(QPointF p, int wWidth, int wHeight, BezierSplineEditor::point_types* sel) { double nearestDistanceSquared = 1000; - point_types selectedPoint; + point_types selectedPoint = PTypeP; int nearestIndex = -1; int i = 0; -- 2.39.2