X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Frs_actionzoomwindow.cpp;h=1c53bbbb4c308d5d9314637444b79cf0d3db2dd2;hb=be33e866f2121c48db93e06d743c5ae3826c1948;hp=5ef6118ba966f32972152a8139696d6ea98d964c;hpb=ee048ce722e7beb53e702825bb3285cd5cacd8bb;p=architektonas

diff --git a/src/actions/rs_actionzoomwindow.cpp b/src/actions/rs_actionzoomwindow.cpp
index 5ef6118..1c53bbb 100644
--- a/src/actions/rs_actionzoomwindow.cpp
+++ b/src/actions/rs_actionzoomwindow.cpp
@@ -15,7 +15,7 @@
 #include "rs_actionzoomwindow.h"
 
 #include "rs_dialogfactory.h"
-#include "rs_graphicview.h"
+#include "graphicview.h"
 #include "rs_preview.h"
 
 /**
@@ -26,7 +26,7 @@
  *          area will be fit to the viewport.
  */
 RS_ActionZoomWindow::RS_ActionZoomWindow(RS_EntityContainer & container,
-	RS_GraphicView & graphicView, bool keepAspectRatio):
+	GraphicView & graphicView, bool keepAspectRatio):
 	RS_PreviewActionInterface("Zoom Window", container, graphicView)
 {
 	this->keepAspectRatio = keepAspectRatio;
@@ -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);