diff options
Diffstat (limited to 'src/extras/geometries/qconegeometry.h')
| -rw-r--r-- | src/extras/geometries/qconegeometry.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/extras/geometries/qconegeometry.h b/src/extras/geometries/qconegeometry.h index 2deb56f0e..cff40576e 100644 --- a/src/extras/geometries/qconegeometry.h +++ b/src/extras/geometries/qconegeometry.h @@ -41,11 +41,11 @@ #define QT3DEXTRAS_QCONEGEOMETRY_H #include <Qt3DExtras/qt3dextras_global.h> -#include <Qt3DRender/qgeometry.h> +#include <Qt3DCore/qgeometry.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DCore { class QAttribute; } // Render @@ -53,7 +53,7 @@ namespace Qt3DExtras { class QConeGeometryPrivate; -class Q_3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DRender::QGeometry +class Q_3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DCore::QGeometry { Q_OBJECT Q_PROPERTY( bool hasTopEndcap READ hasTopEndcap WRITE setHasTopEndcap NOTIFY hasTopEndcapChanged ) @@ -63,10 +63,10 @@ class Q_3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DRender::QGeometry Q_PROPERTY( float topRadius READ topRadius WRITE setTopRadius NOTIFY topRadiusChanged ) Q_PROPERTY( float bottomRadius READ bottomRadius WRITE setBottomRadius NOTIFY bottomRadiusChanged ) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) - Q_PROPERTY(Qt3DRender::QAttribute *positionAttribute READ positionAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *normalAttribute READ normalAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *texCoordAttribute READ texCoordAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *positionAttribute READ positionAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *normalAttribute READ normalAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *texCoordAttribute READ texCoordAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: explicit QConeGeometry(QNode *parent = nullptr); @@ -83,10 +83,10 @@ public: int slices() const; float length() const; - Qt3DRender::QAttribute *positionAttribute() const; - Qt3DRender::QAttribute *normalAttribute() const; - Qt3DRender::QAttribute *texCoordAttribute() const; - Qt3DRender::QAttribute *indexAttribute() const; + Qt3DCore::QAttribute *positionAttribute() const; + Qt3DCore::QAttribute *normalAttribute() const; + Qt3DCore::QAttribute *texCoordAttribute() const; + Qt3DCore::QAttribute *indexAttribute() const; public Q_SLOTS: void setHasTopEndcap( bool hasTopEndcap ); |