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

[architektonas] / src / forms / dlgarc.cpp

diff --git a/src/forms/dlgarc.cpp b/src/forms/dlgarc.cpp
index b5a194a548a0650b753693ebae8a9333411acde0..f013f516a1c149ab6a18a526c86f242def1754c7 100644 (file)
--- a/src/forms/dlgarc.cpp
+++ b/src/forms/dlgarc.cpp
@@ -30,19 +30,19 @@ DlgArc::~DlgArc()
 {
 }
 
-void DlgArc::setArc(RS_Arc & a)
+void DlgArc::setArc(Arc & a)
 {
        arc = &a;
        //pen = arc->getPen();
        ui.wPen->setPen(arc->getPen(false), true, false, "Pen");
-       Drawing * graphic = arc->getGraphic();
+       Drawing * drawing = arc->GetDrawing();
 
-       if (graphic != NULL)
-               ui.cbLayer->init(*(graphic->getLayerList()), false, false);
+       if (drawing)
+               ui.cbLayer->init(*(drawing->getLayerList()), false, false);
 
-       RS_Layer * lay = arc->getLayer(false);
+       Layer * lay = arc->getLayer(false);
 
-       if (lay != NULL)
+       if (lay)
                ui.cbLayer->setLayer(*lay);
 
        QString s;
@@ -52,20 +52,20 @@ void DlgArc::setArc(RS_Arc & a)
        ui.leCenterY->setText(s);
        s.setNum(arc->getRadius());
        ui.leRadius->setText(s);
-       s.setNum(RS_Math::rad2deg(arc->getAngle1()));
+       s.setNum(Math::rad2deg(arc->getAngle1()));
        ui.leAngle1->setText(s);
-       s.setNum(RS_Math::rad2deg(arc->getAngle2()));
+       s.setNum(Math::rad2deg(arc->getAngle2()));
        ui.leAngle2->setText(s);
        ui.cbReversed->setChecked(arc->isReversed());
 }
 
 void DlgArc::updateArc()
 {
-       arc->setCenter(Vector(RS_Math::eval(ui.leCenterX->text()),
-               RS_Math::eval(ui.leCenterY->text())));
-       arc->setRadius(RS_Math::eval(ui.leRadius->text()));
-       arc->setAngle1(RS_Math::deg2rad(RS_Math::eval(ui.leAngle1->text())));
-       arc->setAngle2(RS_Math::deg2rad(RS_Math::eval(ui.leAngle2->text())));
+       arc->setCenter(Vector(Math::eval(ui.leCenterX->text()),
+               Math::eval(ui.leCenterY->text())));
+       arc->setRadius(Math::eval(ui.leRadius->text()));
+       arc->setAngle1(Math::deg2rad(Math::eval(ui.leAngle1->text())));
+       arc->setAngle2(Math::deg2rad(Math::eval(ui.leAngle2->text())));
        arc->setReversed(ui.cbReversed->isChecked());
        arc->setPen(ui.wPen->getPen());
        arc->setLayer(ui.cbLayer->currentText());