diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-22 13:56:44 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 20:17:26 +0100 |
| commit | a496e0874858a4b7d991c179c0e12df46c3d324c (patch) | |
| tree | a343142c7addc7c3994b15922d60e940b2218f1d /src/quick/scenegraph/util/qsgtexturematerial.h | |
| parent | 523bf6c3d0076e43aee6747211f6e93005f2d1c6 (diff) | |
Fix warnings about shadowing members
util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow]
[and others]
Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 7fc06c7927..822084b463 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -61,10 +61,10 @@ public: void setTexture(QSGTexture *texture); QSGTexture *texture() const { return m_texture; } - void setMipmapFiltering(QSGTexture::Filtering filtering) { m_mipmap_filtering = filtering; } + void setMipmapFiltering(QSGTexture::Filtering filteringType) { m_mipmap_filtering = filteringType; } QSGTexture::Filtering mipmapFiltering() const { return (QSGTexture::Filtering) m_mipmap_filtering; } - void setFiltering(QSGTexture::Filtering filtering) { m_filtering = filtering; } + void setFiltering(QSGTexture::Filtering filteringType) { m_filtering = filteringType; } QSGTexture::Filtering filtering() const { return (QSGTexture::Filtering) m_filtering; } void setHorizontalWrapMode(QSGTexture::WrapMode mode) { m_horizontal_wrap = mode; } |