diff options
author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 11:56:28 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 10:01:22 +0000 |
commit | 0dbded1506abf172b7b3cf7685bdcb30c7b8012d (patch) | |
tree | a0cdb79e6a482697cc96c3300b0502595b42d4b1 /src/plugins | |
parent | 9b9f34701f47824e8201453d148152fb0855f98a (diff) |
d-pointer classes, private/public changes
Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395
Task-number: QTBUG-39946
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 35437ff07..ad6b5ccd3 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -274,7 +274,7 @@ private: public: explicit AssimpRawTextureImageFunctor(const QByteArray &data); - TexImageDataPtr operator()() Q_DECL_FINAL; + QTexImageDataPtr operator()() Q_DECL_FINAL; bool operator ==(const QTextureDataFunctor &other) const Q_DECL_FINAL; QT3D_FUNCTOR(AssimpRawTextureImageFunctor) @@ -897,9 +897,9 @@ AssimpRawTextureImage::AssimpRawTextureImageFunctor::AssimpRawTextureImageFuncto { } -TexImageDataPtr AssimpRawTextureImage::AssimpRawTextureImageFunctor::operator()() +QTexImageDataPtr AssimpRawTextureImage::AssimpRawTextureImageFunctor::operator()() { - TexImageDataPtr dataPtr; + QTexImageDataPtr dataPtr; dataPtr->setData(m_data, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8); return dataPtr; } |