diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-02-25 16:36:53 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-29 11:18:37 +0000 |
| commit | bb7e1a4707a63e6412695990af1344fdf2a21138 (patch) | |
| tree | 06d4fb177b0700b9c0826eb7a63b978f4808e9b7 /src/render/texture/qabstracttextureimage.h | |
| parent | 33696e8d63f9a4b11de909c3a75fa6ec627bfdd5 (diff) | |
QAbstractTextureImage rename cubeMapFace to face
As per API review
Change-Id: I6c23956ee50c56fa27f50ccf8d484698be706cf9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qabstracttextureimage.h')
| -rw-r--r-- | src/render/texture/qabstracttextureimage.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index ec664a2f7..c46e9e511 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -68,14 +68,14 @@ class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode Q_OBJECT Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged) Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) - Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace face READ face WRITE setFace NOTIFY faceChanged) public: explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0); virtual ~QAbstractTextureImage(); int mipLevel() const; int layer() const; - QAbstractTextureProvider::CubeMapFace cubeMapFace() const; + QAbstractTextureProvider::CubeMapFace face() const; void update(); virtual QTextureDataFunctorPtr dataFunctor() const = 0; @@ -83,12 +83,12 @@ public: public Q_SLOTS: void setMipLevel(int level); void setLayer(int layer); - void setCubeMapFace(QAbstractTextureProvider::CubeMapFace face); + void setFace(QAbstractTextureProvider::CubeMapFace face); Q_SIGNALS: void mipLevelChanged(int mipLevel); void layerChanged(int layer); - void cubeMapFaceChanged(QAbstractTextureProvider::CubeMapFace cubeMapFace); + void faceChanged(QAbstractTextureProvider::CubeMapFace face); protected: void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; |