Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondimleader.cpp

diff --git a/src/actions/actiondimleader.cpp b/src/actions/actiondimleader.cpp
index c0ef6f9698e79c5ceb558135e1046cd183c628bd..f65ff3192240e4f884381be10541baa88097b7de 100644 (file)
--- a/src/actions/actiondimleader.cpp
+++ b/src/actions/actiondimleader.cpp
@@ -22,7 +22,7 @@
 #include "graphicview.h"
 #include "preview.h"
 
-ActionDimLeader::ActionDimLeader(RS_EntityContainer & container, GraphicView & graphicView):
+ActionDimLeader::ActionDimLeader(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Draw leaders", container, graphicView)
 {
        reset();
@@ -39,7 +39,7 @@ ActionDimLeader::~ActionDimLeader()
 
 void ActionDimLeader::reset()
 {
-       //data = RS_LineData(Vector(false), Vector(false));
+       //data = LineData(Vector(false), Vector(false));
        //start = Vector(false);
        //history.clear();
        points.clear();
@@ -58,7 +58,7 @@ void ActionDimLeader::trigger()
 
        if (points.count() > 0)
        {
-               RS_Leader * leader = new RS_Leader(container, RS_LeaderData(true));
+               Leader * leader = new Leader(container, LeaderData(true));
                leader->setLayerToActive();
                leader->setPenToActive();
 
@@ -86,13 +86,13 @@ void ActionDimLeader::trigger()
                graphicView->moveRelativeZero(rz);
                //drawSnapper();
 
-               RS_DEBUG->print("ActionDimLeader::trigger(): leader added: %d", leader->getId());
+               DEBUG->print("ActionDimLeader::trigger(): leader added: %d", leader->getId());
        }
 }
 
 void ActionDimLeader::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDimLeader::mouseMoveEvent begin");
+       DEBUG->print("ActionDimLeader::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -109,17 +109,17 @@ void ActionDimLeader::mouseMoveEvent(QMouseEvent * e)
                        Vector * v = points[i];
 
 //                     if (last.valid)
-//                             preview->addEntity(new RS_Line(preview, RS_LineData(last, *v)));
+//                             preview->addEntity(new Line(preview, LineData(last, *v)));
 
                        last = *v;
                }
 
                Vector p = *points.last();
-//             preview->addEntity(new RS_Line(preview, RS_LineData(p, mouse)));
+//             preview->addEntity(new Line(preview, LineData(p, mouse)));
                drawPreview();
        }
 
-       RS_DEBUG->print("ActionDimLeader::mouseMoveEvent end");
+       DEBUG->print("ActionDimLeader::mouseMoveEvent end");
 }
 
 void ActionDimLeader::mouseReleaseEvent(QMouseEvent * e)
@@ -187,14 +187,14 @@ void ActionDimLeader::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDimLeader::commandEvent(RS_CommandEvent * e)
+void ActionDimLeader::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;
@@ -219,20 +219,20 @@ QStringList ActionDimLeader::getAvailableCommands()
 
 void ActionDimLeader::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetStartpoint:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify target point"), tr("Cancel"));
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify target point"), tr("Cancel"));
                        break;
 
                case SetEndpoint:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify next point"), tr("Finish"));
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify next point"), tr("Finish"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -255,11 +255,11 @@ void ActionDimLeader::updateMouseCursor()
 
 void ActionDimLeader::updateToolBar()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarDim);
        }
 }