Doc: Fix QDoc warnings and do further cleanup

Fix the documentation issues that still remained broken after
renaming the namespaces/QML modules. Do further cleanup and
minor doc editing.

Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

4 files changed, 16 insertions, 16 deletions

diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index a5f1a6c47..b0132e43a 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -45,7 +45,7 @@ namespace Qt3DRender
 /*!
  * \qmltype AbstractLight
  * \inqmlmodule Qt3D.Render
- * \instantiates QAbstractLight
+ * \instantiates Qt3DRender::QAbstractLight
  * \brief Encapsulate a QAbstractLight object in a Qt 3D scene.
  * \since 5.3
  */
@@ -92,7 +92,7 @@ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent)
 
 
 /*!
- *  \property Qt3DCore::QAbstractLight::color
+ *  \property Qt3DRender::QAbstractLight::color
  *
  * Holds the current QAbstractLight color.
  */
@@ -112,7 +112,7 @@ void QAbstractLight::setColor(const QColor &color)
 }
 
 /*!
-    \property Qt3DCore::QAbstractLight::intensity
+    \property Qt3DRender::QAbstractLight::intensity
 
     Holds the current QAbstractLight intensity.
 */
@@ -132,7 +132,7 @@ void QAbstractLight::setIntensity(float intensity)
 }
 
 /*!
-    \property Qt3DCore::QAbstractLight::position
+    \property Qt3DRender::QAbstractLight::position
 
     Holds the current QAbstractLight position.
 */
diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp
index c523215a9..2e3f91714 100644
--- a/src/render/lights/qdirectionallight.cpp
+++ b/src/render/lights/qdirectionallight.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-/*!
+/*
  *
  * Expected Shader struct
  *
diff --git a/src/render/lights/qpointlight.cpp b/src/render/lights/qpointlight.cpp
index 2fb6755cf..21ff60aa0 100644
--- a/src/render/lights/qpointlight.cpp
+++ b/src/render/lights/qpointlight.cpp
@@ -68,8 +68,8 @@ QPointLightPrivate::QPointLightPrivate()
 }
 
 /*!
-  \class QPointLight
-  \inmodule Qt3DRenderer
+  \class Qt3DRender::QPointLight
+  \inmodule Qt3DRender
   \since 5.5
 
  */
@@ -84,7 +84,7 @@ QPointLightPrivate::QPointLightPrivate()
 */
 
 /*!
-  \fn Qt3DRender::QPointLight::QPointLight(QNode *parent)
+  \fn Qt3DRender::QPointLight::QPointLight(Qt3DCore::QNode *parent)
   Constructs a new QPointLight with the specified \a parent.
  */
 QPointLight::QPointLight(QNode *parent)
diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp
index b8f360bf4..ab0d822e7 100644
--- a/src/render/lights/qspotlight.cpp
+++ b/src/render/lights/qspotlight.cpp
@@ -73,8 +73,8 @@ QSpotLightPrivate::QSpotLightPrivate()
 }
 
 /*!
-  \class QSpotLight
-  \inmodule Qt3DRenderer
+  \class Qt3DRender::QSpotLight
+  \inmodule Qt3DRender
   \since 5.5
 
  */
@@ -88,7 +88,7 @@ QSpotLightPrivate::QSpotLightPrivate()
     \brief For OpenGL ...
 */
 
-/*! \fn void Qt3DCore::QSpotLight::copy(const QNode *ref)
+/*! \fn void Qt3DRender::QSpotLight::copy(const Qt3DCore::QNode *ref)
   Copies the \a ref instance into this one.
  */
 
@@ -104,7 +104,7 @@ void QSpotLight::copy(const QNode *ref)
 
 
 /*!
-  \fn Qt3DCore::QSpotLight::QSpotLight(QNode *parent)
+  \fn Qt3DRender::QSpotLight::QSpotLight(Qt3DCore::QNode *parent)
   Constructs a new QSpotLight with the specified \a parent.
  */
 QSpotLight::QSpotLight(QNode *parent)
@@ -119,12 +119,12 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
 }
 
 /*!
-  \qmlproperty vector3d Qt3D.Renderer::SpotLight::direction
+  \qmlproperty vector3d Qt3D.Render::SpotLight::direction
 
 */
 
 /*!
-  \property Qt3DCore::QSpotLight::direction
+  \property Qt3DRender::QSpotLight::direction
 
  */
 
@@ -136,12 +136,12 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
 
 
 /*!
-  \qmlproperty float Qt3D.Renderer::SpotLight::cutOffAngle
+  \qmlproperty float Qt3D.Render::SpotLight::cutOffAngle
 
 */
 
 /*!
-  \property Qt3DCore::QSpotLight::cutOffAngle
+  \property Qt3DRender::QSpotLight::cutOffAngle
 
  */
 float QSpotLight::cutOffAngle() const