X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Frs_actionsnapintersectionmanual.cpp;h=d10c83096a918ae91f62961c81b283d8447433ee;hb=f7188d32d0beaef31fc3475be05daea2f018ebec;hp=78330b5addc55dff8d9d67625c55c08f292d5de6;hpb=ee048ce722e7beb53e702825bb3285cd5cacd8bb;p=architektonas

diff --git a/src/actions/rs_actionsnapintersectionmanual.cpp b/src/actions/rs_actionsnapintersectionmanual.cpp
index 78330b5..d10c830 100644
--- a/src/actions/rs_actionsnapintersectionmanual.cpp
+++ b/src/actions/rs_actionsnapintersectionmanual.cpp
@@ -15,7 +15,7 @@
 #include "rs_actionsnapintersectionmanual.h"
 
 #include "rs_dialogfactory.h"
-#include "rs_graphicview.h"
+#include "graphicview.h"
 #include "rs_information.h"
 #include "rs_preview.h"
 
@@ -23,7 +23,7 @@
  * @param both Trim both entities.
  */
 RS_ActionSnapIntersectionManual::RS_ActionSnapIntersectionManual(
-	RS_EntityContainer & container, RS_GraphicView & graphicView):
+	RS_EntityContainer & container, GraphicView & graphicView):
 	RS_PreviewActionInterface("Trim Entity", container, graphicView)
 {
 	entity2 = NULL;
@@ -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();