summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-16 12:13:16 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-17 09:05:22 +1000
commitd230742ea820a21a3f1ed0c58b5e6d8680b2f2aa (patch)
treec1d736272599c1701aace889c82f0a1f48077b7d /dix
parent4ddb002b6847e8a88e6f13ae0453a35ee79946ae (diff)
Xi: namespace XI2 files.
Some files (notably those merged with MPX before XI2 came along) didn't use a 'xi' prefix. This patch changes all of them to meaningful names. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/devices.c4
-rw-r--r--dix/eventconvert.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 3996ca64a..2b0358875 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -78,11 +78,11 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>
#include "exglobals.h"
#include "exevents.h"
-#include "querydev.h" /* for SizeDeviceClasses */
+#include "xiquerydevice.h" /* for SizeDeviceClasses */
#include "xiproperty.h"
#include "enterleave.h" /* for EnterWindow() */
#include "xserver-properties.h"
-#include "chdevhier.h" /* For XISendDeviceHierarchyEvent */
+#include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */
/** @file
* This file handles input device-related stuff.
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 85ddd61f2..ac2b0c310 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -45,7 +45,7 @@
#include "events.h"
#include "exglobals.h"
#include "eventconvert.h"
-#include "querydev.h"
+#include "xiquerydevice.h"
#include "xkbsrv.h"