Scrubbed out all references to RS2::qtToRsButton(). Gone!

[architektonas] / src / actions / rs_actionzoompan.cpp

diff --git a/src/actions/rs_actionzoompan.cpp b/src/actions/rs_actionzoompan.cpp
index 0795666a671f4f59d09513a133a221f700fa6160..7e788de415e4aa6a140a88906e1aaf9e064e455e 100644 (file)
--- a/src/actions/rs_actionzoompan.cpp
+++ b/src/actions/rs_actionzoompan.cpp
@@ -62,8 +62,8 @@ void RS_ActionZoomPan::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionZoomPan::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::MidButton
-           || RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::MidButton
+           || e->button() == Qt::LeftButton)
        {
                //v1 = snapPoint(e);
                x1 = e->x();
@@ -74,9 +74,9 @@ void RS_ActionZoomPan::mousePressEvent(QMouseEvent * e)
 
 void RS_ActionZoomPan::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::MidButton)
+       else if (e->button() == Qt::MidButton)
                init(-1);
        else
                setStatus(0);