X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionselectcontour.cpp;h=66d6a7c19241509a0e6ef8d41439a03dfb3ba430;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=ebedace064b3c26d3ff86cbc0c69e420f2a250c4;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actionselectcontour.cpp b/src/actions/actionselectcontour.cpp
index ebedace..66d6a7c 100644
--- a/src/actions/actionselectcontour.cpp
+++ b/src/actions/actionselectcontour.cpp
@@ -16,10 +16,12 @@
 
 #include "actionselectcontour.h"
 
-#include "rs_dialogfactory.h"
-#include "rs_selection.h"
+#include "debug.h"
+#include "dialogfactory.h"
+#include "graphicview.h"
+#include "selection.h"
 
-ActionSelectContour::ActionSelectContour(RS_EntityContainer & container,
+ActionSelectContour::ActionSelectContour(EntityContainer & container,
 	GraphicView & graphicView):
 	ActionInterface("Select Contours", container, graphicView)
 {
@@ -41,17 +43,17 @@ void ActionSelectContour::trigger()
 	{
 		if (en->isAtomic())
 		{
-			RS_Selection s(*container, graphicView);
+			Selection s(*container, graphicView);
 			s.selectContour(en);
 
-			if (RS_DIALOGFACTORY)
-				RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+			if (DIALOGFACTORY)
+				DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 		}
-		else if (RS_DIALOGFACTORY)
-			RS_DIALOGFACTORY->commandMessage(tr("Entity must be an Atomic Entity."));
+		else if (DIALOGFACTORY)
+			DIALOGFACTORY->commandMessage(tr("Entity must be an Atomic Entity."));
 	}
 	else
-		RS_DEBUG->print("ActionSelectContour::trigger: Entity is NULL\n");
+		DEBUG->print("ActionSelectContour::trigger: Entity is NULL\n");
 }
 
 void ActionSelectContour::mouseReleaseEvent(QMouseEvent * e)