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/render/texture/texturedatamanager_p.h | |
| 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/render/texture/texturedatamanager_p.h')
| -rw-r--r-- | src/render/texture/texturedatamanager_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h index 9748b3699..9248ce8a2 100644 --- a/src/render/texture/texturedatamanager_p.h +++ b/src/render/texture/texturedatamanager_p.h @@ -50,7 +50,7 @@ #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRender/qtexture.h> -#include <Qt3DRender/texturedata.h> +#include <Qt3DRender/qtexturedata.h> #include <Qt3DRender/private/handle_types_p.h> #include <QPair> @@ -65,7 +65,7 @@ namespace Render { typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair; typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair; -class TextureDataManager : public Qt3DCore::QResourceManager<TexImageData, +class TextureDataManager : public Qt3DCore::QResourceManager<QTexImageData, Qt3DCore::QNodeId, 16, Qt3DCore::ArrayAllocatingPolicy, @@ -97,7 +97,7 @@ private: } // namespace Render } // namespace Qt3DRender -Q_DECLARE_RESOURCE_INFO(Qt3DRender::TexImageData, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::QTexImageData, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE |