Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actiondrawellipseaxis.cpp

diff --git a/src/actions/actiondrawellipseaxis.cpp b/src/actions/actiondrawellipseaxis.cpp
index e219649c442ace9715c123a1faa6cdfc1b8028a0..932aa15404acb7959042f57d19a3ad02137aad6e 100644 (file)
--- a/src/actions/actiondrawellipseaxis.cpp
+++ b/src/actions/actiondrawellipseaxis.cpp
@@ -28,7 +28,7 @@
  * @param isArc true if this action will produce an ellipse arc.
  *              false if it will produce a full ellipse.
  */
-ActionDrawEllipseAxis::ActionDrawEllipseAxis(RS_EntityContainer & container, GraphicView & graphicView, bool isArc): ActionInterface("Draw ellipse with axis",
+ActionDrawEllipseAxis::ActionDrawEllipseAxis(EntityContainer & container, GraphicView & graphicView, bool isArc): ActionInterface("Draw ellipse with axis",
                container, graphicView)
 {
        this->isArc = isArc;
@@ -67,8 +67,8 @@ void ActionDrawEllipseAxis::trigger()
 {
        ActionInterface::trigger();
 
-       RS_EllipseData ellipseData(center, major, ratio, angle1, angle2, false);
-       RS_Ellipse * ellipse = new RS_Ellipse(container, ellipseData);
+       EllipseData ellipseData(center, major, ratio, angle1, angle2, false);
+       Ellipse * ellipse = new Ellipse(container, ellipseData);
        ellipse->setLayerToActive();
        ellipse->setPenToActive();
 
@@ -91,13 +91,13 @@ void ActionDrawEllipseAxis::trigger()
 
        setStatus(SetCenter);
 
-       RS_DEBUG->print("ActionDrawEllipseAxis::trigger():"
+       DEBUG->print("ActionDrawEllipseAxis::trigger():"
                " entity added: %d", ellipse->getId());
 }
 
 void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent begin");
+       DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -112,8 +112,8 @@ void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                {
                        deletePreview();
                        clearPreview();
-                       RS_EllipseData ed(center, mouse - center, 0.5, 0.0, 2 * M_PI, false);
-//                     preview->addEntity(new RS_Ellipse(preview, ed));
+                       EllipseData ed(center, mouse - center, 0.5, 0.0, 2 * M_PI, false);
+//                     preview->addEntity(new Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -124,11 +124,11 @@ void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                {
                        deletePreview();
                        clearPreview();
-                       RS_Line line(NULL, RS_LineData(center - major, center + major));
+                       Line line(NULL, LineData(center - major, center + major));
                        double d = line.getDistanceToPoint(mouse);
                        ratio = d / (line.getLength() / 2);
-                       RS_EllipseData ed(center, major, ratio, 0.0, 2 * M_PI, false);
-//                     preview->addEntity(new RS_Ellipse(preview, ed));
+                       EllipseData ed(center, major, ratio, 0.0, 2 * M_PI, false);
+//                     preview->addEntity(new Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -148,10 +148,10 @@ void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        v.scale(Vector(1.0, 1.0 / ratio));
                        angle1 = v.angle(); // + major.angle();
 
-//                     preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
+//                     preview->addEntity(new Line(preview, LineData(center, mouse)));
 
-                       RS_EllipseData ed(center, major, ratio, angle1, angle1 + 1.0, false);
-//                     preview->addEntity(new RS_Ellipse(preview, ed));
+                       EllipseData ed(center, major, ratio, angle1, angle1 + 1.0, false);
+//                     preview->addEntity(new Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -170,10 +170,10 @@ void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        v.scale(Vector(1.0, 1.0 / ratio));
                        angle2 = v.angle(); // + major.angle();
 
-//                     preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
+//                     preview->addEntity(new Line(preview, LineData(center, mouse)));
 
-                       RS_EllipseData ed(center, major, ratio, angle1, angle2, false);
-//                     preview->addEntity(new RS_Ellipse(preview, ed));
+                       EllipseData ed(center, major, ratio, angle1, angle2, false);
+//                     preview->addEntity(new Ellipse(preview, ed));
                        drawPreview();
                }
 
@@ -181,7 +181,7 @@ void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent end");
+       DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent end");
 }
 
 void ActionDrawEllipseAxis::mouseReleaseEvent(QMouseEvent * e)
@@ -223,7 +223,7 @@ void ActionDrawEllipseAxis::coordinateEvent(Vector * e)
 
        case SetMinor:
        {
-               RS_Line line(NULL, RS_LineData(center - major, center + major));
+               Line line(NULL, LineData(center - major, center + major));
                double d = line.getDistanceToPoint(mouse);
                ratio = d / (line.getLength() / 2);
 
@@ -266,14 +266,14 @@ void ActionDrawEllipseAxis::coordinateEvent(Vector * e)
        }
 }
 
-void ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
+void ActionDrawEllipseAxis::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;
        }
@@ -282,7 +282,7 @@ void ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
        {
        case SetMinor: {
                bool ok;
-               double m = RS_Math::eval(c, &ok);
+               double m = Math::eval(c, &ok);
 
                if (ok == true)
                {
@@ -293,38 +293,38 @@ void ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
                        else
                                setStatus(SetAngle1);
                }
-               else if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+               else if (DIALOGFACTORY != NULL)
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
        }
        break;
 
        case SetAngle1: {
                bool ok;
-               double a = RS_Math::eval(c, &ok);
+               double a = Math::eval(c, &ok);
 
                if (ok == true)
                {
-                       angle1 = RS_Math::deg2rad(a);
+                       angle1 = Math::deg2rad(a);
                        setStatus(SetAngle2);
                }
-               else if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+               else if (DIALOGFACTORY != NULL)
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
        }
        break;
 
        case SetAngle2: {
                bool ok;
-               double a = RS_Math::eval(c, &ok);
+               double a = Math::eval(c, &ok);
 
                if (ok == true)
                {
-                       angle2 = RS_Math::deg2rad(a);
+                       angle2 = Math::deg2rad(a);
                        trigger();
                }
-               else if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
+               else if (DIALOGFACTORY != NULL)
+                       DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
        }
        break;
@@ -342,38 +342,38 @@ QStringList ActionDrawEllipseAxis::getAvailableCommands()
 
 void ActionDrawEllipseAxis::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetCenter:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify ellipse center"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify ellipse center"),
                                tr("Cancel"));
                        break;
 
                case SetMajor:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify endpoint of major axis"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify endpoint of major axis"),
                                tr("Back"));
                        break;
 
                case SetMinor:
-                       RS_DIALOGFACTORY->updateMouseWidget(
+                       DIALOGFACTORY->updateMouseWidget(
                                tr("Specify endpoint or length of minor axis:"),
                                tr("Back"));
                        break;
 
                case SetAngle1:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify start angle"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify start angle"),
                                tr("Back"));
                        break;
 
                case SetAngle2:
-                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify end angle"),
+                       DIALOGFACTORY->updateMouseWidget(tr("Specify end angle"),
                                tr("Back"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -386,11 +386,11 @@ void ActionDrawEllipseAxis::updateMouseCursor()
 
 void ActionDrawEllipseAxis::updateToolBar()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarEllipses);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarEllipses);
        }
 }