Phase two of adding polyline functionality...

[architektonas] / src / actions / actionmodifyrotate2.cpp

diff --git a/src/actions/actionmodifyrotate2.cpp b/src/actions/actionmodifyrotate2.cpp
index 51530e5f58bcc7094eaeeafb9d9389a13acfcccb..d12293c35c11dc6b805f9871795e3c568ca71c24 100644 (file)
--- a/src/actions/actionmodifyrotate2.cpp
+++ b/src/actions/actionmodifyrotate2.cpp
@@ -16,10 +16,11 @@
 
 #include "actionmodifyrotate2.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 
 ActionModifyRotate2::ActionModifyRotate2(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Rotate Entities around two centers", container, graphicView)
 {
 }
@@ -35,19 +36,19 @@ void ActionModifyRotate2::init(int status)
 
 void ActionModifyRotate2::trigger()
 {
-       RS_DEBUG->print("ActionModifyRotate2::trigger()");
+       DEBUG->print("ActionModifyRotate2::trigger()");
 
-       RS_Modification m(*container, graphicView);
+       Modification m(*container, graphicView);
        m.rotate2(data);
 
        finish();
 
-       RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyRotate2::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionModifyRotate2::mouseMoveEvent begin");
+       DEBUG->print("ActionModifyRotate2::mouseMoveEvent begin");
 
        if (getStatus() == SetReferencePoint1 || getStatus() == SetReferencePoint2)
        {
@@ -71,7 +72,7 @@ void ActionModifyRotate2::mouseMoveEvent(QMouseEvent * e)
                }
        }
 
-       RS_DEBUG->print("ActionModifyRotate2::mouseMoveEvent end");
+       DEBUG->print("ActionModifyRotate2::mouseMoveEvent end");
 }
 
 void ActionModifyRotate2::mouseReleaseEvent(QMouseEvent * e)
@@ -107,7 +108,7 @@ void ActionModifyRotate2::coordinateEvent(Vector * e)
                data.center2 = pos;
                setStatus(ShowDialog);
 
-               if (RS_DIALOGFACTORY->requestRotate2Dialog(data))
+               if (DIALOGFACTORY->requestRotate2Dialog(data))
                        trigger();
                        //finish();
                break;
@@ -117,7 +118,7 @@ void ActionModifyRotate2::coordinateEvent(Vector * e)
        }
 }
 
-void ActionModifyRotate2::commandEvent(RS_CommandEvent * /*e*/)
+void ActionModifyRotate2::commandEvent(CommandEvent * /*e*/)
 {
 }
 
@@ -132,17 +133,17 @@ void ActionModifyRotate2::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetReferencePoint1:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify absolute reference point"),
+               DIALOGFACTORY->updateMouseWidget(tr("Specify absolute reference point"),
                        tr("Cancel"));
                break;
 
        case SetReferencePoint2:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify relative reference point"),
+               DIALOGFACTORY->updateMouseWidget(tr("Specify relative reference point"),
                        tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -158,11 +159,11 @@ void ActionModifyRotate2::updateToolBar()
        {
        case SetReferencePoint1:
        case SetReferencePoint2:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                break;
 
        default:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
                break;
        }
 }