From 1d5d4ddcb46efd9295e6edae41196721bd41cb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 29 Dec 2010 19:01:29 +0100
Subject: [PATCH] Renamed AbstractShaderProgram::{load -> attach}Shader().

---
 examples/triangle/IdentityShader.cpp | 4 ++--
 src/AbstractShaderProgram.cpp        | 2 +-
 src/AbstractShaderProgram.h          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/triangle/IdentityShader.cpp b/examples/triangle/IdentityShader.cpp
index fd96449bd..7a168849b 100644
--- a/examples/triangle/IdentityShader.cpp
+++ b/examples/triangle/IdentityShader.cpp
@@ -21,8 +21,8 @@ IdentityShader::IdentityShader() {
     Shader* vertexShader = Shader::fromFile(Shader::Vertex, "identity.vert");
     Shader* fragmentShader = Shader::fromFile(Shader::Fragment, "identity.frag");
 
-    loadShader(vertexShader);
-    loadShader(fragmentShader);
+    attachShader(vertexShader);
+    attachShader(fragmentShader);
 
     bindAttribute(Vertex, "vertex");
     bindAttribute(Color, "color");
diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp
index 467f8a1e6..2a1a407bf 100644
--- a/src/AbstractShaderProgram.cpp
+++ b/src/AbstractShaderProgram.cpp
@@ -41,7 +41,7 @@ bool AbstractShaderProgram::use() {
     return true;
 }
 
-bool AbstractShaderProgram::loadShader(Shader* shader) {
+bool AbstractShaderProgram::attachShader(Shader* shader) {
     if(!shader) return false;
 
     GLuint _shader = shader->compile();
diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h
index 61c7a96da..4a6cca3ab 100644
--- a/src/AbstractShaderProgram.h
+++ b/src/AbstractShaderProgram.h
@@ -32,7 +32,7 @@ namespace Magnum {
 
 This class is designed to be used via subclassing. Subclasses define these
 functions and properties:
- - @b Constructor, which loads particular shaders, links the program, binds
+ - @b Constructor, which attaches particular shaders, links the program, binds
    attribute locations and gets uniform locations.
  - <strong>Attribute location</strong> enum with indexes where the particular
    attribute is bound, for example:
@@ -103,7 +103,7 @@ class AbstractShaderProgram {
          * linking.
          * @note The shader should be deleted by caller after linking.
          */
-        bool loadShader(Shader* shader);
+        bool attachShader(Shader* shader);
 
         /**
          * @brief Bind attribute to given location