Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actionmodifydeletequick.cpp

diff --git a/src/actions/actionmodifydeletequick.cpp b/src/actions/actionmodifydeletequick.cpp
index eeeddf7e32895482033fb90a0e99eb5273b231ef..2be4009512c22af71c11c0002f978357239a0dbe 100644 (file)
--- a/src/actions/actionmodifydeletequick.cpp
+++ b/src/actions/actionmodifydeletequick.cpp
@@ -16,11 +16,12 @@
 
 #include "actionmodifydeletequick.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
 ActionModifyDeleteQuick::ActionModifyDeleteQuick(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Quick Delete Entities", container, graphicView)
 {
        en = NULL;
@@ -35,17 +36,20 @@ ActionModifyDeleteQuick::~ActionModifyDeleteQuick()
  */
 void ActionModifyDeleteQuick::trigger()
 {
-       RS_DEBUG->print("ActionModifyDeleteQuick::trigger()");
+       DEBUG->print("ActionModifyDeleteQuick::trigger()");
 
-       if (en != NULL)
+       if (en)
        {
-               RS_DEBUG->print("Entity found");
-               RS_EntityContainer * parent = en->getParent();
+               DEBUG->print("Entity found");
+               EntityContainer * parent = en->getParent();
 
-               if (parent != NULL)
+               if (parent)
                {
                        en->setSelected(false);
+#warning "!!! Old rendering path need upgrade !!!"
+#if 0
                        graphicView->deleteEntity(en);
+#endif
                        en->changeUndoState();
 
                        if (document)
@@ -56,10 +60,10 @@ void ActionModifyDeleteQuick::trigger()
                        }
                }
 
-               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
        }
        else
-               RS_DEBUG->print("ActionModifyDeleteQuick::mousePressEvent:"
+               DEBUG->print("ActionModifyDeleteQuick::mousePressEvent:"
                        " Entity is NULL\n");
 }
 
@@ -79,12 +83,12 @@ void ActionModifyDeleteQuick::updateMouseButtonHints()
        switch (getStatus())
        {
        case 0:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Pick entity to delete"),
+               DIALOGFACTORY->updateMouseWidget(tr("Pick entity to delete"),
                        tr("Cancel"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }