From c9ad94713642a46d0ea562e2a7aab671eb8041a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 31 Oct 2013 17:02:16 +0100 Subject: [PATCH] Plugins: mark the includes as inter-project, not external. --- src/Plugins/MagnumFont/MagnumFont.cpp | 10 +++++----- src/Plugins/MagnumFont/MagnumFont.h | 4 ++-- src/Plugins/MagnumFont/Test/MagnumFontTest.cpp | 4 ++-- .../MagnumFontConverter/MagnumFontConverter.cpp | 11 ++++++----- .../MagnumFontConverter/MagnumFontConverter.h | 2 +- .../Test/MagnumFontConverterTest.cpp | 13 +++++++------ .../Test/TgaImageConverterTest.cpp | 11 ++++++----- src/Plugins/TgaImageConverter/TgaImageConverter.cpp | 9 +++++---- src/Plugins/TgaImageConverter/TgaImageConverter.h | 2 +- src/Plugins/TgaImporter/Test/TgaImporterTest.cpp | 4 ++-- src/Plugins/TgaImporter/TgaImporter.cpp | 9 +++++---- src/Plugins/WavAudioImporter/WavHeader.h | 2 +- src/Plugins/WavAudioImporter/WavImporter.h | 3 ++- 13 files changed, 45 insertions(+), 39 deletions(-) diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/Plugins/MagnumFont/MagnumFont.cpp index 8fdbeedf9..21a639978 100644 --- a/src/Plugins/MagnumFont/MagnumFont.cpp +++ b/src/Plugins/MagnumFont/MagnumFont.cpp @@ -25,11 +25,11 @@ #include "MagnumFont.h" #include -#include -#include -#include -#include -#include +#include "Containers/Array.h" +#include "Utility/Directory.h" +#include "Utility/Unicode.h" +#include "Text/GlyphCache.h" +#include "Trade/ImageData.h" #include "TgaImporter/TgaImporter.h" diff --git a/src/Plugins/MagnumFont/MagnumFont.h b/src/Plugins/MagnumFont/MagnumFont.h index 13c6723e2..925568a07 100644 --- a/src/Plugins/MagnumFont/MagnumFont.h +++ b/src/Plugins/MagnumFont/MagnumFont.h @@ -28,8 +28,8 @@ * @brief Class Magnum::Text::MagnumFont */ -#include -#include +#include "Text/AbstractFont.h" +#include "Trade/Trade.h" namespace Magnum { namespace Text { diff --git a/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp b/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp index f1d14394e..aecb00a8e 100644 --- a/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp +++ b/src/Plugins/MagnumFont/Test/MagnumFontTest.cpp @@ -22,10 +22,10 @@ DEALINGS IN THE SOFTWARE. */ -#include -#include #include +#include "Test/AbstractOpenGLTester.h" +#include "Text/GlyphCache.h" #include "MagnumFont/MagnumFont.h" #include "magnumFontTestConfigure.h" diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp index 0e841fca3..b7ac51cfc 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -27,11 +27,12 @@ #include #include #include -#include -#include -#include -#include -#include + +#include "ColorFormat.h" +#include "Image.h" +#include "Text/GlyphCache.h" +#include "Text/AbstractFont.h" +#include "TgaImageConverter/TgaImageConverter.h" namespace Magnum { namespace Text { diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h b/src/Plugins/MagnumFontConverter/MagnumFontConverter.h index fc725b36f..ff23c414b 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.h +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Text::MagnumFontConverter */ -#include +#include "Text/AbstractFontConverter.h" namespace Magnum { namespace Text { diff --git a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp b/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp index d75fbb48a..d4c6dcce6 100644 --- a/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp +++ b/src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp @@ -24,12 +24,13 @@ #include #include -#include -#include -#include -#include -#include -#include + +#include "ColorFormat.h" +#include "Extensions.h" +#include "TextureFormat.h" +#include "Test/AbstractOpenGLTester.h" +#include "Text/GlyphCache.h" +#include "Trade/ImageData.h" #include "Text/AbstractFont.h" #include "MagnumFontConverter/MagnumFontConverter.h" diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 20e1a5c77..3688a6dcd 100644 --- a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -27,11 +27,12 @@ #include #include #include -#include -#include -#include -#include -#include + +#include "ColorFormat.h" +#include "Image.h" +#include "Trade/ImageData.h" +#include "TgaImageConverter/TgaImageConverter.h" +#include "TgaImporter/TgaImporter.h" #include "configure.h" diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp index f5b6ddc08..fdb9c8c11 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp @@ -26,10 +26,11 @@ #include #include -#include -#include -#include -#include + +#include "Containers/Array.h" +#include "Utility/Endianness.h" +#include "ColorFormat.h" +#include "Image.h" #ifdef MAGNUM_TARGET_GLES #include diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/Plugins/TgaImageConverter/TgaImageConverter.h index 01b8f6bc8..7acaa4dfd 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.h +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Trade::TgaImageConverter */ -#include +#include "Trade/AbstractImageConverter.h" #ifndef DOXYGEN_GENERATING_OUTPUT #if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS) diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp index 7f08d8c62..d371e55d3 100644 --- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include +#include "ColorFormat.h" +#include "Trade/ImageData.h" #include "TgaImporter/TgaImporter.h" #include "configure.h" diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index 731610160..471e3d652 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -28,15 +28,16 @@ #include #include #include -#include -#include + +#include "ColorFormat.h" +#include "Trade/ImageData.h" #ifdef MAGNUM_TARGET_GLES #include #include "Math/Swizzle.h" #include "Math/Vector4.h" -#include -#include +#include "Context.h" +#include "Extensions.h" #endif #include "TgaHeader.h" diff --git a/src/Plugins/WavAudioImporter/WavHeader.h b/src/Plugins/WavAudioImporter/WavHeader.h index e472b8f5f..32779d21c 100644 --- a/src/Plugins/WavAudioImporter/WavHeader.h +++ b/src/Plugins/WavAudioImporter/WavHeader.h @@ -28,7 +28,7 @@ * @brief Struct Magnum::Audio::WavHeader */ -#include +#include "Types.h" namespace Magnum { namespace Audio { diff --git a/src/Plugins/WavAudioImporter/WavImporter.h b/src/Plugins/WavAudioImporter/WavImporter.h index 1bcbd7319..12fae4634 100644 --- a/src/Plugins/WavAudioImporter/WavImporter.h +++ b/src/Plugins/WavAudioImporter/WavImporter.h @@ -30,7 +30,8 @@ #include #include -#include