Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actioneditpaste.cpp

diff --git a/src/actions/actioneditpaste.cpp b/src/actions/actioneditpaste.cpp
index 7d4ac423bdcc96dfa9bc897fffb720d4641bccfe..28b80a588d69a626b654a3ab0e0546a75993c556 100644 (file)
--- a/src/actions/actioneditpaste.cpp
+++ b/src/actions/actioneditpaste.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,18 +16,18 @@
 
 #include "actioneditpaste.h"
 
-#include "rs_clipboard.h"
-#include "rs_dialogfactory.h"
-#include "rs_modification.h"
-#include "rs_preview.h"
-#include "rs_units.h"
+#include "clipboard.h"
+#include "dialogfactory.h"
+#include "modification.h"
+#include "preview.h"
+#include "units.h"
 
 /**
  * Constructor.
  *
  * @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)
 {
 }
@@ -46,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();
@@ -62,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));
                }
 
@@ -109,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;
        }
 }
@@ -127,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);
 }