From c707370f30f2a0cad962f079d89f5a19da96fd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 28 Feb 2013 00:32:39 +0100 Subject: [PATCH] Removed unneeded includes. --- src/AbstractResourceLoader.h | 2 -- src/Array.h | 1 - src/DimensionTraits.h | 3 ++- src/Implementation/BufferState.h | 2 -- src/Implementation/State.h | 2 -- src/Implementation/TextureState.h | 2 ++ src/MeshTools/FlipNormals.h | 1 - src/MeshTools/GenerateFlatNormals.h | 1 - src/MeshTools/Test/CombineIndexedArraysTest.cpp | 2 +- src/MeshTools/Test/SubdivideTest.cpp | 1 - src/Physics/ObjectShapeGroup.h | 1 - src/SceneGraph/AbstractFeature.h | 3 ++- src/Timeline.h | 2 +- src/Trade/TextureData.h | 2 -- 14 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/AbstractResourceLoader.h b/src/AbstractResourceLoader.h index e1d358215..47a8215da 100644 --- a/src/AbstractResourceLoader.h +++ b/src/AbstractResourceLoader.h @@ -19,8 +19,6 @@ * @brief Class Magnum::AbstractResourceLoader */ -#include "Magnum.h" - #include #include "ResourceManager.h" diff --git a/src/Array.h b/src/Array.h index cfe5dfb28..81ccb02b0 100644 --- a/src/Array.h +++ b/src/Array.h @@ -19,7 +19,6 @@ * @brief Class Magnum::Array, Magnum::Array1D, Magnum::Array2D, Magnum::Array3D */ -#include #include #include diff --git a/src/DimensionTraits.h b/src/DimensionTraits.h index eb790dbe0..b9cfba286 100644 --- a/src/DimensionTraits.h +++ b/src/DimensionTraits.h @@ -15,7 +15,8 @@ GNU Lesser General Public License version 3 for more details. */ -#include "Magnum.h" +#include "Math/Math.h" +#include "Types.h" /** @file * @brief Class Magnum::DimensionTraits diff --git a/src/Implementation/BufferState.h b/src/Implementation/BufferState.h index 097d3ea56..fd4bdebec 100644 --- a/src/Implementation/BufferState.h +++ b/src/Implementation/BufferState.h @@ -15,8 +15,6 @@ GNU Lesser General Public License version 3 for more details. */ -#include "Magnum.h" - #include "Buffer.h" namespace Magnum { namespace Implementation { diff --git a/src/Implementation/State.h b/src/Implementation/State.h index dd02d6823..738acb31d 100644 --- a/src/Implementation/State.h +++ b/src/Implementation/State.h @@ -15,8 +15,6 @@ GNU Lesser General Public License version 3 for more details. */ -#include "Magnum.h" - namespace Magnum { namespace Implementation { struct BufferState; diff --git a/src/Implementation/TextureState.h b/src/Implementation/TextureState.h index 73eca32af..b35ae25a6 100644 --- a/src/Implementation/TextureState.h +++ b/src/Implementation/TextureState.h @@ -15,6 +15,8 @@ GNU Lesser General Public License version 3 for more details. */ +#include + #include "Magnum.h" namespace Magnum { namespace Implementation { diff --git a/src/MeshTools/FlipNormals.h b/src/MeshTools/FlipNormals.h index c0f6f5519..2b89892de 100644 --- a/src/MeshTools/FlipNormals.h +++ b/src/MeshTools/FlipNormals.h @@ -19,7 +19,6 @@ * @brief Function Magnum::MeshTools::flipNormals() */ -#include #include #include "Magnum.h" diff --git a/src/MeshTools/GenerateFlatNormals.h b/src/MeshTools/GenerateFlatNormals.h index b9060b292..9198d9bc4 100644 --- a/src/MeshTools/GenerateFlatNormals.h +++ b/src/MeshTools/GenerateFlatNormals.h @@ -19,7 +19,6 @@ * @brief Function Magnum::MeshTools::generateFlatNormals() */ -#include #include #include diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/MeshTools/Test/CombineIndexedArraysTest.cpp index edd14e225..ba7356f71 100644 --- a/src/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -16,7 +16,7 @@ #include #include -#include "Magnum.h" +#include "Types.h" #include "MeshTools/CombineIndexedArrays.h" namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/MeshTools/Test/SubdivideTest.cpp index bbbab9e79..72b15c49a 100644 --- a/src/MeshTools/Test/SubdivideTest.cpp +++ b/src/MeshTools/Test/SubdivideTest.cpp @@ -16,7 +16,6 @@ #include #include -#include "Magnum.h" #include "MeshTools/Clean.h" #include "MeshTools/Subdivide.h" diff --git a/src/Physics/ObjectShapeGroup.h b/src/Physics/ObjectShapeGroup.h index ffc736708..05bf8fcc8 100644 --- a/src/Physics/ObjectShapeGroup.h +++ b/src/Physics/ObjectShapeGroup.h @@ -19,7 +19,6 @@ * @brief Class Magnum::Physics::ObjectShapeGroup */ -#include #include #include "Physics/ObjectShape.h" diff --git a/src/SceneGraph/AbstractFeature.h b/src/SceneGraph/AbstractFeature.h index c8b81f45e..4d119f2a7 100644 --- a/src/SceneGraph/AbstractFeature.h +++ b/src/SceneGraph/AbstractFeature.h @@ -22,7 +22,8 @@ #include #include -#include "AbstractObject.h" +#include "Magnum.h" +#include "SceneGraph/AbstractObject.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Timeline.h b/src/Timeline.h index 91908937e..8b8b2b2d6 100644 --- a/src/Timeline.h +++ b/src/Timeline.h @@ -17,7 +17,7 @@ #include -#include "Magnum.h" +#include "Types.h" #include "magnumVisibility.h" diff --git a/src/Trade/TextureData.h b/src/Trade/TextureData.h index 1dc4f16d0..ad2c70003 100644 --- a/src/Trade/TextureData.h +++ b/src/Trade/TextureData.h @@ -19,8 +19,6 @@ * @brief Class Magnum::Trade::TextureData */ -#include - namespace Magnum { namespace Trade { /**