Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionsnapintersectionmanual.cpp

diff --git a/src/actions/actionsnapintersectionmanual.cpp b/src/actions/actionsnapintersectionmanual.cpp
index 72b65f415bd89467db917904df692e958fc9ffd6..fca53c468769bd8e819b5fe025f7f08c844ff94b 100644 (file)
--- a/src/actions/actionsnapintersectionmanual.cpp
+++ b/src/actions/actionsnapintersectionmanual.cpp
@@ -26,7 +26,7 @@
  * @param both Trim both entities.
  */
 ActionSnapIntersectionManual::ActionSnapIntersectionManual(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Trim Entity", container, graphicView)
 {
        entity2 = NULL;
@@ -48,12 +48,12 @@ void ActionSnapIntersectionManual::init(int status)
 
 void ActionSnapIntersectionManual::trigger()
 {
-       RS_DEBUG->print("ActionSnapIntersectionManual::trigger()");
+       DEBUG->print("ActionSnapIntersectionManual::trigger()");
 
        if (entity2 != NULL && entity2->isAtomic()
            && entity1 != NULL && entity1->isAtomic())
        {
-               VectorSolutions sol = RS_Information::getIntersection(entity1, entity2, false);
+               VectorSolutions sol = Information::getIntersection(entity1, entity2, false);
 
                entity2 = NULL;
                entity1 = NULL;
@@ -74,9 +74,9 @@ void ActionSnapIntersectionManual::trigger()
 
 void ActionSnapIntersectionManual::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionSnapIntersectionManual::mouseMoveEvent begin");
+       DEBUG->print("ActionSnapIntersectionManual::mouseMoveEvent begin");
 
-       RS_Entity * se = catchEntity(e);
+       Entity * se = catchEntity(e);
        Vector mouse = graphicView->toGraph(e->x(), e->y());
 
        switch (getStatus())
@@ -90,17 +90,17 @@ void ActionSnapIntersectionManual::mouseMoveEvent(QMouseEvent * e)
                entity2 = se;
                coord = mouse;
 
-               VectorSolutions sol = RS_Information::getIntersection(entity1, entity2, false);
+               VectorSolutions sol = Information::getIntersection(entity1, entity2, false);
                Vector ip = sol.getClosest(coord);
 
                if (ip.valid)
                {
                        deletePreview();
                        clearPreview();
-//                     preview->addEntity(new RS_Circle(preview, RS_CircleData(ip, graphicView->toGraphDX(4))));
+//                     preview->addEntity(new Circle(preview, CircleData(ip, graphicView->toGraphDX(4))));
                        drawPreview();
 
-                       RS_DIALOGFACTORY->updateCoordinateWidget(ip, ip - graphicView->getRelativeZero());
+                       DIALOGFACTORY->updateCoordinateWidget(ip, ip - graphicView->getRelativeZero());
                }
        }
                break;
@@ -109,7 +109,7 @@ void ActionSnapIntersectionManual::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionSnapIntersectionManual::mouseMoveEvent end");
+       DEBUG->print("ActionSnapIntersectionManual::mouseMoveEvent end");
 }
 
 void ActionSnapIntersectionManual::mouseReleaseEvent(QMouseEvent * e)
@@ -117,7 +117,7 @@ void ActionSnapIntersectionManual::mouseReleaseEvent(QMouseEvent * e)
        if (e->button() == Qt::LeftButton)
        {
                Vector mouse = graphicView->toGraph(e->x(), e->y());
-               RS_Entity * se = catchEntity(e);
+               Entity * se = catchEntity(e);
 
                switch (getStatus())
                {
@@ -154,17 +154,17 @@ void ActionSnapIntersectionManual::updateMouseButtonHints()
        switch (getStatus())
        {
        case ChooseEntity1:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Select first entity"),
+               DIALOGFACTORY->updateMouseWidget(tr("Select first entity"),
                        tr("Back"));
                break;
 
        case ChooseEntity2:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Select second entity"),
+               DIALOGFACTORY->updateMouseWidget(tr("Select second entity"),
                        tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -176,7 +176,7 @@ void ActionSnapIntersectionManual::updateMouseCursor()
 
 void ActionSnapIntersectionManual::updateToolBar()
 {
-       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 }