summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-10-22 15:40:21 +0200
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-10-27 13:21:59 +0000
commitd954056627d34907eeee6bba10ddf2e792d90140 (patch)
tree7d446091c193011540eb044b2d89bfed3c15d224 /src/input
parent31a4c1e3438bc47ac9d488f557f6144f0a7463ba (diff)
Doc: Updated the docs for the namespace changes
Each of the submodules now have there own namespace so the following changes are required to adapt: - Added \namespace docs for the new namespaces. - Updated all the \class and \instantiates entries to use the appropriate namespace qualifier. - Changed the \module and \qmlmodule names for Qt 3D Core and Qt 3D Render modules. - Added the missing \module and \qmlmodule pages for the Qt 3D Collision module. Change-Id: Ibc5bf30e4f50aecb6a3b24bc8536f17ed19d681d Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/input')
-rw-r--r--src/input/q3dkeyevent.cpp4
-rw-r--r--src/input/q3dmouseevent.cpp4
-rw-r--r--src/input/qkeyboardcontroller.cpp6
-rw-r--r--src/input/qkeyboardinput.cpp6
-rw-r--r--src/input/qmousecontroller.cpp2
-rw-r--r--src/input/qmouseinput.cpp2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/input/q3dkeyevent.cpp b/src/input/q3dkeyevent.cpp
index dced98fc0..7c817967b 100644
--- a/src/input/q3dkeyevent.cpp
+++ b/src/input/q3dkeyevent.cpp
@@ -43,7 +43,7 @@ namespace Qt3DInput {
//Qt6: Move this into a QtQmlGui module and merge it with QQuickKeyEvent
/*!
- \class Qt3DCore::Q3DKeyEvent
+ \class Qt3DInput::Q3DKeyEvent
\inmodule Qt3DInput
\since 5.5
*/
@@ -51,7 +51,7 @@ namespace Qt3DInput {
/*!
\qmltype KeyEvent
\inqmlmodule Qt3D.Input
- \instantiates Qt3DCore::Q3DKeyEvent
+ \instantiates Qt3DInput::Q3DKeyEvent
\since 5.5
The KeyEvent QML type cannot be directly created. Objects of this type
diff --git a/src/input/q3dmouseevent.cpp b/src/input/q3dmouseevent.cpp
index 60f8b0784..d880c7585 100644
--- a/src/input/q3dmouseevent.cpp
+++ b/src/input/q3dmouseevent.cpp
@@ -48,7 +48,7 @@ namespace Qt3DInput {
// These can always be added in follow up commits once the input API takes shape
/*!
- * \class Qt3DCore::Q3DMouseEvent
+ * \class Qt3DInput::Q3DMouseEvent
* \inmodule Qt3DInput
*
* \brief The Qt3DCore::Q3DMouseEvent contains parameters that describe a mouse event.
@@ -160,7 +160,7 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const
/*!
- * \class Qt3DCore::Q3DWheelEvent
+ * \class Qt3DInput::Q3DWheelEvent
* \inmodule Qt3DInput
*
* \brief The Qt3DCore::Q3DWheelEvent contains parameters that describe a mouse wheel event.
diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp
index fc069edc3..17345c6c2 100644
--- a/src/input/qkeyboardcontroller.cpp
+++ b/src/input/qkeyboardcontroller.cpp
@@ -47,7 +47,7 @@ using namespace Qt3DCore;
namespace Qt3DInput {
/*!
- \class Qt3DCore::QKeyboardControllerPrivate
+ \class Qt3DInput::QKeyboardControllerPrivate
\internal
*/
QKeyboardControllerPrivate::QKeyboardControllerPrivate()
@@ -56,7 +56,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate()
}
/*!
- \class Qt3DCore::QKeyboardController
+ \class Qt3DInput::QKeyboardController
\inmodule Qt3DInput
\since 5.5
*/
@@ -65,7 +65,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate()
\qmltype KeyboardController
\inqmlmodule Qt3D.Input
\since 5.5
- \instantiates Qt3DCore::QKeyboardController
+ \instantiates Qt3DInput::QKeyboardController
\inherits Node
*/
diff --git a/src/input/qkeyboardinput.cpp b/src/input/qkeyboardinput.cpp
index 332799457..bf9cac074 100644
--- a/src/input/qkeyboardinput.cpp
+++ b/src/input/qkeyboardinput.cpp
@@ -46,7 +46,7 @@ using namespace Qt3DCore;
namespace Qt3DInput {
/*!
- \class Qt3DCore::QKeyboardInputPrivate
+ \class Qt3DInput::QKeyboardInputPrivate
\internal
*/
QKeyboardInputPrivate::QKeyboardInputPrivate()
@@ -58,7 +58,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate()
}
/*!
- \class Qt3DCore::QKeyboardInput
+ \class Qt3DInput::QKeyboardInput
\inmodule Qt3DInput
\since 5.5
*/
@@ -66,7 +66,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate()
/*!
\qmltype KeyboardInput
\inqmlmodule Qt3D.Input
- \instantiates Qt3DCore::QKeyboardInput
+ \instantiates Qt3DInput::QKeyboardInput
\inherits Component3D
\since 5.5
*/
diff --git a/src/input/qmousecontroller.cpp b/src/input/qmousecontroller.cpp
index a31f598be..49acc17aa 100644
--- a/src/input/qmousecontroller.cpp
+++ b/src/input/qmousecontroller.cpp
@@ -50,7 +50,7 @@ QMouseControllerPrivate::QMouseControllerPrivate()
}
/*!
- * \class Qt3DCore::QMouseController
+ * \class Qt3DInput::QMouseController
* \inmodule Qt3DInput
*
* \brief Qt3DCore::QMouseController is in charge of dispatching mouse events to
diff --git a/src/input/qmouseinput.cpp b/src/input/qmouseinput.cpp
index a56e229f4..dc0bfe567 100644
--- a/src/input/qmouseinput.cpp
+++ b/src/input/qmouseinput.cpp
@@ -55,7 +55,7 @@ QMouseInputPrivate::QMouseInputPrivate()
}
/*!
- * \class Qt3DCore::QMouseInput
+ * \class Qt3DInput::QMouseInput
* \inmodule Qt3DInput
*
* \brief Provides a mean of being notified about mouse events when attached to