Final touches on renaming SDL_eventtouch to SDL_x11touch
authorSam Lantinga
Sat, 01 Jan 2011 20:04:50 -0800
changeset 494504c8581b729e
parent 4944 921637675f2c
child 4946 acdd88ebd0a0
Final touches on renaming SDL_eventtouch to SDL_x11touch
Xcode/SDL/SDL.xcodeproj/project.pbxproj
src/video/x11/SDL_x11touch.h
     1.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sat Jan 01 19:50:50 2011 -0800
     1.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sat Jan 01 20:04:50 2011 -0800
     1.3 @@ -460,6 +460,10 @@
     1.4  		046B91ED0A11B53500FB151C /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B91E90A11B53500FB151C /* SDL_sysloadso.c */; };
     1.5  		046B92130A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; };
     1.6  		046B92140A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; };
     1.7 +		046B9B6812D02EE600159CFE /* SDL_x11touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B9B6612D02EE600159CFE /* SDL_x11touch.c */; };
     1.8 +		046B9B6912D02EE600159CFE /* SDL_x11touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 046B9B6712D02EE600159CFE /* SDL_x11touch.h */; };
     1.9 +		046B9B6A12D02EE600159CFE /* SDL_x11touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B9B6612D02EE600159CFE /* SDL_x11touch.c */; };
    1.10 +		046B9B6B12D02EE600159CFE /* SDL_x11touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 046B9B6712D02EE600159CFE /* SDL_x11touch.h */; };
    1.11  		04DB838C10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */; };
    1.12  		04DB838D10FD8C81000519B5 /* SDL_drawrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */; };
    1.13  		04DB838E10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */; };
    1.14 @@ -491,8 +495,6 @@
    1.15  		8CB0A77F11F6A8E700CBA2DE /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A77B11F6A8E700CBA2DE /* SDL_gesture.c */; };
    1.16  		8CB0A78011F6A8E700CBA2DE /* SDL_touch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77C11F6A8E700CBA2DE /* SDL_touch_c.h */; };
    1.17  		8CB0A78111F6A8E700CBA2DE /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A77D11F6A8E700CBA2DE /* SDL_touch.c */; };
    1.18 -		8CB0A78711F6A90B00CBA2DE /* SDL_eventtouch.c in Sources */ = {isa = PBXBuildFile; fileRef = 8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */; };
    1.19 -		8CB0A78811F6A90B00CBA2DE /* SDL_eventtouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */; };
    1.20  		BECDF62E0761BA81005FE872 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; };
    1.21  		BECDF62F0761BA81005FE872 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; };
    1.22  		BECDF6300761BA81005FE872 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538332006D78D67F000001 /* SDL_audiodev.c */; };
    1.23 @@ -849,6 +851,8 @@
    1.24  		044E5F8411E6051C0076F181 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../include/SDL_clipboard.h; sourceTree = SOURCE_ROOT; };
    1.25  		046B91E90A11B53500FB151C /* SDL_sysloadso.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_sysloadso.c; sourceTree = "<group>"; };
    1.26  		046B92100A11B8AD00FB151C /* SDL_dlcompat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dlcompat.c; sourceTree = "<group>"; };
    1.27 +		046B9B6612D02EE600159CFE /* SDL_x11touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11touch.c; sourceTree = "<group>"; };
    1.28 +		046B9B6712D02EE600159CFE /* SDL_x11touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11touch.h; sourceTree = "<group>"; };
    1.29  		04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendfillrect.c; sourceTree = "<group>"; };
    1.30  		04DB838B10FD8C81000519B5 /* SDL_drawrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawrect.c; sourceTree = "<group>"; };
    1.31  		04DEA56F11E6006A00386CAC /* SDL_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_input.h; path = ../../include/SDL_input.h; sourceTree = SOURCE_ROOT; };
    1.32 @@ -897,8 +901,6 @@
    1.33  		8CB0A77B11F6A8E700CBA2DE /* SDL_gesture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gesture.c; sourceTree = "<group>"; };
    1.34  		8CB0A77C11F6A8E700CBA2DE /* SDL_touch_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_touch_c.h; sourceTree = "<group>"; };
    1.35  		8CB0A77D11F6A8E700CBA2DE /* SDL_touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_touch.c; sourceTree = "<group>"; };
    1.36 -		8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_eventtouch.c; sourceTree = "<group>"; };
    1.37 -		8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_eventtouch.h; sourceTree = "<group>"; };
    1.38  		B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_cpuinfo.c; sourceTree = "<group>"; };
    1.39  		B29A290D04E5B28700A80002 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = "<group>"; };
    1.40  		B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = ../../include/SDL_cpuinfo.h; sourceTree = SOURCE_ROOT; };
    1.41 @@ -1145,12 +1147,10 @@
    1.42  		00CFA719106B498B00758660 /* x11 */ = {
    1.43  			isa = PBXGroup;
    1.44  			children = (
    1.45 -				8CB0A78511F6A90B00CBA2DE /* SDL_eventtouch.c */,
    1.46 -				8CB0A78611F6A90B00CBA2DE /* SDL_eventtouch.h */,
    1.47 +				00CFA71A106B498B00758660 /* imKStoUCS.c */,
    1.48 +				00CFA71B106B498B00758660 /* imKStoUCS.h */,
    1.49  				8CB0A76A11F6A84800CBA2DE /* SDL_x11clipboard.c */,
    1.50  				8CB0A76B11F6A84800CBA2DE /* SDL_x11clipboard.h */,
    1.51 -				00CFA71A106B498B00758660 /* imKStoUCS.c */,
    1.52 -				00CFA71B106B498B00758660 /* imKStoUCS.h */,
    1.53  				00CFA71C106B498B00758660 /* SDL_x11dyn.c */,
    1.54  				00CFA71D106B498B00758660 /* SDL_x11dyn.h */,
    1.55  				00CFA71E106B498B00758660 /* SDL_x11events.c */,
    1.56 @@ -1172,6 +1172,8 @@
    1.57  				453773901207C6E9002F0F45 /* SDL_x11shape.c */,
    1.58  				453773911207C6E9002F0F45 /* SDL_x11shape.h */,
    1.59  				00CFA72E106B498B00758660 /* SDL_x11sym.h */,
    1.60 +				046B9B6612D02EE600159CFE /* SDL_x11touch.c */,
    1.61 +				046B9B6712D02EE600159CFE /* SDL_x11touch.h */,
    1.62  				00CFA72F106B498B00758660 /* SDL_x11video.c */,
    1.63  				00CFA730106B498B00758660 /* SDL_x11video.h */,
    1.64  				00CFA731106B498B00758660 /* SDL_x11window.c */,
    1.65 @@ -1863,11 +1865,11 @@
    1.66  				8CB0A77911F6A87F00CBA2DE /* SDL_touch.h in Headers */,
    1.67  				8CB0A77E11F6A8E700CBA2DE /* SDL_gesture_c.h in Headers */,
    1.68  				8CB0A78011F6A8E700CBA2DE /* SDL_touch_c.h in Headers */,
    1.69 -				8CB0A78811F6A90B00CBA2DE /* SDL_eventtouch.h in Headers */,
    1.70  				4537737D1207C4CE002F0F45 /* SDL_shape_internals.h in Headers */,
    1.71  				453773821207C518002F0F45 /* SDL_shape.h in Headers */,
    1.72  				453773891207C5A2002F0F45 /* SDL_cocoashape.h in Headers */,
    1.73  				453773931207C6E9002F0F45 /* SDL_x11shape.h in Headers */,
    1.74 +				046B9B6912D02EE600159CFE /* SDL_x11touch.h in Headers */,
    1.75  			);
    1.76  			runOnlyForDeploymentPostprocessing = 0;
    1.77  		};
    1.78 @@ -1978,6 +1980,7 @@
    1.79  				0420498311E6F052007E7EC9 /* scancodes_linux.h in Headers */,
    1.80  				0420498411E6F052007E7EC9 /* scancodes_win32.h in Headers */,
    1.81  				0420498511E6F052007E7EC9 /* scancodes_xfree86.h in Headers */,
    1.82 +				046B9B6B12D02EE600159CFE /* SDL_x11touch.h in Headers */,
    1.83  			);
    1.84  			runOnlyForDeploymentPostprocessing = 0;
    1.85  		};
    1.86 @@ -2350,10 +2353,10 @@
    1.87  				8CB0A76C11F6A84800CBA2DE /* SDL_x11clipboard.c in Sources */,
    1.88  				8CB0A77F11F6A8E700CBA2DE /* SDL_gesture.c in Sources */,
    1.89  				8CB0A78111F6A8E700CBA2DE /* SDL_touch.c in Sources */,
    1.90 -				8CB0A78711F6A90B00CBA2DE /* SDL_eventtouch.c in Sources */,
    1.91  				4537737E1207C4CE002F0F45 /* SDL_shape.c in Sources */,
    1.92  				4537738A1207C5A2002F0F45 /* SDL_cocoashape.m in Sources */,
    1.93  				453773921207C6E9002F0F45 /* SDL_x11shape.c in Sources */,
    1.94 +				046B9B6812D02EE600159CFE /* SDL_x11touch.c in Sources */,
    1.95  			);
    1.96  			runOnlyForDeploymentPostprocessing = 0;
    1.97  		};
    1.98 @@ -2473,6 +2476,7 @@
    1.99  				04DEA57611E6009000386CAC /* SDL_clipboard.c in Sources */,
   1.100  				04DEA57C11E600A600386CAC /* SDL_cocoaclipboard.m in Sources */,
   1.101  				0420496411E6EFD3007E7EC9 /* SDL_clipboardevents.c in Sources */,
   1.102 +				046B9B6A12D02EE600159CFE /* SDL_x11touch.c in Sources */,
   1.103  			);
   1.104  			runOnlyForDeploymentPostprocessing = 0;
   1.105  		};
     2.1 --- a/src/video/x11/SDL_x11touch.h	Sat Jan 01 19:50:50 2011 -0800
     2.2 +++ b/src/video/x11/SDL_x11touch.h	Sat Jan 01 20:04:50 2011 -0800
     2.3 @@ -21,8 +21,8 @@
     2.4  */
     2.5  #include "SDL_config.h"
     2.6  
     2.7 -#ifndef _SDL_eventtouch_h
     2.8 -#define _SDL_eventtouch_h
     2.9 +#ifndef _SDL_x11touch_h
    2.10 +#define _SDL_x11touch_h
    2.11  
    2.12  
    2.13  //What should this be?
    2.14 @@ -38,6 +38,6 @@
    2.15  extern void X11_InitTouch(_THIS);
    2.16  extern void X11_QuitTouch(_THIS);
    2.17  
    2.18 -#endif /* _SDL_eventtouch_h */
    2.19 +#endif /* _SDL_x11touch_h */
    2.20  
    2.21  /* vi: set ts=4 sw=4 expandtab: */