Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionmodifytrimamount.cpp

diff --git a/src/actions/actionmodifytrimamount.cpp b/src/actions/actionmodifytrimamount.cpp
index a34367825c287993e8a70a5e5dc86c626adf6eec..83fbbe0da6747bd9e2b46bfa3f25ce92c0095aab 100644 (file)
--- a/src/actions/actionmodifytrimamount.cpp
+++ b/src/actions/actionmodifytrimamount.cpp
@@ -22,7 +22,7 @@
 #include "modification.h"
 
 ActionModifyTrimAmount::ActionModifyTrimAmount(
-       RS_EntityContainer & container, GraphicView & graphicView):
+       EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Trim Entity by a given amount",
                container, graphicView)
 {
@@ -50,17 +50,17 @@ void ActionModifyTrimAmount::init(int status)
 
 void ActionModifyTrimAmount::trigger()
 {
-       RS_DEBUG->print("ActionModifyTrimAmount::trigger()");
+       DEBUG->print("ActionModifyTrimAmount::trigger()");
 
        if (trimEntity != NULL && trimEntity->isAtomic())
        {
-               RS_Modification m(*container, graphicView);
-               m.trimAmount(trimCoord, (RS_AtomicEntity *)trimEntity, distance);
+               Modification m(*container, graphicView);
+               m.trimAmount(trimCoord, (AtomicEntity *)trimEntity, distance);
 
                trimEntity = NULL;
                setStatus(ChooseTrimEntity);
 
-               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
        }
 }
 
@@ -80,14 +80,14 @@ void ActionModifyTrimAmount::mouseReleaseEvent(QMouseEvent * e)
                        else
                        {
                                if (trimEntity == NULL)
-                                       RS_DIALOGFACTORY->commandMessage(
+                                       DIALOGFACTORY->commandMessage(
                                                tr("No entity found. "));
                                else if (trimEntity->rtti() == RS2::EntityInsert)
-                                       RS_DIALOGFACTORY->commandMessage(
+                                       DIALOGFACTORY->commandMessage(
                                                tr("The chosen Entity is in a block. "
                                                        "Please edit the block."));
                                else
-                                       RS_DIALOGFACTORY->commandMessage(
+                                       DIALOGFACTORY->commandMessage(
                                                tr("The chosen Entity is not an atomic entity "
                                                        "or cannot be trimmed."));
                        }
@@ -104,13 +104,13 @@ void ActionModifyTrimAmount::mouseReleaseEvent(QMouseEvent * e)
        }
 }
 
-void ActionModifyTrimAmount::commandEvent(RS_CommandEvent * e)
+void ActionModifyTrimAmount::commandEvent(CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
+               DIALOGFACTORY->commandMessage(msgAvailableCommands()
                        + getAvailableCommands().join(", "));
                return;
        }
@@ -119,13 +119,13 @@ void ActionModifyTrimAmount::commandEvent(RS_CommandEvent * e)
        {
        case ChooseTrimEntity: {
                bool ok;
-               double d = RS_Math::eval(c, &ok);
+               double d = Math::eval(c, &ok);
 
                if (ok == true)
                        distance = d;
                else
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
-               RS_DIALOGFACTORY->requestOptions(this, true, true);
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+               DIALOGFACTORY->requestOptions(this, true, true);
                setStatus(ChooseTrimEntity);
        }
        break;
@@ -155,14 +155,14 @@ void ActionModifyTrimAmount::showOptions()
 {
        ActionInterface::showOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, true);
+       DIALOGFACTORY->requestOptions(this, true);
 }
 
 void ActionModifyTrimAmount::hideOptions()
 {
        ActionInterface::hideOptions();
 
-       RS_DIALOGFACTORY->requestOptions(this, false);
+       DIALOGFACTORY->requestOptions(this, false);
 }
 
 void ActionModifyTrimAmount::updateMouseButtonHints()
@@ -170,12 +170,12 @@ void ActionModifyTrimAmount::updateMouseButtonHints()
        switch (getStatus())
        {
        case ChooseTrimEntity:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Select entity to trim or enter distance:"), tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -187,7 +187,7 @@ void ActionModifyTrimAmount::updateMouseCursor()
 
 void ActionModifyTrimAmount::updateToolBar()
 {
-       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+       DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 }
 
 double ActionModifyTrimAmount::getDistance()