Get rid of underscore defines. They are reserved by the standard.

11 years ago · c004fb778f
parent b8e9343764
commit c004fb778f
25 changed files with 51 additions and 51 deletions
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@ -1,5 +1,5 @@
-#ifndef _MWINPUT_MWINPUTMANAGERIMP_H
-#define _MWINPUT_MWINPUTMANAGERIMP_H
+#ifndef MWINPUT_MWINPUTMANAGERIMP_H
+#define MWINPUT_MWINPUTMANAGERIMP_H

 #include "../mwgui/mode.hpp"

--- a/apps/openmw/mwrender/activatoranimation.hpp
+++ b/apps/openmw/mwrender/activatoranimation.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ACTIVATORANIMATION_H
-#define _GAME_RENDER_ACTIVATORANIMATION_H
+#ifndef GAME_RENDER_ACTIVATORANIMATION_H
+#define GAME_RENDER_ACTIVATORANIMATION_H

 #include "animation.hpp"

--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ACTORS_H
-#define _GAME_RENDER_ACTORS_H
+#ifndef GAME_RENDER_ACTORS_H
+#define GAME_RENDER_ACTORS_H

 #include <openengine/ogre/renderer.hpp>

--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ANIMATION_H
-#define _GAME_RENDER_ANIMATION_H
+#ifndef GAME_RENDER_ANIMATION_H
+#define GAME_RENDER_ANIMATION_H

 #include <OgreController.h>
 #include <OgreVector3.h>
--- a/apps/openmw/mwrender/creatureanimation.hpp
+++ b/apps/openmw/mwrender/creatureanimation.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_CREATUREANIMATION_H
-#define _GAME_RENDER_CREATUREANIMATION_H
+#ifndef GAME_RENDER_CREATUREANIMATION_H
+#define GAME_RENDER_CREATUREANIMATION_H

 #include "animation.hpp"

--- a/apps/openmw/mwrender/debugging.hpp
+++ b/apps/openmw/mwrender/debugging.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_MWSCENE_H
-#define _GAME_RENDER_MWSCENE_H
+#ifndef GAME_RENDER_MWSCENE_H
+#define GAME_RENDER_MWSCENE_H

 #include <utility>
 #include <openengine/ogre/renderer.hpp>
--- a/apps/openmw/mwrender/globalmap.hpp
+++ b/apps/openmw/mwrender/globalmap.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_GLOBALMAP_H
-#define _GAME_RENDER_GLOBALMAP_H
+#ifndef GAME_RENDER_GLOBALMAP_H
+#define GAME_RENDER_GLOBALMAP_H

 #include <string>

--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_LOCALMAP_H
-#define _GAME_RENDER_LOCALMAP_H
+#ifndef GAME_RENDER_LOCALMAP_H
+#define GAME_RENDER_LOCALMAP_H

 #include <openengine/ogre/renderer.hpp>

--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_NPCANIMATION_H
-#define _GAME_RENDER_NPCANIMATION_H
+#ifndef GAME_RENDER_NPCANIMATION_H
+#define GAME_RENDER_NPCANIMATION_H

 #include "animation.hpp"

--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_OBJECTS_H
-#define _GAME_RENDER_OBJECTS_H
+#ifndef GAME_RENDER_OBJECTS_H
+#define GAME_RENDER_OBJECTS_H

 #include <OgreColourValue.h>
 #include <OgreAxisAlignedBox.h>
--- a/apps/openmw/mwrender/occlusionquery.hpp
+++ b/apps/openmw/mwrender/occlusionquery.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_OCCLUSION_QUERY_H
-#define _GAME_OCCLUSION_QUERY_H
+#ifndef GAME_OCCLUSION_QUERY_H
+#define GAME_OCCLUSION_QUERY_H

 #include <OgreRenderObjectListener.h>
 #include <OgreRenderQueueListener.h>
--- a/apps/openmw/mwrender/renderinginterface.hpp
+++ b/apps/openmw/mwrender/renderinginterface.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDERING_INTERFACE_H
-#define _GAME_RENDERING_INTERFACE_H
+#ifndef GAME_RENDERING_INTERFACE_H
+#define GAME_RENDERING_INTERFACE_H

 namespace MWRender
 {
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@ -1,5 +1,5 @@
-#ifndef _GAME_RENDERING_MANAGER_H
-#define _GAME_RENDERING_MANAGER_H
+#ifndef GAME_RENDERING_MANAGER_H
+#define GAME_RENDERING_MANAGER_H

 #include "sky.hpp"
 #include "debugging.hpp"
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@ -1,5 +1,5 @@
-#ifndef _COMPONENTS_SETTINGS_H
-#define _COMPONENTS_SETTINGS_H
+#ifndef COMPONENTS_SETTINGS_H
+#define COMPONENTS_SETTINGS_H

 #include <OgreConfigFile.h>

--- a/extern/oics/ICSChannel.h
+++ b/extern/oics/ICSChannel.h
@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */

-#ifndef _Channel_H_
-#define _Channel_H_
+#ifndef OICS_Channel_H_
+#define OICS_Channel_H_

 #include "ICSPrerequisites.h"

@ -119,4 +119,4 @@ namespace ICS
 }


-#endif
+#endif
--- a/extern/oics/ICSControl.h
+++ b/extern/oics/ICSControl.h
@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */

-#ifndef _Control_H_
-#define _Control_H_
+#ifndef OICS_Control_H_
+#define OICS_Control_H_

 #include "ICSPrerequisites.h"

--- a/extern/oics/ICSInputControlSystem.h
+++ b/extern/oics/ICSInputControlSystem.h
@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */

-#ifndef _InputControlSystem_H_
-#define _InputControlSystem_H_
+#ifndef OICS_InputControlSystem_H_
+#define OICS_InputControlSystem_H_

 #include "ICSPrerequisites.h"

--- a/extern/sdl4ogre/OISCompat.h
+++ b/extern/sdl4ogre/OISCompat.h
@ -1,5 +1,5 @@
-#ifndef _OIS_SDL_COMPAT_H
-#define _OIS_SDL_COMPAT_H
+#ifndef OIS_SDL_COMPAT_H
+#define OIS_SDL_COMPAT_H

 #include <SDL_events.h>
 #include <SDL_types.h>
--- a/extern/sdl4ogre/cursormanager.hpp
+++ b/extern/sdl4ogre/cursormanager.hpp
@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_CURSOR_MANAGER_H
-#define _SDL4OGRE_CURSOR_MANAGER_H
+#ifndef SDL4OGRE_CURSOR_MANAGER_H
+#define SDL4OGRE_CURSOR_MANAGER_H

 #include <SDL_types.h>
 #include <string>
--- a/extern/sdl4ogre/sdlcursormanager.hpp
+++ b/extern/sdl4ogre/sdlcursormanager.hpp
@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_CURSORMANAGER_H
-#define _SDL4OGRE_CURSORMANAGER_H
+#ifndef SDL4OGRE_CURSORMANAGER_H
+#define SDL4OGRE_CURSORMANAGER_H

 #include <SDL.h>

--- a/extern/sdl4ogre/sdlinputwrapper.hpp
+++ b/extern/sdl4ogre/sdlinputwrapper.hpp
@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_SDLINPUTWRAPPER_H
-#define _SDL4OGRE_SDLINPUTWRAPPER_H
+#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
+#define SDL4OGRE_SDLINPUTWRAPPER_H

 #include <SDL_events.h>

--- a/libs/openengine/bullet/BtOgreExtras.h
+++ b/libs/openengine/bullet/BtOgreExtras.h
@ -13,8 +13,8 @@
 * =====================================================================================
 */

-#ifndef _BtOgreShapes_H_
-#define _BtOgreShapes_H_
+#ifndef BtOgreShapes_H_
+#define BtOgreShapes_H_

 #include "btBulletDynamicsCommon.h"
 #include "OgreSimpleRenderable.h"
--- a/libs/openengine/bullet/BtOgreGP.h
+++ b/libs/openengine/bullet/BtOgreGP.h
@ -14,8 +14,8 @@
 * =====================================================================================
 */

-#ifndef _BtOgrePG_H_
-#define _BtOgrePG_H_
+#ifndef BtOgrePG_H_
+#define BtOgrePG_H_

 #include "btBulletDynamicsCommon.h"
 #include "BtOgreExtras.h"
--- a/libs/openengine/bullet/BtOgrePG.h
+++ b/libs/openengine/bullet/BtOgrePG.h
@ -14,8 +14,8 @@
 * =====================================================================================
 */

-#ifndef _BtOgreGP_H_
-#define _BtOgreGP_H_
+#ifndef BtOgreGP_H_
+#define BtOgreGP_H_

 #include "btBulletDynamicsCommon.h"
 #include "OgreSceneNode.h"
--- a/libs/openengine/bullet/BulletShapeLoader.h
+++ b/libs/openengine/bullet/BulletShapeLoader.h
@ -1,5 +1,5 @@
-#ifndef _BULLET_SHAPE_LOADER_H_
-#define _BULLET_SHAPE_LOADER_H_
+#ifndef OPENMW_BULLET_SHAPE_LOADER_H_
+#define OPENMW_BULLET_SHAPE_LOADER_H_

 #include <OgreResource.h>
 #include <OgreResourceManager.h>