From 740c4dbcd6b5fd6bfe471b5684b4542f648ac57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 5 Oct 2014 15:38:14 +0200
Subject: [PATCH] TextureTools: shorter filenames for headers.

To be consistent with the rest, I don't know how did I forget about
this. Also it seems that the resource import header was never used, as
it included long-gone magnumConfigure.h. Thus I'm also not maintaining
any backwards compatibility, because it never worked in the first place.
---
 src/Magnum/TextureTools/Atlas.h                           | 2 +-
 src/Magnum/TextureTools/CMakeLists.txt                    | 4 ++--
 src/Magnum/TextureTools/DistanceField.h                   | 2 +-
 ...mTextureToolsResourceImport.hpp => resourceImport.hpp} | 8 +++++---
 .../{magnumTextureToolsVisibility.h => visibility.h}      | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)
 rename src/Magnum/TextureTools/{magnumTextureToolsResourceImport.hpp => resourceImport.hpp} (89%)
 rename src/Magnum/TextureTools/{magnumTextureToolsVisibility.h => visibility.h} (93%)

diff --git a/src/Magnum/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h
index 57ac04e9d..1d233d0ff 100644
--- a/src/Magnum/TextureTools/Atlas.h
+++ b/src/Magnum/TextureTools/Atlas.h
@@ -33,7 +33,7 @@
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Vector2.h"
-#include "Magnum/TextureTools/magnumTextureToolsVisibility.h"
+#include "Magnum/TextureTools/visibility.h"
 
 namespace Magnum { namespace TextureTools {
 
diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt
index 8621c2a63..89ae955b5 100644
--- a/src/Magnum/TextureTools/CMakeLists.txt
+++ b/src/Magnum/TextureTools/CMakeLists.txt
@@ -34,10 +34,10 @@ set(MagnumTextureTools_HEADERS
     Atlas.h
     DistanceField.h
 
-    magnumTextureToolsVisibility.h)
+    visibility.h)
 
 if(BUILD_STATIC)
-    set(MagnumTextureTools_HEADERS ${MagnumTextureTools_HEADERS} magnumTextureToolsResourceImport.hpp)
+    list(APPEND MagnumTextureTools_HEADERS resourceImport.hpp)
 endif()
 
 add_library(MagnumTextureTools ${SHARED_OR_STATIC}
diff --git a/src/Magnum/TextureTools/DistanceField.h b/src/Magnum/TextureTools/DistanceField.h
index 342ecb092..13cadad6f 100644
--- a/src/Magnum/TextureTools/DistanceField.h
+++ b/src/Magnum/TextureTools/DistanceField.h
@@ -34,7 +34,7 @@
 #endif
 #include "Magnum/Magnum.h"
 
-#include "Magnum/TextureTools/magnumTextureToolsVisibility.h"
+#include "Magnum/TextureTools/visibility.h"
 
 namespace Magnum { namespace TextureTools {
 
diff --git a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/resourceImport.hpp
similarity index 89%
rename from src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
rename to src/Magnum/TextureTools/resourceImport.hpp
index 58d60eacb..89ce97539 100644
--- a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
+++ b/src/Magnum/TextureTools/resourceImport.hpp
@@ -1,5 +1,5 @@
-#ifndef Magnum_TextureTools_magnumTextureToolsResourceImport_hpp
-#define Magnum_TextureTools_magnumTextureToolsResourceImport_hpp
+#ifndef Magnum_TextureTools_resourceImport_hpp
+#define Magnum_TextureTools_resourceImport_hpp
 /*
     This file is part of Magnum.
 
@@ -25,7 +25,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Magnum/magnumConfigure.h"
+#include "Magnum/configure.h"
 
 #ifdef MAGNUM_BUILD_STATIC
 #include <Corrade/Utility/Resource.h>
@@ -35,6 +35,8 @@ static int magnumTextureToolsResourceImport() {
     CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS)
     return 0;
 } CORRADE_AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport)
+#else
+#error this header is available only in static build
 #endif
 
 #endif
diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/visibility.h
similarity index 93%
rename from src/Magnum/TextureTools/magnumTextureToolsVisibility.h
rename to src/Magnum/TextureTools/visibility.h
index 3d329a101..6203b4f67 100644
--- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h
+++ b/src/Magnum/TextureTools/visibility.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_TextureTools_magnumTextureToolsVisibility_h
-#define Magnum_TextureTools_magnumTextureToolsVisibility_h
+#ifndef Magnum_TextureTools_visibility_h
+#define Magnum_TextureTools_visibility_h
 /*
     This file is part of Magnum.