X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fprintpreviewoptions.cpp;h=07dbf7ad81c531b6c684814d540659bda6d0019c;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=fa7bbb6e352792a19e565c27d1e76112f0138d48;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/printpreviewoptions.cpp b/src/forms/printpreviewoptions.cpp
index fa7bbb6..07dbf7a 100644
--- a/src/forms/printpreviewoptions.cpp
+++ b/src/forms/printpreviewoptions.cpp
@@ -16,11 +16,11 @@
 
 #include "printpreviewoptions.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "actioninterface.h"
 #include "actionprintpreview.h"
-#include "rs_debug.h"
-#include "rs_math.h"
+#include "debug.h"
+#include "mathextra.h"
 
 //PrintPreviewOptions::PrintPreviewOptions(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
 PrintPreviewOptions::PrintPreviewOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -96,7 +96,7 @@ void PrintPreviewOptions::setAction(ActionInterface * a, bool/*update*/)
 		QString sAngle;
 		QString sFactor;
 		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 {
 			RS_SETTINGS->beginGroup("/PrintPreview");
@@ -111,7 +111,7 @@ void PrintPreviewOptions::setAction(ActionInterface * a, bool/*update*/)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "QG_PrintPreviewOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "QG_PrintPreviewOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -121,8 +121,8 @@ void PrintPreviewOptions::updateData()
 	if (action != NULL)
 	{
 		/*
-		action->setAngle(RS_Math::deg2rad(RS_Math::eval(leAngle->text())));
-		action->setFactor(RS_Math::eval(leFactor->text()));
+		action->setAngle(Math::deg2rad(Math::eval(leAngle->text())));
+		action->setFactor(Math::eval(leFactor->text()));
 		*/
 	}
 }
@@ -173,7 +173,7 @@ void PrintPreviewOptions::scale(const QString & s)
 	else
 	{
 		bool ok = false;
-		double f = RS_Math::eval(s, &ok);
+		double f = Math::eval(s, &ok);
 
 		if (ok)
 			action->setScale(f);