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

diff --git a/src/actions/actiondimension.cpp b/src/actions/actiondimension.cpp
index d4d3c66..86bae2c 100644
--- a/src/actions/actiondimension.cpp
+++ b/src/actions/actiondimension.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,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();
@@ -29,8 +31,8 @@ ActionDimension::~ActionDimension()
 
 void ActionDimension::reset()
 {
-	data = RS_DimensionData(Vector(false), Vector(false), RS2::VAlignMiddle,
-			RS2::HAlignCenter, RS2::Exact, 1.0, "", "Standard", 0.0);
+	data = DimensionData(Vector(false), Vector(false), RS2::VAlignMiddle,
+		RS2::HAlignCenter, RS2::Exact, 1.0, "", "Standard", 0.0);
 	diameter = false;
 }
 
@@ -43,16 +45,16 @@ void ActionDimension::hideOptions()
 {
 	ActionInterface::hideOptions();
 
-	if (RS_DIALOGFACTORY != NULL)
-		RS_DIALOGFACTORY->requestOptions(this, false);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionDimension::showOptions()
 {
 	ActionInterface::showOptions();
 
-	if (RS_DIALOGFACTORY != NULL)
-		RS_DIALOGFACTORY->requestOptions(this, true, true);
+	if (DIALOGFACTORY)
+		DIALOGFACTORY->requestOptions(this, true, true);
 }
 
 void ActionDimension::updateMouseCursor()
@@ -62,13 +64,13 @@ void ActionDimension::updateMouseCursor()
 
 void ActionDimension::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
-	{
-		if (!isFinished())
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
-		else
-			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
-	}
+	if (!DIALOGFACTORY)
+		return;
+
+	if (!isFinished())
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+	else
+		DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
 }
 
 QString ActionDimension::getText()
@@ -138,9 +140,8 @@ void ActionDimension::setDiameter(bool d)
 /*static*/ bool ActionDimension::isDimensionAction(RS2::ActionType type)
 {
 	return (type == RS2::ActionDimAligned
-	        || type == RS2::ActionDimLinear
-	        || type == RS2::ActionDimAngular
-	        || type == RS2::ActionDimDiametric
-	        || type == RS2::ActionDimRadial);
+		|| type == RS2::ActionDimLinear
+		|| type == RS2::ActionDimAngular
+		|| type == RS2::ActionDimDiametric
+		|| type == RS2::ActionDimRadial);
 }
-