Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actionmodifyattributes.cpp

diff --git a/src/actions/actionmodifyattributes.cpp b/src/actions/actionmodifyattributes.cpp
index ab8481d93e5db9c1bd8dad55f03850e53824ebbf..fcbe0f52c247fc6238b9b4dd945f08ca04a3734a 100644 (file)
--- a/src/actions/actionmodifyattributes.cpp
+++ b/src/actions/actionmodifyattributes.cpp
@@ -16,13 +16,13 @@
 
 #include "actionmodifyattributes.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 #include "graphicview.h"
-#include "rs_modification.h"
+#include "modification.h"
 
 ActionModifyAttributes::ActionModifyAttributes(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Change Attributes", container, graphicView)
 {
 }
@@ -39,28 +39,30 @@ void ActionModifyAttributes::init(int status)
 
 void ActionModifyAttributes::trigger()
 {
-       RS_DEBUG->print("ActionModifyAttributes::trigger()");
+       DEBUG->print("ActionModifyAttributes::trigger()");
 
-       RS_AttributesData data;
-       data.pen = RS_Pen();
+       AttributesData data;
+       data.pen = Pen();
        data.layer = "0";
        data.changeColor = false;
        data.changeLineType = false;
        data.changeWidth = false;
        data.changeLayer = false;
 
-       if (graphic != NULL)
-               if (RS_DIALOGFACTORY->requestAttributesDialog(data,
-                           *graphic->getLayerList()))
+       if (graphic)
+       {
+               if (DIALOGFACTORY->requestAttributesDialog(data,
+                   *graphic->getLayerList()))
                {
-                       RS_Modification m(*container, graphicView);
+                       Modification m(*container, graphicView);
                        m.changeAttributes(data);
                }
+       }
 
        finish();
        graphicView->killSelectActions();
 
-       RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyAttributes::updateMouseButtonHints()
@@ -68,10 +70,10 @@ void ActionModifyAttributes::updateMouseButtonHints()
        switch (getStatus())
        {
        //case Acknowledge:
-       //RS_DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"), tr("Cancel"));
+       //DIALOGFACTORY->updateMouseWidget(tr("Acknowledge"), tr("Cancel"));
        //break;
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -84,7 +86,7 @@ void ActionModifyAttributes::updateMouseCursor()
 void ActionModifyAttributes::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
 }