summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-06-04 01:41:44 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-06-04 01:41:44 (GMT)
commitb1b09172aee658e085423ddf6abfea291a072c74 (patch)
tree364e032dfe776d67e70e1a2d14e8dac2c2140e9e /src/opengl/qglshaderprogram.cpp
parent637099f70265aeff31213cc0d935645f121a773b (diff)
downloadQt-b1b09172aee658e085423ddf6abfea291a072c74.zip
Qt-b1b09172aee658e085423ddf6abfea291a072c74.tar.gz
Qt-b1b09172aee658e085423ddf6abfea291a072c74.tar.bz2
Code cleanup - use constructor initializers in shader classes.
Task-number: QT-80 Reviewed-by: Ian Walters
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r--src/opengl/qglshaderprogram.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 67fd9d0..37732dd 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -245,14 +245,14 @@ class QGLShaderPrivate
{
public:
QGLShaderPrivate(QGLShader::ShaderType type, const QGLContext *ctx)
+ : context(ctx)
+ , shader(0)
+ , shaderType(type)
+ , compiled(false)
+ , isPartial(type == QGLShader::PartialVertexShader ||
+ type == QGLShader::PartialFragmentShader)
+ , hasPartialSource(false)
{
- context = ctx;
- shader = 0;
- shaderType = type;
- compiled = false;
- isPartial = (type == QGLShader::PartialVertexShader ||
- type == QGLShader::PartialFragmentShader);
- hasPartialSource = false;
}
const QGLContext *context;
@@ -727,14 +727,14 @@ class QGLShaderProgramPrivate
{
public:
QGLShaderProgramPrivate(const QGLContext *ctx)
+ : context(ctx)
+ , program(0)
+ , linked(false)
+ , inited(false)
+ , hasPartialShaders(false)
+ , vertexShader(0)
+ , fragmentShader(0)
{
- context = ctx;
- program = 0;
- linked = false;
- inited = false;
- hasPartialShaders = false;
- vertexShader = 0;
- fragmentShader = 0;
}
~QGLShaderProgramPrivate()
{