summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/input
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-16 09:29:38 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-01-16 09:40:39 +0200
commit3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 (patch)
treeeb768f3128237608b1a1c385877fc84d7d32dcd6 /src/datavisualization/input
parentde93a42512e58c598427178373f0e3e59b04dec7 (diff)
Docs updated after namespace macro removal
- some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/input')
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp7
-rw-r--r--src/datavisualization/input/q3dinputhandler.h4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.cpp8
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.cpp6
4 files changed, 20 insertions, 5 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 80e02d5e..0a79db27 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -35,7 +35,7 @@ const int farZoomRangeDivider = 120;
const float rotationSpeed = 100.0f;
/*!
- * \class Q3DInputHandler
+ * \class QtDataVisualization::Q3DInputHandler
* \inmodule QtDataVisualization
* \brief Basic wheel mouse based input handler.
* \since Qt Data Visualization 1.0
@@ -190,4 +190,9 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
scene()->activeCamera()->setZoomLevel(zoomLevel);
}
+/*!
+ * \class QtDataVisualization::Q3DInputHandlerPrivate
+ * \internal
+ */
+
}
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index cca2f983..7b5f3aca 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -23,7 +23,7 @@
namespace QtDataVisualization {
-class Q3DInputHandler; // Workaround for qdoc bug, removing this will cause qdoc compiler to not find the class.
+class Q3DInputHandlerPrivate;
class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler
{
@@ -41,6 +41,8 @@ public:
private:
Q_DISABLE_COPY(Q3DInputHandler)
+
+ QScopedPointer<Q3DInputHandlerPrivate> *d_ptr;
};
}
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 9e599535..32f60a6c 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -20,7 +20,7 @@
namespace QtDataVisualization {
/*!
- * \class QAbstract3DInputHandler
+ * \class QtDataVisualization::QAbstract3DInputHandler
* \inmodule QtDataVisualization
* \brief The base class for implementations of input handlers.
* \since Qt Data Visualization 1.0
@@ -55,7 +55,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QAbstract3DInputHandler
+ * \instantiates QtDataVisualization::QAbstract3DInputHandler
* \brief Base type for all QtDataVisualization input handlers.
*
* This type is uncreatable.
@@ -228,6 +228,10 @@ QPoint QAbstract3DInputHandler::previousInputPos() const
}
+/*!
+ * \class QtDataVisualization::QAbstract3DInputHandlerPrivate
+ * \internal
+ */
QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputHandler *q) :
q_ptr(q),
m_prevDistance(0),
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 0dd5b469..f5be97df 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -36,7 +36,7 @@ const int minZoomLevel = 10;
const int maxZoomLevel = 500;
/*!
- * \class QTouch3DInputHandler
+ * \class QtDataVisualization::QTouch3DInputHandler
* \inmodule QtDataVisualization
* \brief Basic touch display based input handler.
* \since Qt Data Visualization 1.0
@@ -129,6 +129,10 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
}
}
+/*!
+ * \class QtDataVisualization::QTouch3DInputHandlerPrivate
+ * \internal
+ */
QTouch3DInputHandlerPrivate::QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q)
: q_ptr(q),
m_holdTimer(0)