summaryrefslogtreecommitdiffstats
path: root/src/plugins/geometryloaders/default/basegeometryloader_p.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-01-22 21:35:32 +0000
committerMike Krus <mike.krus@kdab.com>2020-02-27 06:29:57 +0000
commit17706144e9dc6c2dfde580b7821f18c5f6924682 (patch)
tree5f77929db358607fe63a1d438b7a746a6966cbfb /src/plugins/geometryloaders/default/basegeometryloader_p.h
parent7f625e93620b313466d0223e911c0c3a5b492617 (diff)
Geometry refactoring
Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/geometryloaders/default/basegeometryloader_p.h')
-rw-r--r--src/plugins/geometryloaders/default/basegeometryloader_p.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/geometryloaders/default/basegeometryloader_p.h b/src/plugins/geometryloaders/default/basegeometryloader_p.h
index 0fe1e2763..2f9e25fab 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader_p.h
+++ b/src/plugins/geometryloaders/default/basegeometryloader_p.h
@@ -67,9 +67,11 @@ QT_BEGIN_NAMESPACE
class QIODevice;
class QString;
-namespace Qt3DRender {
-
+namespace Qt3DCore {
class QGeometry;
+}
+
+namespace Qt3DRender {
class BaseGeometryLoader : public QGeometryLoaderInterface
{
@@ -96,7 +98,7 @@ public:
QVector<QVector4D> tangents() const { return m_tangents; }
QVector<unsigned int> indices() const { return m_indices; }
- QGeometry *geometry() const override;
+ Qt3DCore::QGeometry *geometry() const override;
bool load(QIODevice *ioDev, const QString &subMesh = QString()) override;
@@ -124,7 +126,7 @@ protected:
QVector<QVector4D> m_tangents;
QVector<unsigned int> m_indices;
- QGeometry *m_geometry;
+ Qt3DCore::QGeometry *m_geometry;
};
struct FaceIndices