diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/defaults/qphongmaterial.cpp | |
parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qphongmaterial.cpp')
-rw-r--r-- | src/render/defaults/qphongmaterial.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index a1d313c67..8e9186418 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QPhongMaterialPrivate + \class Qt3DRender::QPhongMaterialPrivate \internal */ QPhongMaterialPrivate::QPhongMaterialPrivate() @@ -76,7 +76,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() } /*! - \class Qt3D::QPhongMaterial + \class Qt3DRender::QPhongMaterial \brief The QPhongMaterial class provides a default implementation of the phong lighting effect. \inmodule Qt3DRenderer \since 5.5 @@ -96,7 +96,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() */ /*! - \fn Qt3D::QPhongMaterial::QPhongMaterial(QNode *parent) + \fn Qt3DRender::QPhongMaterial::QPhongMaterial(QNode *parent) Constructs a new QPhongMaterial instance with parent object \a parent. */ @@ -112,7 +112,7 @@ QPhongMaterial::QPhongMaterial(QNode *parent) } /*! - \fn Qt3D::QPhongMaterial::~QPhongMaterial() + \fn Qt3DRender::QPhongMaterial::~QPhongMaterial() Destroys the QPhongMaterial. */ @@ -121,7 +121,7 @@ QPhongMaterial::~QPhongMaterial() } /*! - \property Qt3D::QPhongMaterial::ambient + \property Qt3DRender::QPhongMaterial::ambient Holds the ambient color. */ @@ -132,7 +132,7 @@ QColor QPhongMaterial::ambient() const } /*! - \property Qt3D::QPhongMaterial::diffuse + \property Qt3DRender::QPhongMaterial::diffuse Holds the diffuse color. */ @@ -143,7 +143,7 @@ QColor QPhongMaterial::diffuse() const } /*! - \property QColor Qt3D::QPhongMaterial::specular + \property QColor Qt3DRender::QPhongMaterial::specular Holds the specular color. */ @@ -154,7 +154,7 @@ QColor QPhongMaterial::specular() const } /*! - \property Qt3D::QPhongMaterial::shininess + \property Qt3DRender::QPhongMaterial::shininess Holds the shininess exponent. */ @@ -233,6 +233,6 @@ void QPhongMaterialPrivate::init() q_func()->setEffect(m_phongEffect); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |