X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgline.cpp;h=0374cb3e18d4eff1b0eb87d0e6afa9ba7ef7106f;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=d6a94d5c5bb026b1c52ff2fb294b3d545b6b6136;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/dlgline.cpp b/src/forms/dlgline.cpp
index d6a94d5..0374cb3 100644
--- a/src/forms/dlgline.cpp
+++ b/src/forms/dlgline.cpp
@@ -16,9 +16,9 @@
 
 #include "dlgline.h"
 
-#include "rs_insert.h"
+#include "insert.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgLine::DlgLine(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -30,7 +30,7 @@ DlgLine::~DlgLine()
 {
 }
 
-void DlgLine::setLine(RS_Line & l)
+void DlgLine::setLine(Line & l)
 {
 	line = &l;
 	//pen = line->getPen();
@@ -40,7 +40,7 @@ void DlgLine::setLine(RS_Line & l)
 	if (graphic)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = line->getLayer(false);
+	Layer * lay = line->getLayer(false);
 
 	if (lay)
 		ui.cbLayer->setLayer(*lay);
@@ -58,10 +58,10 @@ void DlgLine::setLine(RS_Line & l)
 
 void DlgLine::updateLine()
 {
-	line->setStartpoint(Vector(RS_Math::eval(ui.leStartX->text()),
-		RS_Math::eval(ui.leStartY->text())));
-	line->setEndpoint(Vector(RS_Math::eval(ui.leEndX->text()),
-		RS_Math::eval(ui.leEndY->text())));
+	line->setStartpoint(Vector(Math::eval(ui.leStartX->text()),
+		Math::eval(ui.leStartY->text())));
+	line->setEndpoint(Vector(Math::eval(ui.leEndX->text()),
+		Math::eval(ui.leEndY->text())));
 	line->setPen(ui.wPen->getPen());
 	line->setLayer(ui.cbLayer->currentText());
 }