diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-01-26 16:55:27 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 10:18:31 +0100 |
commit | 8aa187fec80810d37107341ca6dc53264187ae9d (patch) | |
tree | a914ab1cc1384360fe02174f2f3f2eba9c1b852f /src/quick/scenegraph/util | |
parent | 6ca82a4130cebf1e1b6d7599a72b339bb3a2dada (diff) |
Rename QSGTexture::textureSubRect to normalizedTextureSubRect()
Change-Id: Id61cdaf1078d7b61d39644a80df8067f4ce4ceb0
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/util')
-rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexture.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 32042b0a3d..f06c2013a9 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -249,7 +249,7 @@ bool QSGTexture::isAtlasTexture() const The default implementation returns a rect at position (0, 0) with width and height of 1. */ -QRectF QSGTexture::textureSubRect() const +QRectF QSGTexture::normalizedTextureSubRect() const { return QRectF(0, 0, 1, 1); } diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h index df07382d10..a31d09e70b 100644 --- a/src/quick/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -76,7 +76,7 @@ public: virtual bool hasAlphaChannel() const = 0; virtual bool hasMipmaps() const = 0; - virtual QRectF textureSubRect() const; + virtual QRectF normalizedTextureSubRect() const; virtual bool isAtlasTexture() const; @@ -106,7 +106,7 @@ protected: QRectF QSGTexture::convertToNormalizedSourceRect(const QRectF &rect) const { QSize s = textureSize(); - QRectF r = textureSubRect(); + QRectF r = normalizedTextureSubRect(); qreal sx = r.width() / s.width(); qreal sy = r.height() / s.height(); |