diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-27 15:16:08 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-05-20 11:12:22 +0000 |
| commit | bffa7c6425ef52b5f9f2e413c7d4207e779041a2 (patch) | |
| tree | da261d84c3d82c4a50eba5126f6bd89c1a6e735e /src/render/texture/qabstracttextureimage.h | |
| parent | 21f2ea86eee32cb64ef2ed864db0aac8647308fd (diff) | |
Move QTextureImageDataGenerator to its own header
Change-Id: I0f80f7bafefb904c8171ff89f24687d15acd4b50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qabstracttextureimage.h')
| -rw-r--r-- | src/render/texture/qabstracttextureimage.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index a63ba0bba..2959b156d 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -40,7 +40,6 @@ #ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_H #define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H -#include <Qt3DRender/qabstractfunctor.h> #include <Qt3DRender/qabstracttexture.h> QT_BEGIN_NAMESPACE @@ -51,20 +50,6 @@ namespace Render { class TextureImage; } -// TO DO TexImageDataPtr -> QImageDataPtr + d_ptr -// We might also get rid of the layer, face, mipmap level from -// TexImageDataPtr and store that in the functor directly -// or use the QTextureImage instead -class QT3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor -{ -public: - virtual ~QTextureImageDataGenerator() {} - virtual QTextureImageDataPtr operator()() = 0; - virtual bool operator ==(const QTextureImageDataGenerator &other) const = 0; -}; - -typedef QSharedPointer<QTextureImageDataGenerator> QTextureImageDataGeneratorPtr; - class QAbstractTextureImagePrivate; class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode @@ -106,6 +91,4 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QTextureImageDataGeneratorPtr) - #endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_H |