In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / forms / dlgspline.cpp

diff --git a/src/forms/dlgspline.cpp b/src/forms/dlgspline.cpp
index 0437cc43e7b72ee46b3dea93a4c0ba1d4997cf12..e0a852a33a0365cf18856e2f5a42b9b30478dece 100644 (file)
--- a/src/forms/dlgspline.cpp
+++ b/src/forms/dlgspline.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>
 //
@@ -15,7 +17,7 @@
 #include "dlgspline.h"
 
 #include "drawing.h"
-#include "rs_spline.h"
+#include "spline.h"
 
 DlgSpline::DlgSpline(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QDialog(parent, flags)
@@ -27,16 +29,16 @@ DlgSpline::~DlgSpline()
 {
 }
 
-void DlgSpline::setSpline(RS_Spline & e)
+void DlgSpline::setSpline(Spline & e)
 {
        spline = &e;
        //pen = spline->getPen();
        ui.wPen->setPen(spline->getPen(false), true, false, "Pen");
-       Drawing * graphic = spline->getGraphic();
-       RS_Layer * lay = spline->getLayer(false);
+       Drawing * drawing = spline->GetDrawing();
+       Layer * lay = spline->getLayer(false);
 
-       if (graphic)
-               ui.cbLayer->init(*(graphic->getLayerList()), false, false);
+       if (drawing)
+               ui.cbLayer->init(*(drawing->getLayerList()), false, false);
 
        if (lay)
                ui.cbLayer->setLayer(*lay);
@@ -51,7 +53,7 @@ void DlgSpline::setSpline(RS_Spline & e)
 
 void DlgSpline::updateSpline()
 {
-       spline->setDegree(RS_Math::round(RS_Math::eval(ui.cbDegree->currentText())));
+       spline->setDegree(Math::round(Math::eval(ui.cbDegree->currentText())));
        spline->setClosed(ui.cbClosed->isChecked());
        spline->setPen(ui.wPen->getPen());
        spline->setLayer(ui.cbLayer->currentText());