Merging r6256 from trunk to ogl-es branch

(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -9,6 +9,11 @@ Changes in ogl-es (not yet released - will be merged with trunk at some point)
 
 --------------------------
 Changes in 1.9 (not yet released)
+- Many defines changed because they were using names which are reserved identifiers in c++.
+  Mostly it's about replacing __IRRxxx or _IRRxxx identifiers by versions without underscores
+  Sometimes underscores at end also got removed.
+  There is a header file irrLegacyDefines.h which can be included to allow having the old defines back.
+  Thanks @Markus Elfring  for reporting this (bug #427)
 - Add equals and set_data functions to core::array for easier working with blocks of data.
 - SIrrlichtCreationParameters::IgnoreInput set to false works again on X11. 
   Thanks @ Victor Gaydov for report + patch + very good test cases! (bug #401)
@@ -3930,7 +3935,7 @@ Changes in version 0.12.0 (24 August 2005)
 
 - Changed the names the driver return (now "OpenGL 1.5", "Direct3D 9.0" and "Direct3D 8.1")
 
-- Added a new macro _IRR_DEBUG_BREAK_IF which is now used instead of the _asm int 3 break points in
+- Added a new macro IRR_DEBUG_BREAK_IF which is now used instead of the _asm int 3 break points in
   debug mode.
 
 - Fixed a bug were the software renderer didn't clip 2d rectangles. This effect was visible for

include/CDynamicMeshBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
+#ifndef IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED
-#define __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
+#define IRR_C_DYNAMIC_MESHBUFFER_H_INCLUDED
 
 #include "IDynamicMeshBuffer.h"
 
@@ -35,17 +35,17 @@ namespace scene
 				IndexBuffer->drop();
 		}
 
-		virtual IVertexBuffer& getVertexBuffer() const _IRR_OVERRIDE_
+		virtual IVertexBuffer& getVertexBuffer() const IRR_OVERRIDE
 		{
 			return *VertexBuffer;
 		}
 
-		virtual IIndexBuffer& getIndexBuffer() const _IRR_OVERRIDE_
+		virtual IIndexBuffer& getIndexBuffer() const IRR_OVERRIDE
 		{
 			return *IndexBuffer;
 		}
 
-		virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) _IRR_OVERRIDE_
+		virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) IRR_OVERRIDE
 		{
 			if (newVertexBuffer)
 				newVertexBuffer->grab();
@@ -55,7 +55,7 @@ namespace scene
 			VertexBuffer=newVertexBuffer;
 		}
 
-		virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) _IRR_OVERRIDE_
+		virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) IRR_OVERRIDE
 		{
 			if (newIndexBuffer)
 				newIndexBuffer->grab();
@@ -66,31 +66,31 @@ namespace scene
 		}
 
 		//! Get Material of this buffer.
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
+		virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE
 		{
 			return Material;
 		}
 
 		//! Get Material of this buffer.
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
+		virtual video::SMaterial& getMaterial() IRR_OVERRIDE
 		{
 			return Material;
 		}
 
 		//! Get bounding box
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
+		virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE
 		{
 			return BoundingBox;
 		}
 
 		//! Set bounding box
-		virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
+		virtual void setBoundingBox( const core::aabbox3df& box) IRR_OVERRIDE
 		{
 			BoundingBox = box;
 		}
 
 		//! Recalculate bounding box
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_
+		virtual void recalculateBoundingBox() IRR_OVERRIDE
 		{
 			if (!getVertexBuffer().size())
 				BoundingBox.reset(0,0,0);
@@ -103,13 +103,13 @@ namespace scene
 		}
 
 		//! Describe what kind of primitive geometry is used by the meshbuffer
-		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
+		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE
 		{
 			PrimitiveType = type;
 		}
 
 		//! Get the kind of primitive geometry which is used by the meshbuffer
-		virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
+		virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE
 		{
 			return PrimitiveType;
 		}
@@ -130,4 +130,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/CIndexBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_INDEX_BUFFER_H_INCLUDED__
+#ifndef IRR_C_INDEX_BUFFER_H_INCLUDED
-#define __C_INDEX_BUFFER_H_INCLUDED__
+#define IRR_C_INDEX_BUFFER_H_INCLUDED
 
 #include "IIndexBuffer.h"
 
@@ -39,46 +39,46 @@ namespace scene
 		public:
 			core::array<T> Indices;
 
-			virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
+			virtual u32 stride() const IRR_OVERRIDE {return sizeof(T);}
 
-			virtual u32 size() const _IRR_OVERRIDE_ {return Indices.size();}
+			virtual u32 size() const IRR_OVERRIDE {return Indices.size();}
 
-			virtual void push_back(const u32 &element) _IRR_OVERRIDE_
+			virtual void push_back(const u32 &element) IRR_OVERRIDE
 			{
 				// push const ref due to compiler problem with gcc 4.6, big endian
 				Indices.push_back((const T&)element);
 			}
 
-			virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
+			virtual u32 operator [](u32 index) const IRR_OVERRIDE
 			{
 				return (u32)(Indices[index]);
 			}
 
-			virtual u32 getLast() _IRR_OVERRIDE_ {return (u32)Indices.getLast();}
+			virtual u32 getLast() IRR_OVERRIDE {return (u32)Indices.getLast();}
 
-			virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
+			virtual void setValue(u32 index, u32 value) IRR_OVERRIDE
 			{
 				Indices[index]=(T)value;
 			}
 
-			virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
+			virtual void set_used(u32 usedNow) IRR_OVERRIDE
 			{
 				Indices.set_used(usedNow);
 			}
 
-			virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
+			virtual void reallocate(u32 new_size) IRR_OVERRIDE
 			{
 				Indices.reallocate(new_size);
 			}
 
-			virtual u32 allocated_size() const _IRR_OVERRIDE_
+			virtual u32 allocated_size() const IRR_OVERRIDE
 			{
 				return Indices.allocated_size();
 			}
 
-			virtual void* pointer() _IRR_OVERRIDE_  {return Indices.pointer();}
+			virtual void* pointer() IRR_OVERRIDE  {return Indices.pointer();}
 
-			virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_
+			virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE
 			{
 				if (sizeof(T)==sizeof(u16))
 					return video::EIT_16BIT;
@@ -110,7 +110,7 @@ namespace scene
 		}
 
 		//virtual void setType(video::E_INDEX_TYPE IndexType);
-		virtual void setType(video::E_INDEX_TYPE IndexType) _IRR_OVERRIDE_
+		virtual void setType(video::E_INDEX_TYPE IndexType) IRR_OVERRIDE
 		{
 			IIndexList *NewIndices=0;
 
@@ -141,78 +141,78 @@ namespace scene
 			Indices=NewIndices;
 		}
 
-		virtual void* getData() _IRR_OVERRIDE_ {return Indices->pointer();}
+		virtual void* getData() IRR_OVERRIDE {return Indices->pointer();}
 
-		virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_ {return Indices->getType();}
+		virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE {return Indices->getType();}
 
-		virtual u32 stride() const _IRR_OVERRIDE_ {return Indices->stride();}
+		virtual u32 stride() const IRR_OVERRIDE {return Indices->stride();}
 
-		virtual u32 size() const _IRR_OVERRIDE_
+		virtual u32 size() const IRR_OVERRIDE
 		{
 			return Indices->size();
 		}
 
-		virtual void push_back(const u32 &element) _IRR_OVERRIDE_
+		virtual void push_back(const u32 &element) IRR_OVERRIDE
 		{
 			Indices->push_back(element);
 		}
 
-		virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
+		virtual u32 operator [](u32 index) const IRR_OVERRIDE
 		{
 			return (*Indices)[index];
 		}
 
-		virtual u32 getLast() _IRR_OVERRIDE_
+		virtual u32 getLast() IRR_OVERRIDE
 		{
 			return Indices->getLast();
 		}
 
-		virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
+		virtual void setValue(u32 index, u32 value) IRR_OVERRIDE
 		{
 			Indices->setValue(index, value);
 		}
 
-		virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
+		virtual void set_used(u32 usedNow) IRR_OVERRIDE
 		{
 			Indices->set_used(usedNow);
 		}
 
-		virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
+		virtual void reallocate(u32 new_size) IRR_OVERRIDE
 		{
 			Indices->reallocate(new_size);
 		}
 
-		virtual u32 allocated_size() const _IRR_OVERRIDE_
+		virtual u32 allocated_size() const IRR_OVERRIDE
 		{
 			return Indices->allocated_size();
 		}
 
-		virtual void* pointer() _IRR_OVERRIDE_
+		virtual void* pointer() IRR_OVERRIDE
 		{
 			return Indices->pointer();
 		}
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const IRR_OVERRIDE
 		{
 			return MappingHint;
 		}
 
 		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) IRR_OVERRIDE
 		{
 			MappingHint=NewMappingHint;
 		}
 
 		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty() _IRR_OVERRIDE_
+		virtual void setDirty() IRR_OVERRIDE
 		{
 			++ChangedID;
 		}
 
 		//! Get the currently used ID for identification of changes.
 		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;}
+		virtual u32 getChangedID() const IRR_OVERRIDE {return ChangedID;}
 
 		E_HARDWARE_MAPPING MappingHint;
 		u32 ChangedID;
@@ -223,4 +223,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/CMeshBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __T_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_T_MESH_BUFFER_H_INCLUDED
-#define __T_MESH_BUFFER_H_INCLUDED__
+#define IRR_T_MESH_BUFFER_H_INCLUDED
 
 #include "irrArray.h"
 #include "IMeshBuffer.h"
@@ -31,7 +31,7 @@ namespace scene
 
 		//! Get material of this meshbuffer
 		/** \return Material of this buffer */
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
+		virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE
 		{
 			return Material;
 		}
@@ -39,7 +39,7 @@ namespace scene
 
 		//! Get material of this meshbuffer
 		/** \return Material of this buffer */
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
+		virtual video::SMaterial& getMaterial() IRR_OVERRIDE
 		{
 			return Material;
 		}
@@ -47,7 +47,7 @@ namespace scene
 
 		//! Get pointer to vertices
 		/** \return Pointer to vertices. */
-		virtual const void* getVertices() const _IRR_OVERRIDE_
+		virtual const void* getVertices() const IRR_OVERRIDE
 		{
 			return Vertices.const_pointer();
 		}
@@ -55,7 +55,7 @@ namespace scene
 
 		//! Get pointer to vertices
 		/** \return Pointer to vertices. */
-		virtual void* getVertices() _IRR_OVERRIDE_
+		virtual void* getVertices() IRR_OVERRIDE
 		{
 			return Vertices.pointer();
 		}
@@ -63,21 +63,21 @@ namespace scene
 
 		//! Get number of vertices
 		/** \return Number of vertices. */
-		virtual u32 getVertexCount() const _IRR_OVERRIDE_
+		virtual u32 getVertexCount() const IRR_OVERRIDE
 		{
 			return Vertices.size();
 		}
 
 		//! Get type of index data which is stored in this meshbuffer.
 		/** \return Index type of this buffer. */
-		virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
+		virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE
 		{
 			return video::EIT_16BIT;
 		}
 
 		//! Get pointer to indices
 		/** \return Pointer to indices. */
-		virtual const u16* getIndices() const _IRR_OVERRIDE_
+		virtual const u16* getIndices() const IRR_OVERRIDE
 		{
 			return Indices.const_pointer();
 		}
@@ -85,7 +85,7 @@ namespace scene
 
 		//! Get pointer to indices
 		/** \return Pointer to indices. */
-		virtual u16* getIndices() _IRR_OVERRIDE_
+		virtual u16* getIndices() IRR_OVERRIDE
 		{
 			return Indices.pointer();
 		}
@@ -93,7 +93,7 @@ namespace scene
 
 		//! Get number of indices
 		/** \return Number of indices. */
-		virtual u32 getIndexCount() const _IRR_OVERRIDE_
+		virtual u32 getIndexCount() const IRR_OVERRIDE
 		{
 			return Indices.size();
 		}
@@ -101,7 +101,7 @@ namespace scene
 
 		//! Get the axis aligned bounding box
 		/** \return Axis aligned bounding box of this buffer. */
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
+		virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE
 		{
 			return BoundingBox;
 		}
@@ -110,7 +110,7 @@ namespace scene
 		//! Set the axis aligned bounding box
 		/** \param box New axis aligned bounding box for this buffer. */
 		//! set user axis aligned bounding box
-		virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_
+		virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE
 		{
 			BoundingBox = box;
 		}
@@ -118,7 +118,7 @@ namespace scene
 
 		//! Recalculate the bounding box.
 		/** should be called if the mesh changed. */
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_
+		virtual void recalculateBoundingBox() IRR_OVERRIDE
 		{
 			if (!Vertices.empty())
 			{
@@ -135,43 +135,43 @@ namespace scene
 
 		//! Get type of vertex data stored in this buffer.
 		/** \return Type of vertex data. */
-		virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
+		virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE
 		{
 			return T::getType();
 		}
 
 		//! returns position of vertex i
-		virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE
 		{
 			return Vertices[i].Pos;
 		}
 
 		//! returns position of vertex i
-		virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
+		virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE
 		{
 			return Vertices[i].Pos;
 		}
 
 		//! returns normal of vertex i
-		virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE
 		{
 			return Vertices[i].Normal;
 		}
 
 		//! returns normal of vertex i
-		virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
+		virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE
 		{
 			return Vertices[i].Normal;
 		}
 
 		//! returns texture coord of vertex i
-		virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE
 		{
 			return Vertices[i].TCoords;
 		}
 
 		//! returns texture coord of vertex i
-		virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
+		virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE
 		{
 			return Vertices[i].TCoords;
 		}
@@ -182,7 +182,7 @@ namespace scene
 		or the main buffer is of standard type. Otherwise, behavior is
 		undefined.
 		*/
-		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_
+		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE
 		{
 			if (vertices == getVertices())
 				return;
@@ -211,7 +211,7 @@ namespace scene
 		undefined.
 		\param other Meshbuffer to be appended to this one.
 		*/
-		virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_
+		virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE
 		{
 			/*
 			if (this==other)
@@ -237,19 +237,19 @@ namespace scene
 
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE
 		{
 			return MappingHint_Vertex;
 		}
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE
 		{
 			return MappingHint_Index;
 		}
 
 		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
 				MappingHint_Vertex=NewMappingHint;
@@ -258,19 +258,19 @@ namespace scene
 		}
 
 		//! Describe what kind of primitive geometry is used by the meshbuffer
-		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
+		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) IRR_OVERRIDE
 		{
 			PrimitiveType = type;
 		}
 
 		//! Get the kind of primitive geometry which is used by the meshbuffer
-		virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
+		virtual E_PRIMITIVE_TYPE getPrimitiveType() const IRR_OVERRIDE
 		{
 			return PrimitiveType;
 		}
 
 		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
+		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX)
 				++ChangedID_Vertex;
@@ -280,11 +280,11 @@ namespace scene
 
 		//! Get the currently used ID for identification of changes.
 		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}
+		virtual u32 getChangedID_Vertex() const IRR_OVERRIDE {return ChangedID_Vertex;}
 
 		//! Get the currently used ID for identification of changes.
 		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID_Index() const _IRR_OVERRIDE_ {return ChangedID_Index;}
+		virtual u32 getChangedID_Index() const IRR_OVERRIDE {return ChangedID_Index;}
 
 		u32 ChangedID_Vertex;
 		u32 ChangedID_Index;
@@ -315,5 +315,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-
-

include/CVertexBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_VERTEX_BUFFER_H_INCLUDED__
+#ifndef IRR_C_VERTEX_BUFFER_H_INCLUDED
-#define __C_VERTEX_BUFFER_H_INCLUDED__
+#define IRR_C_VERTEX_BUFFER_H_INCLUDED
 
 #include "IVertexBuffer.h"
 
@@ -40,33 +40,33 @@ namespace scene
 		public:
 			core::array<T> Vertices;
 
-			virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
+			virtual u32 stride() const IRR_OVERRIDE {return sizeof(T);}
 
-			virtual u32 size() const _IRR_OVERRIDE_ {return Vertices.size();}
+			virtual u32 size() const IRR_OVERRIDE {return Vertices.size();}
 
-			virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
+			virtual void push_back (const video::S3DVertex &element) IRR_OVERRIDE
 			{Vertices.push_back((T&)element);}
 
-			virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
+			virtual video::S3DVertex& operator [](const u32 index) const IRR_OVERRIDE
 			{return (video::S3DVertex&)Vertices[index];}
 
-			virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
+			virtual video::S3DVertex& getLast() IRR_OVERRIDE
 			{return (video::S3DVertex&)Vertices.getLast();}
 
-			virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
+			virtual void set_used(u32 usedNow) IRR_OVERRIDE
 			{Vertices.set_used(usedNow);}
 
-			virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
+			virtual void reallocate(u32 new_size) IRR_OVERRIDE
 			{Vertices.reallocate(new_size);}
 
-			virtual u32 allocated_size() const _IRR_OVERRIDE_
+			virtual u32 allocated_size() const IRR_OVERRIDE
 			{
 				return Vertices.allocated_size();
 			}
 
-			virtual video::S3DVertex* pointer() _IRR_OVERRIDE_ {return Vertices.pointer();}
+			virtual video::S3DVertex* pointer() IRR_OVERRIDE {return Vertices.pointer();}
 
-			virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return T::getType();}
+			virtual video::E_VERTEX_TYPE getType() const IRR_OVERRIDE {return T::getType();}
 		};
 
 	public:
@@ -95,7 +95,7 @@ namespace scene
 		}
 
 
-		virtual void setType(video::E_VERTEX_TYPE vertexType) _IRR_OVERRIDE_
+		virtual void setType(video::E_VERTEX_TYPE vertexType) IRR_OVERRIDE
 		{
 			IVertexList *NewVertices=0;
 
@@ -130,73 +130,73 @@ namespace scene
 			Vertices=NewVertices;
 		}
 
-		virtual void* getData() _IRR_OVERRIDE_ {return Vertices->pointer();}
+		virtual void* getData() IRR_OVERRIDE {return Vertices->pointer();}
 
-		virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return Vertices->getType();}
+		virtual video::E_VERTEX_TYPE getType() const IRR_OVERRIDE {return Vertices->getType();}
 
-		virtual u32 stride() const _IRR_OVERRIDE_ {return Vertices->stride();}
+		virtual u32 stride() const IRR_OVERRIDE {return Vertices->stride();}
 
-		virtual u32 size() const _IRR_OVERRIDE_
+		virtual u32 size() const IRR_OVERRIDE
 		{
 			return Vertices->size();
 		}
 
-		virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
+		virtual void push_back (const video::S3DVertex &element) IRR_OVERRIDE
 		{
 			Vertices->push_back(element);
 		}
 
-		virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
+		virtual video::S3DVertex& operator [](const u32 index) const IRR_OVERRIDE
 		{
 			return (*Vertices)[index];
 		}
 
-		virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
+		virtual video::S3DVertex& getLast() IRR_OVERRIDE
 		{
 			return Vertices->getLast();
 		}
 
-		virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
+		virtual void set_used(u32 usedNow) IRR_OVERRIDE
 		{
 			Vertices->set_used(usedNow);
 		}
 
-		virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
+		virtual void reallocate(u32 new_size) IRR_OVERRIDE
 		{
 			Vertices->reallocate(new_size);
 		}
 
-		virtual u32 allocated_size() const _IRR_OVERRIDE_
+		virtual u32 allocated_size() const IRR_OVERRIDE
 		{
 			return Vertices->allocated_size();
 		}
 
-		virtual video::S3DVertex* pointer() _IRR_OVERRIDE_
+		virtual video::S3DVertex* pointer() IRR_OVERRIDE
 		{
 			return Vertices->pointer();
 		}
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const IRR_OVERRIDE
 		{
 			return MappingHint;
 		}
 
 		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) IRR_OVERRIDE
 		{
 			MappingHint=NewMappingHint;
 		}
 
 		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty() _IRR_OVERRIDE_
+		virtual void setDirty() IRR_OVERRIDE
 		{
 			++ChangedID;
 		}
 
 		//! Get the currently used ID for identification of changes.
 		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID() const _IRR_OVERRIDE_  {return ChangedID;}
+		virtual u32 getChangedID() const IRR_OVERRIDE  {return ChangedID;}
 
 		E_HARDWARE_MAPPING MappingHint;
 		u32 ChangedID;
@@ -207,4 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EAttributes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_ATTRIBUTES_H_INCLUDED__
+#ifndef IRR_E_ATTRIBUTES_H_INCLUDED
-#define __E_ATTRIBUTES_H_INCLUDED__
+#define IRR_E_ATTRIBUTES_H_INCLUDED
 
 namespace irr
 {

include/ECullingTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_CULLING_TYPES_H_INCLUDED__
+#ifndef IRR_E_CULLING_TYPES_H_INCLUDED
-#define __E_CULLING_TYPES_H_INCLUDED__
+#define IRR_E_CULLING_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -36,6 +36,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_CULLING_TYPES_H_INCLUDED
-#endif // __E_CULLING_TYPES_H_INCLUDED__
-

include/EDebugSceneTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#ifndef IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
-#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#define IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -45,6 +45,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_DEBUG_SCENE_TYPES_H_INCLUDED
-#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-

include/EDeviceTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEVICE_TYPES_H_INCLUDED__
+#ifndef IRR_E_DEVICE_TYPES_H_INCLUDED
-#define __E_DEVICE_TYPES_H_INCLUDED__
+#define IRR_E_DEVICE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -66,5 +66,4 @@ namespace irr
 
 } // end namespace irr
 
-#endif // __E_DEVICE_TYPES_H_INCLUDED__
+#endif // IRR_E_DEVICE_TYPES_H_INCLUDED
-

include/EDriverFeatures.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_FEATURES_H_INCLUDED__
+#ifndef IRR_E_DRIVER_FEATURES_H_INCLUDED
-#define __E_DRIVER_FEATURES_H_INCLUDED__
+#define IRR_E_DRIVER_FEATURES_H_INCLUDED
 
 namespace irr
 {
@@ -152,6 +152,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif
-

include/EDriverTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_TYPES_H_INCLUDED__
+#ifndef IRR_E_DRIVER_TYPES_H_INCLUDED
-#define __E_DRIVER_TYPES_H_INCLUDED__
+#define IRR_E_DRIVER_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -97,5 +97,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
 #endif

include/EFocusFlags.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef E_FOCUS_FLAGS_H_INCLUDED__
+#ifndef IRR_E_FOCUS_FLAGS_H_INCLUDED
-#define E_FOCUS_FLAGS_H_INCLUDED__
+#define IRR_E_FOCUS_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -35,4 +35,3 @@ enum EFOCUS_FLAG
 } // namespace irr
 
 #endif
-

include/EGUIAlignment.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_GUI_ALIGNMENT_H_INCLUDED__
+#ifndef IRR_E_GUI_ALIGNMENT_H_INCLUDED
-#define __E_GUI_ALIGNMENT_H_INCLUDED__
+#define IRR_E_GUI_ALIGNMENT_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -36,4 +36,4 @@ const c8* const GUIAlignmentNames[] =
 } // namespace gui
 } // namespace irr
 
-#endif // __E_GUI_ALIGNMENT_H_INCLUDED__
+#endif // IRR_E_GUI_ALIGNMENT_H_INCLUDED

include/EGUIElementTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_GUI_ELEMENT_TYPES_H_INCLUDED__
+#ifndef IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED
-#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__
+#define IRR_E_GUI_ELEMENT_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -138,7 +138,3 @@ const c8* const GUIElementTypeNames[] =
 } // end namespace irr
 
 #endif
-
-
-
-

include/EHardwareBufferFlags.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#ifndef IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED
-#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#define IRR_E_HARDWARE_BUFFER_FLAGS_INCLUDED
 
 namespace irr
 {
@@ -41,4 +41,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EMaterialFlags.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MATERIAL_FLAGS_H_INCLUDED__
+#ifndef IRR_E_MATERIAL_FLAGS_H_INCLUDED
-#define __E_MATERIAL_FLAGS_H_INCLUDED__
+#define IRR_E_MATERIAL_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -96,6 +96,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
+#endif // IRR_E_MATERIAL_FLAGS_H_INCLUDED
-#endif // __E_MATERIAL_FLAGS_H_INCLUDED__
-

include/EMaterialTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MATERIAL_TYPES_H_INCLUDED__
+#ifndef IRR_E_MATERIAL_TYPES_H_INCLUDED
-#define __E_MATERIAL_TYPES_H_INCLUDED__
+#define IRR_E_MATERIAL_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -229,6 +229,4 @@ namespace video
 } // end namespace video
 } // end namespace irr
 
-
+#endif // IRR_E_MATERIAL_TYPES_H_INCLUDED
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-

include/EMeshWriterEnums.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MESH_WRITER_ENUMS_H_INCLUDED__
+#ifndef IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
-#define __E_MESH_WRITER_ENUMS_H_INCLUDED__
+#define IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -60,6 +60,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_E_MESH_WRITER_ENUMS_H_INCLUDED
-#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__
-

include/EMessageBoxFlags.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
+#ifndef IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED
-#define __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
+#define IRR_E_MESSAGE_BOX_FLAGS_H_INCLUDED
 
 namespace irr
 {
@@ -33,4 +33,3 @@ enum EMESSAGE_BOX_FLAG
 } // namespace irr
 
 #endif
-

include/EPrimitiveTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_PRIMITIVE_TYPES_H_INCLUDED__
+#ifndef IRR_E_PRIMITIVE_TYPES_H_INCLUDED
-#define __E_PRIMITIVE_TYPES_H_INCLUDED__
+#define IRR_E_PRIMITIVE_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -58,4 +58,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/EReadFileType.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_READ_FILE_TYPES_H_INCLUDED__
+#ifndef IRR_E_READ_FILE_TYPES_H_INCLUDED
-#define __E_READ_FILE_TYPES_H_INCLUDED__
+#define IRR_E_READ_FILE_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -30,5 +30,4 @@ namespace io
 } // end namespace io
 } // end namespace irr
 
-
 #endif

include/ESceneNodeAnimatorTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__
+#ifndef IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED
-#define __E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED__
+#define IRR_E_SCENE_NODE_ANIMATOR_TYPES_H_INCLUDED
 
 namespace irr
 {
@@ -53,6 +53,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/ESceneNodeTypes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_SCENE_NODE_TYPES_H_INCLUDED__
+#ifndef IRR_E_SCENE_NODE_TYPES_H_INCLUDED
-#define __E_SCENE_NODE_TYPES_H_INCLUDED__
+#define IRR_E_SCENE_NODE_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -99,11 +99,7 @@ namespace scene
 		ESNT_ANY            = MAKE_IRR_ID('a','n','y','_')
 	};
 
-
-
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/EShaderTypes.h

@@ -1,5 +1,5 @@
-#ifndef __E_SHADER_TYPES_H_INCLUDED__
+#ifndef IRR_E_SHADER_TYPES_H_INCLUDED
-#define __E_SHADER_TYPES_H_INCLUDED__
+#define IRR_E_SHADER_TYPES_H_INCLUDED
 
 #include "irrTypes.h"
 
@@ -86,5 +86,4 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
 } // end namespace video
 } // end namespace irr
 
-#endif // __E_SHADER_TYPES_H_INCLUDED__
+#endif // IRR_E_SHADER_TYPES_H_INCLUDED
-

include/ETerrainElements.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_TERRAIN_ELEMENTS_H__
+#ifndef IRR_E_TERRAIN_ELEMENTS_H
-#define __E_TERRAIN_ELEMENTS_H__
+#define IRR_E_TERRAIN_ELEMENTS_H
 
 namespace irr
 {
@@ -33,4 +33,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMesh.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_H_INCLUDED
-#define __I_ANIMATED_MESH_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_H_INCLUDED
 
 #include "aabbox3d.h"
 #include "IMesh.h"
@@ -61,7 +61,7 @@ namespace scene
 		if getMeshType() returns EAMT_MD2 it's safe to cast the
 		IAnimatedMesh to IAnimatedMeshMD2.
 		\returns Type of the mesh. */
-		virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_
+		virtual E_ANIMATED_MESH_TYPE getMeshType() const IRR_OVERRIDE
 		{
 			return EAMT_UNKNOWN;
 		}
@@ -71,4 +71,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshMD2.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_MD2_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_MD2_H_INCLUDED
-#define __I_ANIMATED_MESH_MD2_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_MD2_H_INCLUDED
 
 #include "IAnimatedMesh.h"
 
@@ -76,4 +76,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshMD3.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_MD3_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_MD3_H_INCLUDED
-#define __I_ANIMATED_MESH_MD3_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_MD3_H_INCLUDED
 
 #include "IAnimatedMesh.h"
 #include "IQ3Shader.h"
@@ -301,4 +301,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAnimatedMeshSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
-#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#define IRR_I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "IBoneSceneNode.h"
@@ -230,4 +230,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IAttributeExchangingObject.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__
+#ifndef IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED
-#define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__
+#define IRR_I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 
@@ -19,10 +19,10 @@ class IAttributes;
 //! Enumeration flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object
 enum E_ATTRIBUTE_READ_WRITE_FLAGS
 {
-	//! Serialization/Deserializion is done for an xml file
+	//! Serialization/deserialization is done for an xml file
 	EARWF_FOR_FILE = 0x00000001,
 
-	//! Serialization/Deserializion is done for an editor property box
+	//! Serialization/deserialization is done for an editor property box
 	EARWF_FOR_EDITOR = 0x00000002,
 
 	//! When writing filenames, relative paths should be used
@@ -68,4 +68,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IAttributes.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ATTRIBUTES_H_INCLUDED__
+#ifndef IRR_I_ATTRIBUTES_H_INCLUDED
-#define __I_ATTRIBUTES_H_INCLUDED__
+#define IRR_I_ATTRIBUTES_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -759,6 +759,3 @@ public:
 } // end namespace irr
 
 #endif
-
-
-

include/IBillboardSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED
-#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BILLBOARD_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -79,6 +79,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IBillboardTextSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED
-#define __I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BILLBOARD_TEXT_SCENE_NODE_H_INCLUDED
 
 #include "IBillboardSceneNode.h"
 
@@ -73,6 +73,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IBoneSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BONE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_BONE_SCENE_NODE_H_INCLUDED
-#define __I_BONE_SCENE_NODE_H_INCLUDED__
+#define IRR_I_BONE_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -61,7 +61,7 @@ namespace scene
 
 		//! Get the name of the bone
 		/** \deprecated Use getName instead. This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ virtual const c8* getBoneName() const { return getName(); }
+		IRR_DEPRECATED virtual const c8* getBoneName() const { return getName(); }
 
 		//! Get the index of the bone
 		virtual u32 getBoneIndex() const = 0;
@@ -74,17 +74,17 @@ namespace scene
 		virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
 
 		//! Get the axis aligned bounding box of this node
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_ = 0;
+		virtual const core::aabbox3d<f32>& getBoundingBox() const IRR_OVERRIDE = 0;
 
 		//! Returns the relative transformation of the scene node.
 		//virtual core::matrix4 getRelativeTransformation() const = 0;
 
 		//! The animation method.
-		virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_ =0;
+		virtual void OnAnimate(u32 timeMs) IRR_OVERRIDE =0;
 
 		//! The render method.
 		/** Does nothing as bones are not visible. */
-		virtual void render() _IRR_OVERRIDE_ { }
+		virtual void render() IRR_OVERRIDE { }
 
 		//! How the relative transformation of the bone is used
 		virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0;
@@ -105,4 +105,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/ICameraSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CAMERA_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_CAMERA_SCENE_NODE_H_INCLUDED
-#define __I_CAMERA_SCENE_NODE_H_INCLUDED__
+#define IRR_I_CAMERA_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "IEventReceiver.h"
@@ -72,7 +72,7 @@ namespace scene
 		ISceneManager::addCameraSceneNodeFPS, may want to get
 		this input for changing their position, look at target or
 		whatever. */
-		virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_ =0;
+		virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE =0;
 
 		//! Sets the look at target of the camera
 		/** If the camera's target and rotation are bound ( @see
@@ -90,7 +90,7 @@ namespace scene
 		bindTargetAndRotation() ) then calling this will also change
 		the camera's target to match the rotation.
 		\param rotation New rotation of the node in degrees. */
-		virtual void setRotation(const core::vector3df& rotation) _IRR_OVERRIDE_ =0;
+		virtual void setRotation(const core::vector3df& rotation) IRR_OVERRIDE =0;
 
 		//! Gets the current look at target of the camera
 		/** \return The current look at target of the camera, in world co-ordinates */
@@ -173,7 +173,7 @@ namespace scene
 		virtual bool getTargetAndRotationBinding(void) const =0;
 
 		//! Writes attributes of the camera node
-		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
+		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE
 		{
 			ISceneNode::serializeAttributes(out, options);
 
@@ -183,7 +183,7 @@ namespace scene
 		}
 
 		//! Reads attributes of the camera node
-		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
+		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE
 		{
 			ISceneNode::deserializeAttributes(in, options);
 			if (!in)
@@ -207,4 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IColladaMeshWriter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_I_COLLADA_MESH_WRITER_H_INCLUDED
-#define __IRR_I_COLLADA_MESH_WRITER_H_INCLUDED__
+#define IRR_I_COLLADA_MESH_WRITER_H_INCLUDED
 
 #include "IMeshWriter.h"
 #include "ISceneNode.h"

include/IContextManager.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#ifndef IRR_I_CONTEXT_MANAGER_H_INCLUDED
-#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#define IRR_I_CONTEXT_MANAGER_H_INCLUDED
 
 #include "SExposedVideoData.h"
 #include "SIrrCreationParameters.h"

include/ICursorControl.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CURSOR_CONTROL_H_INCLUDED__
+#ifndef IRR_I_CURSOR_CONTROL_H_INCLUDED
-#define __I_CURSOR_CONTROL_H_INCLUDED__
+#define IRR_I_CURSOR_CONTROL_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -196,4 +196,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IDummyTransformationSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
-#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#define IRR_I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -39,4 +39,3 @@ public:
 
 
 #endif
-

include/IDynamicMeshBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED
-#define __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__
+#define IRR_I_DYNAMIC_MESH_BUFFER_H_INCLUDED
 
 #include "IMeshBuffer.h"
 #include "IVertexBuffer.h"
@@ -26,23 +26,23 @@ namespace scene
 
 		//! Get the material of this meshbuffer
 		/** \return Material of this buffer. */
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ =0;
+		virtual video::SMaterial& getMaterial() IRR_OVERRIDE =0;
 
 		//! Get the material of this meshbuffer
 		/** \return Material of this buffer. */
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ =0;
+		virtual const video::SMaterial& getMaterial() const IRR_OVERRIDE =0;
 
 		//! Get the axis aligned bounding box of this meshbuffer.
 		/** \return Axis aligned bounding box of this buffer. */
-		virtual const core::aabbox3df& getBoundingBox() const _IRR_OVERRIDE_ =0;
+		virtual const core::aabbox3df& getBoundingBox() const IRR_OVERRIDE =0;
 
 		//! Set axis aligned bounding box
 		/** \param box User defined axis aligned bounding box to use
 		for this buffer. */
-		virtual void setBoundingBox(const core::aabbox3df& box) _IRR_OVERRIDE_ =0;
+		virtual void setBoundingBox(const core::aabbox3df& box) IRR_OVERRIDE =0;
 
 		//! Recalculates the bounding box. Should be called if the mesh changed.
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_ =0;
+		virtual void recalculateBoundingBox() IRR_OVERRIDE =0;
 
 		//! Append the vertices and indices to the current buffer
 		/** Only works for compatible vertex types.
@@ -50,7 +50,7 @@ namespace scene
 		\param numVertices Number of vertices in the array.
 		\param indices Pointer to index array.
 		\param numIndices Number of indices in array. */
-		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) _IRR_OVERRIDE_
+		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) IRR_OVERRIDE
 		{
 
 		}
@@ -58,7 +58,7 @@ namespace scene
 		//! Append the meshbuffer to the current buffer
 		/** Only works for compatible vertex types
 		\param other Buffer to append to this one. */
-		virtual void append(const IMeshBuffer* const other) _IRR_OVERRIDE_
+		virtual void append(const IMeshBuffer* const other) IRR_OVERRIDE
 		{
 
 		}
@@ -66,19 +66,19 @@ namespace scene
 		// ------------------- To be removed? -------------------  //
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const IRR_OVERRIDE
 		{
 			return getVertexBuffer().getHardwareMappingHint();
 		}
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const IRR_OVERRIDE
 		{
 			return getIndexBuffer().getHardwareMappingHint();
 		}
 
 		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) IRR_OVERRIDE
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
 				getVertexBuffer().setHardwareMappingHint(NewMappingHint);
@@ -87,7 +87,7 @@ namespace scene
 		}
 
 		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
+		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) IRR_OVERRIDE
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
 				getVertexBuffer().setDirty();
@@ -95,12 +95,12 @@ namespace scene
 				getIndexBuffer().setDirty();
 		}
 
-		virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_
+		virtual u32 getChangedID_Vertex() const IRR_OVERRIDE
 		{
 			return getVertexBuffer().getChangedID();
 		}
 
-		virtual u32 getChangedID_Index() const _IRR_OVERRIDE_
+		virtual u32 getChangedID_Index() const IRR_OVERRIDE
 		{
 			return getIndexBuffer().getChangedID();
 		}
@@ -109,7 +109,7 @@ namespace scene
 
 		//! Get type of vertex data which is stored in this meshbuffer.
 		/** \return Vertex type of this buffer. */
-		virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
+		virtual video::E_VERTEX_TYPE getVertexType() const IRR_OVERRIDE
 		{
 			return getVertexBuffer().getType();
 		}
@@ -117,7 +117,7 @@ namespace scene
 		//! Get access to vertex data. The data is an array of vertices.
 		/** Which vertex type is used can be determined by getVertexType().
 		\return Pointer to array of vertices. */
-		virtual const void* getVertices() const _IRR_OVERRIDE_
+		virtual const void* getVertices() const IRR_OVERRIDE
 		{
 			return getVertexBuffer().getData();
 		}
@@ -125,78 +125,78 @@ namespace scene
 		//! Get access to vertex data. The data is an array of vertices.
 		/** Which vertex type is used can be determined by getVertexType().
 		\return Pointer to array of vertices. */
-		virtual void* getVertices() _IRR_OVERRIDE_
+		virtual void* getVertices() IRR_OVERRIDE
 		{
 			return getVertexBuffer().getData();
 		}
 
 		//! Get amount of vertices in meshbuffer.
 		/** \return Number of vertices in this buffer. */
-		virtual u32 getVertexCount() const _IRR_OVERRIDE_
+		virtual u32 getVertexCount() const IRR_OVERRIDE
 		{
 			return getVertexBuffer().size();
 		}
 
 		//! Get type of index data which is stored in this meshbuffer.
 		/** \return Index type of this buffer. */
-		virtual video::E_INDEX_TYPE getIndexType() const _IRR_OVERRIDE_
+		virtual video::E_INDEX_TYPE getIndexType() const IRR_OVERRIDE
 		{
 			return getIndexBuffer().getType();
 		}
 
 		//! Get access to indices.
 		/** \return Pointer to indices array. */
-		virtual const u16* getIndices() const _IRR_OVERRIDE_
+		virtual const u16* getIndices() const IRR_OVERRIDE
 		{
 			return (u16*)getIndexBuffer().getData();
 		}
 
 		//! Get access to indices.
 		/** \return Pointer to indices array. */
-		virtual u16* getIndices() _IRR_OVERRIDE_
+		virtual u16* getIndices() IRR_OVERRIDE
 		{
 			return (u16*)getIndexBuffer().getData();
 		}
 
 		//! Get amount of indices in this meshbuffer.
 		/** \return Number of indices in this buffer. */
-		virtual u32 getIndexCount() const _IRR_OVERRIDE_
+		virtual u32 getIndexCount() const IRR_OVERRIDE
 		{ 
 			return getIndexBuffer().size();
 		}
 
 		//! returns position of vertex i
-		virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector3df& getPosition(u32 i) const IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].Pos;
 		}
 
 		//! returns position of vertex i
-		virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
+		virtual core::vector3df& getPosition(u32 i) IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].Pos;
 		}
 
 		//! returns texture coords of vertex i
-		virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector2df& getTCoords(u32 i) const IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].TCoords;
 		}
 
 		//! returns texture coords of vertex i
-		virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
+		virtual core::vector2df& getTCoords(u32 i) IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].TCoords;
 		}
 
 		//! returns normal of vertex i
-		virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
+		virtual const core::vector3df& getNormal(u32 i) const IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].Normal;
 		}
 
 		//! returns normal of vertex i
-		virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
+		virtual core::vector3df& getNormal(u32 i) IRR_OVERRIDE
 		{
 			return getVertexBuffer()[i].Normal;
 		}
@@ -207,5 +207,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-
-

include/IEventReceiver.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_EVENT_RECEIVER_H_INCLUDED__
+#ifndef IRR_I_EVENT_RECEIVER_H_INCLUDED
-#define __I_EVENT_RECEIVER_H_INCLUDED__
+#define IRR_I_EVENT_RECEIVER_H_INCLUDED
 
 #include "ILogger.h"
 #include "Keycodes.h"
@@ -654,4 +654,3 @@ struct SJoystickInfo
 } // end namespace irr
 
 #endif
-

include/IFileArchive.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_ARCHIVE_H_INCLUDED__
+#ifndef IRR_I_FILE_ARCHIVE_H_INCLUDED
-#define __I_FILE_ARCHIVE_H_INCLUDED__
+#define IRR_I_FILE_ARCHIVE_H_INCLUDED
 
 #include "IReadFile.h"
 #include "IFileList.h"
@@ -145,4 +145,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IFileList.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_LIST_H_INCLUDED__
+#ifndef IRR_I_FILE_LIST_H_INCLUDED
-#define __I_FILE_LIST_H_INCLUDED__
+#define IRR_I_FILE_LIST_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -89,6 +89,4 @@ public:
 } // end namespace irr
 } // end namespace io
 
-
 #endif
-

include/IFileSystem.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_SYSTEM_H_INCLUDED__
+#ifndef IRR_I_FILE_SYSTEM_H_INCLUDED
-#define __I_FILE_SYSTEM_H_INCLUDED__
+#define IRR_I_FILE_SYSTEM_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IXMLReader.h"
@@ -225,7 +225,7 @@ public:
 	\param ignorePaths: If set to true, files in the added archive can be accessed
 	without its complete path.
 	\return True if the archive was added successfully, false if not. */
-	_IRR_DEPRECATED_ virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
+	IRR_DEPRECATED virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
 	{
 		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_ZIP);
 	}
@@ -241,7 +241,7 @@ public:
 	\param ignorePaths: If set to true, files in the added archive can be accessed
 	without its complete path.
 	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
+	IRR_DEPRECATED virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
 	{
 		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_FOLDER);
 	}
@@ -259,7 +259,7 @@ public:
 	\param ignorePaths: If set to true, files in the added archive can be accessed
 	without its complete path.(should not use with Quake2 paks
 	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
+	IRR_DEPRECATED virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
 	{
 		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_PAK);
 	}
@@ -396,4 +396,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGPUProgrammingServices.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#ifndef IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED
-#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#define IRR_I_GPU_PROGRAMMING_SERVICES_H_INCLUDED
 
 #include "EShaderTypes.h"
 #include "EMaterialTypes.h"
@@ -452,4 +452,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIButton.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_BUTTON_H_INCLUDED__
+#ifndef IRR_I_GUI_BUTTON_H_INCLUDED
-#define __I_GUI_BUTTON_H_INCLUDED__
+#define IRR_I_GUI_BUTTON_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -265,4 +265,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUICheckBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_CHECKBOX_H_INCLUDED__
+#ifndef IRR_I_GUI_CHECKBOX_H_INCLUDED
-#define __I_GUI_CHECKBOX_H_INCLUDED__
+#define IRR_I_GUI_CHECKBOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -50,4 +50,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIColorSelectDialog.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#ifndef IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
-#define __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+#define IRR_I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -34,4 +34,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIComboBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_COMBO_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_COMBO_BOX_H_INCLUDED
-#define __I_GUI_COMBO_BOX_H_INCLUDED__
+#define IRR_I_GUI_COMBO_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -71,4 +71,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIContextMenu.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_CONTEXT_MENU_H_INCLUDED__
+#ifndef IRR_I_GUI_CONTEXT_MENU_H_INCLUDED
-#define __I_GUI_CONTEXT_MENU_H_INCLUDED__
+#define IRR_I_GUI_CONTEXT_MENU_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -159,4 +159,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIEditBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_EDIT_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_EDIT_BOX_H_INCLUDED
-#define __I_GUI_EDIT_BOX_H_INCLUDED__
+#define IRR_I_GUI_EDIT_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -154,4 +154,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIElement.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ELEMENT_H_INCLUDED__
+#ifndef IRR_I_GUI_ELEMENT_H_INCLUDED
-#define __I_GUI_ELEMENT_H_INCLUDED__
+#define IRR_I_GUI_ELEMENT_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "irrList.h"
@@ -547,7 +547,7 @@ public:
 
 
 	//! Called if an event happened.
-	virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_
+	virtual bool OnEvent(const SEvent& event) IRR_OVERRIDE
 	{
 		return Parent ? Parent->OnEvent(event) : false;
 	}
@@ -792,7 +792,7 @@ public:
 	//! Writes attributes of the scene node.
 	/** Implement this to expose the attributes of your scene node for
 	scripting languages, editors, debuggers or xml serialization purposes. */
-	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
+	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE
 	{
 		out->addString("Name", Name.c_str());
 		out->addInt("Id", ID );
@@ -817,7 +817,7 @@ public:
 	//! Reads attributes of the scene node.
 	/** Implement this to set the attributes of your scene node for
 	scripting languages, editors, debuggers or xml deserialization purposes. */
-	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
+	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE
 	{
 		setName(in->getAttributeAsString("Name", Name));
 		setID(in->getAttributeAsInt("Id", ID));
@@ -1066,4 +1066,3 @@ protected:
 } // end namespace irr
 
 #endif
-

include/IGUIElementFactory.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#ifndef IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
-#define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#define IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "EGUIElementTypes.h"
@@ -62,5 +62,4 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
+#endif // IRR_I_GUI_ELEMENT_FACTORY_H_INCLUDED
-

include/IGUIEnvironment.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__
+#ifndef IRR_I_GUI_ENVIRONMENT_H_INCLUDED
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
+#define IRR_I_GUI_ENVIRONMENT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
@@ -668,4 +668,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIFileOpenDialog.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#ifndef IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED
-#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#define IRR_I_GUI_FILE_OPEN_DIALOG_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "path.h"
@@ -47,4 +47,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIFont.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FONT_H_INCLUDED__
+#ifndef IRR_I_GUI_FONT_H_INCLUDED
-#define __I_GUI_FONT_H_INCLUDED__
+#define IRR_I_GUI_FONT_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -101,4 +101,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIFontBitmap.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FONT_BITMAP_H_INCLUDED__
+#ifndef IRR_I_GUI_FONT_BITMAP_H_INCLUDED
-#define __I_GUI_FONT_BITMAP_H_INCLUDED__
+#define IRR_I_GUI_FONT_BITMAP_H_INCLUDED
 
 #include "IGUIFont.h"
 
@@ -19,7 +19,7 @@ class IGUIFontBitmap : public IGUIFont
 public:
 
 	//! Returns the type of this font
-	virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; }
+	virtual EGUI_FONT_TYPE getType() const IRR_OVERRIDE { return EGFT_BITMAP; }
 
 	//! returns the parsed Symbol Information
 	virtual IGUISpriteBank* getSpriteBank() const = 0;
@@ -36,11 +36,10 @@ public:
 	kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the
 	left side kerning value of thisLetter, then add the global value.
 	*/
-	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ = 0;
+	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const IRR_OVERRIDE = 0;
 };
 
 } // end namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIImage.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_IMAGE_H_INCLUDED__
+#ifndef IRR_I_GUI_IMAGE_H_INCLUDED
-#define __I_GUI_IMAGE_H_INCLUDED__
+#define IRR_I_GUI_IMAGE_H_INCLUDED
 
 #include "IGUIElement.h"
 

include/IGUIImageList.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__
+#ifndef IRR_I_GUI_IMAGE_LIST_H_INCLUDED
-#define __I_GUI_IMAGE_LIST_H_INCLUDED__
+#define IRR_I_GUI_IMAGE_LIST_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "rect.h"
@@ -42,4 +42,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IGUIInOutFader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_IN_OUT_FADER_H_INCLUDED__
+#ifndef IRR_I_GUI_IN_OUT_FADER_H_INCLUDED
-#define __I_GUI_IN_OUT_FADER_H_INCLUDED__
+#define IRR_I_GUI_IN_OUT_FADER_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -42,7 +42,7 @@ namespace gui
 
 		//! Starts the fade in process.
 		/** In the beginning the whole rect is drawn by the set color
-		(black by default) and at the end of the overgiven time the
+		(black by default) and at the end of the given time the
 		color has faded out.
 		\param time: Time specifying how long it should need to fade in,
 		in milliseconds. */
@@ -64,4 +64,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIListBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_LIST_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_LIST_BOX_H_INCLUDED
-#define __I_GUI_LIST_BOX_H_INCLUDED__
+#define IRR_I_GUI_LIST_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -139,4 +139,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIMeshViewer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_MESH_VIEWER_H_INCLUDED__
+#ifndef IRR_I_GUI_MESH_VIEWER_H_INCLUDED
-#define __I_GUI_MESH_VIEWER_H_INCLUDED__
+#define IRR_I_GUI_MESH_VIEWER_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -50,4 +50,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIProfiler.h

@@ -2,8 +2,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Written by Michael Zeilfelder
 
-#ifndef I_GUI_PROFILER_H_INCLUDED__
+#ifndef IRR_I_GUI_PROFILER_H_INCLUDED
-#define I_GUI_PROFILER_H_INCLUDED__
+#define IRR_I_GUI_PROFILER_H_INCLUDED
 
 #include "IGUIElement.h"
 

include/IGUIScrollBar.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SCROLL_BAR_H_INCLUDED__
+#ifndef IRR_I_GUI_SCROLL_BAR_H_INCLUDED
-#define __I_GUI_SCROLL_BAR_H_INCLUDED__
+#define IRR_I_GUI_SCROLL_BAR_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -62,4 +62,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUISkin.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SKIN_H_INCLUDED__
+#ifndef IRR_I_GUI_SKIN_H_INCLUDED
-#define __I_GUI_SKIN_H_INCLUDED__
+#define IRR_I_GUI_SKIN_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "EGUIAlignment.h"
@@ -577,4 +577,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUISpinBox.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SPIN_BOX_H_INCLUDED__
+#ifndef IRR_I_GUI_SPIN_BOX_H_INCLUDED
-#define __I_GUI_SPIN_BOX_H_INCLUDED__
+#define IRR_I_GUI_SPIN_BOX_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -88,5 +88,4 @@ namespace gui
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_SPIN_BOX_H_INCLUDED__
+#endif // IRR_I_GUI_SPIN_BOX_H_INCLUDED
-

include/IGUISpriteBank.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__
+#ifndef IRR_I_GUI_SPRITE_BANK_H_INCLUDED
-#define __I_GUI_SPRITE_BANK_H_INCLUDED__
+#define IRR_I_GUI_SPRITE_BANK_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -138,5 +138,4 @@ public:
 } // end namespace gui
 } // end namespace irr
 
-#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__
+#endif // IRR_I_GUI_SPRITE_BANK_H_INCLUDED
-

include/IGUIStaticText.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_STATIC_TEXT_H_INCLUDED__
+#ifndef IRR_I_GUI_STATIC_TEXT_H_INCLUDED
-#define __I_GUI_STATIC_TEXT_H_INCLUDED__
+#define IRR_I_GUI_STATIC_TEXT_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -136,4 +136,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITabControl.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TAB_CONTROL_H_INCLUDED__
+#ifndef IRR_I_GUI_TAB_CONTROL_H_INCLUDED
-#define __I_GUI_TAB_CONTROL_H_INCLUDED__
+#define IRR_I_GUI_TAB_CONTROL_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -131,7 +131,7 @@ namespace gui
 
 		//! Returns zero based index of tab if in tabcontrol.
 		/** \deprecated Deprecated in 1.9, use IGUITabControl::getTabIndex instead*/
-		_IRR_DEPRECATED_ virtual s32 getNumber() const
+		IRR_DEPRECATED virtual s32 getNumber() const
 		{
 			if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
 				return static_cast<IGUITabControl*>(Parent)->getTabIndex(this);
@@ -161,4 +161,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITable.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TABLE_H_INCLUDED__
+#ifndef IRR_I_GUI_TABLE_H_INCLUDED
-#define __I_GUI_TABLE_H_INCLUDED__
+#define IRR_I_GUI_TABLE_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -232,4 +232,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIToolbar.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TOOL_BAR_H_INCLUDED__
+#ifndef IRR_I_GUI_TOOL_BAR_H_INCLUDED
-#define __I_GUI_TOOL_BAR_H_INCLUDED__
+#define IRR_I_GUI_TOOL_BAR_H_INCLUDED
 
 #include "IGUIElement.h"
 
@@ -37,4 +37,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUITreeView.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TREE_VIEW_H_INCLUDED__
+#ifndef IRR_I_GUI_TREE_VIEW_H_INCLUDED
-#define __I_GUI_TREE_VIEW_H_INCLUDED__
+#define IRR_I_GUI_TREE_VIEW_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "IGUIImageList.h"
@@ -80,7 +80,7 @@ namespace gui
 		//! removes all children (recursive) from this node
 		/** \deprecated Deprecated in 1.8, use clearChildren() instead.
 		This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ void clearChilds()
+		IRR_DEPRECATED void clearChilds()
 		{
 			return clearChildren();
 		}
@@ -91,7 +91,7 @@ namespace gui
 		//! returns true if this node has child nodes
 		/** \deprecated Deprecated in 1.8, use hasChildren() instead.
 		This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool hasChilds() const
+		IRR_DEPRECATED bool hasChilds() const
 		{
 			return hasChildren();
 		}
@@ -295,4 +295,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGUIWindow.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_WINDOW_H_INCLUDED__
+#ifndef IRR_I_GUI_WINDOW_H_INCLUDED
-#define __I_GUI_WINDOW_H_INCLUDED__
+#define IRR_I_GUI_WINDOW_H_INCLUDED
 
 #include "IGUIElement.h"
 #include "EMessageBoxFlags.h"
@@ -71,4 +71,3 @@ namespace gui
 } // end namespace irr
 
 #endif
-

include/IGeometryCreator.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GEOMETRY_CREATOR_H_INCLUDED__
+#ifndef IRR_I_GEOMETRY_CREATOR_H_INCLUDED
-#define __I_GEOMETRY_CREATOR_H_INCLUDED__
+#define IRR_I_GEOMETRY_CREATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IMesh.h"
@@ -225,5 +225,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-#endif // __I_GEOMETRY_CREATOR_H_INCLUDED__
+#endif // IRR_I_GEOMETRY_CREATOR_H_INCLUDED
-

include/IImage.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_IMAGE_H_INCLUDED__
+#ifndef IRR_I_IMAGE_H_INCLUDED
-#define __I_IMAGE_H_INCLUDED__
+#define IRR_I_IMAGE_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -190,7 +190,7 @@ public:
 	depends on the color format of the image. For example if the color
 	format is ECF_A8R8G8B8, it is of u32. Be sure to call unlock() after
 	you don't need the pointer any more. */
-	_IRR_DEPRECATED_ void* lock()
+	IRR_DEPRECATED void* lock()
 	{
 		return getData();
 	}
@@ -198,7 +198,7 @@ public:
 	//! Unlock function.
 	/** Should be called after the pointer received by lock() is not
 	needed anymore. */
-	_IRR_DEPRECATED_ void unlock()
+	IRR_DEPRECATED void unlock()
 	{
 	}
 
@@ -363,14 +363,14 @@ public:
 	virtual void fill(const SColor &color) =0;
 
 	//! Inform whether the image is compressed
-	_IRR_DEPRECATED_ bool isCompressed() const
+	IRR_DEPRECATED bool isCompressed() const
 	{
 		return IImage::isCompressedFormat(Format);
 	}
 
 	//! Check whether the image has MipMaps
 	/** \return True if image has MipMaps, else false. */
-	_IRR_DEPRECATED_ bool hasMipMaps() const
+	IRR_DEPRECATED bool hasMipMaps() const
 	{
 		return (getMipMapsData() != 0);
 	}
@@ -589,4 +589,3 @@ protected:
 } // end namespace irr
 
 #endif
-

include/IImageLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SURFACE_LOADER_H_INCLUDED__
+#ifndef IRR_I_SURFACE_LOADER_H_INCLUDED
-#define __I_SURFACE_LOADER_H_INCLUDED__
+#define IRR_I_SURFACE_LOADER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
@@ -63,4 +63,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IImageWriter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef _I_IMAGE_WRITER_H_INCLUDED__
+#ifndef IRR_I_IMAGE_WRITER_H_INCLUDED
-#define _I_IMAGE_WRITER_H_INCLUDED__
+#define IRR_I_IMAGE_WRITER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -41,5 +41,4 @@ public:
 } // namespace video
 } // namespace irr
 
-#endif // _I_IMAGE_WRITER_H_INCLUDED__
+#endif // IRR_I_IMAGE_WRITER_H_INCLUDED
-

include/IIndexBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_INDEX_BUFFER_H_INCLUDED__
+#ifndef IRR_I_INDEX_BUFFER_H_INCLUDED
-#define __I_INDEX_BUFFER_H_INCLUDED__
+#define IRR_I_INDEX_BUFFER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -13,11 +13,6 @@
 namespace irr
 {
 
-namespace video
-{
-
-}
-
 namespace scene
 {
 
@@ -62,4 +57,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/ILightManager.h

@@ -3,8 +3,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_LIGHT_MANAGER_H_INCLUDED__
+#ifndef IRR_I_LIGHT_MANAGER_H_INCLUDED
-#define __I_LIGHT_MANAGER_H_INCLUDED__
+#define IRR_I_LIGHT_MANAGER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"

include/ILightSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_LIGHT_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_LIGHT_SCENE_NODE_H_INCLUDED
-#define __I_LIGHT_SCENE_NODE_H_INCLUDED__
+#define IRR_I_LIGHT_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 #include "SLight.h"
@@ -84,4 +84,3 @@ public:
 
 
 #endif
-

include/ILogger.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_LOGGER_H_INCLUDED__
+#ifndef IRR_I_LOGGER_H_INCLUDED
-#define __I_LOGGER_H_INCLUDED__
+#define IRR_I_LOGGER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 
@@ -99,4 +99,3 @@ public:
 } // end namespace
 
 #endif
-

include/IMaterialRenderer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MATERIAL_RENDERER_H_INCLUDED__
+#ifndef IRR_I_MATERIAL_RENDERER_H_INCLUDED
-#define __I_MATERIAL_RENDERER_H_INCLUDED__
+#define IRR_I_MATERIAL_RENDERER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -104,4 +104,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IMaterialRendererServices.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#ifndef IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED
-#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#define IRR_I_MATERIAL_RENDERER_SERVICES_H_INCLUDED
 
 #include "SMaterial.h"
 #include "S3DVertex.h"
@@ -28,7 +28,7 @@ public:
 	/** Sets all basic renderstates if needed.
 	Basic render states are diffuse, ambient, specular, and emissive color,
 	specular power, bilinear and trilinear filtering, wireframe mode,
-	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
 	fog enabling.
 	\param material The new material to be used.
 	\param lastMaterial The material used until now.
@@ -116,25 +116,25 @@ public:
 	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
 
 	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const f32* floats, int count)
+	IRR_DEPRECATED bool setVertexShaderConstant(const c8* name, const f32* floats, int count)
 	{
 		return setVertexShaderConstant(getVertexShaderConstantID(name), floats, count);
 	}
 
 	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const s32* ints, int count)
+	IRR_DEPRECATED bool setVertexShaderConstant(const c8* name, const s32* ints, int count)
 	{
 		return setVertexShaderConstant(getVertexShaderConstantID(name), ints, count);
 	}
 
 	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const f32* floats, int count)
+	IRR_DEPRECATED bool setPixelShaderConstant(const c8* name, const f32* floats, int count)
 	{
 		return setPixelShaderConstant(getPixelShaderConstantID(name), floats, count);
 	}
 
 	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const s32* ints, int count)
+	IRR_DEPRECATED bool setPixelShaderConstant(const c8* name, const s32* ints, int count)
 	{
 		return setPixelShaderConstant(getPixelShaderConstantID(name), ints, count);
 	}
@@ -148,4 +148,3 @@ public:
 } // end namespace irr
 
 #endif
-

include/IMemoryReadFile.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MEMORY_READ_FILE_H_INCLUDED__
+#ifndef IRR_I_MEMORY_READ_FILE_H_INCLUDED
-#define __I_MEMORY_READ_FILE_H_INCLUDED__
+#define IRR_I_MEMORY_READ_FILE_H_INCLUDED
 
 #include "IReadFile.h"
 
@@ -28,4 +28,3 @@ namespace io
 } // end namespace irr
 
 #endif
-

include/IMesh.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_H_INCLUDED__
+#ifndef IRR_I_MESH_H_INCLUDED
-#define __I_MESH_H_INCLUDED__
+#define IRR_I_MESH_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -120,7 +120,7 @@ namespace scene
 		if getMeshType() returns EAMT_MD2 it's safe to cast the
 		IMesh to IAnimatedMeshMD2.
 		Note: It's no longer just about animated meshes, that name has just historical reasons.
-		\returns Type of the mesh  */
+		\return Type of the mesh  */
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const
 		{
 			return EAMT_STATIC;
@@ -131,4 +131,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IMeshBuffer.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_BUFFER_H_INCLUDED__
+#ifndef IRR_I_MESH_BUFFER_H_INCLUDED
-#define __I_MESH_BUFFER_H_INCLUDED__
+#define IRR_I_MESH_BUFFER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"

include/IMeshCache.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_CACHE_H_INCLUDED__
+#ifndef IRR_I_MESH_CACHE_H_INCLUDED
-#define __I_MESH_CACHE_H_INCLUDED__
+#define IRR_I_MESH_CACHE_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -81,7 +81,7 @@ namespace scene
 		//! Returns a mesh based on its name (often a filename).
 		/** \deprecated Use getMeshByName() instead. This method may be removed by
 		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ IAnimatedMesh* getMeshByFilename(const io::path& filename)
+		IRR_DEPRECATED IAnimatedMesh* getMeshByFilename(const io::path& filename)
 		{
 			return getMeshByName(filename);
 		}
@@ -89,7 +89,7 @@ namespace scene
 		//! Get the name of a loaded mesh, based on its index. (Name is often identical to the filename).
 		/** \deprecated Use getMeshName() instead. This method may be removed by
 		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const
+		IRR_DEPRECATED const io::path& getMeshFilename(u32 index) const
 		{
 			return getMeshName(index).getInternalName();
 		}
@@ -97,7 +97,7 @@ namespace scene
 		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
 		/** \deprecated Use getMeshName() instead. This method may be removed by
 		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const
+		IRR_DEPRECATED const io::path& getMeshFilename(const IMesh* const mesh) const
 		{
 			return getMeshName(mesh).getInternalName();
 		}
@@ -105,7 +105,7 @@ namespace scene
 		//! Renames a loaded mesh.
 		/** \deprecated Use renameMesh() instead. This method may be removed by
 		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(u32 index, const io::path& filename)
+		IRR_DEPRECATED bool setMeshFilename(u32 index, const io::path& filename)
 		{
 			return renameMesh(index, filename);
 		}
@@ -113,7 +113,7 @@ namespace scene
 		//! Renames a loaded mesh.
 		/** \deprecated Use renameMesh() instead. This method may be removed by
 		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(const IMesh* const mesh, const io::path& filename)
+		IRR_DEPRECATED bool setMeshFilename(const IMesh* const mesh, const io::path& filename)
 		{
 			return renameMesh(mesh, filename);
 		}
@@ -174,4 +174,3 @@ namespace scene
 } // end namespace irr
 
 #endif
-

include/IMeshLoader.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_LOADER_H_INCLUDED__
+#ifndef IRR_I_MESH_LOADER_H_INCLUDED
-#define __I_MESH_LOADER_H_INCLUDED__
+#define IRR_I_MESH_LOADER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "path.h"

include/IMeshManipulator.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_MANIPULATOR_H_INCLUDED__
+#ifndef IRR_I_MESH_MANIPULATOR_H_INCLUDED
-#define __I_MESH_MANIPULATOR_H_INCLUDED__
+#define IRR_I_MESH_MANIPULATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "vector3d.h"
@@ -122,7 +122,7 @@ namespace scene
 		/** \deprecated Use scale() instead. This method may be removed by Irrlicht 1.9
 		\param mesh Mesh on which the operation is performed.
 		\param factor Scale factor for each axis. */
-		_IRR_DEPRECATED_ void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);}
+		IRR_DEPRECATED void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);}
 
 		//! Scale the texture coords of a mesh.
 		/** \param mesh Mesh on which the operation is performed.
@@ -188,7 +188,7 @@ namespace scene
 		/** \deprecated Use transform() instead. This method may be removed by Irrlicht 1.9
 		\param mesh Mesh on which the operation is performed.
 		\param m transformation matrix. */
-		_IRR_DEPRECATED_ virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const {return transform(mesh,m);}
+		IRR_DEPRECATED virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const {return transform(mesh,m);}
 
 		//! Creates a planar texture mapping on the mesh
 		/** \param mesh: Mesh on which the operation is performed.
@@ -441,5 +441,4 @@ protected:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif

include/IMeshSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_MESH_SCENE_NODE_H_INCLUDED
-#define __I_MESH_SCENE_NODE_H_INCLUDED__
+#define IRR_I_MESH_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
 
@@ -78,6 +78,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IMeshTextureLoader.h

@@ -1,8 +1,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__
+#ifndef IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED
-#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED__
+#define IRR_I_MESH_TEXTURE_LOADER_H_INCLUDED
 
 #include "path.h"
 #include "IReferenceCounted.h"

include/IMeshWriter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_MESH_WRITER_H_INCLUDED__
+#ifndef IRR_I_MESH_WRITER_H_INCLUDED
-#define __IRR_I_MESH_WRITER_H_INCLUDED__
+#define IRR_I_MESH_WRITER_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "EMeshWriterEnums.h"
@@ -55,4 +55,3 @@ namespace scene
 } // end namespace
 
 #endif
-

include/IMetaTriangleSelector.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_META_TRIANGLE_SELECTOR_H_INCLUDED__
+#ifndef IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED
-#define __I_META_TRIANGLE_SELECTOR_H_INCLUDED__
+#define IRR_I_META_TRIANGLE_SELECTOR_H_INCLUDED
 
 #include "ITriangleSelector.h"
 
@@ -38,6 +38,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IOSOperator.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_OS_OPERATOR_H_INCLUDED__
+#ifndef IRR_I_OS_OPERATOR_H_INCLUDED
-#define __I_OS_OPERATOR_H_INCLUDED__
+#define IRR_I_OS_OPERATOR_H_INCLUDED
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -20,7 +20,7 @@ public:
 
 	//! Get the current operation system version as string.
 	/** \deprecated Use getOperatingSystemVersion instead. This method will be removed in Irrlicht 1.9. */
-	_IRR_DEPRECATED_ const wchar_t* getOperationSystemVersion() const
+	IRR_DEPRECATED const wchar_t* getOperationSystemVersion() const
 	{
 		return core::stringw(getOperatingSystemVersion()).c_str();
 	}

include/IOctreeSceneNode.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_OCTREE_SCENE_NODE_H_INCLUDED__
+#ifndef IRR_I_OCTREE_SCENE_NODE_H_INCLUDED
-#define __I_OCTREE_SCENE_NODE_H_INCLUDED__
+#define IRR_I_OCTREE_SCENE_NODE_H_INCLUDED
 
 #include "IMeshSceneNode.h"
 
@@ -78,6 +78,4 @@ public:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleAffector.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_PARTICLE_AFFECTOR_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_AFFECTOR_H_INCLUDED
-#define __I_PARTICLE_AFFECTOR_H_INCLUDED__
+#define IRR_I_PARTICLE_AFFECTOR_H_INCLUDED
 
 #include "IAttributeExchangingObject.h"
 #include "SParticle.h"
@@ -67,6 +67,4 @@ protected:
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleAnimatedMeshSceneNodeEmitter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
-#define __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 #include "IAnimatedMeshSceneNode.h"
@@ -43,12 +43,10 @@ public:
 	virtual bool getEveryMeshVertex() const = 0;
 
 	//! Get emitter type
-	virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_ANIMATED_MESH; }
+	virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_ANIMATED_MESH; }
 };
 
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
-#endif // __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
-

include/IParticleAttractionAffector.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
-#define __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
+#define IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
 
 #include "IParticleAffector.h"
 
@@ -54,12 +54,10 @@ public:
 	virtual bool getAffectZ() const = 0;
 
 	//! Get emitter type
-	virtual E_PARTICLE_AFFECTOR_TYPE getType() const _IRR_OVERRIDE_ { return EPAT_ATTRACT; }
+	virtual E_PARTICLE_AFFECTOR_TYPE getType() const IRR_OVERRIDE { return EPAT_ATTRACT; }
 };
 
 } // end namespace scene
 } // end namespace irr
 
-
+#endif // IRR_I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
-#endif // __I_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
-

include/IParticleBoxEmitter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_PARTICLE_BOX_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED
-#define __I_PARTICLE_BOX_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_BOX_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 #include "aabbox3d.h"
@@ -25,12 +25,10 @@ public:
 	virtual const core::aabbox3df& getBox() const = 0;
 
 	//! Get emitter type
-	virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_BOX; }
+	virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_BOX; }
 };
 
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-

include/IParticleCylinderEmitter.h

@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__
+#ifndef IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED
-#define __I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED__
+#define IRR_I_PARTICLE_CYLINDER_EMITTER_H_INCLUDED
 
 #include "IParticleEmitter.h"
 
@@ -48,12 +48,10 @@ public:
 	virtual bool getOutlineOnly() const = 0;
 
 	//! Get emitter type
-	virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_CYLINDER; }
+	virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_CYLINDER; }
 };
 
 } // end namespace scene
 } // end namespace irr
 
-
 #endif
-