From a2ba8185a7d9c8ddb81616827421aad8860229a7 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 1 Jan 2011 20:04:50 -0800 Subject: [PATCH] Final touches on renaming SDL_eventtouch to SDL_x11touch --- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 24 ++++++++++++++---------- src/video/x11/SDL_x11touch.h | 6 +++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 0b37ba638..6041c21e0 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -460,6 +460,10 @@ 046B91ED0A11B53500FB151C /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B91E90A11B53500FB151C /* SDL_sysloadso.c */; }; 046B92130A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; }; 046B92140A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; }; + 046B9B6812D02EE600159CFE /* SDL_x11touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B9B6612D02EE600159CFE /* SDL_x11touch.c */; }; + 046B9B6912D02EE600159CFE /* SDL_x11touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 046B9B6712D02EE600159CFE /* SDL_x11touch.h */; }; + 046B9B6A12D02EE600159CFE /* SDL_x11touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B9B6612D02EE600159CFE /* SDL_x11touch.c */; }; + 046B9B6B12D02EE600159CFE /* SDL_x11touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 046B9B6712D02EE600159CFE /* SDL_x11touch.h */; }; 04DB838C10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */; }; 04DB838D10FD8C81000519B5 /* SDL_drawrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */; }; 04DB838E10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */; }; @@ -491,8 +495,6 @@ 8CB0A77F11F6A8E700CBA2DE /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A77B11F6A8E700CBA2DE /* SDL_gesture.c */; }; 8CB0A78011F6A8E700CBA2DE /* SDL_touch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77C11F6A8E700CBA2DE /* SDL_touch_c.h */; }; 8CB0A78111F6A8E700CBA2DE /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A77D11F6A8E700CBA2DE /* SDL_touch.c */; }; - 8CB0A78711F6A90B00CBA2DE /* SDL_eventtouch.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */; }; - 8CB0A78811F6A90B00CBA2DE /* SDL_eventtouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */; }; BECDF62E0761BA81005FE872 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; }; BECDF62F0761BA81005FE872 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; }; BECDF6300761BA81005FE872 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538332006D78D67F000001 /* SDL_audiodev.c */; }; @@ -849,6 +851,8 @@ 044E5F8411E6051C0076F181 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../include/SDL_clipboard.h; sourceTree = SOURCE_ROOT; }; 046B91E90A11B53500FB151C /* SDL_sysloadso.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_sysloadso.c; sourceTree = ""; }; 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dlcompat.c; sourceTree = ""; }; + 046B9B6612D02EE600159CFE /* SDL_x11touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11touch.c; sourceTree = ""; }; + 046B9B6712D02EE600159CFE /* SDL_x11touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11touch.h; sourceTree = ""; }; 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendfillrect.c; sourceTree = ""; }; 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawrect.c; sourceTree = ""; }; 04DEA56F11E6006A00386CAC /* SDL_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_input.h; path = ../../include/SDL_input.h; sourceTree = SOURCE_ROOT; }; @@ -897,8 +901,6 @@ 8CB0A77B11F6A8E700CBA2DE /* SDL_gesture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gesture.c; sourceTree = ""; }; 8CB0A77C11F6A8E700CBA2DE /* SDL_touch_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch_c.h; sourceTree = ""; }; 8CB0A77D11F6A8E700CBA2DE /* SDL_touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_touch.c; sourceTree = ""; }; - 8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_eventtouch.c; sourceTree = ""; }; - 8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_eventtouch.h; sourceTree = ""; }; B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_cpuinfo.c; sourceTree = ""; }; B29A290D04E5B28700A80002 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = ""; }; B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = ../../include/SDL_cpuinfo.h; sourceTree = SOURCE_ROOT; }; @@ -1145,12 +1147,10 @@ 00CFA719106B498B00758660 /* x11 */ = { isa = PBXGroup; children = ( - 8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */, - 8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */, - 8CB0A76A11F6A84800CBA2DE /* SDL_x11clipboard.c */, - 8CB0A76B11F6A84800CBA2DE /* SDL_x11clipboard.h */, 00CFA71A106B498B00758660 /* imKStoUCS.c */, 00CFA71B106B498B00758660 /* imKStoUCS.h */, + 8CB0A76A11F6A84800CBA2DE /* SDL_x11clipboard.c */, + 8CB0A76B11F6A84800CBA2DE /* SDL_x11clipboard.h */, 00CFA71C106B498B00758660 /* SDL_x11dyn.c */, 00CFA71D106B498B00758660 /* SDL_x11dyn.h */, 00CFA71E106B498B00758660 /* SDL_x11events.c */, @@ -1172,6 +1172,8 @@ 453773901207C6E9002F0F45 /* SDL_x11shape.c */, 453773911207C6E9002F0F45 /* SDL_x11shape.h */, 00CFA72E106B498B00758660 /* SDL_x11sym.h */, + 046B9B6612D02EE600159CFE /* SDL_x11touch.c */, + 046B9B6712D02EE600159CFE /* SDL_x11touch.h */, 00CFA72F106B498B00758660 /* SDL_x11video.c */, 00CFA730106B498B00758660 /* SDL_x11video.h */, 00CFA731106B498B00758660 /* SDL_x11window.c */, @@ -1863,11 +1865,11 @@ 8CB0A77911F6A87F00CBA2DE /* SDL_touch.h in Headers */, 8CB0A77E11F6A8E700CBA2DE /* SDL_gesture_c.h in Headers */, 8CB0A78011F6A8E700CBA2DE /* SDL_touch_c.h in Headers */, - 8CB0A78811F6A90B00CBA2DE /* SDL_eventtouch.h in Headers */, 4537737D1207C4CE002F0F45 /* SDL_shape_internals.h in Headers */, 453773821207C518002F0F45 /* SDL_shape.h in Headers */, 453773891207C5A2002F0F45 /* SDL_cocoashape.h in Headers */, 453773931207C6E9002F0F45 /* SDL_x11shape.h in Headers */, + 046B9B6912D02EE600159CFE /* SDL_x11touch.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1978,6 +1980,7 @@ 0420498311E6F052007E7EC9 /* scancodes_linux.h in Headers */, 0420498411E6F052007E7EC9 /* scancodes_win32.h in Headers */, 0420498511E6F052007E7EC9 /* scancodes_xfree86.h in Headers */, + 046B9B6B12D02EE600159CFE /* SDL_x11touch.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2350,10 +2353,10 @@ 8CB0A76C11F6A84800CBA2DE /* SDL_x11clipboard.c in Sources */, 8CB0A77F11F6A8E700CBA2DE /* SDL_gesture.c in Sources */, 8CB0A78111F6A8E700CBA2DE /* SDL_touch.c in Sources */, - 8CB0A78711F6A90B00CBA2DE /* SDL_eventtouch.c in Sources */, 4537737E1207C4CE002F0F45 /* SDL_shape.c in Sources */, 4537738A1207C5A2002F0F45 /* SDL_cocoashape.m in Sources */, 453773921207C6E9002F0F45 /* SDL_x11shape.c in Sources */, + 046B9B6812D02EE600159CFE /* SDL_x11touch.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2473,6 +2476,7 @@ 04DEA57611E6009000386CAC /* SDL_clipboard.c in Sources */, 04DEA57C11E600A600386CAC /* SDL_cocoaclipboard.m in Sources */, 0420496411E6EFD3007E7EC9 /* SDL_clipboardevents.c in Sources */, + 046B9B6A12D02EE600159CFE /* SDL_x11touch.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/video/x11/SDL_x11touch.h b/src/video/x11/SDL_x11touch.h index fc1a169af..72f15d748 100644 --- a/src/video/x11/SDL_x11touch.h +++ b/src/video/x11/SDL_x11touch.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_eventtouch_h -#define _SDL_eventtouch_h +#ifndef _SDL_x11touch_h +#define _SDL_x11touch_h //What should this be? @@ -38,6 +38,6 @@ typedef struct EventTouchData extern void X11_InitTouch(_THIS); extern void X11_QuitTouch(_THIS); -#endif /* _SDL_eventtouch_h */ +#endif /* _SDL_x11touch_h */ /* vi: set ts=4 sw=4 expandtab: */