X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgrotate2.cpp;h=edae463d64a1356b8bc278715701b7ea3c4740e3;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=824b7a7f5bcda762e497fb8fd6735f6cd1c26992;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas diff --git a/src/forms/dlgrotate2.cpp b/src/forms/dlgrotate2.cpp index 824b7a7..edae463 100644 --- a/src/forms/dlgrotate2.cpp +++ b/src/forms/dlgrotate2.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 // @@ -14,7 +16,7 @@ #include "dlgrotate2.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgRotate2::DlgRotate2(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): @@ -76,12 +78,12 @@ DlgRotate2::~DlgRotate2() settings.endGroup(); } -void DlgRotate2::setData(RS_Rotate2Data * d) +void DlgRotate2::setData(Rotate2Data * d) { data = d; - //leAngle1->setText(QString("%1").arg(RS_Math::rad2deg(data->angle1))); - //leAngle2->setText(QString("%1").arg(RS_Math::rad2deg(data->angle2))); + //leAngle1->setText(QString("%1").arg(Math::rad2deg(data->angle1))); + //leAngle2->setText(QString("%1").arg(Math::rad2deg(data->angle2))); } void DlgRotate2::updateData() @@ -93,8 +95,8 @@ void DlgRotate2::updateData() else data->number = ui.leNumber->text().toInt(); - data->angle1 = RS_Math::deg2rad(RS_Math::eval(ui.leAngle1->text())); - data->angle2 = RS_Math::deg2rad(RS_Math::eval(ui.leAngle2->text())); + data->angle1 = Math::deg2rad(Math::eval(ui.leAngle1->text())); + data->angle2 = Math::deg2rad(Math::eval(ui.leAngle2->text())); data->useCurrentAttributes = ui.cbCurrentAttributes->isChecked(); data->useCurrentLayer = ui.cbCurrentLayer->isChecked(); }