Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actionmodifydelete.cpp

diff --git a/src/actions/actionmodifydelete.cpp b/src/actions/actionmodifydelete.cpp
index 7c5cc9f9976f229222a4c8bce33db94f334edad9..9e9ee6dc277a90757b2a4d902730c19f576c02e2 100644 (file)
--- a/src/actions/actionmodifydelete.cpp
+++ b/src/actions/actionmodifydelete.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>
 //
@@ -14,11 +16,12 @@
 
 #include "actionmodifydelete.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_modification.h"
+#include "modification.h"
 
-ActionModifyDelete::ActionModifyDelete(RS_EntityContainer & container,
+ActionModifyDelete::ActionModifyDelete(EntityContainer & container,
        GraphicView & graphicView): ActionInterface("Delete Entities",
                container, graphicView)
 {
@@ -36,27 +39,27 @@ void ActionModifyDelete::init(int status)
 
 void ActionModifyDelete::trigger()
 {
-       RS_DEBUG->print("ActionModifyDelete::trigger()");
-       RS_Modification m(*container, graphicView);
+       DEBUG->print("ActionModifyDelete::trigger()");
+       Modification m(*container, graphicView);
        m.remove();
        finish();
 
-       if (RS_DIALOGFACTORY != NULL)
-               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       if (DIALOGFACTORY != NULL)
+               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyDelete::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                //case Acknowledge:
-               //    RS_DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"),
+               //    DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"),
                //      tr("Cancel"));
                //    break;
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -69,11 +72,11 @@ void ActionModifyDelete::updateMouseCursor()
 
 void ActionModifyDelete::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
        }
 }