Reduce IrrCompileConfig usage to files that actually need it

[irrlicht.git] / source / Irrlicht / CAttributes.h

diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h
index 966d31cb1140b0aa4ea31a2d41735d8263de95fa..3d881156997a95304a9cde065d6c2436bbd0a03d 100644 (file)
--- a/source/Irrlicht/CAttributes.h
+++ b/source/Irrlicht/CAttributes.h
@@ -5,7 +5,6 @@
 #ifndef __C_ATTRIBUTES_H_INCLUDED__\r
 #define __C_ATTRIBUTES_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
 \r
 #include "IAttributes.h"\r
 #include "IAttribute.h"\r
@@ -30,37 +29,37 @@ public:
        ~CAttributes();\r
 \r
        //! Returns amount of attributes in this collection of attributes.\r
-       virtual u32 getAttributeCount() const _IRR_OVERRIDE_;\r
+       u32 getAttributeCount() const override;\r
 \r
        //! Returns attribute name by index.\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual const c8* getAttributeName(s32 index) const _IRR_OVERRIDE_;\r
+       const c8* getAttributeName(s32 index) const override;\r
 \r
        //! Returns the type of an attribute\r
        //! \param attributeName: Name for the attribute\r
-       virtual E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) const _IRR_OVERRIDE_;\r
+       E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) const override;\r
 \r
        //! Returns attribute type by index.\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) const _IRR_OVERRIDE_;\r
+       E_ATTRIBUTE_TYPE getAttributeType(s32 index) const override;\r
 \r
        //! Returns the type string of the attribute\r
        //! \param attributeName: String for the attribute type\r
        //! \param defaultNotFound Value returned when attributeName was not found\r
-       virtual const wchar_t* getAttributeTypeString(const c8* attributeName, const wchar_t* defaultNotFound = L"unknown") const _IRR_OVERRIDE_;\r
+       const wchar_t* getAttributeTypeString(const c8* attributeName, const wchar_t* defaultNotFound = L"unknown") const override;\r
 \r
        //! Returns the type string of the attribute by index.\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual const wchar_t* getAttributeTypeString(s32 index, const wchar_t* defaultNotFound = L"unknown") const _IRR_OVERRIDE_;\r
+       const wchar_t* getAttributeTypeString(s32 index, const wchar_t* defaultNotFound = L"unknown") const override;\r
 \r
        //! Returns if an attribute with a name exists\r
-       virtual bool existsAttribute(const c8* attributeName) const _IRR_OVERRIDE_;\r
+       bool existsAttribute(const c8* attributeName) const override;\r
 \r
        //! Returns attribute index from name, -1 if not found\r
-       virtual s32 findAttribute(const c8* attributeName) const _IRR_OVERRIDE_;\r
+       s32 findAttribute(const c8* attributeName) const override;\r
 \r
        //! Removes all attributes\r
-       virtual void clear() _IRR_OVERRIDE_;\r
+       void clear() override;\r
 \r
 \r
        /*\r
@@ -70,23 +69,23 @@ public:
        */\r
 \r
        //! Adds an attribute as integer\r
-       virtual void addInt(const c8* attributeName, s32 value) _IRR_OVERRIDE_;\r
+       void addInt(const c8* attributeName, s32 value) override;\r
 \r
        //! Sets an attribute as integer value\r
-       virtual void setAttribute(const c8* attributeName, s32 value) _IRR_OVERRIDE_;\r
+       void setAttribute(const c8* attributeName, s32 value) override;\r
 \r
        //! Gets an attribute as integer value\r
        //! \param attributeName: Name of the attribute to get.\r
        //! \param defaultNotFound Value returned when attributeName was not found\r
        //! \return Returns value of the attribute previously set by setAttribute()\r
-       virtual s32 getAttributeAsInt(const c8* attributeName, irr::s32 defaultNotFound=0) const _IRR_OVERRIDE_;\r
+       s32 getAttributeAsInt(const c8* attributeName, irr::s32 defaultNotFound=0) const override;\r
 \r
        //! Gets an attribute as integer value\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual s32 getAttributeAsInt(s32 index) const _IRR_OVERRIDE_;\r
+       s32 getAttributeAsInt(s32 index) const override;\r
 \r
        //! Sets an attribute as integer value\r
-       virtual void setAttribute(s32 index, s32 value) _IRR_OVERRIDE_;\r
+       void setAttribute(s32 index, s32 value) override;\r
 \r
        /*\r
 \r
@@ -95,23 +94,23 @@ public:
        */\r
 \r
        //! Adds an attribute as float\r
-       virtual void addFloat(const c8* attributeName, f32 value) _IRR_OVERRIDE_;\r
+       void addFloat(const c8* attributeName, f32 value) override;\r
 \r
        //! Sets a attribute as float value\r
-       virtual void setAttribute(const c8* attributeName, f32 value) _IRR_OVERRIDE_;\r
+       void setAttribute(const c8* attributeName, f32 value) override;\r
 \r
        //! Gets an attribute as float value\r
        //! \param attributeName: Name of the attribute to get.\r
        //! \param defaultNotFound Value returned when attributeName was not found\r
        //! \return Returns value of the attribute previously set by setAttribute()\r
-       virtual f32 getAttributeAsFloat(const c8* attributeName, irr::f32 defaultNotFound=0.f) const _IRR_OVERRIDE_;\r
+       f32 getAttributeAsFloat(const c8* attributeName, irr::f32 defaultNotFound=0.f) const override;\r
 \r
        //! Gets an attribute as float value\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual f32 getAttributeAsFloat(s32 index) const _IRR_OVERRIDE_;\r
+       f32 getAttributeAsFloat(s32 index) const override;\r
 \r
        //! Sets an attribute as float value\r
-       virtual void setAttribute(s32 index, f32 value) _IRR_OVERRIDE_;\r
+       void setAttribute(s32 index, f32 value) override;\r
 \r
 \r
        /*\r
@@ -119,23 +118,23 @@ public:
        */\r
 \r
        //! Adds an attribute as bool\r
-       virtual void addBool(const c8* attributeName, bool value) _IRR_OVERRIDE_;\r
+       void addBool(const c8* attributeName, bool value) override;\r
 \r
        //! Sets an attribute as boolean value\r
-       virtual void setAttribute(const c8* attributeName, bool value) _IRR_OVERRIDE_;\r
+       void setAttribute(const c8* attributeName, bool value) override;\r
 \r
        //! Gets an attribute as boolean value\r
        //! \param attributeName: Name of the attribute to get.\r
        //! \param defaultNotFound Value returned when attributeName was not found\r
        //! \return Returns value of the attribute previously set by setAttribute()\r
-       virtual bool getAttributeAsBool(const c8* attributeName, bool defaultNotFound=false) const _IRR_OVERRIDE_;\r
+       bool getAttributeAsBool(const c8* attributeName, bool defaultNotFound=false) const override;\r
 \r
        //! Gets an attribute as boolean value\r
        //! \param index: Index value, must be between 0 and getAttributeCount()-1.\r
-       virtual bool getAttributeAsBool(s32 index) const _IRR_OVERRIDE_;\r
+       bool getAttributeAsBool(s32 index) const override;\r
 \r
        //! Sets an attribute as boolean value\r
-       virtual void setAttribute(s32 index, bool value) _IRR_OVERRIDE_;\r
+       void setAttribute(s32 index, bool value) override;\r
 \r
 protected:\r
 \r