Adapted to Corrade and Magnum changes.

More shorter lines (sometimes even longer lines).

src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp

@@ -34,11 +34,9 @@
 
 #include "configure.h"
 
-using Corrade::Utility::Directory;
-
 namespace Magnum { namespace Trade { namespace TgaImageConverter { namespace Test {
 
-class TgaImageConverterTest: public Corrade::TestSuite::Tester {
+class TgaImageConverterTest: public TestSuite::Tester {
     public:
         explicit TgaImageConverterTest();
 
@@ -107,8 +105,8 @@ void TgaImageConverterTest::data() {
 }
 
 void TgaImageConverterTest::file() {
-    const std::string filename = Directory::join(TGAIMAGECONVERTER_TEST_DIR, "file.tga");
+    const std::string filename = Utility::Directory::join(TGAIMAGECONVERTER_TEST_DIR, "file.tga");
-    Directory::rm(filename);
+    Utility::Directory::rm(filename);
     CORRADE_VERIFY(TgaImageConverter().convertToFile(&original, filename));
 
     TgaImporter::TgaImporter importer;
@@ -122,7 +120,7 @@ void TgaImageConverterTest::file() {
     CORRADE_COMPARE(std::string(reinterpret_cast<const char*>(converted->data()), 2*3*3),
                     std::string(reinterpret_cast<const char*>(original.data()), 2*3*3));
 
-    Directory::rm(filename);
+    Utility::Directory::rm(filename);
 }
 
 }}}}

src/Plugins/TgaImageConverter/TgaImageConverter.cpp

@@ -35,7 +35,7 @@ namespace Magnum { namespace Trade { namespace TgaImageConverter {
 
 TgaImageConverter::TgaImageConverter() = default;
 
-TgaImageConverter::TgaImageConverter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractImageConverter(manager, std::move(plugin)) {}
+TgaImageConverter::TgaImageConverter(PluginManager::AbstractManager* manager, std::string plugin): AbstractImageConverter(manager, std::move(plugin)) {}
 
 TgaImageConverter::Features TgaImageConverter::features() const {
     return Feature::ConvertToData|Feature::ConvertToFile;

src/Plugins/TgaImageConverter/TgaImageConverter.h

@@ -45,7 +45,7 @@ class TgaImageConverter: public AbstractImageConverter {
         explicit TgaImageConverter();
 
         /** @brief Plugin manager constructor */
-        explicit TgaImageConverter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin);
+        explicit TgaImageConverter(PluginManager::AbstractManager* manager, std::string plugin);
 
         Features features() const override;
         std::pair<const unsigned char*, std::size_t> convertToData(const Image2D* const image) const override;

src/Plugins/TgaImporter/Test/TgaImporterTest.cpp

@@ -32,11 +32,9 @@
 
 #include "configure.h"
 
-using Corrade::Utility::Directory;
-
 namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test {
 
-class TgaImporterTest: public Corrade::TestSuite::Tester {
+class TgaImporterTest: public TestSuite::Tester {
     public:
         TgaImporterTest();
 
@@ -227,7 +225,7 @@ void TgaImporterTest::file() {
         3, 4,
         5, 6
     };
-    CORRADE_VERIFY(importer.openFile(Directory::join(TGAIMPORTER_TEST_DIR, "file.tga")));
+    CORRADE_VERIFY(importer.openFile(Utility::Directory::join(TGAIMPORTER_TEST_DIR, "file.tga")));
 
     Trade::ImageData2D* image = importer.image2D(0);
     CORRADE_VERIFY(image);

src/Plugins/TgaImporter/TgaImporter.cpp

@@ -35,13 +35,11 @@
 
 #include "TgaHeader.h"
 
-using Corrade::Utility::Endianness;
-
 namespace Magnum { namespace Trade { namespace TgaImporter {
 
 TgaImporter::TgaImporter(): in(nullptr) {}
 
-TgaImporter::TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), in(nullptr) {}
+TgaImporter::TgaImporter(PluginManager::AbstractManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), in(nullptr) {}
 
 TgaImporter::~TgaImporter() { close(); }
 
@@ -93,8 +91,8 @@ ImageData2D* TgaImporter::image2D(UnsignedInt id) {
     in->read(reinterpret_cast<char*>(&header), sizeof(TgaHeader));
 
     /* Convert to machine endian */
-    header.width = Endianness::littleEndian(header.width);
+    header.width = Utility::Endianness::littleEndian(header.width);
-    header.height = Endianness::littleEndian(header.height);
+    header.height = Utility::Endianness::littleEndian(header.height);
 
     /* Image format */
     ImageFormat format;
@@ -146,11 +144,11 @@ ImageData2D* TgaImporter::image2D(UnsignedInt id) {
     Vector2i dimensions(header.width, header.height);
 
     #ifdef MAGNUM_TARGET_GLES
-    if(format == ImageData2D::Format::RGB) {
+    if(format == ImageFormat::RGB) {
         auto data = reinterpret_cast<Math::Vector3<UnsignedByte>*>(buffer);
         std::transform(data, data + dimensions.product(), data,
             [](Math::Vector3<UnsignedByte> pixel) { return swizzle<'b', 'g', 'r'>(pixel); });
-    } else if(format == ImageData2D::Format::RGBA) {
+    } else if(format == ImageFormat::RGBA) {
         auto data = reinterpret_cast<Math::Vector4<UnsignedByte>*>(buffer);
         std::transform(data, data + dimensions.product(), data,
             [](Math::Vector4<UnsignedByte> pixel) { return swizzle<'b', 'g', 'r', 'a'>(pixel); });

src/Plugins/TgaImporter/TgaImporter.h

@@ -57,7 +57,7 @@ class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {
         explicit TgaImporter();
 
         /** @brief Plugin manager constructor */
-        explicit TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin);
+        explicit TgaImporter(PluginManager::AbstractManager* manager, std::string plugin);
 
         virtual ~TgaImporter();