diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-09 17:36:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-09 17:36:42 +0400 |
commit | 97d4fb4161bc82888fc1052e53882ccaae6be1f4 (patch) | |
tree | 48af08fc0dff29e7b618acac09a438f21df878ef /source/gameengine/GamePlayer | |
parent | a580c891a7911c46a8d57703858904ca25f29c1a (diff) |
code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.
Diffstat (limited to 'source/gameengine/GamePlayer')
12 files changed, 19 insertions, 33 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 2a597c4c43d..a995dcfaa86 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -38,7 +38,7 @@ #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning #include <windows.h> -#endif // WIN32 +#endif /* WIN32 */ #include "GL/glew.h" @@ -273,5 +273,4 @@ protected: static TBannerId s_bannerId; }; -#endif // __GPC_CANVAS_H__ - +#endif /* __GPC_CANVAS_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h index 60f0d2af199..6247bd630bb 100644 --- a/source/gameengine/GamePlayer/common/GPC_Engine.h +++ b/source/gameengine/GamePlayer/common/GPC_Engine.h @@ -121,5 +121,4 @@ private: }; -#endif // __GPC_ENGINE_H__ - +#endif /* __GPC_ENGINE_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h index 63e051dd1d4..afe7f921a61 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h @@ -34,7 +34,7 @@ #ifdef WIN32 #pragma warning (disable : 4786) -#endif // WIN32 +#endif /* WIN32 */ #include "SCA_IInputDevice.h" @@ -87,5 +87,4 @@ public: virtual void HookEscape(); }; -#endif // _GPC_KEYBOARDDEVICE_H - +#endif /* __GPC_KEYBOARDDEVICE_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h index 2db1b1ec34c..7699a9e3eae 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.h @@ -34,7 +34,7 @@ #ifdef WIN32 #pragma warning (disable : 4786) -#endif // WIN32 +#endif /* WIN32 */ #include "SCA_IInputDevice.h" @@ -102,5 +102,4 @@ protected: virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval); }; -#endif // __GPC_MOUSEDEVICE_H__ - +#endif /* __GPC_MOUSEDEVICE_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.h b/source/gameengine/GamePlayer/common/GPC_RawImage.h index 4d3f45597f8..afff59484b9 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawImage.h +++ b/source/gameengine/GamePlayer/common/GPC_RawImage.h @@ -117,5 +117,4 @@ protected: int m_height; }; -#endif // __GPC_RAWIMAGE_H__ - +#endif /* __GPC_RAWIMAGE_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h index 6f15276ab83..d5c1b210454 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h +++ b/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h @@ -34,5 +34,4 @@ void GetRawLoadingAnimation(unsigned char **data, int *dataSize); -#endif // __GPC_RAWLOADDOTBLENDARRAY_H__ - +#endif /* __GPC_RAWLOADDOTBLENDARRAY_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h index ade00020353..bb5c5e220a3 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h +++ b/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h @@ -38,5 +38,4 @@ void GetRawBlender3DLogo(unsigned char **data, int *width, int *height); void GetRawNaNLogo(unsigned char **data, int *width, int *height); #endif -#endif // __GPC_RAWLOGOARRAYS_H__ - +#endif /* __GPC_RAWLOGOARRAYS_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index 166a931beab..1030c09548a 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -36,7 +36,7 @@ // don't show stl-warnings #pragma warning (disable:4786) #include <windows.h> -#endif // WIN32 +#endif /* WIN32 */ #include "RAS_IRenderTools.h" @@ -106,7 +106,4 @@ public: virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj); }; -#endif // __GPC_RENDERTOOLS_H__ - - - +#endif /* __GPC_RENDERTOOLS_H__ */ diff --git a/source/gameengine/GamePlayer/common/GPC_System.h b/source/gameengine/GamePlayer/common/GPC_System.h index 03bb7743637..4169064179e 100644 --- a/source/gameengine/GamePlayer/common/GPC_System.h +++ b/source/gameengine/GamePlayer/common/GPC_System.h @@ -59,5 +59,4 @@ public: // NG_NetworkDeviceInterface* m_ndi; }; -#endif // __GPC_SYSTEM_H__ - +#endif /* __GPC_SYSTEM_H__ */ diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h index d931f605a64..f2d7ec267f3 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h @@ -34,7 +34,7 @@ #ifdef WIN32 #pragma warning (disable : 4786) -#endif // WIN32 +#endif /* WIN32 */ #include "GPC_Canvas.h" @@ -66,5 +66,4 @@ public: void EndDraw() {}; }; -#endif // __GPG_CANVAS_H__ - +#endif /* __GPG_CANVAS_H__ */ diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h index 8d72a621b6a..4c6b8205a42 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h @@ -35,7 +35,7 @@ #ifdef WIN32 #pragma warning (disable : 4786) -#endif // WIN32 +#endif /* WIN32 */ #include "GHOST_Types.h" #include "GPC_KeyboardDevice.h" @@ -53,5 +53,4 @@ public: virtual ~GPG_KeyboardDevice(void); }; -#endif //__GPG_KEYBOARDDEVICE_H__ - +#endif /* __GPG_KEYBOARDDEVICE_H__ */ diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.h b/source/gameengine/GamePlayer/ghost/GPG_System.h index 796ad0c2b8c..d68fc812dd3 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_System.h +++ b/source/gameengine/GamePlayer/ghost/GPG_System.h @@ -35,7 +35,7 @@ #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning -#endif // WIN32 +#endif /* WIN32 */ #include "GPC_System.h" @@ -51,5 +51,4 @@ public: virtual double GetTimeInSeconds(); }; -#endif // __GPG_SYSTEM_H__ - +#endif /* __GPG_SYSTEM_H__ */ |