]> Shamusworld >> Repos - architektonas/blobdiff - src/forms/dlgline.cpp
Bugfixes related to removing Snapper class.
[architektonas] / src / forms / dlgline.cpp
index 86075384cc9a3b98242afefecf4dc5bb0571d6d4..0374cb3e18d4eff1b0eb87d0e6afa9ba7ef7106f 100644 (file)
@@ -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 "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)
@@ -28,7 +30,7 @@ DlgLine::~DlgLine()
 {
 }
 
-void DlgLine::setLine(RS_Line & l)
+void DlgLine::setLine(Line & l)
 {
        line = &l;
        //pen = line->getPen();
@@ -38,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);
@@ -56,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());
 }