X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgdimlinear.cpp;h=ba92dec8a0e669e61b3090f05d1d874aa0360c1c;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=c7829463dadefe90025b180da9834a228d804352;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/dlgdimlinear.cpp b/src/forms/dlgdimlinear.cpp
index c782946..ba92dec 100644
--- a/src/forms/dlgdimlinear.cpp
+++ b/src/forms/dlgdimlinear.cpp
@@ -16,9 +16,9 @@
 
 #include "dlgdimlinear.h"
 
-#include "rs_dimlinear.h"
+#include "dimlinear.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgDimLinear::DlgDimLinear(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -30,7 +30,7 @@ DlgDimLinear::~DlgDimLinear()
 {
 }
 
-void DlgDimLinear::setDim(RS_DimLinear & d)
+void DlgDimLinear::setDim(DimLinear & d)
 {
 	dim = &d;
 	ui.wPen->setPen(dim->getPen(false), true, false, "Pen");
@@ -39,17 +39,17 @@ void DlgDimLinear::setDim(RS_DimLinear & d)
 	if (graphic)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = dim->getLayer(false);
+	Layer * lay = dim->getLayer(false);
 
 	if (lay)
 		ui.cbLayer->setLayer(*lay);
 
 	ui.wLabel->setLabel(dim->getLabel(false));
-	ui.leAngle->setText(QString("%1").arg(RS_Math::rad2deg(dim->getAngle())));
+	ui.leAngle->setText(QString("%1").arg(Math::rad2deg(dim->getAngle())));
 }
 
 void DlgDimLinear::updateDim()
 {
 	dim->setLabel(ui.wLabel->getLabel());
-	dim->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text(), 0.0)));
+	dim->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text(), 0.0)));
 }