From 7b2445b2ce7787f60b335cf8a46be8e1fd49a2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 29 Jul 2004 13:29:24 +0000
Subject: [PATCH] input_server messages ids are shared : they go to private
 headers #include fixes

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8506 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/input/InputServer.cpp | 15 ++++++++-------
 src/servers/input/InputServer.h   | 27 ---------------------------
 src/servers/input/Jamfile         |  1 +
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 4e9cdfc25b..dab9abcf14 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -35,18 +35,19 @@
 #include <stdio.h>
 
 #include "InputServer.h"
-#include "Path.h"
-#include "Directory.h"
-#include "FindDirectory.h"
-#include "Entry.h"
-#include "Locker.h"
-#include "Debug.h"
+#include <Path.h>
+#include <Directory.h>
+#include <FindDirectory.h>
+#include <Entry.h>
+#include <Locker.h>
+#include <Debug.h>
 #include <String.h>
 
 #include "InputServerDeviceListEntry.h"
 #include "InputServerFilterListEntry.h"
 #include "InputServerMethodListEntry.h"
-#include "Message.h"
+#include <Message.h>
+#include "InputServerTypes.h"
 
 // include app_server headers for communication
 #include <PortLink.h>
diff --git a/src/servers/input/InputServer.h b/src/servers/input/InputServer.h
index 4ce39ae9ee..1d3286ad9e 100644
--- a/src/servers/input/InputServer.h
+++ b/src/servers/input/InputServer.h
@@ -49,33 +49,6 @@
 
 class PortLink;
 
-// Constants
-#define SET_METHOD					'stmd'
-#define GET_MOUSE_TYPE				'gtmt'
-#define SET_MOUSE_TYPE 				'stmt'
-#define GET_MOUSE_ACCELERATION 		'gtma'
-#define SET_MOUSE_ACCELERATION 		'stma'
-#define GET_KEY_REPEAT_DELAY 		'gkrd'
-#define SET_KEY_REPEAT_DELAY 		'skrd'
-#define GET_KEY_INFO 				'ktki'
-#define GET_MODIFIERS 				'gtmf'
-#define SET_MODIFIER_KEY 			'smky'
-#define SET_KEYBOARD_LOCKS 			'skbl'
-#define GET_MOUSE_SPEED 			'gtms'
-#define SET_MOUSE_SPEED 			'stms'
-#define SET_MOUSE_POSITION 			'stmp'
-#define GET_MOUSE_MAP 				'gtmm'
-#define SET_MOUSE_MAP 				'stmm'
-#define GET_KEYBOARD_ID 			'gkbi'
-#define GET_CLICK_SPEED 			'gtcs'
-#define SET_CLICK_SPEED 			'stcs'
-#define GET_KEY_REPEAT_RATE 		'gkrr'
-#define SET_KEY_REPEAT_RATE 		'skrr'
-#define GET_KEY_MAP 				'gtkm'
-#define SET_KEY_MAP 				'stkm'
-#define FOCUS_IM_AWARE_VIEW 		'fiav'
-#define UNFOCUS_IM_AWARE_VIEW 		'uiav'
-
 class InputDeviceListItem
 {
 	public:
diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile
index 1c01a56d81..7db111703f 100644
--- a/src/servers/input/Jamfile
+++ b/src/servers/input/Jamfile
@@ -3,6 +3,7 @@ SubDir OBOS_TOP src servers input ;
 AddResources input_server : input_server.rdef ;
 
 UsePrivateHeaders app ;
+UsePrivateHeaders input ;
 
 Server input_server :
 	InputServer.cpp