X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondimension.cpp;h=86bae2c2baad9809bbf4edf71eacb666ca909d00;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=b5b9fb809fa23af9e88c8f27a5d1e132967f201e;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actiondimension.cpp b/src/actions/actiondimension.cpp
index b5b9fb8..86bae2c 100644
--- a/src/actions/actiondimension.cpp
+++ b/src/actions/actiondimension.cpp
@@ -16,10 +16,10 @@
 
 #include "actiondimension.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
-ActionDimension::ActionDimension(const char * name, RS_EntityContainer & container, GraphicView & graphicView):
+ActionDimension::ActionDimension(const char * name, EntityContainer & container, GraphicView & graphicView):
 	ActionInterface(name, container, graphicView)
 {
 	reset();
@@ -31,7 +31,7 @@ ActionDimension::~ActionDimension()
 
 void ActionDimension::reset()
 {
-	data = RS_DimensionData(Vector(false), Vector(false), RS2::VAlignMiddle,
+	data = DimensionData(Vector(false), Vector(false), RS2::VAlignMiddle,
 		RS2::HAlignCenter, RS2::Exact, 1.0, "", "Standard", 0.0);
 	diameter = false;
 }
@@ -45,16 +45,16 @@ void ActionDimension::hideOptions()
 {
 	ActionInterface::hideOptions();
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestOptions(this, false);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDimension::showOptions()
 {
 	ActionInterface::showOptions();
 
-	if (RS_DIALOGFACTORY)
-		RS_DIALOGFACTORY->requestOptions(this, true, true);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimension::updateMouseCursor()
@@ -64,13 +64,13 @@ void ActionDimension::updateMouseCursor()
 
 void ActionDimension::updateToolBar()
 {
-	if (!RS_DIALOGFACTORY)
+	if (!DIALOGFACTORY)
 		return;
 
 	if (!isFinished())
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 	else
-		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
 }
 
 QString ActionDimension::getText()