X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Farcoptions.cpp;h=4811be29eefff6576a1ea449ae33dc5414ffe273;hb=865303923fcb231a171992b75a73364ff469ff8c;hp=0f794e7c3ce0d1272db9f8dcfdc20e75af16ff2a;hpb=3f46c180da0806c9c263e6d87d0f1404632402da;p=architektonas

diff --git a/src/forms/arcoptions.cpp b/src/forms/arcoptions.cpp
index 0f794e7..4811be2 100644
--- a/src/forms/arcoptions.cpp
+++ b/src/forms/arcoptions.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>
 //
@@ -15,21 +17,20 @@
 
 #include "arcoptions.h"
 
-#include "rs_actiondrawarc.h"
-#include "rs_actioninterface.h"
+#include "actiondrawarc.h"
+#include "actioninterface.h"
 #include "settings.h"
 
 ArcOptions::ArcOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-	QWidget(parent, flags)
+	QWidget(parent, flags),
+	rbPos(new QRadioButton(this)),
+	rbNeg(new QRadioButton(this))
 {
 	QHBoxLayout * layout = new QHBoxLayout(this);
 	layout->setContentsMargins(0, 0, 0, 0);
 
-	rbPos = new QRadioButton(this);
-	rbNeg = new QRadioButton(this);
-
-	rbPos->setIcon(QIcon(":/res/qg_dirpos.xpm"));
-	rbNeg->setIcon(QIcon(":/res/qg_dirneg.xpm"));
+	rbPos->setIcon(QIcon(":/res/qg_dirpos"));
+	rbNeg->setIcon(QIcon(":/res/qg_dirneg"));
 
 	layout->addWidget(rbPos);
 	layout->addWidget(rbNeg);
@@ -50,11 +51,11 @@ ArcOptions::~ArcOptions()
 	settings.endGroup();
 }
 
-void ArcOptions::setAction(RS_ActionInterface * a, bool update)
+void ArcOptions::setAction(ActionInterface * a, bool update)
 {
 	if (a != NULL && a->rtti() == RS2::ActionDrawArc)
 	{
-		action = (RS_ActionDrawArc *)a;
+		action = (ActionDrawArc *)a;
 
 		bool reversed;