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

diff --git a/src/actions/rs_actionblockscreate.cpp b/src/actions/rs_actionblockscreate.cpp
index 083f2fe4e4588f25b3beea28b6ab8077e880120f..70f57d0e5b8bb95c16deeef9d9df3e02c8545ce3 100644 (file)
--- a/src/actions/rs_actionblockscreate.cpp
+++ b/src/actions/rs_actionblockscreate.cpp
@@ -117,7 +117,7 @@ void RS_ActionBlocksCreate::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionBlocksCreate::mouseReleaseEvent(QMouseEvent * e)
 {
-//     if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+//     if (e->button() == Qt::LeftButton)
        if (e->button() == Qt::LeftButton)
        {
 //             Vector ce(snapPoint(e));
@@ -125,7 +125,7 @@ void RS_ActionBlocksCreate::mouseReleaseEvent(QMouseEvent * e)
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-//     else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+//     else if (e->button() == Qt::RightButton)
        else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();

diff --git a/src/actions/rs_actiondefault.cpp b/src/actions/rs_actiondefault.cpp
index 9159eee0eb2b27da4ae0ff6f4e385124c8818d55..7ae500b2d8e257c13641b2967a1fbf61268ad5db 100644 (file)
--- a/src/actions/rs_actiondefault.cpp
+++ b/src/actions/rs_actiondefault.cpp
@@ -166,7 +166,7 @@ void RS_ActionDefault::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDefault::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {

diff --git a/src/actions/rs_actiondimangular.cpp b/src/actions/rs_actiondimangular.cpp
index 31bb89e34b42eae7d700eff4fcd0a4ef00cb82b1..9ebb5681c7c64184ce67833838f25fc66674751f 100644 (file)
--- a/src/actions/rs_actiondimangular.cpp
+++ b/src/actions/rs_actiondimangular.cpp
@@ -119,7 +119,7 @@ void RS_ActionDimAngular::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDimAngular::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -187,7 +187,7 @@ void RS_ActionDimAngular::mouseReleaseEvent(QMouseEvent * e)
                break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondimdiametric.cpp b/src/actions/rs_actiondimdiametric.cpp
index 07bfa2b503a1e5fe1b9aac8e9b0bb637f04dec89..ce4757055d41e86f7be761f56fd7062537aa8dea 100644 (file)
--- a/src/actions/rs_actiondimdiametric.cpp
+++ b/src/actions/rs_actiondimdiametric.cpp
@@ -144,7 +144,7 @@ void RS_ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -185,7 +185,7 @@ void RS_ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondimleader.cpp b/src/actions/rs_actiondimleader.cpp
index c1d2aa9ba084c4ba3b5dbb6303e4492dccf66562..8d625d9d894b16bd019d4990202c455d60b87fe2 100644 (file)
--- a/src/actions/rs_actiondimleader.cpp
+++ b/src/actions/rs_actiondimleader.cpp
@@ -121,12 +121,12 @@ void RS_ActionDimLeader::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDimLeader::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                if (getStatus() == SetEndpoint)
                {

diff --git a/src/actions/rs_actiondimlinear.cpp b/src/actions/rs_actiondimlinear.cpp
index db10186569f96ac01a28bef35988ac8967c8772e..efa3be0412b5f6890e877e5b93a4b1c5793d944d 100644 (file)
--- a/src/actions/rs_actiondimlinear.cpp
+++ b/src/actions/rs_actiondimlinear.cpp
@@ -142,12 +142,12 @@ void RS_ActionDimLinear::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDimLinear::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondimradial.cpp b/src/actions/rs_actiondimradial.cpp
index 9d3bebf4981e1f369ebdff35541af774eaf051aa..f9b86412e258e824271c7300d3a47e850c98175d 100644 (file)
--- a/src/actions/rs_actiondimradial.cpp
+++ b/src/actions/rs_actiondimradial.cpp
@@ -139,7 +139,7 @@ void RS_ActionDimRadial::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDimRadial::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -179,7 +179,7 @@ void RS_ActionDimRadial::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawarc.cpp b/src/actions/rs_actiondrawarc.cpp
index c4fded99e432b67f4927e08e04fdc1c121c61aec..671d3cde3d2999b1f28c8b5acce0fb216b4d29f4 100644 (file)
--- a/src/actions/rs_actiondrawarc.cpp
+++ b/src/actions/rs_actiondrawarc.cpp
@@ -156,12 +156,12 @@ void RS_ActionDrawArc::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawArc::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawarc3p.cpp b/src/actions/rs_actiondrawarc3p.cpp
index 6f5d641851b53fbabb65499d4ecb9ec817a36836..bf1c49332be3dd52564a72f7eb72afb2a838970c 100644 (file)
--- a/src/actions/rs_actiondrawarc3p.cpp
+++ b/src/actions/rs_actiondrawarc3p.cpp
@@ -138,12 +138,12 @@ void RS_ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawArc3P::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawarctangential.cpp b/src/actions/rs_actiondrawarctangential.cpp
index 25d52bc3774914a2d9648fd28ac40b1d9129e192..1f639dce1989cc21067ffc02fb8b43f68735da35 100644 (file)
--- a/src/actions/rs_actiondrawarctangential.cpp
+++ b/src/actions/rs_actiondrawarctangential.cpp
@@ -135,7 +135,7 @@ void RS_ActionDrawArcTangential::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawArcTangential::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -176,7 +176,7 @@ void RS_ActionDrawArcTangential::mouseReleaseEvent(QMouseEvent * e)
                break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawcircle.cpp b/src/actions/rs_actiondrawcircle.cpp
index 54baf3107ec6bf1ed316e502dd30934adbb0a174..7b1d50be8c2fab0c995c85c4a280fe9ac43c18c7 100644 (file)
--- a/src/actions/rs_actiondrawcircle.cpp
+++ b/src/actions/rs_actiondrawcircle.cpp
@@ -106,12 +106,12 @@ void RS_ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawCircle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawimage.cpp b/src/actions/rs_actiondrawimage.cpp
index d68e5b517fd86cd4a4566048f8ab97b2d676c057..2ba383db2481ef504262bc95cd54129004007eef 100644 (file)
--- a/src/actions/rs_actiondrawimage.cpp
+++ b/src/actions/rs_actiondrawimage.cpp
@@ -125,13 +125,13 @@ void RS_ActionDrawImage::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawImage::mouseReleaseEvent(QMouseEvent * e)
 {
-//     if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+//     if (e->button() == Qt::LeftButton)
        if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-//     else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+//     else if (e->button() == Qt::RightButton)
        else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawline.cpp b/src/actions/rs_actiondrawline.cpp
index 89a8ea5f4f00993c8ef81d052ade73cc9c1617e7..8a3d4f5d54d074afe2e4f689892d90544130cfa7 100644 (file)
--- a/src/actions/rs_actiondrawline.cpp
+++ b/src/actions/rs_actiondrawline.cpp
@@ -113,12 +113,12 @@ void RS_ActionDrawLine::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLine::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawlineangle.cpp b/src/actions/rs_actiondrawlineangle.cpp
index 188d8c41bbe491786632f0858169b8a7498085a6..cf2540150ce9afd28ebfbb1db8fe7c2e63fe1f3b 100644 (file)
--- a/src/actions/rs_actiondrawlineangle.cpp
+++ b/src/actions/rs_actiondrawlineangle.cpp
@@ -98,7 +98,7 @@ void RS_ActionDrawLineAngle::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineAngle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                if (getStatus() == SetPos)
                {
@@ -106,7 +106,7 @@ void RS_ActionDrawLineAngle::mouseReleaseEvent(QMouseEvent * e)
                        coordinateEvent(&ce);
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawlinebisector.cpp b/src/actions/rs_actiondrawlinebisector.cpp
index c3760951d1c40298032ffa186d9c7e959e8ee907..e06ebf933708518a84b8c971c44e4950de5b2b84 100644 (file)
--- a/src/actions/rs_actiondrawlinebisector.cpp
+++ b/src/actions/rs_actiondrawlinebisector.cpp
@@ -126,7 +126,7 @@ void RS_ActionDrawLineBisector::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineBisector::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawlinepolygon.cpp b/src/actions/rs_actiondrawlinepolygon.cpp
index c32d062fead7ab1416e832f185765b77f3ac06ed..c9761a634cb10b9495d4ed42c78340a81ed717cb 100644 (file)
--- a/src/actions/rs_actiondrawlinepolygon.cpp
+++ b/src/actions/rs_actiondrawlinepolygon.cpp
@@ -85,12 +85,12 @@ void RS_ActionDrawLinePolygon::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLinePolygon::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawlinepolygon2.cpp b/src/actions/rs_actiondrawlinepolygon2.cpp
index feaa99f98f04a164ae39ec5b2d6b1942caddb825..8e260612bbab92ff3a9fd93972d7efe79e921608 100644 (file)
--- a/src/actions/rs_actiondrawlinepolygon2.cpp
+++ b/src/actions/rs_actiondrawlinepolygon2.cpp
@@ -85,12 +85,12 @@ void RS_ActionDrawLinePolygon2::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLinePolygon2::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawlinerectangle.cpp b/src/actions/rs_actiondrawlinerectangle.cpp
index 3dc5b2d6c9e1609c787be785b15d187331c20dd9..455eeeb42c79ecf732871b3269c88551c7700a6d 100644 (file)
--- a/src/actions/rs_actiondrawlinerectangle.cpp
+++ b/src/actions/rs_actiondrawlinerectangle.cpp
@@ -106,12 +106,12 @@ void RS_ActionDrawLineRectangle::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineRectangle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawlinerelangle.cpp b/src/actions/rs_actiondrawlinerelangle.cpp
index 4e69092356a99b7da0761a1ce841831308b2a00d..1ecd4c0639078b27ec6884e4b899a7635919f42a 100644 (file)
--- a/src/actions/rs_actiondrawlinerelangle.cpp
+++ b/src/actions/rs_actiondrawlinerelangle.cpp
@@ -142,7 +142,7 @@ void RS_ActionDrawLineRelAngle::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineRelAngle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -174,7 +174,7 @@ void RS_ActionDrawLineRelAngle::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actiondrawlinetangent1.cpp b/src/actions/rs_actiondrawlinetangent1.cpp
index a39f4dfc1fa6ba8933e2636209b3eb1e0b4ceacd..d6f0770b4d0cc0b62e217be602c73a925e024b99 100644 (file)
--- a/src/actions/rs_actiondrawlinetangent1.cpp
+++ b/src/actions/rs_actiondrawlinetangent1.cpp
@@ -118,7 +118,7 @@ void RS_ActionDrawLineTangent1::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineTangent1::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawlinetangent2.cpp b/src/actions/rs_actiondrawlinetangent2.cpp
index 98027d396d96f16ea35a4efef54ac99a25cf77c1..a284560dc528aff25f20a40a3cb8c7ec2b44ff8f 100644 (file)
--- a/src/actions/rs_actiondrawlinetangent2.cpp
+++ b/src/actions/rs_actiondrawlinetangent2.cpp
@@ -120,7 +120,7 @@ void RS_ActionDrawLineTangent2::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawLineTangent2::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                deletePreview();
                clearPreview();

diff --git a/src/actions/rs_actiondrawpoint.cpp b/src/actions/rs_actiondrawpoint.cpp
index 8ec3a810a5f2f29e8a8fe295564a7671e739581e..0a3d48ddd7685338a26b3815a0c086f81dd8edfc 100644 (file)
--- a/src/actions/rs_actiondrawpoint.cpp
+++ b/src/actions/rs_actiondrawpoint.cpp
@@ -56,12 +56,12 @@ void RS_ActionDrawPoint::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawPoint::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actiondrawspline.cpp b/src/actions/rs_actiondrawspline.cpp
index ba4e6811fef276d981bcd1578f5f77a70d53b548..faa11ebf88e55bd2f800f73c75345cd615fef61c 100644 (file)
--- a/src/actions/rs_actiondrawspline.cpp
+++ b/src/actions/rs_actiondrawspline.cpp
@@ -104,12 +104,10 @@ void RS_ActionDrawSpline::mouseMoveEvent(QMouseEvent * e)
                tmpSpline->update();
                preview->addEntity(tmpSpline);
 
-//             Q3ValueList<Vector> cpts = tmpSpline->getControlPoints();
-//             Q3ValueList<Vector>::iterator it;
                QList<Vector> cpts = tmpSpline->getControlPoints();
                QList<Vector>::iterator it;
 
-               for (it = cpts.begin(); it != cpts.end(); ++it)
+               for(it = cpts.begin(); it != cpts.end(); ++it)
                        preview->addEntity(new RS_Point(preview, RS_PointData(*it)));
 
                drawPreview();
@@ -120,15 +118,16 @@ void RS_ActionDrawSpline::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionDrawSpline::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                if (getStatus() == SetNextPoint)
                        trigger();
+
                deletePreview();
                clearPreview();
                deleteSnapper();

diff --git a/src/actions/rs_actioneditcopy.cpp b/src/actions/rs_actioneditcopy.cpp
index bbb70d6d9bf35e2886951d097a5a42f6f4ca7a22..02f0e2cd74f8f3139cd1a8bb79688f38cb44cf34 100644 (file)
--- a/src/actions/rs_actioneditcopy.cpp
+++ b/src/actions/rs_actioneditcopy.cpp
@@ -59,12 +59,12 @@ void RS_ActionEditCopy::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionEditCopy::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actioneditpaste.cpp b/src/actions/rs_actioneditpaste.cpp
index f4b7aa987d872c2be82b40df4eab1a79ee8ce518..e52a7d171e4ad6707b50f8150377130b52cbfa48 100644 (file)
--- a/src/actions/rs_actioneditpaste.cpp
+++ b/src/actions/rs_actioneditpaste.cpp
@@ -83,12 +83,12 @@ void RS_ActionEditPaste::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionEditPaste::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actioninfoangle.cpp b/src/actions/rs_actioninfoangle.cpp
index c6fa7ddfc8b116816a698e5d4e155d6136e9abea..3dc6cb8b03c39b02f0f0599da93244477866c9db 100644 (file)
--- a/src/actions/rs_actioninfoangle.cpp
+++ b/src/actions/rs_actioninfoangle.cpp
@@ -82,7 +82,7 @@ void RS_ActionInfoAngle::mouseMoveEvent(QMouseEvent * /*e*/)
 
 void RS_ActionInfoAngle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
@@ -115,7 +115,7 @@ void RS_ActionInfoAngle::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actioninfoarea.cpp b/src/actions/rs_actioninfoarea.cpp
index 34e16468e789d469313a396de1e672fb79472c65..ffb506354897d9b0936b89f8cc92720e46c97411 100644 (file)
--- a/src/actions/rs_actioninfoarea.cpp
+++ b/src/actions/rs_actioninfoarea.cpp
@@ -125,12 +125,12 @@ void RS_ActionInfoArea::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionInfoArea::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                //deletePreview();
                //clearPreview();

diff --git a/src/actions/rs_actioninfodist.cpp b/src/actions/rs_actioninfodist.cpp
index 2c3a6ad07fde133705850742ff8f9889d1c8e078..a63ea037d9f3d2da821e360f11a3097755ae5445 100644 (file)
--- a/src/actions/rs_actioninfodist.cpp
+++ b/src/actions/rs_actioninfodist.cpp
@@ -86,12 +86,12 @@ void RS_ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actioninfodist2.cpp b/src/actions/rs_actioninfodist2.cpp
index f051c92b7823f1406fbd894e6187e80eef47a3b2..84859d87f4a2218749a1fd678e65f272236b0453 100644 (file)
--- a/src/actions/rs_actioninfodist2.cpp
+++ b/src/actions/rs_actioninfodist2.cpp
@@ -71,7 +71,7 @@ void RS_ActionInfoDist2::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionInfoDist2::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -92,7 +92,7 @@ void RS_ActionInfoDist2::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actioninfoinside.cpp b/src/actions/rs_actioninfoinside.cpp
index 9417b4dc8f1549c4d6334f277b210437190d35f4..7012a93d3c47e01bcca7f917641ddfc47a287e2d 100644 (file)
--- a/src/actions/rs_actioninfoinside.cpp
+++ b/src/actions/rs_actioninfoinside.cpp
@@ -57,7 +57,7 @@ void RS_ActionInfoInside::mouseMoveEvent(QMouseEvent * /*e*/)
 
 void RS_ActionInfoInside::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actionlibraryinsert.cpp b/src/actions/rs_actionlibraryinsert.cpp
index 4fdab2ff80b04d5a1efdcb2a0574b17af57a7dd6..2447d8f9d89a63aa76e5eda436359ec6b01cb352 100644 (file)
--- a/src/actions/rs_actionlibraryinsert.cpp
+++ b/src/actions/rs_actionlibraryinsert.cpp
@@ -124,12 +124,12 @@ void RS_ActionLibraryInsert::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionLibraryInsert::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actionmodifybevel.cpp b/src/actions/rs_actionmodifybevel.cpp
index 34fce8dea8935b3ef973ef80c0d8ef7d874d1281..652e447356fc8165e81729bb4b00f8467b2ed85b 100644 (file)
--- a/src/actions/rs_actionmodifybevel.cpp
+++ b/src/actions/rs_actionmodifybevel.cpp
@@ -95,7 +95,7 @@ void RS_ActionModifyBevel::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyBevel::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -116,7 +116,7 @@ void RS_ActionModifyBevel::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifycut.cpp b/src/actions/rs_actionmodifycut.cpp
index 54c721469764c25b1a24bd8e2624d9c3458ce9e2..fb59aac1010d6e6d9fd02ce8552a8dc4340a200d 100644 (file)
--- a/src/actions/rs_actionmodifycut.cpp
+++ b/src/actions/rs_actionmodifycut.cpp
@@ -78,7 +78,7 @@ void RS_ActionModifyCut::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -123,7 +123,7 @@ void RS_ActionModifyCut::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
 

diff --git a/src/actions/rs_actionmodifydeletefree.cpp b/src/actions/rs_actionmodifydeletefree.cpp
index e7715ae0e20b9ec896853d5495964aa6db788644..dabac671af6927f1786119e63a1b58b0492d4738 100644 (file)
--- a/src/actions/rs_actionmodifydeletefree.cpp
+++ b/src/actions/rs_actionmodifydeletefree.cpp
@@ -97,7 +97,7 @@ void RS_ActionModifyDeleteFree::trigger()
 
 void RS_ActionModifyDeleteFree::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionmodifydeletequick.cpp b/src/actions/rs_actionmodifydeletequick.cpp
index 89f001bab2ae0e836a05ad86955564731b329054..f8dc8af0e21bb4f1c261eb6cd4006491caa7716e 100644 (file)
--- a/src/actions/rs_actionmodifydeletequick.cpp
+++ b/src/actions/rs_actionmodifydeletequick.cpp
@@ -63,7 +63,7 @@ void RS_ActionModifyDeleteQuick::trigger()
 
 void RS_ActionModifyDeleteQuick::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionmodifyentity.cpp b/src/actions/rs_actionmodifyentity.cpp
index 051304650c43f5206b6ec02810c0c5d9624beed0..63b22998265e4fa73b0110ffe3beb0e01f9a4470 100644 (file)
--- a/src/actions/rs_actionmodifyentity.cpp
+++ b/src/actions/rs_actionmodifyentity.cpp
@@ -66,7 +66,7 @@ void RS_ActionModifyEntity::trigger()
 
 void RS_ActionModifyEntity::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionmodifymirror.cpp b/src/actions/rs_actionmodifymirror.cpp
index fab05b2e65bb4a1bc1629f2a7bb824f0f0cea953..437de4b860e876a81f1e4b2e03d919f85bae6e51 100644 (file)
--- a/src/actions/rs_actionmodifymirror.cpp
+++ b/src/actions/rs_actionmodifymirror.cpp
@@ -86,12 +86,12 @@ void RS_ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyMirror::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifymove.cpp b/src/actions/rs_actionmodifymove.cpp
index c5f43c9472df28c642af2aa2cb12c0e6590e8261..542129829421094633a95ee5b8958c80782628c9 100644 (file)
--- a/src/actions/rs_actionmodifymove.cpp
+++ b/src/actions/rs_actionmodifymove.cpp
@@ -81,12 +81,12 @@ void RS_ActionModifyMove::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyMove::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifymoverotate.cpp b/src/actions/rs_actionmodifymoverotate.cpp
index a241d799863cee6a4d2264bba3777f058c04b83b..2480d927de7654ce38ed4dfcb01dbe61369a9149 100644 (file)
--- a/src/actions/rs_actionmodifymoverotate.cpp
+++ b/src/actions/rs_actionmodifymoverotate.cpp
@@ -89,12 +89,12 @@ void RS_ActionModifyMoveRotate::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyMoveRotate::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifyrotate.cpp b/src/actions/rs_actionmodifyrotate.cpp
index 77c102bf1a44d2f80fe4aecbed8052e553325441..224a07e18a852d62896acf726aa1464b1bf351f4 100644 (file)
--- a/src/actions/rs_actionmodifyrotate.cpp
+++ b/src/actions/rs_actionmodifyrotate.cpp
@@ -65,12 +65,12 @@ void RS_ActionModifyRotate::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyRotate::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifyrotate2.cpp b/src/actions/rs_actionmodifyrotate2.cpp
index b62704542d82c6174d3c61f2827bfcd8e8012df5..41912348253889a32db29858bef45e30bedb924a 100644 (file)
--- a/src/actions/rs_actionmodifyrotate2.cpp
+++ b/src/actions/rs_actionmodifyrotate2.cpp
@@ -83,12 +83,12 @@ void RS_ActionModifyRotate2::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyRotate2::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifyround.cpp b/src/actions/rs_actionmodifyround.cpp
index 67c0503bd50107087a6ed501e1dca6946cc2edd4..8b6eaf389cf1de1a7d9521217544de939fc12993 100644 (file)
--- a/src/actions/rs_actionmodifyround.cpp
+++ b/src/actions/rs_actionmodifyround.cpp
@@ -136,7 +136,7 @@ void RS_ActionModifyRound::mouseReleaseEvent(QMouseEvent * e)
        Vector mouse = graphicView->toGraph(e->x(), e->y());
        RS_Entity * se = catchEntity(e, RS2::ResolveAll);
 
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -163,7 +163,7 @@ void RS_ActionModifyRound::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifyscale.cpp b/src/actions/rs_actionmodifyscale.cpp
index 38e3a5b8c9a4638ff4e467e5aa41a5bddfe72173..5ab6499e47a0d303df161ff5c5c8995f1f121bc3 100644 (file)
--- a/src/actions/rs_actionmodifyscale.cpp
+++ b/src/actions/rs_actionmodifyscale.cpp
@@ -65,7 +65,7 @@ void RS_ActionModifyScale::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyScale::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector mouse = snapPoint(e);
 
@@ -86,7 +86,7 @@ void RS_ActionModifyScale::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifystretch.cpp b/src/actions/rs_actionmodifystretch.cpp
index f71e10778c43519bfccb9ef557dd3224ef661173..7f391f85755fadb215fe067f64218cf97d7d5ec5 100644 (file)
--- a/src/actions/rs_actionmodifystretch.cpp
+++ b/src/actions/rs_actionmodifystretch.cpp
@@ -130,12 +130,12 @@ void RS_ActionModifyStretch::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyStretch::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifytrim.cpp b/src/actions/rs_actionmodifytrim.cpp
index 611d0128fb3125f82b5e0b15aa3d34a377463a94..a73ebfdc6854db89165a03cde1c17e6c4c0fd00c 100644 (file)
--- a/src/actions/rs_actionmodifytrim.cpp
+++ b/src/actions/rs_actionmodifytrim.cpp
@@ -98,7 +98,7 @@ void RS_ActionModifyTrim::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionModifyTrim::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector mouse = graphicView->toGraph(e->x(), e->y());
                RS_Entity * se = catchEntity(e);
@@ -129,7 +129,7 @@ void RS_ActionModifyTrim::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

diff --git a/src/actions/rs_actionmodifytrimamount.cpp b/src/actions/rs_actionmodifytrimamount.cpp
index 65666c82c203f99af5ff0395ef42a0602e69920b..c28031eed655e87f4bcbbbb563f01258d1640e31 100644 (file)
--- a/src/actions/rs_actionmodifytrimamount.cpp
+++ b/src/actions/rs_actionmodifytrimamount.cpp
@@ -65,7 +65,7 @@ void RS_ActionModifyTrimAmount::mouseReleaseEvent(QMouseEvent * e)
        trimCoord = graphicView->toGraph(e->x(), e->y());
        trimEntity = catchEntity(e);
 
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -93,7 +93,7 @@ void RS_ActionModifyTrimAmount::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actionprintpreview.cpp b/src/actions/rs_actionprintpreview.cpp
index e280e57116d2d5ad68b7f9c293b6e33ca1b03da4..b9c6d1f139ee2312ec222cf5c9cfe352e6b3a42d 100644 (file)
--- a/src/actions/rs_actionprintpreview.cpp
+++ b/src/actions/rs_actionprintpreview.cpp
@@ -73,7 +73,7 @@ void RS_ActionPrintPreview::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionPrintPreview::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -99,9 +99,7 @@ void RS_ActionPrintPreview::mouseReleaseEvent(QMouseEvent * e)
        default:
                //deleteSnapper();
                RS_DIALOGFACTORY->requestPreviousMenu();
-#if QT_VERSION >= 0x030000
                e->accept();
-#endif
                break;
        }
 }

diff --git a/src/actions/rs_actionselect.cpp b/src/actions/rs_actionselect.cpp
index 88d73b7ec6cc6e2e4b0e126c09aa9ece73b67a4f..15afb6fbf44b413c7716f292e337febb0b5d07a9 100644 (file)
--- a/src/actions/rs_actionselect.cpp
+++ b/src/actions/rs_actionselect.cpp
@@ -36,7 +36,7 @@ void RS_ActionSelect::init(int status)
 
 void RS_ActionSelect::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
 }
 

diff --git a/src/actions/rs_actionselectcontour.cpp b/src/actions/rs_actionselectcontour.cpp
index 378a905c2ce138d1adab73d59021bb1331c2c42d..9f98a062f5074f8a8ec38768d8f91d6bdafe1f19 100644 (file)
--- a/src/actions/rs_actionselectcontour.cpp
+++ b/src/actions/rs_actionselectcontour.cpp
@@ -56,7 +56,7 @@ void RS_ActionSelectContour::trigger()
 
 void RS_ActionSelectContour::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionselectintersected.cpp b/src/actions/rs_actionselectintersected.cpp
index dc158d5c4cee3596d11023ac9adee1531d050e86..7f73a75ecc6d19bea30ae1691d4bc4ab281df9b8 100644 (file)
--- a/src/actions/rs_actionselectintersected.cpp
+++ b/src/actions/rs_actionselectintersected.cpp
@@ -83,7 +83,7 @@ void RS_ActionSelectIntersected::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionSelectIntersected::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -105,14 +105,14 @@ void RS_ActionSelectIntersected::mouseReleaseEvent(QMouseEvent * e)
 {
        RS_DEBUG->print("RS_ActionSelectIntersected::mouseReleaseEvent()");
 
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                if (getStatus() == SetPoint2)
                        deletePreview();
                deleteSnapper();
                init(getStatus() - 1);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       else if (e->button() == Qt::LeftButton)
                if (getStatus() == SetPoint2)
                {
                        v2 = snapPoint(e);

diff --git a/src/actions/rs_actionselectlayer.cpp b/src/actions/rs_actionselectlayer.cpp
index 933d01206704ddd8855c76fc2b10b4b93ad53d5e..72306ec7fa27c98f0fc2de9634921bcab920a9f6 100644 (file)
--- a/src/actions/rs_actionselectlayer.cpp
+++ b/src/actions/rs_actionselectlayer.cpp
@@ -48,7 +48,7 @@ void RS_ActionSelectLayer::trigger()
 
 void RS_ActionSelectLayer::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionselectsingle.cpp b/src/actions/rs_actionselectsingle.cpp
index 507b11cae4037d8a3e4f0c0040954fb602d29153..33792d3998515dc86dcb1667b8569892a95c9bd5 100644 (file)
--- a/src/actions/rs_actionselectsingle.cpp
+++ b/src/actions/rs_actionselectsingle.cpp
@@ -53,7 +53,7 @@ void RS_ActionSelectSingle::keyPressEvent(QKeyEvent * e)
 
 void RS_ActionSelectSingle::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
                init(getStatus() - 1);
        else
        {

diff --git a/src/actions/rs_actionselectwindow.cpp b/src/actions/rs_actionselectwindow.cpp
index f0da9bfe60dfa1d84daab99fa90033b94f1b9136..44416063bf0e785452e644c554c7c1ff61df8676 100644 (file)
--- a/src/actions/rs_actionselectwindow.cpp
+++ b/src/actions/rs_actionselectwindow.cpp
@@ -94,7 +94,7 @@ void RS_ActionSelectWindow::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionSelectWindow::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -116,7 +116,7 @@ void RS_ActionSelectWindow::mouseReleaseEvent(QMouseEvent * e)
 {
        RS_DEBUG->print("RS_ActionSelectWindow::mouseReleaseEvent()");
 
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                if (getStatus() == SetCorner2)
                {
@@ -124,7 +124,7 @@ void RS_ActionSelectWindow::mouseReleaseEvent(QMouseEvent * e)
                        trigger();
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                if (getStatus() == SetCorner2)
                        deletePreview();

diff --git a/src/actions/rs_actionsetrelativezero.cpp b/src/actions/rs_actionsetrelativezero.cpp
index 14c6ff73adc5b8c1718e75f25587ab635db3d0c9..46d22a48a6f348ee41939cfb0e354df88f5067d4 100644 (file)
--- a/src/actions/rs_actionsetrelativezero.cpp
+++ b/src/actions/rs_actionsetrelativezero.cpp
@@ -52,7 +52,7 @@ void RS_ActionSetRelativeZero::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionSetRelativeZero::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                deleteSnapper();
                init(getStatus() - 1);

diff --git a/src/actions/rs_actionsnapintersectionmanual.cpp b/src/actions/rs_actionsnapintersectionmanual.cpp
index 78330b5addc55dff8d9d67625c55c08f292d5de6..319e7ed1da0f45679ab089653eba54c9011dd62e 100644 (file)
--- a/src/actions/rs_actionsnapintersectionmanual.cpp
+++ b/src/actions/rs_actionsnapintersectionmanual.cpp
@@ -122,7 +122,7 @@ void RS_ActionSnapIntersectionManual::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionSnapIntersectionManual::mouseReleaseEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                Vector mouse = graphicView->toGraph(e->x(), e->y());
                RS_Entity * se = catchEntity(e);
@@ -148,7 +148,7 @@ void RS_ActionSnapIntersectionManual::mouseReleaseEvent(QMouseEvent * e)
                        break;
                }
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       else if (e->button() == Qt::RightButton)
        {
                deletePreview();
                deleteSnapper();

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);

diff --git a/src/actions/rs_actionzoomwindow.cpp b/src/actions/rs_actionzoomwindow.cpp
index 5ef6118ba966f32972152a8139696d6ea98d964c..4f370eb48a14b15f031e2361a4c833a76a879280 100644 (file)
--- a/src/actions/rs_actionzoomwindow.cpp
+++ b/src/actions/rs_actionzoomwindow.cpp
@@ -86,7 +86,7 @@ void RS_ActionZoomWindow::mouseMoveEvent(QMouseEvent * e)
 
 void RS_ActionZoomWindow::mousePressEvent(QMouseEvent * e)
 {
-       if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       if (e->button() == Qt::LeftButton)
        {
                switch (getStatus())
                {
@@ -107,14 +107,14 @@ void RS_ActionZoomWindow::mouseReleaseEvent(QMouseEvent * e)
 {
        RS_DEBUG->print("RS_ActionZoomWindow::mouseReleaseEvent()");
 
-       if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
+       if (e->button() == Qt::RightButton)
        {
                if (getStatus() == 1)
                        deletePreview();
 
                init(getStatus() - 1);
        }
-       else if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
+       else if (e->button() == Qt::LeftButton)
                if (getStatus() == 1)
                {
                        v2 = snapPoint(e);

diff --git a/src/base/rs.h b/src/base/rs.h
index a17cad6c7faae283680d201299ef8300ac833a8f..9ba69d97fe433222d14ad33c4abfd78a9fa8f890 100644 (file)
--- a/src/base/rs.h
+++ b/src/base/rs.h
@@ -586,7 +586,8 @@ Qt::KeyButtonMask   Qt::KeyboardModifierMask
                Keypad          = Qt::KeypadModifier
        };
 
-#if 1
+//get rid of unnecessary shiaut like this:
+#if 0
     /**
      * Wrapper for Qt
      */

diff --git a/src/base/rs_graphicview.cpp b/src/base/rs_graphicview.cpp
index 4dd3e13cc5b14c81a59565d92e404540e0d44288..73500e211f8d16baef514699fc55dfb4c9550519 100644 (file)
--- a/src/base/rs_graphicview.cpp
+++ b/src/base/rs_graphicview.cpp
@@ -565,8 +565,7 @@ void RS_GraphicView::mouseReleaseEvent(QMouseEvent * e)
 
        if (eventHandler != NULL)
        {
-               if (RS2::qtToRsButtonState(e->button()) != RS2::RightButton
-                       || eventHandler->hasAction())
+               if (e->button() != Qt::RightButton || eventHandler->hasAction())
                {
                        eventHandler->mouseReleaseEvent(e);
                        //e->accept();
@@ -574,10 +573,7 @@ void RS_GraphicView::mouseReleaseEvent(QMouseEvent * e)
                else
                {
                        back();
-//#if QT_VERSION>=0x030000
                        e->accept();
-//#endif
-
                }
        }