X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Frs_actiondrawspline.cpp;h=91fa9a1b5ef89b04713ce135ddb97dbc7ee3dbe8;hb=27d4a138d23453e93a833e9347444b828a971cb4;hp=ba4e6811fef276d981bcd1578f5f77a70d53b548;hpb=ee048ce722e7beb53e702825bb3285cd5cacd8bb;p=architektonas

diff --git a/src/actions/rs_actiondrawspline.cpp b/src/actions/rs_actiondrawspline.cpp
index ba4e681..91fa9a1 100644
--- 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();