X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionmodifyentity.cpp;h=167cb6a1158b60f5bd8e3abda5da712ba061743c;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=2dbe66a6c02c09f48ca0e41890bd7a661cfc183a;hpb=dd17716b803ab2aa4163b905904a078f9fa5ae02;p=architektonas

diff --git a/src/actions/actionmodifyentity.cpp b/src/actions/actionmodifyentity.cpp
index 2dbe66a..167cb6a 100644
--- a/src/actions/actionmodifyentity.cpp
+++ b/src/actions/actionmodifyentity.cpp
@@ -16,16 +16,16 @@
 
 /*
 Program received signal SIGSEGV, Segmentation fault.
-0x080d0fd1 in PaintInterface::fillRect(int, int, int, int, RS_Color const&) ()
+0x080d0fd1 in PaintInterface::fillRect(int, int, int, int, Color const&) ()
 (gdb) bt
-#0  0x080d0fd1 in PaintInterface::fillRect(int, int, int, int, RS_Color const&)
+#0  0x080d0fd1 in PaintInterface::fillRect(int, int, int, int, Color const&)
     ()
-#1  0x080cf523 in PaintInterface::drawHandle(Vector const&, RS_Color const&, int) ()
-#2  0x0822d7e0 in GraphicView::drawEntity(RS_Entity*, double, bool) ()
-#3  0x0822d9a0 in GraphicView::deleteEntity(RS_Entity*) ()
+#1  0x080cf523 in PaintInterface::drawHandle(Vector const&, Color const&, int) ()
+#2  0x0822d7e0 in GraphicView::drawEntity(Entity*, double, bool) ()
+#3  0x0822d9a0 in GraphicView::deleteEntity(Entity*) ()
 #4  0x081334dc in ActionModifyEntity::trigger() ()
 #5  0x081336ef in ActionModifyEntity::mouseReleaseEvent(QMouseEvent*) ()
-#6  0x08089d2a in RS_EventHandler::mouseReleaseEvent(QMouseEvent*) ()
+#6  0x08089d2a in EventHandler::mouseReleaseEvent(QMouseEvent*) ()
 #7  0x0822a482 in GraphicView::mouseReleaseEvent(QMouseEvent*) ()
 #8  0x081eb00a in QG_GraphicView::mouseReleaseEvent(QMouseEvent*) ()
 #9  0xb77063c1 in QWidget::event(QEvent*) () from /usr/lib/qt4/libQtGui.so.4
@@ -56,11 +56,11 @@ Program received signal SIGSEGV, Segmentation fault.
 
 #include "actionmodifyentity.h"
 
-#include "rs_debug.h"
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
-ActionModifyEntity::ActionModifyEntity(RS_EntityContainer & container,
+ActionModifyEntity::ActionModifyEntity(EntityContainer & container,
 	GraphicView & graphicView):
 	ActionInterface("Modify Entity", container, graphicView), en(NULL)
 {
@@ -75,13 +75,13 @@ void ActionModifyEntity::trigger()
 {
 	if (!en)
 	{
-		RS_DEBUG->print("ActionModifyEntity::trigger: Entity is NULL\n");
+		DEBUG->print("ActionModifyEntity::trigger: Entity is NULL\n");
 		return;
 	}
 
-	RS_Entity * clone = en->clone();
+	Entity * clone = en->clone();
 
-	if (RS_DIALOGFACTORY->requestModifyEntityDialog(clone))
+	if (DIALOGFACTORY->requestModifyEntityDialog(clone))
 	{
 		container->addEntity(clone);
 #warning "!!! Old rendering path need upgrade !!!"
@@ -102,7 +102,7 @@ void ActionModifyEntity::trigger()
 			document->endUndoCycle();
 		}
 
-		RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+		DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 	}
 	else
 		delete clone;