From cb9a66bd8a654c03bb98b0e62ac1cc8fb088a99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 2 Jul 2013 18:59:48 +0200 Subject: [PATCH] Properly prefix visibility macros. --- src/Plugins/TgaImporter/TgaImporter.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h index 55238e3f9..3f3b5d80f 100644 --- a/src/Plugins/TgaImporter/TgaImporter.h +++ b/src/Plugins/TgaImporter/TgaImporter.h @@ -32,11 +32,11 @@ #include #ifdef TgaImporter_EXPORTS - #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT + #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT #endif -#define MAGNUM_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL +#define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL namespace Magnum { namespace Trade { @@ -45,7 +45,7 @@ namespace Magnum { namespace Trade { Supports uncompressed BGR, BGRA or grayscale images with 8 bits per channel. */ -class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { +class MAGNUM_TRADE_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { public: /** @brief Default constructor */ explicit TgaImporter(); @@ -56,13 +56,13 @@ class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { virtual ~TgaImporter(); private: - Features MAGNUM_TGAIMPORTER_LOCAL doFeatures() const override; - bool MAGNUM_TGAIMPORTER_LOCAL doIsOpened() const override; - void MAGNUM_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference data) override; - void MAGNUM_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override; - void MAGNUM_TGAIMPORTER_LOCAL doClose() override; - UnsignedInt MAGNUM_TGAIMPORTER_LOCAL doImage2DCount() const override; - ImageData2D MAGNUM_TGAIMPORTER_LOCAL * doImage2D(UnsignedInt id) override; + Features MAGNUM_TRADE_TGAIMPORTER_LOCAL doFeatures() const override; + bool MAGNUM_TRADE_TGAIMPORTER_LOCAL doIsOpened() const override; + void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference data) override; + void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override; + void MAGNUM_TRADE_TGAIMPORTER_LOCAL doClose() override; + UnsignedInt MAGNUM_TRADE_TGAIMPORTER_LOCAL doImage2DCount() const override; + ImageData2D MAGNUM_TRADE_TGAIMPORTER_LOCAL * doImage2D(UnsignedInt id) override; std::istream* in; };