summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qparametermapping.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-12 20:45:19 +0100
committerPaul Lemire <paul.lemire@kdab.com>2015-10-13 13:19:50 +0000
commit7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/materialsystem/qparametermapping.h
parent0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff)
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qparametermapping.h')
-rw-r--r--src/render/materialsystem/qparametermapping.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h
index f4e209abd..e104f4001 100644
--- a/src/render/materialsystem/qparametermapping.h
+++ b/src/render/materialsystem/qparametermapping.h
@@ -46,7 +46,7 @@ namespace Qt3DRender {
class QParameterMappingPrivate;
-class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged)
@@ -62,8 +62,8 @@ public:
};
Q_ENUM(Binding)
- explicit QParameterMapping(Qt3D::QNode *parent = 0);
- QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0);
+ explicit QParameterMapping(Qt3DCore::QNode *parent = 0);
+ QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = 0);
~QParameterMapping();
void setParameterName(const QString &name);
@@ -80,8 +80,8 @@ Q_SIGNALS:
void bindingTypeChanged();
protected:
- QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0);
- void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+ QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = 0);
+ void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QParameterMapping)