Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawpoint.cpp

diff --git a/src/actions/actiondrawpoint.cpp b/src/actions/actiondrawpoint.cpp
index f1ac97864570782df04234899cbf822a263da61a..891990def138b2f47c98e9f46be0e8ece433330b 100644 (file)
--- a/src/actions/actiondrawpoint.cpp
+++ b/src/actions/actiondrawpoint.cpp
@@ -21,7 +21,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDrawPoint::ActionDrawPoint(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDrawPoint::ActionDrawPoint(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Draw Points", container, graphicView)
 {
 }
@@ -34,7 +34,7 @@ void ActionDrawPoint::trigger()
 {
        if (pt.valid)
        {
-               RS_Point * point = new RS_Point(container, RS_PointData(pt));
+               Point * point = new Point(container, PointData(pt));
                container->addEntity(point);
 
                if (document)
@@ -82,14 +82,14 @@ void ActionDrawPoint::coordinateEvent(Vector * e)
        trigger();
 }
 
-void ActionDrawPoint::commandEvent(RS_CommandEvent * e)
+void ActionDrawPoint::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               if (DIALOGFACTORY != NULL)
+                       DIALOGFACTORY->commandMessage(msgAvailableCommands()
                                + getAvailableCommands().join(", "));
 
                return;
@@ -104,16 +104,16 @@ QStringList ActionDrawPoint::getAvailableCommands()
 
 void ActionDrawPoint::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case 0:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify location"), tr("Cancel"));
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify location"), tr("Cancel"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -126,11 +126,11 @@ void ActionDrawPoint::updateMouseCursor()
 
 void ActionDrawPoint::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarPoints);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarPoints);
        }
 }