X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_eventhandler.cpp;h=3484ca9f159b11e83d4dee41b4a81219706c2c3b;hb=d774c2655ba2c3657a565f325411144452392277;hp=a92775c000a6bc46ae54318b8e1bfa51cae9565c;hpb=c715d05d11ffe2913fe3465ec43d456ee9b85964;p=architektonas

diff --git a/src/base/rs_eventhandler.cpp b/src/base/rs_eventhandler.cpp
index a92775c..3484ca9 100644
--- a/src/base/rs_eventhandler.cpp
+++ b/src/base/rs_eventhandler.cpp
@@ -14,8 +14,7 @@
 
 #include "rs_eventhandler.h"
 
-#include <QtGui>
-#include "rs_actioninterface.h"
+#include "actioninterface.h"
 #include "rs_commandevent.h"
 #include "rs_debug.h"
 #include "rs_dialogfactory.h"
@@ -168,14 +167,14 @@ void RS_EventHandler::mouseMoveEvent(QMouseEvent * e)
  */
 void RS_EventHandler::mouseLeaveEvent()
 {
-	if (actionIndex >= 0 && currentActions[actionIndex] != NULL
+	if (actionIndex >= 0 && currentActions[actionIndex]
 		&& !currentActions[actionIndex]->isFinished())
 	{
 		currentActions[actionIndex]->suspend();
 	}
 	else
 	{
-		if (defaultAction != NULL)
+		if (defaultAction)
 			defaultAction->suspend();
 		//RS_DEBUG->print("currently no action defined");
 	}
@@ -186,14 +185,14 @@ void RS_EventHandler::mouseLeaveEvent()
  */
 void RS_EventHandler::mouseEnterEvent()
 {
-	if (actionIndex >= 0 && currentActions[actionIndex] != NULL
+	if (actionIndex >= 0 && currentActions[actionIndex]
 		&& !currentActions[actionIndex]->isFinished())
 	{
 		currentActions[actionIndex]->resume();
 	}
 	else
 	{
-		if (defaultAction != NULL)
+		if (defaultAction)
 			defaultAction->resume();
 	}
 }
@@ -203,14 +202,14 @@ void RS_EventHandler::mouseEnterEvent()
  */
 void RS_EventHandler::keyPressEvent(QKeyEvent * e)
 {
-	if (actionIndex >= 0 && currentActions[actionIndex] != NULL
+	if (actionIndex >= 0 && currentActions[actionIndex]
 		&& !currentActions[actionIndex]->isFinished())
 	{
 		currentActions[actionIndex]->keyPressEvent(e);
 	}
 	else
 	{
-		if (defaultAction != NULL)
+		if (defaultAction)
 			defaultAction->keyPressEvent(e);
 		else
 			e->ignore();
@@ -224,14 +223,14 @@ void RS_EventHandler::keyPressEvent(QKeyEvent * e)
  */
 void RS_EventHandler::keyReleaseEvent(QKeyEvent * e)
 {
-	if (actionIndex >= 0 && currentActions[actionIndex] != NULL
+	if (actionIndex >= 0 && currentActions[actionIndex]
 		&& !currentActions[actionIndex]->isFinished())
 	{
 		currentActions[actionIndex]->keyReleaseEvent(e);
 	}
 	else
 	{
-		if (defaultAction != NULL)
+		if (defaultAction)
 			defaultAction->keyReleaseEvent(e);
 		else
 			e->ignore();
@@ -423,9 +422,9 @@ void RS_EventHandler::disableCoordinateInput()
 /**
  * @return Current action.
  */
-RS_ActionInterface * RS_EventHandler::getCurrentAction()
+ActionInterface * RS_EventHandler::getCurrentAction()
 {
-	if (actionIndex >= 0 && currentActions[actionIndex] != NULL
+	if (actionIndex >= 0 && currentActions[actionIndex]
 		&& !currentActions[actionIndex]->isFinished())
 		return currentActions[actionIndex];
 
@@ -435,7 +434,7 @@ RS_ActionInterface * RS_EventHandler::getCurrentAction()
 /**
  * @return The current default action.
  */
-RS_ActionInterface * RS_EventHandler::getDefaultAction()
+ActionInterface * RS_EventHandler::getDefaultAction()
 {
 	return defaultAction;
 }
@@ -443,9 +442,9 @@ RS_ActionInterface * RS_EventHandler::getDefaultAction()
 /**
  * Sets the default action.
  */
-void RS_EventHandler::setDefaultAction(RS_ActionInterface * action)
+void RS_EventHandler::setDefaultAction(ActionInterface * action)
 {
-	if (defaultAction != NULL)
+	if (defaultAction)
 	{
 		defaultAction->finish();
 		delete defaultAction;
@@ -458,7 +457,7 @@ void RS_EventHandler::setDefaultAction(RS_ActionInterface * action)
 /**
  * Sets the current action.
  */
-void RS_EventHandler::setCurrentAction(RS_ActionInterface * action)
+void RS_EventHandler::setCurrentAction(ActionInterface * action)
 {
 	RS_DEBUG->print("RS_EventHandler::setCurrentAction");
 
@@ -466,7 +465,7 @@ void RS_EventHandler::setCurrentAction(RS_ActionInterface * action)
 		return;
 
 	// Predecessor of the new action or NULL:
-	RS_ActionInterface * predecessor = NULL;
+	ActionInterface * predecessor = NULL;
 
 	// Suspend current action:
 	if (actionIndex >= 0 && currentActions[actionIndex]
@@ -490,7 +489,7 @@ void RS_EventHandler::setCurrentAction(RS_ActionInterface * action)
 	if (actionIndex == RS_MAXACTIONS - 1)
 	{
 		// delete oldest action if necessary (usually never happens):
-		if (currentActions[0] != NULL)
+		if (currentActions[0])
 		{
 			currentActions[0]->finish();
 			delete currentActions[0];
@@ -538,7 +537,7 @@ void RS_EventHandler::killSelectActions()
 {
 	for(int c=0; c<RS_MAXACTIONS; ++c)
 	{
-		if (currentActions[c] != NULL)
+		if (currentActions[c])
 		{
 			if (currentActions[c]->rtti() == RS2::ActionSelectSingle
 				|| currentActions[c]->rtti() == RS2::ActionSelectContour
@@ -657,12 +656,17 @@ void RS_EventHandler::cleanUp()
  */
 void RS_EventHandler::setSnapMode(RS2::SnapMode sm)
 {
+#if 0
 	for(int c=0; c<RS_MAXACTIONS; ++c)
 		if (currentActions[c])
 			currentActions[c]->setSnapMode(sm);
 
 	if (defaultAction)
 		defaultAction->setSnapMode(sm);
+#else
+#warning "!!! Not sure if this is going to work correctly..."
+	graphicView->snapper.setSnapMode(sm);
+#endif
 }
 
 /**
@@ -670,12 +674,17 @@ void RS_EventHandler::setSnapMode(RS2::SnapMode sm)
  */
 void RS_EventHandler::setSnapRestriction(RS2::SnapRestriction sr)
 {
+#if 0
 	for(int c=0; c<RS_MAXACTIONS; ++c)
 		if (currentActions[c])
 			currentActions[c]->setSnapRestriction(sr);
 
 	if (defaultAction)
 		defaultAction->setSnapRestriction(sr);
+#else
+#warning "!!! Not sure if this is going to work correctly..."
+	graphicView->snapper.setSnapRestriction(sr);
+#endif
 }
 
 void RS_EventHandler::debugActions()
@@ -687,7 +696,7 @@ void RS_EventHandler::debugActions()
 		if (c == actionIndex)
 			RS_DEBUG->print("Current");
 
-		if (currentActions[c] != NULL)
+		if (currentActions[c])
 			RS_DEBUG->print("Action %03d: %s [%s]",
 				c, currentActions[c]->getName().toLatin1().data(),
 				currentActions[c]->isFinished() ? "finished" : "active");