Doc: link and qdoc errors Qt3D

Task-number: QTBUG-44180
Change-Id: Ic798dee5d33dbf18dbc9d978a0f07217895a30ee
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

1 files changed, 22 insertions, 35 deletions

diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 71eefa9d4..16a758e2e 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -154,8 +154,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial()
-    Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
+ Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseSpecularMapMaterialPrivate(this), parent)
@@ -174,9 +173,10 @@ QDiffuseSpecularMapMaterial::~QDiffuseSpecularMapMaterial()
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::ambient() const
-    \return the current QColor ambient value.
- */
+    \property Qt3D::QDiffuseSpecularMapMaterial::ambient
+
+    Holds the current QColor ambient value.
+*/
 QColor QDiffuseSpecularMapMaterial::ambient() const
 {
     Q_D(const QDiffuseSpecularMapMaterial);
@@ -184,9 +184,11 @@ QColor QDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::diffuse() const
-    \return the current diffuse map texture.
-    \b {Note:} By default the diffuse texture has a linear
+    \property *QDiffuseSpecularMapMaterial::diffuse
+
+    Holds the current diffuse map texture.
+
+    \note By default the diffuse texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -198,9 +200,11 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::specular() const
-    \return the current specular map texture.
-    \b {Note:} By default the specular texture has a linear
+    \property Qt3D::QDiffuseSpecularMapMaterial::specular
+
+    Holds the current specular map texture.
+
+    \note By default the specular texture has a linear
     magnification filter, a linear mipmap linear minification filter,
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
@@ -212,8 +216,10 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::shininess() const
-    \return the current shininess as a float value.
+    \property Qt3D::QDiffuseSpecularMapMaterial::shininess
+
+    Holds the current shininess as a float value.
+
  */
 float QDiffuseSpecularMapMaterial::shininess() const
 {
@@ -222,8 +228,9 @@ float QDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::textureScale() const
-    \return the current texture scale.
+    \property Qt3D::QDiffuseSpecularMapMaterial::textureScale
+
+    Holds the current texture scale.
  */
 float QDiffuseSpecularMapMaterial::textureScale() const
 {
@@ -231,50 +238,30 @@ float QDiffuseSpecularMapMaterial::textureScale() const
     return d->m_textureScaleParameter->value().toFloat();
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
-    Sets the current ambient color to \a ambient
- */
 void QDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_ambientParameter->setValue(ambient);
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
-    Sets the current diffuse map to \a diffuse.
- */
 void QDiffuseSpecularMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
-    Sets the current specular map to \a specular.
- */
 void QDiffuseSpecularMapMaterial::setSpecular(QAbstractTextureProvider *specular)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_specularParameter->setValue(QVariant::fromValue(specular));
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setShininess(float shininess)
-    Sets the current shininess value to \a shininess.
- */
 void QDiffuseSpecularMapMaterial::setShininess(float shininess)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_shininessParameter->setValue(shininess);
 }
 
-/*!
-    \fn Qt3D::QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
-    Sets the current texture scale to \a textureScale.
- */
 void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
 {
     Q_D(QDiffuseSpecularMapMaterial);