LAB: Renamed mouse.* to eventman.*

12 files changed, 5 insertions, 16 deletions

diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index fe3c4284df..1823fe6fa5 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -36,7 +36,6 @@
 #include "lab/intro.h"
 #include "lab/parsefun.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
 #include "lab/resource.h"
 
 namespace Lab {
diff --git a/engines/lab/mouse.cpp b/engines/lab/eventman.cpp
index 45dd53f5c3..751f387e05 100644
--- a/engines/lab/mouse.cpp
+++ b/engines/lab/eventman.cpp
@@ -30,7 +30,6 @@
 
 #include "lab/lab.h"
 #include "lab/image.h"
-#include "lab/mouse.h"
 #include "lab/interface.h"
 
 namespace Lab {
diff --git a/engines/lab/mouse.h b/engines/lab/eventman.h
index b3b3e30da3..156fb96adc 100644
--- a/engines/lab/mouse.h
+++ b/engines/lab/eventman.h
@@ -28,10 +28,8 @@
  *
  */
 
-#include "common/events.h"
-
-#ifndef LAB_MOUSE_H
-#define LAB_MOUSE_H
+#ifndef LAB_EVENTMAN_H
+#define LAB_EVENTMAN_H
 
 namespace Lab {
 
@@ -80,4 +78,4 @@ public:
 
 } // End of namespace Lab
 
-#endif /* LAB_MOUSE_H */
+#endif /* LAB_EVENTMAN_H */
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp
index 9de6400aa6..4c2d3d7019 100644
--- a/engines/lab/graphics.cpp
+++ b/engines/lab/graphics.cpp
@@ -34,7 +34,6 @@
 #include "lab/image.h"
 #include "lab/labfun.h"
 #include "lab/parsefun.h"
-#include "lab/mouse.h"
 #include "lab/text.h"
 #include "lab/resource.h"
 
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index ada510bd6e..9a51978bdf 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -32,7 +32,6 @@
 #include "lab/labfun.h"
 #include "lab/image.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
 #include "common/util.h"
 
 namespace Lab {
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index f4b223a025..6135f5e9d7 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -37,7 +37,7 @@
 #include "engines/engine.h"
 #include "lab/labfun.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
+#include "lab/eventman.h"
 #include "lab/music.h"
 #include "lab/resource.h"
 #include "lab/anim.h"
diff --git a/engines/lab/labfile.cpp b/engines/lab/labfile.cpp
index 99a02c14ff..3a34f80b43 100644
--- a/engines/lab/labfile.cpp
+++ b/engines/lab/labfile.cpp
@@ -30,7 +30,6 @@
 
 #include "lab/lab.h"
 #include "lab/labfun.h"
-#include "lab/mouse.h"
 #include "common/file.h"
 
 namespace Lab {
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 0690ed0fb9..efc1825b4b 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -33,7 +33,6 @@
 #include "lab/anim.h"
 #include "lab/image.h"
 #include "lab/text.h"
-#include "lab/mouse.h"
 #include "lab/parsefun.h"
 #include "lab/parsetypes.h"
 #include "lab/resource.h"
diff --git a/engines/lab/module.mk b/engines/lab/module.mk
index cfe867a0a2..67d6b286d5 100644
--- a/engines/lab/module.mk
+++ b/engines/lab/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	anim.o \
 	detection.o \
 	engine.o \
+	eventman.o \
 	graphics.o \
 	image.o \
 	interface.o \
@@ -13,7 +14,6 @@ MODULE_OBJS := \
 	labfile.o \
 	labsets.o \
 	map.o \
-	mouse.o \
 	music.o \
 	processroom.o \
 	resource.o \
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 7f8df15c35..6a7bb4baea 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -31,7 +31,6 @@
 #include "audio/mixer.h"
 
 #include "lab/labfun.h"
-#include "lab/mouse.h"
 #include "lab/music.h"
 #include "lab/lab.h"
 
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 419e0d3a05..401d89766c 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -40,7 +40,6 @@
 #include "lab/interface.h"
 #include "lab/anim.h"
 #include "lab/text.h"
-#include "lab/mouse.h"
 #include "lab/parsetypes.h"
 #include "lab/resource.h"
 
diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp
index 959218e98c..d64953c6b9 100644
--- a/engines/lab/vga.cpp
+++ b/engines/lab/vga.cpp
@@ -33,7 +33,6 @@
 
 #include "lab/lab.h"
 #include "lab/image.h"
-#include "lab/mouse.h"
 
 namespace Lab {