X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionzoompan.cpp;fp=src%2Factions%2Frs_actionzoompan.cpp;h=0425f60e014d1fd0502b8b92de783c66c80d96b7;hb=d774c2655ba2c3657a565f325411144452392277;hp=e4ce07afef8e813f1e2ee97c309e933d4f6f5e06;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actionzoompan.cpp b/src/actions/actionzoompan.cpp
similarity index 64%
rename from src/actions/rs_actionzoompan.cpp
rename to src/actions/actionzoompan.cpp
index e4ce07a..0425f60 100644
--- a/src/actions/rs_actionzoompan.cpp
+++ b/src/actions/actionzoompan.cpp
@@ -1,4 +1,4 @@
-// rs_actionzoompan.cpp
+// actionzoompan.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,28 +12,28 @@
 // JLH  06/05/2010  Added this text. :-)
 //
 
-#include "rs_actionzoompan.h"
+#include "actionzoompan.h"
 
 #include "graphicview.h"
 
-RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer & container, GraphicView & graphicView):
-	RS_ActionInterface("Zoom Pan", container, graphicView)
+ActionZoomPan::ActionZoomPan(RS_EntityContainer & container, GraphicView & graphicView):
+	ActionInterface("Zoom Pan", container, graphicView)
 {
 }
 
-RS_ActionZoomPan::~RS_ActionZoomPan()
+ActionZoomPan::~ActionZoomPan()
 {
 }
 
-void RS_ActionZoomPan::init(int status)
+void ActionZoomPan::init(int status)
 {
-	RS_ActionInterface::init(status);
-	snapMode = RS2::SnapFree;
-	snapRes = RS2::RestrictNothing;
+	ActionInterface::init(status);
+/*	snapMode = RS2::SnapFree;
+	snapRes = RS2::RestrictNothing;*/
 	x1 = y1 = x2 = y2 = -1;
 }
 
-void RS_ActionZoomPan::trigger()
+void ActionZoomPan::trigger()
 {
 	if (x1 >= 0)
 	{
@@ -44,7 +44,7 @@ void RS_ActionZoomPan::trigger()
 }
 
 #define SCROLL_DELTA 4
-void RS_ActionZoomPan::mouseMoveEvent(QMouseEvent * e)
+void ActionZoomPan::mouseMoveEvent(QMouseEvent * e)
 {
 	x2 = e->x();
 	y2 = e->y();
@@ -57,7 +57,7 @@ void RS_ActionZoomPan::mouseMoveEvent(QMouseEvent * e)
 		trigger();
 }
 
-void RS_ActionZoomPan::mousePressEvent(QMouseEvent * e)
+void ActionZoomPan::mousePressEvent(QMouseEvent * e)
 {
 	if (e->button() == Qt::MidButton || e->button() == Qt::LeftButton)
 	{
@@ -67,7 +67,7 @@ void RS_ActionZoomPan::mousePressEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionZoomPan::mouseReleaseEvent(QMouseEvent * e)
+void ActionZoomPan::mouseReleaseEvent(QMouseEvent * e)
 {
 	if (e->button() == Qt::RightButton)
 		init(getStatus() - 1);
@@ -75,11 +75,9 @@ void RS_ActionZoomPan::mouseReleaseEvent(QMouseEvent * e)
 		init(-1);
 	else
 		setStatus(0);
-
-	//RS_DEBUG->print("RS_ActionZoomPan::mousePressEvent(): %f %f", v1.x, v1.y);
 }
 
-void RS_ActionZoomPan::updateMouseCursor()
+void ActionZoomPan::updateMouseCursor()
 {
 #ifndef __APPLE__
 	graphicView->setMouseCursor(RS2::SizeAllCursor);