Mercurial > hg > svgui
changeset 1184:97d0c798c2ac 3.0-integration
Fix some compiler problems
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Tue, 13 Dec 2016 16:23:48 +0000 |
| parents | 6605984fa98f |
| children | f32828ea63d9 |
| files | view/Overview.cpp view/Pane.cpp |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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<int, int> extent(x0, x1);
--- 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;