Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actioneditpaste.cpp

diff --git a/src/actions/actioneditpaste.cpp b/src/actions/actioneditpaste.cpp
index 5bc21fb4cb3c14ed08538f2625b1e22e7a00eae2..28b80a588d69a626b654a3ab0e0546a75993c556 100644 (file)
--- a/src/actions/actioneditpaste.cpp
+++ b/src/actions/actioneditpaste.cpp
@@ -27,7 +27,7 @@
  *
  * @param undo true for undo and false for redo.
  */
-ActionEditPaste::ActionEditPaste(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Edit Paste",
+ActionEditPaste::ActionEditPaste(EntityContainer & container, GraphicView & graphicView): ActionInterface("Edit Paste",
                container, graphicView)
 {
 }
@@ -48,8 +48,8 @@ void ActionEditPaste::trigger()
        deletePreview();
        clearPreview();
 
-       RS_Modification m(*container, graphicView);
-       m.paste(RS_PasteData(targetPoint, 1.0, 0.0, false, ""));
+       Modification m(*container, graphicView);
+       m.paste(PasteData(targetPoint, 1.0, 0.0, false, ""));
 
        graphicView->redraw();
        finish();
@@ -64,14 +64,14 @@ void ActionEditPaste::mouseMoveEvent(QMouseEvent * e)
 
                deletePreview();
                clearPreview();
-//             preview->addAllFrom(*RS_CLIPBOARD->getGraphic());
+//             preview->addAllFrom(*CLIPBOARD->getGraphic());
 //             preview->move(targetPoint);
 
                if (graphic)
                {
-                       RS2::Unit sourceUnit = RS_CLIPBOARD->getGraphic()->getUnit();
+                       RS2::Unit sourceUnit = CLIPBOARD->getGraphic()->getUnit();
                        RS2::Unit targetUnit = graphic->getUnit();
-                       double f = RS_Units::convert(1.0, sourceUnit, targetUnit);
+                       double f = Units::convert(1.0, sourceUnit, targetUnit);
 //                     preview->scale(targetPoint, Vector(f, f));
                }
 
@@ -111,12 +111,12 @@ void ActionEditPaste::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetTargetPoint:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Set reference point"),
+               DIALOGFACTORY->updateMouseWidget(tr("Set reference point"),
                        tr("Cancel"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -129,7 +129,7 @@ void ActionEditPaste::updateMouseCursor()
 void ActionEditPaste::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
 }