Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / actions / actionblockscreate.cpp

diff --git a/src/actions/actionblockscreate.cpp b/src/actions/actionblockscreate.cpp
index 172c071b34bb35a47a7a564b58448545a51292f0..723b95c35ac5977f596431917acad8004b073d95 100644 (file)
--- a/src/actions/actionblockscreate.cpp
+++ b/src/actions/actionblockscreate.cpp
@@ -12,7 +12,7 @@
 // Who  When        What
 // ---  ----------  -----------------------------------------------------------
 // JLH  06/03/2010  Added this text. :-)
-// JLH  06/03/2010  Scrubbed out all occurances of RS_CoordinateEvent
+// JLH  06/03/2010  Scrubbed out all occurances of CoordinateEvent
 //
 
 #include "actionblockscreate.h"
@@ -26,7 +26,7 @@
 /**
  * Constructor.
  */
-ActionBlocksCreate::ActionBlocksCreate(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Blocks Create", container, graphicView)
+ActionBlocksCreate::ActionBlocksCreate(EntityContainer & container, GraphicView & graphicView): ActionInterface("Blocks Create", container, graphicView)
 {
        referencePoint = Vector(false);
 }
@@ -65,24 +65,24 @@ void ActionBlocksCreate::trigger()
        //deletePreview();
        //clearPreview();
 
-       //RS_Modification m(*container, graphicView);
+       //Modification m(*container, graphicView);
        //m.paste(data.insertionPoint);
-       //std::cout << *RS_Clipboard::instance();
+       //std::cout << *Clipboard::instance();
 
        if (graphic != NULL)
        {
-               RS_BlockList * blockList = graphic->getBlockList();
+               BlockList * blockList = graphic->getBlockList();
 
                if (blockList != NULL)
                {
-                       RS_BlockData d = RS_DIALOGFACTORY->requestNewBlockDialog(blockList);
+                       BlockData d = DIALOGFACTORY->requestNewBlockDialog(blockList);
 
                        if (!d.name.isEmpty())
                        {
-                               RS_Creation creation(container, graphicView);
+                               Creation creation(container, graphicView);
                                creation.createBlock(d, referencePoint, true);
 
-                               RS_InsertData id(d.name, referencePoint, Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0));
+                               InsertData id(d.name, referencePoint, Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0));
                                creation.createInsert(id);
                        }
                }
@@ -108,7 +108,7 @@ void ActionBlocksCreate::mouseMoveEvent(QMouseEvent * e)
                        clearPreview();
                        //preview->addAllFrom(*block);
                        //preview->move(data.insertionPoint);
-                       RS_Creation creation(preview, NULL, false);
+                       Creation creation(preview, NULL, false);
                        creation.createInsert(data);
                        drawPreview();
                   }*/
@@ -156,11 +156,11 @@ void ActionBlocksCreate::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetReferencePoint:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
+               DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"), tr("Cancel"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -173,8 +173,8 @@ void ActionBlocksCreate::updateMouseCursor()
 void ActionBlocksCreate::updateToolBar()
 {
        if (!isFinished())
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        else
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
 }