diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-26 02:14:58 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-26 02:31:30 (GMT) |
| commit | a161143b81d8b4cfce06d2566dbbd129a2e1b0e1 (patch) | |
| tree | 43336c3b2f9d1e28df244d849f99764c5514d027 /src/opengl/qglshaderprogram.h | |
| parent | 91462fa3ac02aa88e3aeeacfa9fc4d4dbb8fe2a1 (diff) | |
| download | Qt-a161143b81d8b4cfce06d2566dbbd129a2e1b0e1.zip Qt-a161143b81d8b4cfce06d2566dbbd129a2e1b0e1.tar.gz Qt-a161143b81d8b4cfce06d2566dbbd129a2e1b0e1.tar.bz2 | |
Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivate
Reviewed-by: Sarah Smith
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 2848b5f..d8b9a0c 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -101,11 +101,10 @@ public: GLuint shaderId() const; private: - QGLShaderPrivate *d; - friend class QGLShaderProgram; Q_DISABLE_COPY(QGLShader) + Q_DECLARE_PRIVATE(QGLShader) bool compile(const QList<QGLShader *>& shaders, QGLShader::ShaderType type); }; @@ -288,9 +287,8 @@ private Q_SLOTS: void shaderDestroyed(); private: - QGLShaderProgramPrivate *d; - Q_DISABLE_COPY(QGLShaderProgram) + Q_DECLARE_PRIVATE(QGLShaderProgram) bool init(); }; |