diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-07 14:42:59 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-10 23:29:47 +0000 |
| commit | d517346086226493e63ffd1b92bae4fb86ed3024 (patch) | |
| tree | a59d2b837da1f161fe04c9600d5645478e7f2541 /src/particles | |
| parent | 7e590cc0aab2825f90b6fa833ef9ab325653d32d (diff) | |
| download | qtdeclarative-d517346086226493e63ffd1b92bae4fb86ed3024.tar.gz qtdeclarative-d517346086226493e63ffd1b92bae4fb86ed3024.tar.bz2 qtdeclarative-d517346086226493e63ffd1b92bae4fb86ed3024.zip | |
qt quick particles: Fix const correctness in old style casts
Found with GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c958e1d7c929c0
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 0f6cd29a8..c0e1b4e42 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -148,8 +148,8 @@ public: program()->setUniformValue(m_timestamp_id, (float) d->timestamp); program()->setUniformValue(m_entry_id, (float) d->entry); - program()->setUniformValueArray(m_sizetable_id, (float*) d->sizeTable, UNIFORM_ARRAY_SIZE, 1); - program()->setUniformValueArray(m_opacitytable_id, (float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_sizetable_id, (const float*) d->sizeTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_opacitytable_id, (const float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); } int m_entry_id; @@ -295,8 +295,8 @@ public: program()->setUniformValue(m_timestamp_id, (float) d->timestamp); program()->setUniformValue(m_entry_id, (float) d->entry); - program()->setUniformValueArray(m_sizetable_id, (float*) d->sizeTable, 64, 1); - program()->setUniformValueArray(m_opacitytable_id, (float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_sizetable_id, (const float*) d->sizeTable, 64, 1); + program()->setUniformValueArray(m_opacitytable_id, (const float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); } int m_timestamp_id; @@ -1281,7 +1281,7 @@ void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node) #ifdef Q_OS_LINUX // Nouveau drivers can potentially freeze a machine entirely when taking the point-sprite path. - if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "nouveau")) + if (perfLevel < Deformable && strstr((const char *) glGetString(GL_VENDOR), "nouveau")) perfLevel = Deformable; #endif |