X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionlayerstogglelock.cpp;h=6ea9e2088e810a8abc4b5d953d297ca876f9b2d1;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=3743f786379cc4b601077941ac8408117b812347;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/actions/actionlayerstogglelock.cpp b/src/actions/actionlayerstogglelock.cpp
index 3743f78..6ea9e20 100644
--- a/src/actions/actionlayerstogglelock.cpp
+++ b/src/actions/actionlayerstogglelock.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>
 //
@@ -17,7 +19,7 @@
 #include "graphicview.h"
 #include "drawing.h"
 
-ActionLayersToggleLock::ActionLayersToggleLock(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Toggle Layer Visibility",
+ActionLayersToggleLock::ActionLayersToggleLock(EntityContainer & container, GraphicView & graphicView): ActionInterface("Toggle Layer Visibility",
 		container, graphicView)
 {
 }
@@ -28,30 +30,40 @@ ActionLayersToggleLock::~ActionLayersToggleLock()
 
 void ActionLayersToggleLock::trigger()
 {
-	RS_DEBUG->print("toggle layer");
+	DEBUG->print("toggle layer");
 
-	if (graphic != NULL)
+	if (graphic)
 	{
-		RS_Layer * layer = graphic->getActiveLayer();
+		Layer * layer = graphic->getActiveLayer();
 
-		if (layer != NULL)
+		if (layer)
 		{
 			graphic->toggleLayerLock(layer);
 
 			// deselect entities on locked layer:
 			if (layer->isLocked())
-				for (RS_Entity * e = container->firstEntity(); e != NULL;
-				     e = container->nextEntity())
+			{
+				for(Entity * e=container->firstEntity(); e!=NULL;
+					e=container->nextEntity())
+				{
 					if (e != NULL && e->isVisible() && e->getLayer() == layer)
 					{
-						if (graphicView != NULL)
+#warning "!!! Old rendering path need upgrade !!!"
+#if 0
+						if (graphicView)
 							graphicView->deleteEntity(e);
+#endif
 
 						e->setSelected(false);
 
-						if (graphicView != NULL)
+#warning "!!! Old rendering path need upgrade !!!"
+#if 0
+						if (graphicView)
 							graphicView->drawEntity(e);
+#endif
 					}
+				}
+			}
 		}
 	}