Phase two of adding polyline functionality...

[architektonas] / src / actions / actionlayersadd.cpp

diff --git a/src/actions/actionlayersadd.cpp b/src/actions/actionlayersadd.cpp
index ba484c5b8d93be108cad5cb582569c4744aef381..ba156aedceaa8290893cc48cbd70857ffded7d68 100644 (file)
--- a/src/actions/actionlayersadd.cpp
+++ b/src/actions/actionlayersadd.cpp
@@ -16,10 +16,10 @@
 
 #include "actionlayersadd.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 
-ActionLayersAdd::ActionLayersAdd(RS_EntityContainer & container, GraphicView & graphicView):
+ActionLayersAdd::ActionLayersAdd(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Add Layer", container, graphicView)
 {
 }
@@ -30,13 +30,13 @@ ActionLayersAdd::~ActionLayersAdd()
 
 void ActionLayersAdd::trigger()
 {
-       RS_DEBUG->print("add layer");
+       DEBUG->print("add layer");
 
-       if (RS_DIALOGFACTORY != NULL && graphic)
+       if (DIALOGFACTORY && graphic)
        {
-               RS_Layer * layer = RS_DIALOGFACTORY->requestNewLayerDialog(graphic->getLayerList());
+               Layer * layer = DIALOGFACTORY->requestNewLayerDialog(graphic->getLayerList());
 
-               if (layer != NULL)
+               if (layer)
                        graphic->addLayer(layer);
        }