X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionzoomwindow.cpp;h=fab8e1b29cad38f2c87a43dc5fbf35e7288015a6;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=c204847e72a447af500a4db5aa429031f4f041e8;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/actions/actionzoomwindow.cpp b/src/actions/actionzoomwindow.cpp
index c204847..fab8e1b 100644
--- a/src/actions/actionzoomwindow.cpp
+++ b/src/actions/actionzoomwindow.cpp
@@ -16,10 +16,10 @@
 
 #include "actionzoomwindow.h"
 
-#include "rs_debug.h"
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_preview.h"
+#include "preview.h"
 
 /**
  * Default constructor.
@@ -28,7 +28,7 @@
  *          in x and y will stay the same. false Exactly the chosen
  *          area will be fit to the viewport.
  */
-ActionZoomWindow::ActionZoomWindow(RS_EntityContainer & container,
+ActionZoomWindow::ActionZoomWindow(EntityContainer & container,
 	GraphicView & graphicView, bool keepAspectRatio):
 	ActionInterface("Zoom Window", container, graphicView)
 {
@@ -41,7 +41,7 @@ ActionZoomWindow::~ActionZoomWindow()
 
 void ActionZoomWindow::init(int status)
 {
-	RS_DEBUG->print("ActionZoomWindow::init()");
+	DEBUG->print("ActionZoomWindow::init()");
 	ActionInterface::init(status);
 	v1 = v2 = Vector(false);
 /*	snapMode = RS2::SnapFree;
@@ -50,7 +50,7 @@ void ActionZoomWindow::init(int status)
 
 void ActionZoomWindow::trigger()
 {
-	RS_DEBUG->print("ActionZoomWindow::trigger()");
+	DEBUG->print("ActionZoomWindow::trigger()");
 
 	ActionInterface::trigger();
 
@@ -74,14 +74,14 @@ void ActionZoomWindow::mouseMoveEvent(QMouseEvent * e)
 		v2 = snapPoint(e);
 		deletePreview();
 		clearPreview();
-/*		preview->addEntity(new RS_Line(preview,
-				RS_LineData(Vector(v1.x, v1.y), Vector(v2.x, v1.y))));
-		preview->addEntity(new RS_Line(preview,
-				RS_LineData(Vector(v2.x, v1.y), Vector(v2.x, v2.y))));
-		preview->addEntity(new RS_Line(preview,
-				RS_LineData(Vector(v2.x, v2.y), Vector(v1.x, v2.y))));
-		preview->addEntity(new RS_Line(preview,
-				RS_LineData(Vector(v1.x, v2.y), Vector(v1.x, v1.y))));*/
+/*		preview->addEntity(new Line(preview,
+				LineData(Vector(v1.x, v1.y), Vector(v2.x, v1.y))));
+		preview->addEntity(new Line(preview,
+				LineData(Vector(v2.x, v1.y), Vector(v2.x, v2.y))));
+		preview->addEntity(new Line(preview,
+				LineData(Vector(v2.x, v2.y), Vector(v1.x, v2.y))));
+		preview->addEntity(new Line(preview,
+				LineData(Vector(v1.x, v2.y), Vector(v1.x, v1.y))));*/
 		drawPreview();
 	}
 }
@@ -102,12 +102,12 @@ void ActionZoomWindow::mousePressEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionZoomWindow::mousePressEvent(): %f %f", v1.x, v1.y);
+	DEBUG->print("ActionZoomWindow::mousePressEvent(): %f %f", v1.x, v1.y);
 }
 
 void ActionZoomWindow::mouseReleaseEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionZoomWindow::mouseReleaseEvent()");
+	DEBUG->print("ActionZoomWindow::mouseReleaseEvent()");
 
 	if (e->button() == Qt::RightButton)
 	{
@@ -126,20 +126,20 @@ void ActionZoomWindow::mouseReleaseEvent(QMouseEvent * e)
 
 void ActionZoomWindow::updateMouseButtonHints()
 {
-	RS_DEBUG->print("ActionZoomWindow::updateMouseButtonHints()");
+	DEBUG->print("ActionZoomWindow::updateMouseButtonHints()");
 
 	switch (getStatus())
 	{
 	case 0:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first edge"), tr("Cancel"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify first edge"), tr("Cancel"));
 		break;
 
 	case 1:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second edge"), tr("Back"));
+		DIALOGFACTORY->updateMouseWidget(tr("Specify second edge"), tr("Back"));
 		break;
 
 	default:
-		RS_DIALOGFACTORY->updateMouseWidget("", "");
+		DIALOGFACTORY->updateMouseWidget("", "");
 		break;
 	}
 }