summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data
diff options
context:
space:
mode:
authorTomi Korpipรครค <tomi.korpipaa@digia.com>2014-01-16 13:33:57 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-16 13:49:43 +0200
commit8674307d6bafabfcaedfe175b883313f0e7d88b9 (patch)
tree4428b5c4d3dc305d0290b9929a7f703b11fe73f6 /src/datavisualization/data
parentd2c37e276d17fb91163188878988894df993e69b (diff)
Reintroduced namespace macros
Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data')
-rw-r--r--src/datavisualization/data/abstractitemmodelhandler.cpp9
-rw-r--r--src/datavisualization/data/abstractitemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/abstractrenderitem.cpp10
-rw-r--r--src/datavisualization/data/abstractrenderitem_p.h4
-rw-r--r--src/datavisualization/data/baritemmodelhandler.cpp9
-rw-r--r--src/datavisualization/data/baritemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/barrenderitem.cpp20
-rw-r--r--src/datavisualization/data/barrenderitem_p.h4
-rw-r--r--src/datavisualization/data/labelitem.cpp9
-rw-r--r--src/datavisualization/data/labelitem_p.h4
-rw-r--r--src/datavisualization/data/qabstract3dseries.cpp16
-rw-r--r--src/datavisualization/data/qabstract3dseries.h4
-rw-r--r--src/datavisualization/data/qabstract3dseries_p.h4
-rw-r--r--src/datavisualization/data/qabstractdataproxy.cpp12
-rw-r--r--src/datavisualization/data/qabstractdataproxy.h4
-rw-r--r--src/datavisualization/data/qabstractdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qbar3dseries.h4
-rw-r--r--src/datavisualization/data/qbar3dseries_p.h4
-rw-r--r--src/datavisualization/data/qbardataitem.cpp10
-rw-r--r--src/datavisualization/data/qbardataitem.h6
-rw-r--r--src/datavisualization/data/qbardataitem_p.h4
-rw-r--r--src/datavisualization/data/qbardataproxy.cpp16
-rw-r--r--src/datavisualization/data/qbardataproxy.h10
-rw-r--r--src/datavisualization/data/qbardataproxy_p.h4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.cpp12
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.h4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.cpp12
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.cpp12
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.cpp12
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/qscatter3dseries.h4
-rw-r--r--src/datavisualization/data/qscatter3dseries_p.h4
-rw-r--r--src/datavisualization/data/qscatterdataitem.cpp10
-rw-r--r--src/datavisualization/data/qscatterdataitem.h6
-rw-r--r--src/datavisualization/data/qscatterdataitem_p.h4
-rw-r--r--src/datavisualization/data/qscatterdataproxy.cpp14
-rw-r--r--src/datavisualization/data/qscatterdataproxy.h8
-rw-r--r--src/datavisualization/data/qscatterdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qsurface3dseries.h4
-rw-r--r--src/datavisualization/data/qsurface3dseries_p.h4
-rw-r--r--src/datavisualization/data/qsurfacedataitem.cpp10
-rw-r--r--src/datavisualization/data/qsurfacedataitem.h6
-rw-r--r--src/datavisualization/data/qsurfacedataitem_p.h4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.cpp16
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.h10
-rw-r--r--src/datavisualization/data/qsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/scatteritemmodelhandler.cpp9
-rw-r--r--src/datavisualization/data/scatteritemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/scatterrenderitem.cpp14
-rw-r--r--src/datavisualization/data/scatterrenderitem_p.h4
-rw-r--r--src/datavisualization/data/surfaceitemmodelhandler.cpp9
-rw-r--r--src/datavisualization/data/surfaceitemmodelhandler_p.h4
58 files changed, 158 insertions, 257 deletions
diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 33fe7791..cf87c3f9 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -19,12 +19,7 @@
#include "abstractitemmodelhandler_p.h"
#include <QTimer>
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::AbstractItemModelHandler
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
: QObject(parent),
@@ -201,4 +196,4 @@ void AbstractItemModelHandler::handlePendingResolve()
resolveModel();
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index 6771dcc8..f3b72228 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -34,7 +34,7 @@
#include <QPointer>
#include <QTimer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class AbstractItemModelHandler : public QObject
{
@@ -79,6 +79,6 @@ private:
Q_DISABLE_COPY(AbstractItemModelHandler)
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 9ed51e43..8ca33231 100644
--- a/src/datavisualization/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -18,12 +18,7 @@
#include "abstractrenderitem_p.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::AbstractRenderItem
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
AbstractRenderItem::AbstractRenderItem()
: m_selectionLabelItem(0)
@@ -61,5 +56,4 @@ QString &AbstractRenderItem::selectionLabel()
return m_selectionLabel;
}
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index 15860933..6209f640 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -37,7 +37,7 @@
#include <QVector3D>
#include <QQuaternion>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class AbstractRenderItem
{
@@ -65,6 +65,6 @@ protected:
friend class QAbstractDataItem;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index 5147e631..d24bb4a0 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -18,12 +18,7 @@
#include "baritemmodelhandler_p.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::BarItemModelHandler
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -148,4 +143,4 @@ void BarItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index c977103e..6c60102d 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelbardataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class BarItemModelHandler : public AbstractItemModelHandler
{
@@ -49,6 +49,6 @@ protected:
int m_columnCount;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index be96936e..1bb1271d 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -19,22 +19,7 @@
#include "barrenderitem_p.h"
#include "bars3drenderer_p.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::BarRenderItem
- * \internal
- */
-
-/*!
- * \typedef QtDataVisualization::BarRenderItemRow
- * \internal
- */
-
-/*!
- * \typedef QtDataVisualization::BarRenderItemArray
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
BarRenderItem::BarRenderItem()
: AbstractRenderItem(),
@@ -80,5 +65,4 @@ QString &BarRenderItem::sliceLabel()
return m_sliceLabel;
}
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index f44ba2b4..7704d65e 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -31,7 +31,7 @@
#include "abstractrenderitem_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class Bars3DRenderer;
@@ -88,6 +88,6 @@ protected:
typedef QVector<BarRenderItem> BarRenderItemRow;
typedef QVector<BarRenderItemRow> BarRenderItemArray;
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 658912fc..7e893f1f 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -18,12 +18,7 @@
#include "labelitem_p.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::LabelItem
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
LabelItem::LabelItem()
: m_size(QSize(0, 0)),
@@ -66,4 +61,4 @@ void LabelItem::clear()
m_size = QSize(0, 0);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 40e1030a..9359e8c1 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -33,7 +33,7 @@
#include <QOpenGLFunctions>
#include <QSize>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class LabelItem
{
@@ -54,6 +54,6 @@ private:
GLuint m_textureId;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 7c6798bc..1044fe24 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -21,10 +21,10 @@
#include "qabstractdataproxy_p.h"
#include "abstract3dcontroller_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QAbstract3DSeries
+ * \class QAbstract3DSeries
* \inmodule QtDataVisualization
* \brief Base class for all QtDataVisualization series.
* \since Qt Data Visualization 1.0
@@ -34,12 +34,12 @@ namespace QtDataVisualization {
*/
/*!
- * \class QtDataVisualization::QAbstract3DSeriesChangeBitField
+ * \class QAbstract3DSeriesChangeBitField
* \internal
*/
/*!
- * \class QtDataVisualization::QAbstract3DSeriesThemeOverrideBitField
+ * \class QAbstract3DSeriesThemeOverrideBitField
* \internal
*/
@@ -48,7 +48,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QAbstract3DSeries
+ * \instantiates QAbstract3DSeries
* \brief Base type for all QtDataVisualization series.
*
* This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -529,10 +529,6 @@ QString QAbstract3DSeries::name() const
}
// QAbstract3DSeriesPrivate
-/*!
- * \class QtDataVisualization::QAbstract3DSeriesPrivate
- * \internal
- */
QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries *q, QAbstract3DSeries::SeriesType type)
: QObject(0),
@@ -718,4 +714,4 @@ void QAbstract3DSeriesPrivate::resetToTheme(const Q3DTheme &theme, int seriesInd
}
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 615d882e..df6dada8 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -24,7 +24,7 @@
#include <QScopedPointer>
#include <QLinearGradient>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QAbstract3DSeriesPrivate;
@@ -142,6 +142,6 @@ private:
friend class Abstract3DRenderer;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index c8a39818..67d5dee3 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -33,7 +33,7 @@
#ifndef QABSTRACT3DSERIES_P_H
#define QABSTRACT3DSERIES_P_H
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QAbstractDataProxy;
class Abstract3DController;
@@ -142,6 +142,6 @@ public:
QString m_name;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QAbstract3DSeries_P_H
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index ce377d2d..77ce4207 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -20,10 +20,10 @@
#include "qabstractdataproxy_p.h"
#include "qabstract3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QAbstractDataProxy
+ * \class QAbstractDataProxy
* \inmodule QtDataVisualization
* \brief Base class for all QtDataVisualization data proxies.
* \since Qt Data Visualization 1.0
@@ -37,7 +37,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QAbstractDataProxy
+ * \instantiates QAbstractDataProxy
* \brief Base type for all QtDataVisualization data proxies.
*
* This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -91,10 +91,6 @@ QAbstractDataProxy::DataType QAbstractDataProxy::type() const
}
// QAbstractDataProxyPrivate
-/*!
- * \class QtDataVisualization::QAbstractDataProxyPrivate
- * \internal
- */
QAbstractDataProxyPrivate::QAbstractDataProxyPrivate(QAbstractDataProxy *q, QAbstractDataProxy::DataType type)
: QObject(0),
@@ -114,4 +110,4 @@ void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series)
m_series = series;
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index cbe70333..520f407d 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -24,7 +24,7 @@
#include <QObject>
#include <QScopedPointer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QAbstractDataProxyPrivate;
@@ -59,6 +59,6 @@ private:
friend class QAbstract3DSeriesPrivate;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QABSTRACTDATAPROXY_H
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 365ff5f2..2e073f7d 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -33,7 +33,7 @@
#ifndef QABSTRACTDATAPROXY_P_H
#define QABSTRACTDATAPROXY_P_H
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QAbstract3DSeries;
@@ -56,6 +56,6 @@ private:
friend class QAbstractDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QABSTRACTDATAPROXY_P_H
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 96467a95..dff60c24 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -23,7 +23,7 @@
#include <QtDataVisualization/qbardataproxy.h>
#include <QPoint>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBar3DSeriesPrivate;
@@ -60,6 +60,6 @@ private:
friend class Bars3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h
index 8944a5f6..a99d146a 100644
--- a/src/datavisualization/data/qbar3dseries_p.h
+++ b/src/datavisualization/data/qbar3dseries_p.h
@@ -32,7 +32,7 @@
#include "qbar3dseries.h"
#include "qabstract3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBar3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -55,6 +55,6 @@ private:
friend class QBar3DSeries;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index cd4178ab..792e5158 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -18,10 +18,10 @@
#include "qbardataitem_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QBarDataItem
+ * \class QBarDataItem
* \inmodule QtDataVisualization
* \brief The QBarDataItem class provides a container for resolved data to be added to bar graphs.
* \since Qt Data Visualization 1.0
@@ -99,10 +99,6 @@ void QBarDataItem::createExtraData()
d_ptr = new QBarDataItemPrivate;
}
-/*!
- * \class QtDataVisualization::QBarDataItemPrivate
- * \internal
- */
QBarDataItemPrivate::QBarDataItemPrivate()
{
}
@@ -111,4 +107,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate()
{
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index db604a5b..57a14efb 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -19,7 +19,9 @@
#ifndef QBARDATAITEM_H
#define QBARDATAITEM_H
-namespace QtDataVisualization {
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataItemPrivate;
@@ -45,6 +47,6 @@ private:
float m_value;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index 94cdf0a0..6180c039 100644
--- a/src/datavisualization/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qbardataitem.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QBarDataItem;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 93645f38..351575a1 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -20,10 +20,10 @@
#include "qbardataproxy_p.h"
#include "qbar3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QBarDataProxy
+ * \class QBarDataProxy
* \inmodule QtDataVisualization
* \brief Base proxy class for Q3DBars.
* \since Qt Data Visualization 1.0
@@ -48,13 +48,13 @@ namespace QtDataVisualization {
*/
/*!
- * \typedef QtDataVisualization::QBarDataRow
+ * \typedef QBarDataRow
*
* A vector of QBarDataItems.
*/
/*!
- * \typedef QtDataVisualization::QBarDataArray
+ * \typedef QBarDataArray
*
* A list of pointers to QBarDataRows.
*/
@@ -64,7 +64,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QBarDataProxy
+ * \instantiates QBarDataProxy
* \inherits AbstractDataProxy
* \brief Base proxy type for Bars3D.
*
@@ -493,10 +493,6 @@ const QBarDataProxyPrivate *QBarDataProxy::dptrc() const
// QBarDataProxyPrivate
-/*!
- * \class QtDataVisualization::QBarDataProxyPrivate
- * \internal
- */
QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q)
: QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar),
m_dataArray(new QBarDataArray)
@@ -729,4 +725,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series)
emit qptr()->seriesChanged(barSeries);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index c5938531..4a1e547f 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -24,14 +24,14 @@
#include <QVector>
#include <QStringList>
-namespace QtDataVisualization {
-
-typedef QVector<QBarDataItem> QBarDataRow;
-typedef QList<QBarDataRow *> QBarDataArray;
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataProxyPrivate;
class QBar3DSeries;
+typedef QVector<QBarDataItem> QBarDataRow;
+typedef QList<QBarDataRow *> QBarDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
{
Q_OBJECT
@@ -104,6 +104,6 @@ private:
friend class Bars3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QBARDATAPROXY_H
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index f6ad0d51..6576230b 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -33,7 +33,7 @@
#include "qabstractdataproxy_p.h"
#include "qbardataitem.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -72,6 +72,6 @@ private:
friend class QBarDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index 21f7ae8e..feb6cded 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -18,14 +18,14 @@
#include "qheightmapsurfacedataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
// Default ranges correspond value axis defaults
const float defaultMinValue = 0.0f;
const float defaultMaxValue = 10.0f;
/*!
- * \class QtDataVisualization::QHeightMapSurfaceDataProxy
+ * \class QHeightMapSurfaceDataProxy
* \inmodule QtDataVisualization
* \brief Base proxy class for Q3DSurface.
* \since Qt Data Visualization 1.0
@@ -46,7 +46,7 @@ const float defaultMaxValue = 10.0f;
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QHeightMapSurfaceDataProxy
+ * \instantiates QHeightMapSurfaceDataProxy
* \inherits SurfaceDataProxy
* \brief Base proxy type for Surface3D.
*
@@ -300,10 +300,6 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con
// QHeightMapSurfaceDataProxyPrivate
//
-/*!
- * \class QtDataVisualization::QHeightMapSurfaceDataProxyPrivate
- * \internal
- */
QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q)
: QSurfaceDataProxyPrivate(q),
m_minXValue(defaultMinValue),
@@ -552,4 +548,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
emit qptr()->heightMapChanged(m_heightMap);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 42592bca..07f9ce43 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -23,7 +23,7 @@
#include <QImage>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QHeightMapSurfaceDataProxyPrivate;
@@ -77,6 +77,6 @@ private:
friend class Surface3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
index 0137511b..b2450d27 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
@@ -33,7 +33,7 @@
#include "qsurfacedataproxy_p.h"
#include <QTimer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate
{
@@ -64,6 +64,6 @@ private:
friend class QHeightMapSurfaceDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index 52a8cbb5..c1b05371 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -20,10 +20,10 @@
#include "baritemmodelhandler_p.h"
#include <QTimer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QItemModelBarDataProxy
+ * \class QItemModelBarDataProxy
* \inmodule QtDataVisualization
* \brief Proxy class for presenting data in item models with Q3DBars.
* \since Qt Data Visualization 1.0
@@ -66,7 +66,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QItemModelBarDataProxy
+ * \instantiates QItemModelBarDataProxy
* \inherits BarDataProxy
* \brief Proxy class for presenting data in item models with Bars3D.
*
@@ -448,10 +448,6 @@ const QItemModelBarDataProxyPrivate *QItemModelBarDataProxy::dptrc() const
// QItemModelBarDataProxyPrivate
-/*!
- * \class QtDataVisualization::QItemModelBarDataProxyPrivate
- * \internal
- */
QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q)
: QBarDataProxyPrivate(q),
m_itemModelHandler(new BarItemModelHandler(q)),
@@ -493,4 +489,4 @@ void QItemModelBarDataProxyPrivate::connectItemModelHandler()
m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 8a946ca7..94ac9083 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QItemModelBarDataProxyPrivate;
@@ -104,6 +104,6 @@ private:
friend class BarItemModelHandler;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index 16d48f9f..90132264 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelbardataproxy.h"
#include "qbardataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class BarItemModelHandler;
@@ -66,6 +66,6 @@ private:
friend class QItemModelBarDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 869d8e8c..74979309 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -20,10 +20,10 @@
#include "scatteritemmodelhandler_p.h"
#include <QTimer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QItemModelScatterDataProxy
+ * \class QItemModelScatterDataProxy
* \inmodule QtDataVisualization
* \brief Proxy class for presenting data in item models with Q3DScatter.
* \since Qt Data Visualization 1.0
@@ -52,7 +52,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QItemModelScatterDataProxy
+ * \instantiates QItemModelScatterDataProxy
* \inherits ScatterDataProxy
* \brief Proxy class for presenting data in item models with Scatter3D.
*
@@ -237,10 +237,6 @@ const QItemModelScatterDataProxyPrivate *QItemModelScatterDataProxy::dptrc() con
// QItemModelScatterDataProxyPrivate
-/*!
- * \class QtDataVisualization::QItemModelScatterDataProxyPrivate
- * \internal
- */
QItemModelScatterDataProxyPrivate::QItemModelScatterDataProxyPrivate(QItemModelScatterDataProxy *q)
: QScatterDataProxyPrivate(q),
m_itemModelHandler(new ScatterItemModelHandler(q))
@@ -269,4 +265,4 @@ void QItemModelScatterDataProxyPrivate::connectItemModelHandler()
m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 96fab6b6..17077e8d 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QItemModelScatterDataProxyPrivate;
@@ -71,6 +71,6 @@ private:
friend class ScatterItemModelHandler;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
index 7b33704c..37d7d23f 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelscatterdataproxy.h"
#include "qscatterdataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class ScatterItemModelHandler;
@@ -57,6 +57,6 @@ private:
friend class QItemModelScatterDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index b387bd7b..8c11ba88 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -20,12 +20,12 @@
#include "surfaceitemmodelhandler_p.h"
#include <QTimer>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
// TODO: CHECK DOCUMENTATION!
/*!
- * \class QtDataVisualization::QItemModelSurfaceDataProxy
+ * \class QItemModelSurfaceDataProxy
* \inmodule QtDataVisualization
* \brief Proxy class for presenting data in item models with Q3DSurface.
* \since Qt Data Visualization 1.0
@@ -69,7 +69,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QItemModelSurfaceDataProxy
+ * \instantiates QItemModelSurfaceDataProxy
* \inherits SurfaceDataProxy
* \brief Proxy class for presenting data in item models with Surface3D.
*
@@ -458,10 +458,6 @@ const QItemModelSurfaceDataProxyPrivate *QItemModelSurfaceDataProxy::dptrc() con
// QItemModelSurfaceDataProxyPrivate
-/*!
- * \class QtDataVisualization::QItemModelSurfaceDataProxyPrivate
- * \internal
- */
QItemModelSurfaceDataProxyPrivate::QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q)
: QSurfaceDataProxyPrivate(q),
m_itemModelHandler(new SurfaceItemModelHandler(q)),
@@ -503,4 +499,4 @@ void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler()
m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index 8c5b9ed4..fcd2b52b 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QItemModelSurfaceDataProxyPrivate;
@@ -104,6 +104,6 @@ private:
friend class SurfaceItemModelHandler;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
index 81230ab7..2f538a87 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelsurfacedataproxy.h"
#include "qsurfacedataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class SurfaceItemModelHandler;
@@ -66,6 +66,6 @@ private:
friend class QItemModelSurfaceDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index a3192003..e5ce6fd3 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstract3dseries.h>
#include <QtDataVisualization/qscatterdataproxy.h>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatter3DSeriesPrivate;
@@ -64,6 +64,6 @@ private:
friend class Scatter3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h
index aa638445..585887cb 100644
--- a/src/datavisualization/data/qscatter3dseries_p.h
+++ b/src/datavisualization/data/qscatter3dseries_p.h
@@ -32,7 +32,7 @@
#include "qscatter3dseries.h"
#include "qabstract3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatter3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -56,6 +56,6 @@ private:
friend class QScatter3DSeries;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 56d8cd35..d4641c7f 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -18,10 +18,10 @@
#include "qscatterdataitem_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QScatterDataItem
+ * \class QScatterDataItem
* \inmodule QtDataVisualization
* \brief The QScatterDataItem class provides a container for resolved data to be added to scatter
* graphs.
@@ -140,10 +140,6 @@ void QScatterDataItem::createExtraData()
d_ptr = new QScatterDataItemPrivate;
}
-/*!
- * \class QtDataVisualization::QScatterDataItemPrivate
- * \internal
- */
QScatterDataItemPrivate::QScatterDataItemPrivate()
{
}
@@ -152,4 +148,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate()
{
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index 92f34f30..7c7fe20c 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -19,10 +19,12 @@
#ifndef QSCATTERDATAITEM_H
#define QSCATTERDATAITEM_H
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QVector3D>
#include <QQuaternion>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataItemPrivate;
@@ -57,6 +59,6 @@ private:
QQuaternion m_rotation;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index c4dec45e..d9c7af94 100644
--- a/src/datavisualization/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qscatterdataitem.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QScatterDataItem;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index c9292727..7db508ea 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -20,10 +20,10 @@
#include "qscatterdataproxy_p.h"
#include "qscatter3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QScatterDataProxy
+ * \class QScatterDataProxy
* \inmodule QtDataVisualization
* \brief Base proxy class for Q3DScatter.
* \since Qt Data Visualization 1.0
@@ -36,7 +36,7 @@ namespace QtDataVisualization {
*/
/*!
- * \typedef QtDataVisualization::QScatterDataArray
+ * \typedef QScatterDataArray
*
* A vector of QScatterDataItems.
*/
@@ -46,7 +46,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QScatterDataProxy
+ * \instantiates QScatterDataProxy
* \inherits AbstractDataProxy
* \brief Base proxy class for Scatter3D.
*
@@ -283,10 +283,6 @@ const QScatterDataProxyPrivate *QScatterDataProxy::dptrc() const
// QScatterDataProxyPrivate
-/*!
- * \class QtDataVisualization::QScatterDataProxyPrivate
- * \internal
- */
QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q)
: QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter),
m_dataArray(new QScatterDataArray)
@@ -418,4 +414,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr()
return static_cast<QScatterDataProxy *>(q_ptr);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index b1c451b0..b99f503a 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -22,13 +22,13 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qscatterdataitem.h>
-namespace QtDataVisualization {
-
-typedef QVector<QScatterDataItem> QScatterDataArray;
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataProxyPrivate;
class QScatter3DSeries;
+typedef QVector<QScatterDataItem> QScatterDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
{
Q_OBJECT
@@ -79,6 +79,6 @@ private:
friend class Scatter3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index 18ab7887..c9f1d78e 100644
--- a/src/datavisualization/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -33,7 +33,7 @@
#include "qabstractdataproxy_p.h"
#include "qscatterdataitem.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -61,6 +61,6 @@ private:
friend class QScatterDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index d2109b3e..fae841fc 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstract3dseries.h>
#include <QtDataVisualization/qsurfacedataproxy.h>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurface3DSeriesPrivate;
@@ -81,6 +81,6 @@ private:
friend class Surface3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h
index a9305268..af3eac93 100644
--- a/src/datavisualization/data/qsurface3dseries_p.h
+++ b/src/datavisualization/data/qsurface3dseries_p.h
@@ -32,7 +32,7 @@
#include "qsurface3dseries.h"
#include "qabstract3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurface3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -59,6 +59,6 @@ private:
friend class QSurface3DSeries;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index b531d6b6..41d2dff9 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -18,10 +18,10 @@
#include "qsurfacedataitem_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QSurfaceDataItem
+ * \class QSurfaceDataItem
* \inmodule QtDataVisualization
* \brief The QSurfaceDataItem class provides a container for resolved data to be added to surface
* graphs.
@@ -132,10 +132,6 @@ void QSurfaceDataItem::createExtraData()
d_ptr = new QSurfaceDataItemPrivate;
}
-/*!
- * \class QtDataVisualization::QSurfaceDataItemPrivate
- * \internal
- */
QSurfaceDataItemPrivate::QSurfaceDataItemPrivate()
{
}
@@ -144,4 +140,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate()
{
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index a4d0eb27..c31bb93f 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -19,9 +19,11 @@
#ifndef QSURFACEDATAITEM_H
#define QSURFACEDATAITEM_H
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QVector3D>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataItemPrivate;
@@ -53,6 +55,6 @@ private:
QVector3D m_position;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h
index 538bb6d9..d1e7c7da 100644
--- a/src/datavisualization/data/qsurfacedataitem_p.h
+++ b/src/datavisualization/data/qsurfacedataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qsurfacedataitem.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QSurfaceDataItem;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index dbfcfa86..541b1d8f 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -20,10 +20,10 @@
#include "qsurfacedataproxy_p.h"
#include "qsurface3dseries_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
/*!
- * \class QtDataVisualization::QSurfaceDataProxy
+ * \class QSurfaceDataProxy
* \inmodule QtDataVisualization
* \brief Base proxy class for Q3DSurface.
* \since Qt Data Visualization 1.0
@@ -57,13 +57,13 @@ namespace QtDataVisualization {
*/
/*!
- * \typedef QtDataVisualization::QSurfaceDataRow
+ * \typedef QSurfaceDataRow
*
* A vector of QSurfaceDataItems.
*/
/*!
- * \typedef QtDataVisualization::QSurfaceDataArray
+ * \typedef QSurfaceDataArray
*
* A list of pointers to QSurfaceDataRows.
*/
@@ -73,7 +73,7 @@ namespace QtDataVisualization {
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QSurfaceDataProxy
+ * \instantiates QSurfaceDataProxy
* \inherits AbstractDataProxy
* \brief Base proxy class for Surface3D.
*
@@ -359,10 +359,6 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const
// QSurfaceDataProxyPrivate
//
-/*!
- * \class QtDataVisualization::QSurfaceDataProxyPrivate
- * \internal
- */
QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q)
: QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface),
m_dataArray(new QSurfaceDataArray)
@@ -536,4 +532,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series)
emit qptr()->seriesChanged(surfaceSeries);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index f4015fee..b1f16cb3 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -22,14 +22,14 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qsurfacedataitem.h>
-namespace QtDataVisualization {
-
-typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
-typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataProxyPrivate;
class QSurface3DSeries;
+typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
+typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
+
class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
{
Q_OBJECT
@@ -86,6 +86,6 @@ private:
friend class Surface3DController;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QSURFACEDATAPROXY_H
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index d01b4383..d370ef69 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -34,7 +34,7 @@
#include <QSize>
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -67,6 +67,6 @@ private:
friend class QSurfaceDataProxy;
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif // QSURFACEDATAPROXY_P_H
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index ac7e69e8..2faa02a9 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -19,12 +19,7 @@
#include "scatteritemmodelhandler_p.h"
#include <QTimer>
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::ScatterItemModelHandler
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -82,4 +77,4 @@ void ScatterItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index b59b3aa7..f54ed2c5 100644
--- a/src/datavisualization/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelscatterdataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class ScatterItemModelHandler : public AbstractItemModelHandler
{
@@ -48,6 +48,6 @@ protected:
QScatterDataArray *m_proxyArray; // Not owned
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 5b31c5b2..635f11cb 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -20,17 +20,7 @@
#include "scatter3drenderer_p.h"
#include "qscatterdataproxy.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::ScatterRenderItem
- * \internal
- */
-
-/*!
- * \typedef ScatterRenderItemArray
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
ScatterRenderItem::ScatterRenderItem()
: AbstractRenderItem(),
@@ -49,4 +39,4 @@ ScatterRenderItem::~ScatterRenderItem()
{
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index 5e596505..672eda78 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -31,7 +31,7 @@
#include "abstractrenderitem_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class Scatter3DRenderer;
@@ -78,6 +78,6 @@ protected:
};
typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index 3256e660..db6052d9 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -18,12 +18,7 @@
#include "surfaceitemmodelhandler_p.h"
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::SurfaceItemModelHandler
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -144,4 +139,4 @@ void SurfaceItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray);
}
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index edca9dca..2f1a23ae 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelsurfacedataproxy_p.h"
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class SurfaceItemModelHandler : public AbstractItemModelHandler
{
@@ -48,6 +48,6 @@ protected:
QSurfaceDataArray *m_proxyArray; // Not owned
};
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif