X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionselectintersected.cpp;h=fd18464c79c56e9e17d6d6bff09c05643ac9a962;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=122f1f007f727200056758fee74db5ea3a8982e0;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/actions/actionselectintersected.cpp b/src/actions/actionselectintersected.cpp
index 122f1f0..fd18464 100644
--- a/src/actions/actionselectintersected.cpp
+++ b/src/actions/actionselectintersected.cpp
@@ -28,7 +28,7 @@
  * @param select true: select window. false: deselect window
  */
 ActionSelectIntersected::ActionSelectIntersected(
-	RS_EntityContainer & container, GraphicView & graphicView, bool select):
+	EntityContainer & container, GraphicView & graphicView, bool select):
 	ActionInterface("Select Intersected", container, graphicView)
 {
 	this->select = select;
@@ -60,11 +60,11 @@ void ActionSelectIntersected::trigger()
 		if (graphicView->toGuiDX(v1.distanceTo(v2)) > 10)
 		{
 			deleteSnapper();
-			RS_Selection s(*container, graphicView);
+			Selection s(*container, graphicView);
 			s.selectIntersected(v1, v2, select);
 
-			if (RS_DIALOGFACTORY)
-				RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+			if (DIALOGFACTORY)
+				DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 
 			init();
 		}
@@ -78,7 +78,7 @@ void ActionSelectIntersected::mouseMoveEvent(QMouseEvent * e)
 		v2 = snapPoint(e);
 		deletePreview();
 		clearPreview();
-// 		preview->addEntity(new RS_Line(preview, RS_LineData(Vector(v1.x, v1.y), Vector(v2.x, v2.y))));
+// 		preview->addEntity(new Line(preview, LineData(Vector(v1.x, v1.y), Vector(v2.x, v2.y))));
 		drawPreview();
 	}
 }
@@ -99,13 +99,13 @@ void ActionSelectIntersected::mousePressEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("ActionSelectIntersected::mousePressEvent(): %f %f",
+	DEBUG->print("ActionSelectIntersected::mousePressEvent(): %f %f",
 		v1.x, v1.y);
 }
 
 void ActionSelectIntersected::mouseReleaseEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("ActionSelectIntersected::mouseReleaseEvent()");
+	DEBUG->print("ActionSelectIntersected::mouseReleaseEvent()");
 
 	if (e->button() == Qt::RightButton)
 	{
@@ -127,20 +127,20 @@ void ActionSelectIntersected::mouseReleaseEvent(QMouseEvent * e)
 
 void ActionSelectIntersected::updateMouseButtonHints()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		switch (getStatus())
 		{
 		case SetPoint1:
-			RS_DIALOGFACTORY->updateMouseWidget(tr("Choose first point of intersection line"), tr("Cancel"));
+			DIALOGFACTORY->updateMouseWidget(tr("Choose first point of intersection line"), tr("Cancel"));
 			break;
 
 		case SetPoint2:
-			RS_DIALOGFACTORY->updateMouseWidget(tr("Choose second point of intersection line"), tr("Back"));
+			DIALOGFACTORY->updateMouseWidget(tr("Choose second point of intersection line"), tr("Back"));
 			break;
 
 		default:
-			RS_DIALOGFACTORY->updateMouseWidget("", "");
+			DIALOGFACTORY->updateMouseWidget("", "");
 			break;
 		}
 	}
@@ -153,12 +153,12 @@ void ActionSelectIntersected::updateMouseCursor()
 
 void ActionSelectIntersected::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (DIALOGFACTORY != NULL)
 	{
 		if (!isFinished())
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSelect);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarSelect);
 		else
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSelect);
+			DIALOGFACTORY->requestToolBar(RS2::ToolBarSelect);
 	}
 }