X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionlayersedit.cpp;h=21bffbe55a8279901580f3077d84e1e1c5bb3a70;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=773b5efb31c3af4e24aee1f0aa8465fe0a15a612;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/actions/actionlayersedit.cpp b/src/actions/actionlayersedit.cpp
index 773b5ef..21bffbe 100644
--- a/src/actions/actionlayersedit.cpp
+++ b/src/actions/actionlayersedit.cpp
@@ -16,11 +16,11 @@
 
 #include "actionlayersedit.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 #include "drawing.h"
 
-ActionLayersEdit::ActionLayersEdit(RS_EntityContainer & container, GraphicView & graphicView):
+ActionLayersEdit::ActionLayersEdit(EntityContainer & container, GraphicView & graphicView):
 	ActionInterface("Edit Layer", container, graphicView)
 {
 }
@@ -31,22 +31,22 @@ ActionLayersEdit::~ActionLayersEdit()
 
 void ActionLayersEdit::trigger()
 {
-	RS_DEBUG->print("ActionLayersEdit::trigger");
-	RS_Layer * layer = NULL;
+	DEBUG->print("ActionLayersEdit::trigger");
+	Layer * layer = NULL;
 
 	if (graphic)
 	{
-		layer = RS_DIALOGFACTORY->requestEditLayerDialog(graphic->getLayerList());
+		layer = DIALOGFACTORY->requestEditLayerDialog(graphic->getLayerList());
 
 		if (layer)
 		{
 			graphic->editLayer(graphic->getActiveLayer(), *layer);
 
-			// update updateable entities on the layer that has changed
-			for(RS_Entity * e=graphic->firstEntity(RS2::ResolveNone);
+			// Update updatable entities on the layer that has changed
+			for(Entity * e=graphic->firstEntity(RS2::ResolveNone);
 				e!=NULL; e=graphic->nextEntity(RS2::ResolveNone))
 			{
-				RS_Layer * l = e->getLayer();
+				Layer * l = e->getLayer();
 
 				if (l && l->getName() == layer->getName())
 					e->update();