X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Factionhandler.cpp;h=5765d9750dfdea22b0eed14bd78643e019ed6cdf;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=90731bbd2ccdf89d348803f73a9e74f6fcb6f28d;hpb=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas

diff --git a/src/widgets/actionhandler.cpp b/src/widgets/actionhandler.cpp
index 90731bb..5765d97 100644
--- a/src/widgets/actionhandler.cpp
+++ b/src/widgets/actionhandler.cpp
@@ -16,7 +16,7 @@
 
 #include "actionhandler.h"
 
-#include "rs_commandevent.h"
+#include "commandevent.h"
 #include "commands.h"
 #include "actionblocksadd.h"
 #include "actionblocksattributes.h"
@@ -110,7 +110,6 @@
 #include "actionsetsnapmode.h"
 #include "actionsetsnaprestriction.h"
 #include "actionsnapintersectionmanual.h"
-#include "actiontoolregeneratedimensions.h"
 #include "actionzoomauto.h"
 #include "actionzoomin.h"
 #include "actionzoompan.h"
@@ -129,8 +128,8 @@
 #endif
 
 #ifdef RS_CAM
-#include "rs_actioncamexportauto.h"
-#include "rs_actioncamreorder.h"
+#include "actioncamexportauto.h"
+#include "actioncamreorder.h"
 #endif
 
 #include "qg_mainwindowinterface.h"
@@ -141,7 +140,7 @@
  */
 ActionHandler::ActionHandler(QG_MainWindowInterface * mw)
 {
-	RS_DEBUG->print("ActionHandler::ActionHandler");
+	DEBUG->print("ActionHandler::ActionHandler");
 	mainWindow = mw;
 
 	snapFree = NULL;
@@ -158,7 +157,7 @@ ActionHandler::ActionHandler(QG_MainWindowInterface * mw)
 	restrictVertical = NULL;
 
 	lockRelativeZero = NULL;
-	RS_DEBUG->print("ActionHandler::ActionHandler: OK");
+	DEBUG->print("ActionHandler::ActionHandler: OK");
 }
 
 /**
@@ -166,8 +165,8 @@ ActionHandler::ActionHandler(QG_MainWindowInterface * mw)
  */
 ActionHandler::~ActionHandler()
 {
-	RS_DEBUG->print("ActionHandler::~ActionHandler");
-	RS_DEBUG->print("ActionHandler::~ActionHandler: OK");
+	DEBUG->print("ActionHandler::~ActionHandler");
+	DEBUG->print("ActionHandler::~ActionHandler: OK");
 }
 
 /**
@@ -200,7 +199,7 @@ Instead of the following giant switch statement, you could something like the fo
 ActionInterface * ActionHandler::setCurrentAction(ActionInterface * action)
 {
 	GraphicView * gv = mainWindow->getGraphicView();
-	RS_Document * doc = mainWindow->getDocument();
+	Document * doc = mainWindow->getDocument();
 
 	// only global options are allowed without a document:
 	if (gv == NULL || doc == NULL)
@@ -233,16 +232,16 @@ Well... The problem is the action, they're all different...
  */
 ActionInterface * ActionHandler::setCurrentAction(RS2::ActionType id)
 {
-	RS_DEBUG->print("ActionHandler::setCurrentAction()");
+	DEBUG->print("ActionHandler::setCurrentAction()");
 
 	GraphicView * gv = mainWindow->getGraphicView();
-	RS_Document * doc = mainWindow->getDocument();
+	Document * doc = mainWindow->getDocument();
 	ActionInterface * a = NULL;
 
 	// only global options are allowed without a document:
 	if (gv == NULL || doc == NULL)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING,
+		DEBUG->print(Debug::D_WARNING,
 			"ActionHandler::setCurrentAction: graphic view or document is NULL");
 		return NULL;
 	}
@@ -334,9 +333,10 @@ ActionInterface * ActionHandler::setCurrentAction(RS2::ActionType id)
 
 		// Tool actions:
 		//
-	case RS2::ActionToolRegenerateDimensions:
-		a = new ActionToolRegenerateDimensions(*doc, *gv);
-		break;
+//no
+//	case RS2::ActionToolRegenerateDimensions:
+//		a = new ActionToolRegenerateDimensions(*doc, *gv);
+//		break;
 
 		// Zooming actions:
 		//
@@ -775,7 +775,7 @@ ActionInterface * ActionHandler::setCurrentAction(RS2::ActionType id)
 #endif
 
 	default:
-		RS_DEBUG->print(RS_Debug::D_WARNING,
+		DEBUG->print(Debug::D_WARNING,
 			"ActionHandler::setCurrentAction(): No such action found.");
 		break;
 	}
@@ -783,7 +783,7 @@ ActionInterface * ActionHandler::setCurrentAction(RS2::ActionType id)
 	if (a)
 		gv->setCurrentAction(a);
 
-	RS_DEBUG->print("ActionHandler::setCurrentAction(): OK");
+	DEBUG->print("ActionHandler::setCurrentAction(): OK");
 
 	return a;
 }
@@ -829,7 +829,7 @@ bool ActionHandler::keycode(const QString & code)
 	//   it might be intended to launch a new keycode
 	//if (!e.isAccepted()) {
 	// keycode for new action:
-	RS2::ActionType type = RS_COMMANDS->keycodeToAction(code);
+	RS2::ActionType type = COMMANDS->keycodeToAction(code);
 	if (type != RS2::ActionNone)
 	{
 		// some actions require special handling (GUI update):
@@ -896,7 +896,7 @@ bool ActionHandler::keycode(const QString & code)
  */
 bool ActionHandler::command(const QString & cmd)
 {
-	RS_DEBUG->print("ActionHandler::command: %s", cmd.toLatin1().data());
+	DEBUG->print("ActionHandler::command: %s", cmd.toLatin1().data());
 	QString c = cmd.toLower();
 
 	if (c == "\n")
@@ -906,18 +906,18 @@ bool ActionHandler::command(const QString & cmd)
 		if (gv)
 			gv->back();
 
-		RS_DEBUG->print("ActionHandler::command: back");
+		DEBUG->print("ActionHandler::command: back");
 		return true;
 	}
 
 	// pass command on to running action:
-	RS_CommandEvent e(cmd);
+	CommandEvent e(cmd);
 
 	GraphicView * gv = mainWindow->getGraphicView();
 
 	if (gv)
 	{
-		RS_DEBUG->print("ActionHandler::command: trigger command event in graphic view");
+		DEBUG->print("ActionHandler::command: trigger command event in graphic view");
 		gv->commandEvent(&e);
 	}
 
@@ -925,20 +925,20 @@ bool ActionHandler::command(const QString & cmd)
 	//   it might be intended to launch a new command
 	if (!e.isAccepted())
 	{
-		RS_DEBUG->print("ActionHandler::command: convert cmd to action type");
+		DEBUG->print("ActionHandler::command: convert cmd to action type");
 		// command for new action:
-		RS2::ActionType type = RS_COMMANDS->cmdToAction(cmd);
+		RS2::ActionType type = COMMANDS->cmdToAction(cmd);
 
 		if (type != RS2::ActionNone)
 		{
-			RS_DEBUG->print("ActionHandler::command: setting current action");
+			DEBUG->print("ActionHandler::command: setting current action");
 			setCurrentAction(type);
-			RS_DEBUG->print("ActionHandler::command: current action set");
+			DEBUG->print("ActionHandler::command: current action set");
 			return true;
 		}
 	}
 
-	RS_DEBUG->print("ActionHandler::command: current action not set");
+	DEBUG->print("ActionHandler::command: current action not set");
 	return false;
 }