Refactoring: Moved RS_GraphicView to GraphicView.

[architektonas] / src / actions / rs_actiondrawspline.cpp

diff --git a/src/actions/rs_actiondrawspline.cpp b/src/actions/rs_actiondrawspline.cpp
index ba4e6811fef276d981bcd1578f5f77a70d53b548..91fa9a1b5ef89b04713ce135ddb97dbc7ee3dbe8 100644 (file)
--- a/src/actions/rs_actiondrawspline.cpp
+++ b/src/actions/rs_actiondrawspline.cpp
@@ -14,12 +14,13 @@
 
 #include "rs_actiondrawspline.h"
 
+#include "rs_commandevent.h"
 #include "commands.h"
 #include "rs_dialogfactory.h"
-#include "rs_graphicview.h"
+#include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDrawSpline::RS_ActionDrawSpline(RS_EntityContainer & container, RS_GraphicView & graphicView):
+RS_ActionDrawSpline::RS_ActionDrawSpline(RS_EntityContainer & container, GraphicView & graphicView):
        RS_PreviewActionInterface("Draw splines", container, graphicView)
 {
        reset();
@@ -104,12 +105,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 +119,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();