X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgcircle.cpp;h=f332890c3731d12c194d5266634ad0ee1c5e9293;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=72fc3fca5bb0d3e19b1e00754b09a1235a91917a;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas

diff --git a/src/forms/dlgcircle.cpp b/src/forms/dlgcircle.cpp
index 72fc3fc..f332890 100644
--- a/src/forms/dlgcircle.cpp
+++ b/src/forms/dlgcircle.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,9 +16,9 @@
 
 #include "dlgcircle.h"
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgCircle::DlgCircle(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -28,7 +30,7 @@ DlgCircle::~DlgCircle()
 {
 }
 
-void DlgCircle::setCircle(RS_Circle & c)
+void DlgCircle::setCircle(Circle & c)
 {
 	circle = &c;
 	//pen = circle->getPen();
@@ -38,7 +40,7 @@ void DlgCircle::setCircle(RS_Circle & c)
 	if (graphic != NULL)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = circle->getLayer(false);
+	Layer * lay = circle->getLayer(false);
 
 	if (lay != NULL)
 		ui.cbLayer->setLayer(*lay);
@@ -54,9 +56,9 @@ void DlgCircle::setCircle(RS_Circle & c)
 
 void DlgCircle::updateCircle()
 {
-	circle->setCenter(Vector(RS_Math::eval(ui.leCenterX->text()),
-		RS_Math::eval(ui.leCenterY->text())));
-	circle->setRadius(RS_Math::eval(ui.leRadius->text()));
+	circle->setCenter(Vector(Math::eval(ui.leCenterX->text()),
+		Math::eval(ui.leCenterY->text())));
+	circle->setRadius(Math::eval(ui.leRadius->text()));
 	circle->setPen(ui.wPen->getPen());
 	circle->setLayer(ui.cbLayer->currentText());
 	circle->calculateBorders();