From 3c31519133d573b757e5b945384435f17e646386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 3 Mar 2013 23:22:11 +0100
Subject: [PATCH] Shaders: cleanup of VectorShader.

Using this-> for accessing parent class members breaks KDevelop
autocompletion, using explicit class name instead (but the shorter one).
---
 src/Shaders/VectorShader.cpp | 16 ++++++++--------
 src/Shaders/VectorShader.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Shaders/VectorShader.cpp b/src/Shaders/VectorShader.cpp
index f3c563b59..da1706824 100644
--- a/src/Shaders/VectorShader.cpp
+++ b/src/Shaders/VectorShader.cpp
@@ -41,12 +41,12 @@ template<UnsignedInt dimensions> VectorShader<dimensions>::VectorShader(): trans
     Shader vertexShader(v, Shader::Type::Vertex);
     vertexShader.addSource(rs.get("compatibility.glsl"));
     vertexShader.addSource(rs.get(vertexShaderName<dimensions>()));
-    AbstractVectorShader<dimensions>::attachShader(vertexShader);
+    AbstractShaderProgram::attachShader(vertexShader);
 
     Shader fragmentShader(v, Shader::Type::Fragment);
     fragmentShader.addSource(rs.get("compatibility.glsl"));
     fragmentShader.addSource(rs.get("VectorShader.frag"));
-    AbstractVectorShader<dimensions>::attachShader(fragmentShader);
+    AbstractShaderProgram::attachShader(fragmentShader);
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>() ||
@@ -54,24 +54,24 @@ template<UnsignedInt dimensions> VectorShader<dimensions>::VectorShader(): trans
     #else
     if(!Context::current()->isVersionSupported(Version::GLES300)) {
     #endif
-        AbstractVectorShader<dimensions>::bindAttributeLocation(AbstractVectorShader<dimensions>::Position::Location, "position");
-        AbstractVectorShader<dimensions>::bindAttributeLocation(AbstractVectorShader<dimensions>::TextureCoordinates::Location, "textureCoordinates");
+        AbstractShaderProgram::bindAttributeLocation(AbstractVectorShader<dimensions>::Position::Location, "position");
+        AbstractShaderProgram::bindAttributeLocation(AbstractVectorShader<dimensions>::TextureCoordinates::Location, "textureCoordinates");
     }
 
-    AbstractVectorShader<dimensions>::link();
+    AbstractShaderProgram::link();
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_uniform_location>()) {
     #else
     {
     #endif
-        transformationProjectionMatrixUniform = AbstractVectorShader<dimensions>::uniformLocation("transformationProjectionMatrix");
-        colorUniform = AbstractVectorShader<dimensions>::uniformLocation("color");
+        transformationProjectionMatrixUniform = AbstractShaderProgram::uniformLocation("transformationProjectionMatrix");
+        colorUniform = AbstractShaderProgram::uniformLocation("color");
     }
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::shading_language_420pack>())
-        AbstractVectorShader<dimensions>::setUniform(AbstractVectorShader<dimensions>::uniformLocation("vectorTexture"), AbstractVectorShader<dimensions>::VectorTextureLayer);
+        AbstractShaderProgram::setUniform(AbstractShaderProgram::uniformLocation("vectorTexture"), AbstractVectorShader<dimensions>::VectorTextureLayer);
     #endif
 }
 
diff --git a/src/Shaders/VectorShader.h b/src/Shaders/VectorShader.h
index b116803fa..2c17989f2 100644
--- a/src/Shaders/VectorShader.h
+++ b/src/Shaders/VectorShader.h
@@ -38,13 +38,13 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT VectorShader: publi
 
         /** @brief Set transformation and projection matrix */
         inline VectorShader* setTransformationProjectionMatrix(const typename DimensionTraits<dimensions>::MatrixType& matrix) {
-            AbstractVectorShader<dimensions>::setUniform(transformationProjectionMatrixUniform, matrix);
+            AbstractShaderProgram::setUniform(transformationProjectionMatrixUniform, matrix);
             return this;
         }
 
         /** @brief Set fill color */
         inline VectorShader* setColor(const Color4<>& color) {
-            AbstractVectorShader<dimensions>::setUniform(colorUniform, color);
+            AbstractShaderProgram::setUniform(colorUniform, color);
             return this;
         }