From 4139f701463d2ce752b7680ce8ab591079e8bb77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 25 Jan 2013 14:50:21 +0100
Subject: [PATCH] DebugTools: minor code cleanup.

---
 .../Implementation/AbstractShapeRenderer.cpp           | 10 +++++-----
 .../Implementation/AxisAlignedBoxRenderer.cpp          |  1 -
 src/DebugTools/Implementation/BoxRenderer.cpp          |  1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/DebugTools/Implementation/AbstractShapeRenderer.cpp
index 390ab8955..8f92ad157 100644
--- a/src/DebugTools/Implementation/AbstractShapeRenderer.cpp
+++ b/src/DebugTools/Implementation/AbstractShapeRenderer.cpp
@@ -28,9 +28,9 @@ namespace Magnum { namespace DebugTools { namespace Implementation {
 
 namespace {
 
-template<std::uint8_t dimensions> ResourceKey shaderName();
-template<> inline ResourceKey shaderName<2>() { return ResourceKey("FlatShader2D"); }
-template<> inline ResourceKey shaderName<3>() { return ResourceKey("FlatShader3D"); }
+template<std::uint8_t dimensions> ResourceKey shaderKey();
+template<> inline ResourceKey shaderKey<2>() { return ResourceKey("FlatShader2D"); }
+template<> inline ResourceKey shaderKey<3>() { return ResourceKey("FlatShader3D"); }
 
 template<std::uint8_t dimensions> void create(typename MeshData<dimensions>::Type&, Resource<Mesh>&, Resource<Buffer>&, Resource<Buffer>&);
 
@@ -79,12 +79,12 @@ template<> void create<3>(Trade::MeshData3D& data, Resource<Mesh>& meshResource,
 }
 
 template<std::uint8_t dimensions> AbstractShapeRenderer<dimensions>::AbstractShapeRenderer(ResourceKey meshKey, ResourceKey vertexBufferKey, ResourceKey indexBufferKey) {
-    shader = ResourceManager::instance()->get<AbstractShaderProgram, Shaders::FlatShader<dimensions>>(shaderName<dimensions>());
+    shader = ResourceManager::instance()->get<AbstractShaderProgram, Shaders::FlatShader<dimensions>>(shaderKey<dimensions>());
     mesh = ResourceManager::instance()->get<Mesh>(meshKey);
     vertexBuffer = ResourceManager::instance()->get<Buffer>(vertexBufferKey);
     indexBuffer = ResourceManager::instance()->get<Buffer>(indexBufferKey);
 
-    if(!shader) ResourceManager::instance()->set<AbstractShaderProgram>(shaderName<dimensions>(),
+    if(!shader) ResourceManager::instance()->set<AbstractShaderProgram>(shaderKey<dimensions>(),
         new Shaders::FlatShader<dimensions>, ResourceDataState::Final, ResourcePolicy::Resident);
 }
 
diff --git a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp b/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
index 7d28cd1a7..629e12fd8 100644
--- a/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
+++ b/src/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp
@@ -16,7 +16,6 @@
 #include "AxisAlignedBoxRenderer.h"
 
 #include "Mesh.h"
-#include "DebugTools/ResourceManager.h"
 #include "DebugTools/ShapeRenderer.h"
 #include "Physics/AxisAlignedBox.h"
 #include "SceneGraph/AbstractCamera.h"
diff --git a/src/DebugTools/Implementation/BoxRenderer.cpp b/src/DebugTools/Implementation/BoxRenderer.cpp
index 1562d5f90..3ed6493d9 100644
--- a/src/DebugTools/Implementation/BoxRenderer.cpp
+++ b/src/DebugTools/Implementation/BoxRenderer.cpp
@@ -16,7 +16,6 @@
 #include "BoxRenderer.h"
 
 #include "Mesh.h"
-#include "DebugTools/ResourceManager.h"
 #include "DebugTools/ShapeRenderer.h"
 #include "Physics/Box.h"
 #include "SceneGraph/AbstractCamera.h"