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

[architektonas] / src / forms / dlgpoint.cpp

diff --git a/src/forms/dlgpoint.cpp b/src/forms/dlgpoint.cpp
index 47626982d79795008e3cabf0fdd4b4e480c7eb23..163e1c58cadb68d22c8ce56f0c24a25eea30ddf2 100644 (file)
--- a/src/forms/dlgpoint.cpp
+++ b/src/forms/dlgpoint.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 "dlgpoint.h"
 
-#include "rs_point.h"
+#include "point.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgPoint::DlgPoint(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
        QDialog(parent, flags)
@@ -28,17 +30,17 @@ DlgPoint::~DlgPoint()
 {
 }
 
-void DlgPoint::setPoint(RS_Point & p)
+void DlgPoint::setPoint(Point & p)
 {
        point = &p;
 
        ui.wPen->setPen(point->getPen(false), true, false, "Pen");
-       Drawing * graphic = point->getGraphic();
+       Drawing * drawing = point->GetDrawing();
 
-       if (graphic)
-               ui.cbLayer->init(*(graphic->getLayerList()), false, false);
+       if (drawing)
+               ui.cbLayer->init(*(drawing->getLayerList()), false, false);
 
-       RS_Layer * lay = point->getLayer(false);
+       Layer * lay = point->getLayer(false);
 
        if (lay)
                ui.cbLayer->setLayer(*lay);
@@ -52,8 +54,8 @@ void DlgPoint::setPoint(RS_Point & p)
 
 void DlgPoint::updatePoint()
 {
-       point->setPos(Vector(RS_Math::eval(ui.lePosX->text()),
-               RS_Math::eval(ui.lePosY->text())));
+       point->setPos(Vector(Math::eval(ui.lePosX->text()),
+               Math::eval(ui.lePosY->text())));
        point->setPen(ui.wPen->getPen());
        point->setLayer(ui.cbLayer->currentText());
 }