X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flibraryinsertoptions.cpp;h=febdf230e6b1afd950a08af80642082cdaee296d;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=e19a7d9e390114aad12540394ba420cc2f2729af;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas

diff --git a/src/forms/libraryinsertoptions.cpp b/src/forms/libraryinsertoptions.cpp
index e19a7d9..febdf23 100644
--- a/src/forms/libraryinsertoptions.cpp
+++ b/src/forms/libraryinsertoptions.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 <jlhamm@acm.org>
 //
@@ -14,7 +16,7 @@
 
 #include "libraryinsertoptions.h"
 
-#include "rs_actionlibraryinsert.h"
+#include "actionlibraryinsert.h"
 #include "settings.h"
 
 LibraryInsertOptions::LibraryInsertOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -52,18 +54,18 @@ LibraryInsertOptions::~LibraryInsertOptions()
 	settings.endGroup();
 }
 
-void LibraryInsertOptions::setAction(RS_ActionInterface * a, bool update)
+void LibraryInsertOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionLibraryInsert)
 	{
-		action = (RS_ActionLibraryInsert *)a;
+		action = (ActionLibraryInsert *)a;
 
 		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
@@ -79,7 +81,7 @@ void LibraryInsertOptions::setAction(RS_ActionInterface * a, bool update)
 	}
 	else
 	{
-		RS_DEBUG->print(RS_Debug::D_ERROR, "LibraryInsertOptions::setAction: wrong action type");
+		DEBUG->print(Debug::D_ERROR, "LibraryInsertOptions::setAction: wrong action type");
 		action = NULL;
 	}
 }
@@ -88,8 +90,8 @@ void LibraryInsertOptions::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()));
 	}
 }