X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fimageoptions.cpp;h=be6c6613d7d32077bbbd8bb78261ebbc434203df;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=a47e841e861e798135b737a6c7bb3cf7bba2d12b;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/imageoptions.cpp b/src/forms/imageoptions.cpp
index a47e841..be6c661 100644
--- a/src/forms/imageoptions.cpp
+++ b/src/forms/imageoptions.cpp
@@ -16,10 +16,11 @@
 
 #include "imageoptions.h"
 
-#include "rs.h"
-#include "settings.h"
+#include "enums.h"
 #include "actiondrawimage.h"
 #include "actioninterface.h"
+#include "debug.h"
+#include "settings.h"
 
 ImageOptions::ImageOptions(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QWidget(parent, flags)
@@ -46,7 +47,7 @@ void ImageOptions::setAction(ActionInterface * a, bool update)
 
 		if (update)
 		{
-			sAngle = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+			sAngle = QString("%1").arg(Math::rad2deg(action->getAngle()));
 			sFactor = QString("%1").arg(action->getFactor());
 		}
 		else
@@ -63,7 +64,7 @@ void ImageOptions::setAction(ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "ImageOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "ImageOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -72,7 +73,7 @@ void ImageOptions::updateData()
 {
 	if (action != NULL)
 	{
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text())));
-		action->setFactor(RS_Math::eval(ui.leFactor->text()));
+		action->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text())));
+		action->setFactor(Math::eval(ui.leFactor->text()));
 	}
 }