X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Factioninterface.cpp;h=92b77452451cdb88ea7e26184701cced317fa340;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=10f452408161383c5dd9e9a35f096a2e723401d8;hpb=dd17716b803ab2aa4163b905904a078f9fa5ae02;p=architektonas

diff --git a/src/base/actioninterface.cpp b/src/base/actioninterface.cpp
index 10f4524..92b7745 100644
--- a/src/base/actioninterface.cpp
+++ b/src/base/actioninterface.cpp
@@ -19,8 +19,8 @@
 #include "actioninterface.h"
 
 #include "commands.h"
-#include "rs_debug.h"
-#include "rs_entitycontainer.h"
+#include "debug.h"
+#include "entitycontainer.h"
 #include "graphicview.h"
 
 /**
@@ -34,10 +34,10 @@
  * @param graphicView Graphic view instance this action operates on. Please
  *                    note that an action belongs to this view.
  */
-ActionInterface::ActionInterface(const char * name, RS_EntityContainer & ec,
+ActionInterface::ActionInterface(const char * name, EntityContainer & ec,
 	GraphicView & gv): graphicView(&gv), container(&ec)
 {
-	RS_DEBUG->print("ActionInterface::ActionInterface: Setting up action: \"%s\"", name);
+	DEBUG->print("ActionInterface::ActionInterface: Setting up action: \"%s\"", name);
 
 	this->name = name;
 	status = 0;
@@ -60,7 +60,7 @@ ActionInterface::ActionInterface(const char * name, RS_EntityContainer & ec,
 	graphicView->snapper.SetVisible();
 	graphicView->preview.SetVisible();
 
-	RS_DEBUG->print("ActionInterface::ActionInterface: Setting up action: \"%s\": OK", name);
+	DEBUG->print("ActionInterface::ActionInterface: Setting up action: \"%s\": OK", name);
 }
 
 /**
@@ -100,7 +100,7 @@ QString ActionInterface::getName()
  */
 void ActionInterface::init(int status/*= 0*/)
 {
-//	RS_Snapper::init();
+//	Snapper::init();
 	setStatus(status);
 
 	if (status >= 0)
@@ -182,7 +182,7 @@ void ActionInterface::coordinateEvent(Vector *)
  * This function can be overwritten by the implementing action.
  * The default implementation does nothing.
  */
-void ActionInterface::commandEvent(RS_CommandEvent *)
+void ActionInterface::commandEvent(CommandEvent *)
 {
 }
 
@@ -283,7 +283,7 @@ void ActionInterface::setFinished()
  */
 void ActionInterface::finish()
 {
-	RS_DEBUG->print("ActionInterface::finish");
+	DEBUG->print("ActionInterface::finish");
 	status = -1;
 //	graphicView->setMouseCursor(RS2::ArrowCursor);
 	//graphicView->requestToolBar(RS2::ToolBarMain);
@@ -292,10 +292,10 @@ void ActionInterface::finish()
 //jlh:	deleteSnapper();
 	hideOptions();
 	finished = true;
-//	RS_Snapper::finish();		// Sets RS_Snapper::finished = true
+//	Snapper::finish();		// Sets Snapper::finished = true
 	// I think this is where we want to update the screen...
 //	graphicView->redraw();
-	RS_DEBUG->print("ActionInterface::finish: OK");
+	DEBUG->print("ActionInterface::finish: OK");
 }
 
 /**
@@ -315,7 +315,7 @@ void ActionInterface::suspend()
 	// Maybe this is where we need to save the state of the snapper
 	// & preview objects???
 //	graphicView->setMouseCursor(RS2::ArrowCursor);
-//	RS_Snapper::suspend();
+//	Snapper::suspend();
 }
 
 /**
@@ -325,7 +325,7 @@ void ActionInterface::resume()
 {
 	updateMouseCursor();
 	updateToolBar();
-//	RS_Snapper::resume();
+//	Snapper::resume();
 }
 
 /**
@@ -333,7 +333,7 @@ void ActionInterface::resume()
  */
 void ActionInterface::hideOptions()
 {
-//	RS_Snapper::hideOptions();
+//	Snapper::hideOptions();
 }
 
 /**
@@ -341,32 +341,32 @@ void ActionInterface::hideOptions()
  */
 void ActionInterface::showOptions()
 {
-//	RS_Snapper::showOptions();
+//	Snapper::showOptions();
 }
 
 /**
- * Calls checkCommand() from the RS_COMMANDS module.
+ * Calls checkCommand() from the COMMANDS module.
  */
 bool ActionInterface::checkCommand(const QString & cmd, const QString & str,
 	RS2::ActionType action)
 {
-	return RS_COMMANDS->checkCommand(cmd, str, action);
+	return COMMANDS->checkCommand(cmd, str, action);
 }
 
 /**
- * Calls command() from the RS_COMMANDS module.
+ * Calls command() from the COMMANDS module.
  */
 QString ActionInterface::command(const QString & cmd)
 {
-	return RS_COMMANDS->command(cmd);
+	return COMMANDS->command(cmd);
 }
 
 /**
- * Calls msgAvailableCommands() from the RS_COMMANDS module.
+ * Calls msgAvailableCommands() from the COMMANDS module.
  */
 QString ActionInterface::msgAvailableCommands()
 {
-	return RS_COMMANDS->msgAvailableCommands();
+	return COMMANDS->msgAvailableCommands();
 }
 
 // This is here to save some typing in all the action* classes derived from
@@ -376,12 +376,12 @@ Vector ActionInterface::snapPoint(QMouseEvent * e)
 	return graphicView->snapper.snapPoint(e);
 }
 
-RS_Entity * ActionInterface::catchEntity(QMouseEvent * e, RS2::ResolveLevel level/*= RS2::ResolveNone*/)
+Entity * ActionInterface::catchEntity(QMouseEvent * e, RS2::ResolveLevel level/*= RS2::ResolveNone*/)
 {
 	return graphicView->snapper.catchEntity(e, level);
 }
 
-RS_Entity * ActionInterface::catchEntity(Vector v, RS2::ResolveLevel level/*= RS2::ResolveNone*/)
+Entity * ActionInterface::catchEntity(Vector v, RS2::ResolveLevel level/*= RS2::ResolveNone*/)
 {
 	return graphicView->snapper.catchEntity(v, level);
 }