Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionmodifyattributes.cpp

diff --git a/src/actions/actionmodifyattributes.cpp b/src/actions/actionmodifyattributes.cpp
index dbc64519adcfc54c7e614fb78a0d62743da5da87..fcbe0f52c247fc6238b9b4dd945f08ca04a3734a 100644 (file)
--- a/src/actions/actionmodifyattributes.cpp
+++ b/src/actions/actionmodifyattributes.cpp
@@ -22,7 +22,7 @@
 #include "modification.h"
 
 ActionModifyAttributes::ActionModifyAttributes(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Change Attributes", container, graphicView)
 {
 }
@@ -39,10 +39,10 @@ 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;
@@ -51,10 +51,10 @@ void ActionModifyAttributes::trigger()
 
        if (graphic)
        {
-               if (RS_DIALOGFACTORY->requestAttributesDialog(data,
+               if (DIALOGFACTORY->requestAttributesDialog(data,
                    *graphic->getLayerList()))
                {
-                       RS_Modification m(*container, graphicView);
+                       Modification m(*container, graphicView);
                        m.changeAttributes(data);
                }
        }
@@ -62,7 +62,7 @@ void ActionModifyAttributes::trigger()
        finish();
        graphicView->killSelectActions();
 
-       RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyAttributes::updateMouseButtonHints()
@@ -70,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;
        }
 }
@@ -86,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);
 }