use qAbs() instead of abs()

svn path=/branches/KDE4/; revision=2177

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index d3ce230dc2e009d9be6c4e2424585d1584f82156..1b512cb3e1b13d1dab4959fc6dd48b1d22c34cc2 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -388,12 +388,12 @@ void ClipItem::paint(QPainter *painter,
 
 
 OPERATIONTYPE ClipItem::operationMode(QPointF pos, double scale) {
-    if (abs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && abs((int)(pos.y() - rect().y())) < 6) return FADEIN;
-    else if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
-    else if (abs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && abs((int)(pos.y() - rect().y())) < 6) return FADEOUT;
-    else if (abs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
-    else if (abs((int)(pos.x() - (rect().x() + 10))) < 6 && abs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONSTART;
-    else if (abs((int)(pos.x() - (rect().x() + rect().width() - 20))) < 6 && abs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONEND;
+    if (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEIN;
+    else if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+    else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEOUT;
+    else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
+    else if (qAbs((int)(pos.x() - (rect().x() + 10))) < 6 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONSTART;
+    else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - 20))) < 6 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONEND;
 
     return MOVE;
 }

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 674efaba9f24b1ef7c2683b8110b028968921bd9..2ac7ac2b9a604f0ecd1d9b6501f0858c6174fd58 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -93,9 +93,9 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) {
     int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE);
     m_moveCursor = RULER_CURSOR;
     if (event->y() > 10) {
-        if (abs(pos - m_zoneStart) < 4) m_moveCursor = RULER_START;
-        else if (abs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2)) < 4) m_moveCursor = RULER_MIDDLE;
-        else if (abs(pos - m_zoneEnd) < 4) m_moveCursor = RULER_END;
+        if (qAbs(pos - m_zoneStart) < 4) m_moveCursor = RULER_START;
+        else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2)) < 4) m_moveCursor = RULER_MIDDLE;
+        else if (qAbs(pos - m_zoneEnd) < 4) m_moveCursor = RULER_END;
     }
     if (m_moveCursor == RULER_CURSOR)
         m_view->setCursorPos(pos);

diff --git a/src/transition.cpp b/src/transition.cpp
index 3fedee13283e2f4fff3541fb5a329b39faabefba..d776e721a76fac360b815cb3b018ab4d789065b6 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -147,8 +147,8 @@ int Transition::type() const {
 }
 
 OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) {
-    if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
-    else if (abs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
+    if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+    else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
     return MOVE;
 }