X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlginsert.cpp;h=be029bf687057268022e2a96aaf840f0ec5d1bef;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=a9b82448911027e7d29b7c6e8df1553d9456f065;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/forms/dlginsert.cpp b/src/forms/dlginsert.cpp
index a9b8244..be029bf 100644
--- a/src/forms/dlginsert.cpp
+++ b/src/forms/dlginsert.cpp
@@ -30,7 +30,7 @@ DlgInsert::~DlgInsert()
 {
 }
 
-void DlgInsert::setInsert(RS_Insert & i)
+void DlgInsert::setInsert(Insert & i)
 {
 	insert = &i;
 	//pen = insert->getPen();
@@ -40,7 +40,7 @@ void DlgInsert::setInsert(RS_Insert & i)
 	if (graphic)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = insert->getLayer(false);
+	Layer * lay = insert->getLayer(false);
 
 	if (lay)
 		ui.cbLayer->setLayer(*lay);
@@ -52,7 +52,7 @@ void DlgInsert::setInsert(RS_Insert & i)
 	ui.leInsertionPointY->setText(s);
 	s.setNum(insert->getScale().x);
 	ui.leScale->setText(s);
-	s.setNum(RS_Math::rad2deg(insert->getAngle()));
+	s.setNum(Math::rad2deg(insert->getAngle()));
 	ui.leAngle->setText(s);
 	s.setNum(insert->getRows());
 	ui.leRows->setText(s);
@@ -66,15 +66,15 @@ void DlgInsert::setInsert(RS_Insert & i)
 
 void DlgInsert::updateInsert()
 {
-	insert->setInsertionPoint(Vector(RS_Math::eval(ui.leInsertionPointX->text()),
-		RS_Math::eval(ui.leInsertionPointY->text())));
-	insert->setScale(Vector(RS_Math::eval(ui.leScale->text()),
-		RS_Math::eval(ui.leScale->text())));
-	insert->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text())));
-	insert->setRows(RS_Math::round(RS_Math::eval(ui.leRows->text())));
-	insert->setCols(RS_Math::round(RS_Math::eval(ui.leCols->text())));
-	insert->setSpacing(Vector(RS_Math::eval(ui.leRowSpacing->text()),
-		RS_Math::eval(ui.leColSpacing->text())));
+	insert->setInsertionPoint(Vector(Math::eval(ui.leInsertionPointX->text()),
+		Math::eval(ui.leInsertionPointY->text())));
+	insert->setScale(Vector(Math::eval(ui.leScale->text()),
+		Math::eval(ui.leScale->text())));
+	insert->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text())));
+	insert->setRows(Math::round(Math::eval(ui.leRows->text())));
+	insert->setCols(Math::round(Math::eval(ui.leCols->text())));
+	insert->setSpacing(Vector(Math::eval(ui.leRowSpacing->text()),
+		Math::eval(ui.leColSpacing->text())));
 	insert->setPen(ui.wPen->getPen());
 	insert->setLayer(ui.cbLayer->currentText());
 }