# HG changeset patch # User Chris Cannam # Date 1481646228 0 # Node ID 97d0c798c2acf885ef79f2c3ff4aed12b49b13a4 # Parent 6605984fa98f40534b2706555979a16592733850 Fix some compiler problems diff -r 6605984fa98f -r 97d0c798c2ac view/Overview.cpp --- a/view/Overview.cpp Fri Dec 09 18:01:55 2016 +0000 +++ b/view/Overview.cpp Tue Dec 13 16:23:48 2016 +0000 @@ -211,8 +211,6 @@ paint.setClipRegion(e->region()); paint.setRenderHints(QPainter::Antialiasing); - QRect r(rect()); - // We paint a rounded rect for each distinct set of view extents, // and we colour in the inside and outside of the rect that // corresponds to the current view. (One small caveat -- we don't @@ -245,7 +243,6 @@ int x0 = getXForFrame(f0); int x1 = getXForFrame(f1); - if (x1 <= x0) x1 = x0 + 1; std::pair extent(x0, x1); diff -r 6605984fa98f -r 97d0c798c2ac view/Pane.cpp --- a/view/Pane.cpp Fri Dec 09 18:01:55 2016 +0000 +++ b/view/Pane.cpp Tue Dec 13 16:23:48 2016 +0000 @@ -2288,7 +2288,7 @@ } if (e->phase() == Qt::ScrollBegin || - fabs(d) >= 120 || + std::abs(d) >= 120 || (d > 0 && m_pendingWheelAngle < 0) || (d < 0 && m_pendingWheelAngle > 0)) { m_pendingWheelAngle = d;