From 4c8cf7c8fa0c676e21d04b37c188afbcd5441ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 23 Feb 2013 16:29:07 +0100 Subject: [PATCH] Include cleanup. --- src/Plugins/TgaImporter/Test/TgaImporterTest.cpp | 2 -- src/Plugins/TgaImporter/TgaImporter.cpp | 12 ++++++------ src/Plugins/TgaImporter/TgaImporter.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp index 97a308bdf..6d24dd1cb 100644 --- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp @@ -20,8 +20,6 @@ #include "../TgaImporter.h" -using namespace Corrade::Utility; - namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test { class TgaImporterTest: public Corrade::TestSuite::Tester { diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index ea4362729..ef47b0ab8 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -18,11 +18,11 @@ #include #include #include - -#include "Math/Vector2.h" +#include #include -#include "Trade/ImageData.h" -using namespace Corrade::Utility; +#include + +using Corrade::Utility::Endianness; namespace Magnum { namespace Trade { namespace TgaImporter { @@ -61,8 +61,8 @@ bool TgaImporter::open(std::istream& in) { in.read(reinterpret_cast(&header), sizeof(Header)); /* Convert to machine endian */ - header.width = Endianness::littleEndian(header.width); - header.height = Endianness::littleEndian(header.height); + header.width = Endianness::littleEndian(header.width); + header.height = Endianness::littleEndian(header.height); if(header.colorMapType != 0) { Error() << "TgaImporter: paletted files are not supported"; diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h index 110773650..6d7c81c14 100644 --- a/src/Plugins/TgaImporter/TgaImporter.h +++ b/src/Plugins/TgaImporter/TgaImporter.h @@ -19,7 +19,7 @@ * @brief Class Magnum::Trade::TgaImporter::TgaImporter */ -#include "Trade/AbstractImporter.h" +#include #ifndef DOXYGEN_GENERATING_OUTPUT #ifdef _WIN32