X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_eventhandler.h;h=55e0dc7ffcf20572227800ef1383e2bbb417571f;hb=d774c2655ba2c3657a565f325411144452392277;hp=601bba7c17bfed218dc37f43483ca674470c1534;hpb=27d4a138d23453e93a833e9347444b828a971cb4;p=architektonas

diff --git a/src/base/rs_eventhandler.h b/src/base/rs_eventhandler.h
index 601bba7..55e0dc7 100644
--- a/src/base/rs_eventhandler.h
+++ b/src/base/rs_eventhandler.h
@@ -1,11 +1,13 @@
 #ifndef RS_EVENTHANDLER_H
 #define RS_EVENTHANDLER_H
 
-#include "rs_actioninterface.h"
+#include <QtGui>
+#include "rs.h"
 
 #define RS_MAXACTIONS 16
 
-class RS_ActionInterface;
+class ActionInterface;
+class RS_CommandEvent;
 class GraphicView;
 
 /**
@@ -21,29 +23,22 @@ class RS_EventHandler
 
 		void back();
 		void enter();
-
 		void mousePressEvent(QMouseEvent * e);
 		void mouseReleaseEvent(QMouseEvent * e);
 		void mouseMoveEvent(QMouseEvent * e);
 		void mouseLeaveEvent();
 		void mouseEnterEvent();
-
 		void keyPressEvent(QKeyEvent * e);
 		void keyReleaseEvent(QKeyEvent * e);
-
 		void commandEvent(RS_CommandEvent * e);
 		void enableCoordinateInput();
 		void disableCoordinateInput();
-
-		void setDefaultAction(RS_ActionInterface * action);
-		RS_ActionInterface * getDefaultAction();
-
-		void setCurrentAction(RS_ActionInterface * action);
-		RS_ActionInterface * getCurrentAction();
-
+		void setDefaultAction(ActionInterface * action);
+		ActionInterface * getDefaultAction();
+		void setCurrentAction(ActionInterface * action);
+		ActionInterface * getCurrentAction();
 		void killSelectActions();
 		void killAllActions();
-
 		bool hasAction();
 		void cleanUp();
 		void debugActions();
@@ -52,8 +47,8 @@ class RS_EventHandler
 
 	protected:
 		GraphicView * graphicView;
-		RS_ActionInterface * defaultAction;
-		RS_ActionInterface * currentActions[RS_MAXACTIONS];
+		ActionInterface * defaultAction;
+		ActionInterface * currentActions[RS_MAXACTIONS];
 		int actionIndex;
 		bool coordinateInputEnabled;
 };