Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actioninfodist.cpp

diff --git a/src/actions/actioninfodist.cpp b/src/actions/actioninfodist.cpp
index 9cc40fa2a61b1eea905ddce10f6a4be79232652c..02067915bf54ae09dc17c3174cf91aedbeae761b 100644 (file)
--- a/src/actions/actioninfodist.cpp
+++ b/src/actions/actioninfodist.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionInfoDist::ActionInfoDist(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist",
+ActionInfoDist::ActionInfoDist(EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist",
                container, graphicView)
 {
 }
@@ -37,20 +37,20 @@ void ActionInfoDist::init(int status)
 
 void ActionInfoDist::trigger()
 {
-       RS_DEBUG->print("ActionInfoDist::trigger()");
+       DEBUG->print("ActionInfoDist::trigger()");
 
        if (point1.valid && point2.valid)
        {
                double dist = point1.distanceTo(point2);
                QString str;
                str.sprintf("%.6f", dist);
-               RS_DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
+               DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
        }
 }
 
 void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionInfoDist::mouseMoveEvent begin");
+       DEBUG->print("ActionInfoDist::mouseMoveEvent begin");
 
        if (getStatus() == SetPoint1
            || getStatus() == SetPoint2)
@@ -70,7 +70,7 @@ void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 
                                deletePreview();
                                clearPreview();
-//                             preview->addEntity(new RS_Line(preview, RS_LineData(point1, point2)));
+//                             preview->addEntity(new Line(preview, LineData(point1, point2)));
                                drawPreview();
                        }
                        break;
@@ -80,7 +80,7 @@ void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
                }
        }
 
-       RS_DEBUG->print("ActionInfoDist::mouseMoveEvent end");
+       DEBUG->print("ActionInfoDist::mouseMoveEvent end");
 }
 
 void ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
@@ -136,19 +136,19 @@ void ActionInfoDist::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetPoint1:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify first point of distance"),
                        tr("Cancel"));
                break;
 
        case SetPoint2:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify second point of distance"),
                        tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -164,11 +164,11 @@ void ActionInfoDist::updateToolBar()
        {
        case SetPoint1:
        case SetPoint2:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                break;
 
        default:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
                break;
        }
 }