LAB: Make some functions and variables private in eventMan

1 files changed, 24 insertions, 22 deletions

diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h
index cf61c40c19..669866d8fa 100644
--- a/engines/lab/eventman.h
+++ b/engines/lab/eventman.h
@@ -72,50 +72,52 @@ typedef Common::List<Button *> ButtonList;
 class EventManager {
 private:
 	LabEngine *_vm;
+
 	bool _leftClick;
 	bool _rightClick;
-
 	bool _mouseHidden;
-	Button *_lastButtonHit;
+	bool _mouseAtEdge;
+
 	uint16 _nextKeyIn;
 	uint16 _nextKeyOut;
-	Common::Point _mousePos;
-	bool _mouseAtEdge;
 	uint16 _keyBuf[64];
 
-public:
-	EventManager (LabEngine *vm);
-
-	ButtonList *_screenButtonList;
 	Button *_hitButton;
+	Button *_lastButtonHit;
+	ButtonList *_screenButtonList;
+	Common::Point _mousePos;
 	Common::KeyState _keyPressed;
 
+private:
 	Button *checkButtonHit(ButtonList *buttonList, Common::Point pos);
-	void initMouse();
-	void updateMouse();
-	void mouseShow();
-	void mouseHide();
-	Common::Point getMousePos();
-	void setMousePos(Common::Point pos);
 	bool mouseButton(uint16 *x, uint16 *y, bool leftButton);
 	Button *mouseButton();
-	void attachButtonList(ButtonList *buttonList);
-	Button *getButton(uint16 id);
 	void mouseHandler(int flag, Common::Point pos);
 	bool keyPress(uint16 *keyCode);
 	bool haveNextChar();
-	void processInput(bool can_delay = false);
 	uint16 getNextChar();
-	Common::Point updateAndGetMousePos();
-
 	Button *checkNumButtonHit(ButtonList *buttonList, uint16 key);
+	uint16 makeButtonKeyEquiv(uint16 key);
+
+public:
+	EventManager (LabEngine *vm);
+
+	void attachButtonList(ButtonList *buttonList);
 	Button *createButton(uint16 x, uint16 y, uint16 id, uint16 key, Image *im, Image *imalt);
-	void freeButtonList(ButtonList *buttonList);
-	void drawButtonList(ButtonList *buttonList);
 	void disableButton(Button *curgad, uint16 pencolor);
+	void drawButtonList(ButtonList *buttonList);
 	void enableButton(Button *curgad);
+	void freeButtonList(ButtonList *buttonList);
+	Button *getButton(uint16 id);
+	Common::Point getMousePos();
 	IntuiMessage *getMsg();
-	uint16 makeButtonKeyEquiv(uint16 key);
+	void initMouse();
+	void mouseShow();
+	void mouseHide();
+	void processInput(bool can_delay = false);
+	void setMousePos(Common::Point pos);
+	void updateMouse();
+	Common::Point updateAndGetMousePos();
 };
 
 } // End of namespace Lab