diff options
163 files changed, 392 insertions, 968 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index 99a4a91d..20e7f361 100644 --- a/src/datavisualization/axis/qabstract3daxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -19,10 +19,10 @@ #include "qabstract3daxis.h" #include "qabstract3daxis_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QAbstract3DAxis + * \class QAbstract3DAxis * \inmodule QtDataVisualization * \brief QAbstract3DAxis is base class for axes of a graph. * \since Qt Data Visualization 1.0 @@ -37,7 +37,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QAbstract3DAxis + * \instantiates QAbstract3DAxis * \brief AbstractAxis3D is base type for axes of a graph. * * This type is uncreatable, but contains properties that are exposed via subtypes. @@ -255,11 +255,6 @@ bool QAbstract3DAxis::isAutoAdjustRange() const */ // QAbstract3DAxisPrivate -/*! - * \class QtDataVisualization::QAbstract3DAxisPrivate - * \internal - */ - QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type) : QObject(0), q_ptr(q), @@ -405,4 +400,4 @@ void QAbstract3DAxisPrivate::setMax(float max) } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index c85e50d0..c4cb37b2 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -26,7 +26,7 @@ #include <QVector> #include <QStringList> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DAxisPrivate; @@ -103,6 +103,6 @@ private: friend class Bars3DController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h index 4403cc16..cca31fa4 100644 --- a/src/datavisualization/axis/qabstract3daxis_p.h +++ b/src/datavisualization/axis/qabstract3daxis_p.h @@ -33,7 +33,7 @@ #ifndef QABSTRACT3DAXIS_P_H #define QABSTRACT3DAXIS_P_H -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DAxisPrivate : public QObject { @@ -72,6 +72,6 @@ protected: friend class QCategory3DAxis; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp index a29fb376..0ef59b59 100644 --- a/src/datavisualization/axis/qcategory3daxis.cpp +++ b/src/datavisualization/axis/qcategory3daxis.cpp @@ -21,10 +21,10 @@ #include "bars3dcontroller_p.h" #include "qbardataproxy.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QCategory3DAxis + * \class QCategory3DAxis * \inmodule QtDataVisualization * \brief The QCategory3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 @@ -41,7 +41,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QCategory3DAxis + * \instantiates QCategory3DAxis * \inherits AbstractAxis3D * \brief The CategoryAxis3D type is used for manipulating an axis of a graph. * @@ -117,11 +117,6 @@ QCategory3DAxisPrivate *QCategory3DAxis::dptr() return static_cast<QCategory3DAxisPrivate *>(d_ptr.data()); } -/*! - * \class QtDataVisualization::QCategory3DAxisPrivate - * \internal - */ - QCategory3DAxisPrivate::QCategory3DAxisPrivate(QCategory3DAxis *q) : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeCategory), m_labelsExplicitlySet(false) @@ -152,4 +147,4 @@ QCategory3DAxis *QCategory3DAxisPrivate::qptr() return static_cast<QCategory3DAxis *>(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index 2d3235b4..d16eac2a 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/qabstract3daxis.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QCategory3DAxisPrivate; @@ -48,6 +48,6 @@ private: friend class Bars3DController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index 6449e999..f7a16161 100644 --- a/src/datavisualization/axis/qcategory3daxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -33,7 +33,7 @@ #ifndef QCATEGORY3DAXIS_P_H #define QCATEGORY3DAXIS_P_H -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -52,6 +52,6 @@ private: friend class QCategory3DAxis; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp index deee9bac..609e3b86 100644 --- a/src/datavisualization/axis/qvalue3daxis.cpp +++ b/src/datavisualization/axis/qvalue3daxis.cpp @@ -20,10 +20,10 @@ #include "qvalue3daxis_p.h" #include "utils_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QValue3DAxis + * \class QValue3DAxis * \inmodule QtDataVisualization * \brief The QValue3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 @@ -41,7 +41,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QValue3DAxis + * \instantiates QValue3DAxis * \inherits AbstractAxis3D * \brief The ValueAxis3D type is used for manipulating an axis of a graph. * @@ -184,11 +184,6 @@ const QValue3DAxisPrivate *QValue3DAxis::dptrc() const return static_cast<const QValue3DAxisPrivate *>(d_ptr.data()); } -/*! - * \class QtDataVisualization::QValue3DAxisPrivate - * \internal - */ - QValue3DAxisPrivate::QValue3DAxisPrivate(QValue3DAxis *q) : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeValue), m_segmentCount(5), @@ -272,4 +267,4 @@ QValue3DAxis *QValue3DAxisPrivate::qptr() return static_cast<QValue3DAxis *>(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index c842167c..d5d23825 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/qabstract3daxis.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QValue3DAxisPrivate; @@ -60,6 +60,6 @@ private: friend class Surface3DController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h index 08dab486..b1b65fd7 100644 --- a/src/datavisualization/axis/qvalue3daxis_p.h +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -32,7 +32,7 @@ #ifndef QVALUE3DAXIS_P_H #define QVALUE3DAXIS_P_H -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QValue3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -61,6 +61,6 @@ private: friend class QValue3DAxis; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif 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 diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index 29fd17f8..7ec7ac1e 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavisualization.qdocconf @@ -12,8 +12,7 @@ imagedirs += ../images \ images sourcedirs += .. -depends += qtcore \ - qtgui +depends += qtcore qtgui qtdeclarative indexes += $QTDIR/doc/html/qt.index diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index c07f161b..dbfb1754 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -299,7 +299,7 @@ /*! * \fn QSurfaceFormat QtDataVisualization::qDefaultSurfaceFormat(bool antialias = true) - * \relates QtDataVisualization::QAbstract3DGraph + * \relates QAbstract3DGraph * * Anti-aliasing is turned on by default on C++ and turned off on QML, except in OpenGL ES2 * environments, where anti-aliasing is not supported by Qt Data Visualization. diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 9ec6f087..7e938387 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -33,17 +33,7 @@ #include <QThread> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Abstract3DController - * \internal - */ - -/*! - * \class QtDataVisualization::Abstract3DChangeBitField - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) : QObject(parent), @@ -1026,4 +1016,4 @@ void Abstract3DController::emitNeedRender() } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index c38135ed..944c00b1 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -41,7 +41,7 @@ //#define DISPLAY_RENDER_SPEED -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class TextureHelper; class Theme; @@ -146,6 +146,6 @@ protected: #endif }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // ABSTRACT3DRENDERER_P_H diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index 5598563a..acc59906 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -20,12 +20,7 @@ #include "qmath.h" #include <QFontMetrics> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::AxisRenderCache - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION AxisRenderCache::AxisRenderCache() : m_type(QAbstract3DAxis::AxisTypeNone), @@ -188,4 +183,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const return labelWidth; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h index 595ba83b..c4576be5 100644 --- a/src/datavisualization/engine/axisrendercache_p.h +++ b/src/datavisualization/engine/axisrendercache_p.h @@ -34,7 +34,7 @@ #include "qabstract3daxis_p.h" #include "drawer_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class AxisRenderCache : public QObject { @@ -96,6 +96,6 @@ private: Q_DISABLE_COPY(AxisRenderCache) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 97e21fc6..81499ac7 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -38,12 +38,7 @@ // You should see the scene from where the light is //#define SHOW_DEPTH_TEXTURE_SCENE -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Bars3DRenderer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const GLfloat labelMargin = 0.05f; const GLfloat gridLineWidth = 0.005f; @@ -2205,4 +2200,4 @@ void Bars3DRenderer::initLabelShaders(const QString &vertexShader, const QString m_labelShader->initialize(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index 03e490b8..0eb3e60a 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -26,8 +26,8 @@ // // We mean it. -#ifndef Q3DBARSRENDERER_p_H -#define Q3DBARSRENDERER_p_H +#ifndef Q3DBARSRENDERER_P_H +#define Q3DBARSRENDERER_P_H #include "datavisualizationglobal_p.h" #include "bars3dcontroller_p.h" @@ -39,7 +39,7 @@ class QPoint; class QSizeF; class QOpenGLShaderProgram; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; @@ -162,7 +162,6 @@ private: friend class BarRenderItem; }; - -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index a2905e32..72b64212 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -38,12 +38,7 @@ public: }; StaticLibInitializer staticLibInitializer; -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Drawer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION // Vertex array buffer for point const GLfloat point_data[] = {0.0f, 0.0f, 0.0f}; @@ -405,4 +400,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index 82163c08..ba9aadf7 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -36,7 +36,7 @@ #include "abstractrenderitem_p.h" #include <QFont> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; @@ -100,6 +100,6 @@ private: GLuint m_pointbuffer; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 9a6ff6d5..a5b1dc3e 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -24,10 +24,10 @@ #include "q3dcamera.h" #include "qbar3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DBars + * \class Q3DBars * \inmodule QtDataVisualization * \brief The Q3DBars class provides methods for rendering 3D bar graphs. * \since Qt Data Visualization 1.0 @@ -167,7 +167,7 @@ void Q3DBars::removeSeries(QBar3DSeries *series) * the new position in list is calculated as if the series was still in its old * index, so the final index is actually the \a index decremented by one. * - * \sa addSeries(), seriesList(), seriesIndex() + * \sa addSeries(), seriesList() */ void Q3DBars::insertSeries(int index, QBar3DSeries *series) { @@ -351,10 +351,6 @@ const Q3DBarsPrivate *Q3DBars::dptrc() const return static_cast<const Q3DBarsPrivate *>(d_ptr.data()); } -/*! - * \class QtDataVisualization::Q3DBarsPrivate - * \internal - */ Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q) : QAbstract3DGraphPrivate(q) { @@ -384,4 +380,4 @@ Q3DBars *Q3DBarsPrivate::qptr() return static_cast<Q3DBars *>(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 251e410f..bf973c11 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -23,7 +23,7 @@ #include <QFont> #include <QLinearGradient> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DBarsPrivate; class QAbstract3DAxis; @@ -87,6 +87,6 @@ private: Q_DISABLE_COPY(Q3DBars) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h index 3e7c97ac..dbe4ce2d 100644 --- a/src/datavisualization/engine/q3dbars_p.h +++ b/src/datavisualization/engine/q3dbars_p.h @@ -32,7 +32,7 @@ #include "bars3dcontroller_p.h" #include "qabstract3dgraph_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DBars; @@ -52,6 +52,6 @@ public: Bars3DController *m_shared; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp index bbfa4ddc..e9fd3fd8 100644 --- a/src/datavisualization/engine/q3dbox.cpp +++ b/src/datavisualization/engine/q3dbox.cpp @@ -20,10 +20,10 @@ #include "q3dbox.h" #include <QtCore/QList> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - \class QtDataVisualization::Q3DBox + \class Q3DBox \inmodule QtDataVisualization \brief The Q3DBox class represents an axis-aligned box in 3D space. \since Qt Data Visualization 1.0 @@ -404,7 +404,7 @@ Q3DBox Q3DBox::transformed(const QMatrix4x4& matrix) const /*! \fn bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2) - \relates QtDataVisualization::Q3DBox + \relates Q3DBox Returns true if \a box1 and \a box2 are almost equal; false otherwise. */ @@ -482,4 +482,4 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box) #endif // QT_NO_DATASTREAM -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h index fcf46bdf..e18466f3 100644 --- a/src/datavisualization/engine/q3dbox.h +++ b/src/datavisualization/engine/q3dbox.h @@ -22,7 +22,7 @@ #include <QtGui/QMatrix4x4> #include <QtGui/QVector3D> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is removed, make docs will not work for this. @@ -152,6 +152,6 @@ QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box); #endif -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index a045d7bb..8a02d3ae 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -26,10 +26,10 @@ #include <qmath.h> #include <QVector3D> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DCamera + * \class Q3DCamera * \inmodule QtDataVisualization * \brief Representation of a camera in 3D space. * \since Qt Data Visualization 1.0 @@ -81,7 +81,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::Q3DCamera + * \instantiates Q3DCamera * \brief Representation of a camera in 3D space. * * Camera3D represents a basic orbit around centerpoint 3D camera that is used when rendering the @@ -760,10 +760,6 @@ void Q3DCamera::setCameraPosition(float horizontal, float vertical, float zoom) setYRotation(vertical); } -/*! - * \class QtDataVisualization::Q3DCameraPrivate - * \internal - */ Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) : q_ptr(q), m_isViewMatrixUpdateActive(true), @@ -871,5 +867,4 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment) q_ptr->setViewMatrix(viewMatrix); } - -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index b4341bb7..4c4d2851 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -25,7 +25,7 @@ class QVector3D; class QPoint; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DCameraPrivate; @@ -157,6 +157,6 @@ private: friend class QMac3DInputHandler; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DCAMERA_H diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index cfaaeb4d..555d5cd9 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dcamera.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DCamera; @@ -82,6 +82,6 @@ public: friend class QMac3DInputHandler; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DCAMERA_P_H diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp index 6b5c456f..25dbc79e 100644 --- a/src/datavisualization/engine/q3dlight.cpp +++ b/src/datavisualization/engine/q3dlight.cpp @@ -20,10 +20,10 @@ #include "q3dscene.h" #include "q3dlight_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DLight + * \class Q3DLight * \inmodule QtDataVisualization * \brief Representation of a light source in 3D space. * \since Qt Data Visualization 1.0 @@ -36,7 +36,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::Q3DLight + * \instantiates Q3DLight * \brief Representation of a light source in 3D space. * * Light3D represents a monochrome non variable light source in 3D space. @@ -59,10 +59,6 @@ Q3DLight::~Q3DLight() { } -/*! - * \class QtDataVisualization::Q3DLightPrivate - * \internal - */ Q3DLightPrivate::Q3DLightPrivate(Q3DLight *q) : q_ptr(q) { @@ -83,4 +79,4 @@ void Q3DLightPrivate::sync(Q3DLight &other) } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h index 6515b1ae..f37c0983 100644 --- a/src/datavisualization/engine/q3dlight.h +++ b/src/datavisualization/engine/q3dlight.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/q3dobject.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DLightPrivate; class Q3DScene; @@ -43,6 +43,6 @@ private: friend class Q3DScenePrivate; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DLIGHT_H diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h index bd871427..c68956ad 100644 --- a/src/datavisualization/engine/q3dlight_p.h +++ b/src/datavisualization/engine/q3dlight_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dlight.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DScene; class Q3DLight; @@ -49,7 +49,7 @@ public: Q3DLight *q_ptr; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DLIGHT_P_H diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp index 946a41cc..f81b7f91 100644 --- a/src/datavisualization/engine/q3dobject.cpp +++ b/src/datavisualization/engine/q3dobject.cpp @@ -20,10 +20,10 @@ #include "q3dobject_p.h" #include "q3dscene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - \class QtDataVisualization::Q3DObject + \class Q3DObject \inmodule QtDataVisualization \brief Simple baseclass for all the objects in the 3D scene. \since Qt Data Visualization 1.0 @@ -109,10 +109,6 @@ bool Q3DObject::isDirty() const return d_ptr->m_isDirty; } -/*! - * \class QtDataVisualization::Q3DObjectPrivate - * \internal - */ Q3DObjectPrivate::Q3DObjectPrivate(Q3DObject *q) : q_ptr(q), m_isDirty(true) @@ -124,4 +120,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate() } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index c32203cc..da83709a 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -24,7 +24,7 @@ #include <QObject> #include <QVector3D> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DObjectPrivate; @@ -60,6 +60,6 @@ private: friend class Q3DScenePrivate; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DOBJECT_H diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h index 51bf1b08..90de8604 100644 --- a/src/datavisualization/engine/q3dobject_p.h +++ b/src/datavisualization/engine/q3dobject_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DObject; class Q3DScene; @@ -48,6 +48,6 @@ public: bool m_isDirty; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DOBJECT_P_H diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 99e6c096..9af916cb 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -23,10 +23,10 @@ #include "q3dcamera.h" #include "qscatter3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DScatter + * \class Q3DScatter * \inmodule QtDataVisualization * \brief The Q3DScatter class provides methods for rendering 3D scatter graphs. * \since Qt Data Visualization 1.0 @@ -241,10 +241,6 @@ QList<QValue3DAxis *> Q3DScatter::axes() const return retList; } -/*! - * \class QtDataVisualization::Q3DScatterPrivate - * \internal - */ Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q) : QAbstract3DGraphPrivate(q) { @@ -274,5 +270,5 @@ Q3DScatter *Q3DScatterPrivate::qptr() return static_cast<Q3DScatter *>(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index a03e51f7..f9a67d76 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -24,7 +24,7 @@ #include <QFont> #include <QLinearGradient> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DScatterPrivate; class QValue3DAxis; @@ -67,6 +67,6 @@ private: Q_DISABLE_COPY(Q3DScatter) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h index 9c6c4480..66f6fd7b 100644 --- a/src/datavisualization/engine/q3dscatter_p.h +++ b/src/datavisualization/engine/q3dscatter_p.h @@ -32,7 +32,7 @@ #include "scatter3dcontroller_p.h" #include "qabstract3dgraph_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DScatter; @@ -52,6 +52,6 @@ public: Scatter3DController *m_shared; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 4712cf18..de19e84c 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -25,10 +25,10 @@ #include "q3dcamera_p.h" #include "q3dlight_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DScene + * \class Q3DScene * \inmodule QtDataVisualization * \brief Q3DScene class provides description of the 3D scene being visualized. * \since Qt Data Visualization 1.0 @@ -47,7 +47,7 @@ namespace QtDataVisualization { */ /*! - * \class QtDataVisualization::Q3DSceneChangeBitField + * \class Q3DSceneChangeBitField * \internal */ @@ -56,7 +56,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::Q3DScene + * \instantiates Q3DScene * \brief Scene3D type provides description of the 3D scene being visualized. * * The 3D scene contains a single active camera and a single active light source. @@ -461,10 +461,6 @@ void Q3DScene::setLightPositionRelativeToCamera(const QVector3D &relativePositio distanceModifier)); } -/*! - * \class QtDataVisualization::Q3DScenePrivate - * \internal - */ Q3DScenePrivate::Q3DScenePrivate(Q3DScene *q) : QObject(0), q_ptr(q), @@ -653,4 +649,4 @@ QRect Q3DScenePrivate::glSecondarySubViewport() return m_glSecondarySubViewport; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index d43d06ec..8f9ee7b3 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -24,7 +24,7 @@ #include <QObject> #include <QRect> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DCamera; class Q3DBox; @@ -108,6 +108,6 @@ private: friend class Q3DObject; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DSCENE_H diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h index 65d5e4c8..3ba1c2df 100644 --- a/src/datavisualization/engine/q3dscene_p.h +++ b/src/datavisualization/engine/q3dscene_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include <QRect> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DCamera; class Q3DLight; @@ -110,6 +110,6 @@ public: bool m_sceneDirty; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DSCENE_P_H diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index dd5cfab6..a9b9e3d3 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -23,10 +23,10 @@ #include "q3dcamera.h" #include "qsurface3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DSurface + * \class Q3DSurface * \inmodule QtDataVisualization * \brief The Q3DSurface class provides methods for rendering 3D surface plots. * \since Qt Data Visualization 1.0 @@ -264,10 +264,6 @@ QList<QValue3DAxis *> Q3DSurface::axes() const /////////////////// PRIVATE /////////////////////////////////// -/*! - * \class QtDataVisualization::Q3DSurfacePrivate - * \internal - */ Q3DSurfacePrivate::Q3DSurfacePrivate(Q3DSurface *q) : QAbstract3DGraphPrivate(q) { @@ -297,4 +293,4 @@ Q3DSurface *Q3DSurfacePrivate::qptr() return static_cast<Q3DSurface *>(q_ptr); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 833e983a..e8158f65 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -23,7 +23,7 @@ #include <QtDataVisualization/q3dscene.h> #include <QFont> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DSurfacePrivate; class QValue3DAxis; @@ -66,6 +66,6 @@ private: Q_DISABLE_COPY(Q3DSurface) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DSURFACE_H diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h index d604fc51..acaf76d3 100644 --- a/src/datavisualization/engine/q3dsurface_p.h +++ b/src/datavisualization/engine/q3dsurface_p.h @@ -34,7 +34,7 @@ #include <QList> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DSurface; @@ -54,6 +54,6 @@ public: Surface3DController *m_shared; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DSURFACE_P_H diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h index 43f96e4a..a7e49ecd 100644 --- a/src/datavisualization/engine/qabstract3dgraph_p.h +++ b/src/datavisualization/engine/qabstract3dgraph_p.h @@ -36,7 +36,7 @@ class QOpenGLContext; class QOpenGLPaintDevice; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DGraph; class Abstract3DController; @@ -71,6 +71,6 @@ public: float m_devicePixelRatio; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index d2c3eee5..e0348f39 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -41,12 +41,7 @@ // You should see the scene from where the light is //#define SHOW_DEPTH_TEXTURE_SCENE -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Scatter3DRenderer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values @@ -1805,4 +1800,4 @@ void Scatter3DRenderer::selectionColorToSeriesAndIndex(const QVector3D &color, i series = 0; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index fb1e2698..350aa934 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -39,7 +39,7 @@ class QPoint; class QSizeF; class QOpenGLShaderProgram; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; @@ -150,6 +150,6 @@ private: void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QScatter3DSeries *&series); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index fc2081b1..7a47c43f 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -32,12 +32,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::SelectionPointer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const GLfloat sliceUnits = 2.5; @@ -264,4 +259,4 @@ void SelectionPointer::loadLabelMesh() m_labelObj->load(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index b1cb4b63..c6295fa5 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -41,7 +41,7 @@ class QOpenGLShaderProgram; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; @@ -93,6 +93,6 @@ private: QVector3D m_highlightColor; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // NOTIFICATIONLABEL_P_H diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp index 98f1d19e..2f055d46 100644 --- a/src/datavisualization/engine/seriesrendercache.cpp +++ b/src/datavisualization/engine/seriesrendercache.cpp @@ -22,12 +22,7 @@ #include "texturehelper_p.h" #include "utils_p.h" -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::SeriesRenderCache - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const QString smoothString(QStringLiteral("Smooth")); @@ -184,4 +179,4 @@ void SeriesRenderCache::cleanup(TextureHelper *texHelper) texHelper->deleteTexture(&m_multiHighlightGradientTexture); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h index d543da71..81eaacbc 100644 --- a/src/datavisualization/engine/seriesrendercache_p.h +++ b/src/datavisualization/engine/seriesrendercache_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Abstract3DRenderer; class ObjectHelper; @@ -80,7 +80,7 @@ protected: QString m_name; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index da7656f3..b0bb4834 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -38,12 +38,7 @@ static const int ID_TO_RGBA_MASK = 0xff; -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Surface3DRenderer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION //#define SHOW_DEPTH_TEXTURE_SCENE @@ -2193,4 +2188,4 @@ void Surface3DRenderer::generateUniformGradient(const QVector3D newColor) } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 10c2c723..13fd11d8 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -43,7 +43,7 @@ class QOpenGLShaderProgram; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; @@ -184,6 +184,6 @@ private: Q_DISABLE_COPY(Surface3DRenderer) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // SURFACE3DRENDERER_P_H diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index c061c05c..410cc296 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -34,7 +34,7 @@ #include <QVector3D> #include <QDebug> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION // Constants used in several files // Distance from camera to origin @@ -56,6 +56,6 @@ static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f); static const GLfloat gradientTextureHeight = 1024.0f; static const GLfloat gradientTextureWidth = 2.0f; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index e17cc7ea..946abfa1 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -52,4 +52,7 @@ # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT #endif +#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { +#define QT_END_NAMESPACE_DATAVISUALIZATION } + #endif diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 0a79db27..27ebf89d 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -21,7 +21,7 @@ #include "q3dcamera_p.h" #include "q3dlight.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const int minZoomLevel = 10; const int halfSizeZoomLevel = 50; @@ -35,7 +35,7 @@ const int farZoomRangeDivider = 120; const float rotationSpeed = 100.0f; /*! - * \class QtDataVisualization::Q3DInputHandler + * \class Q3DInputHandler * \inmodule QtDataVisualization * \brief Basic wheel mouse based input handler. * \since Qt Data Visualization 1.0 @@ -190,9 +190,4 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) scene()->activeCamera()->setZoomLevel(zoomLevel); } -/*! - * \class QtDataVisualization::Q3DInputHandlerPrivate - * \internal - */ - -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 7b5f3aca..501ac004 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/qabstract3dinputhandler.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DInputHandlerPrivate; @@ -45,6 +45,6 @@ private: QScopedPointer<Q3DInputHandlerPrivate> *d_ptr; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QDEFAULT3DINPUTHANDLER_H diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h index 8724f5bf..df8a1978 100644 --- a/src/datavisualization/input/q3dinputhandler_p.h +++ b/src/datavisualization/input/q3dinputhandler_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DInputHandler; @@ -46,6 +46,6 @@ public: }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // Q3DINPUTHANDLER_P_H diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 32f60a6c..e7374657 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,10 +17,10 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QAbstract3DInputHandler + * \class 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 QtDataVisualization::QAbstract3DInputHandler + * \instantiates QAbstract3DInputHandler * \brief Base type for all QtDataVisualization input handlers. * * This type is uncreatable. @@ -227,11 +227,6 @@ QPoint QAbstract3DInputHandler::previousInputPos() const return d_ptr->m_previousInputPos; } - -/*! - * \class QtDataVisualization::QAbstract3DInputHandlerPrivate - * \internal - */ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputHandler *q) : q_ptr(q), m_prevDistance(0), @@ -247,4 +242,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate() } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 2ad1514b..f8b8ba88 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -22,7 +22,7 @@ #include <QtDataVisualization/q3dscene.h> #include <QMouseEvent> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandlerPrivate; @@ -87,6 +87,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QABSTRACT3DINPUTHANDLER_H diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index a44cc40d..7e616ec2 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -33,7 +33,7 @@ #include "qabstract3dinputhandler.h" #include <QRect> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandler; class Q3DScene; @@ -65,6 +65,6 @@ private: friend class Abstract3DController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QABSTRACT3DINPUTHANDLER_P_H diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index f5be97df..909beb74 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -21,7 +21,7 @@ #include <QTimer> #include <qmath.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const float maxTapAndHoldJitter = 20.0f; const int maxPinchJitter = 10; @@ -36,7 +36,7 @@ const int minZoomLevel = 10; const int maxZoomLevel = 500; /*! - * \class QtDataVisualization::QTouch3DInputHandler + * \class QTouch3DInputHandler * \inmodule QtDataVisualization * \brief Basic touch display based input handler. * \since Qt Data Visualization 1.0 @@ -129,10 +129,6 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event) } } -/*! - * \class QtDataVisualization::QTouch3DInputHandlerPrivate - * \internal - */ QTouch3DInputHandlerPrivate::QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q) : q_ptr(q), m_holdTimer(0) @@ -213,4 +209,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h index 0f3cd255..fef63c3b 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.h +++ b/src/datavisualization/input/qtouch3dinputhandler.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/q3dinputhandler.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QTouch3DInputHandlerPrivate; @@ -42,6 +42,6 @@ private: QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QTOUCH3DINPUTHANDLER_H diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index e8d1793b..143c828d 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -21,7 +21,7 @@ #include "qtouch3dinputhandler.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandler; @@ -45,6 +45,6 @@ public: QPointF m_touchHoldPos; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // QTOUCH3DINPUTHANDLER_H diff --git a/src/datavisualization/theme/builtin3dthemes.cpp b/src/datavisualization/theme/builtin3dthemes.cpp deleted file mode 100644 index 9848e6e5..00000000 --- a/src/datavisualization/theme/builtin3dthemes.cpp +++ /dev/null @@ -1,230 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -#include "builtin3dthemes_p.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -BuiltIn3DThemeQt::BuiltIn3DThemeQt() - : Q3DTheme(QDataVis::ThemeQt) -{ - setBaseColor(QColor(QRgb(0x80c342))); - setBackgroundColor(QColor(QRgb(0xffffff))); - setWindowColor(QColor(QRgb(0xffffff))); - setTextColor(QColor(QRgb(0x35322f))); - setTextBackgroundColor(QColor(0xff, 0xff, 0xff, 0x99)); - setGridLineColor(QColor(QRgb(0xd7d6d5))); - setSingleHighlightColor(QColor(QRgb(0x14aaff))); - setMultiHighlightColor(QColor(QRgb(0x6400aa))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(true); - setColorStyle(QDataVis::ColorStyleUniform); -} - -BuiltIn3DThemePrimaryColors::BuiltIn3DThemePrimaryColors() - : Q3DTheme(QDataVis::ThemePrimaryColors) -{ - setBaseColor(QColor(QRgb(0xffe400))); - setBackgroundColor(QColor(QRgb(0xffffff))); - setWindowColor(QColor(QRgb(0xffffff))); - setTextColor(QColor(QRgb(0x000000))); - setTextBackgroundColor(QColor(0xff, 0xff, 0xff, 0x99)); - setGridLineColor(QColor(QRgb(0xd7d6d5))); - setSingleHighlightColor(QColor(QRgb(0x27beee))); - setMultiHighlightColor(QColor(QRgb(0xee1414))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleUniform); -} - -BuiltIn3DThemeDigia::BuiltIn3DThemeDigia() - : Q3DTheme(QDataVis::ThemeDigia) -{ - setBackgroundColor(QColor(QRgb(0xffffff))); - setWindowColor(QColor(QRgb(0xffffff))); - setTextColor(QColor(QRgb(0x000000))); - setTextBackgroundColor(QColor(0xff, 0xff, 0xff, 0x80)); - setGridLineColor(QColor(QRgb(0xd7d6d5))); - setSingleHighlightColor(QColor(QRgb(0xfa0000))); - setMultiHighlightColor(QColor(QRgb(0x555555))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleObjectGradient); - QLinearGradient gradient = QLinearGradient(qreal(gradientTextureWidth), - qreal(gradientTextureHeight), - 0.0, 0.0); - QColor color; - color.setRed(0xcc * 0.7); - color.setGreen(0xcc * 0.7); - color.setBlue(0xcc * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0xcccccc))); - setBaseGradient(gradient); - color.setRed(0xfa * 0.7); - color.setGreen(0x00); - color.setBlue(0x00); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0xfa0000))); - setSingleHighlightGradient(gradient); - color.setRed(0x55 * 0.7); - color.setGreen(0x55 * 0.7); - color.setBlue(0x55 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x555555))); - setMultiHighlightGradient(gradient); -} - -BuiltIn3DThemeStoneMoss::BuiltIn3DThemeStoneMoss() - : Q3DTheme(QDataVis::ThemeStoneMoss) -{ - setBaseColor(QColor(QRgb(0xbeb32b))); - setBackgroundColor(QColor(QRgb(0x4d4d4f))); - setWindowColor(QColor(QRgb(0x4d4d4f))); - setTextColor(QColor(QRgb(0xffffff))); - setTextBackgroundColor(QColor(0x4d, 0x4d, 0x4f, 0xcd)); - setGridLineColor(QColor(QRgb(0x3e3e40))); - setSingleHighlightColor(QColor(QRgb(0xfbf6d6))); - setMultiHighlightColor(QColor(QRgb(0x442f20))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(true); - setColorStyle(QDataVis::ColorStyleUniform); -} - -BuiltIn3DThemeArmyBlue::BuiltIn3DThemeArmyBlue() - : Q3DTheme(QDataVis::ThemeArmyBlue) -{ - setBackgroundColor(QColor(QRgb(0xd5d6d7))); - setWindowColor(QColor(QRgb(0xd5d6d7))); - setTextColor(QColor(QRgb(0x000000))); - setTextBackgroundColor(QColor(0xd5, 0xd6, 0xd7, 0xcd)); - setGridLineColor(QColor(QRgb(0xaeadac))); - setSingleHighlightColor(QColor(QRgb(0x2aa2f9))); - setMultiHighlightColor(QColor(QRgb(0x103753))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleObjectGradient); - QLinearGradient gradient = QLinearGradient(qreal(gradientTextureWidth), - qreal(gradientTextureHeight), - 0.0, 0.0); - QColor color; - color.setRed(0x49 * 0.7); - color.setGreen(0x5f * 0.7); - color.setBlue(0x76 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x495f76))); - setBaseGradient(gradient); - color.setRed(0x2a * 0.7); - color.setGreen(0xa2 * 0.7); - color.setBlue(0xf9 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x2aa2f9))); - setSingleHighlightGradient(gradient); - color.setRed(0x10 * 0.7); - color.setGreen(0x37 * 0.7); - color.setBlue(0x53 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x103753))); - setMultiHighlightGradient(gradient); -} - -BuiltIn3DThemeRetro::BuiltIn3DThemeRetro() - : Q3DTheme(QDataVis::ThemeRetro) -{ - setBackgroundColor(QColor(QRgb(0xe9e2ce))); - setWindowColor(QColor(QRgb(0xe9e2ce))); - setTextColor(QColor(QRgb(0x000000))); - setTextBackgroundColor(QColor(0xe9, 0xe2, 0xce, 0xc0)); - setGridLineColor(QColor(QRgb(0xd0c0b0))); - setSingleHighlightColor(QColor(QRgb(0x8ea317))); - setMultiHighlightColor(QColor(QRgb(0xc25708))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleObjectGradient); - QLinearGradient gradient = QLinearGradient(qreal(gradientTextureWidth), - qreal(gradientTextureHeight), - 0.0, 0.0); - QColor color; - color.setRed(0x53 * 0.7); - color.setGreen(0x3b * 0.7); - color.setBlue(0x23 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x533b23))); - setBaseGradient(gradient); - color.setRed(0x8e * 0.7); - color.setGreen(0xa3 * 0.7); - color.setBlue(0x17 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0x8ea317))); - setSingleHighlightGradient(gradient); - color.setRed(0xc2 * 0.7); - color.setGreen(0x57 * 0.7); - color.setBlue(0x08 * 0.7); - gradient.setColorAt(0.0, color); - gradient.setColorAt(1.0, QColor(QRgb(0xc25708))); - setMultiHighlightGradient(gradient); -} - -BuiltIn3DThemeEbony::BuiltIn3DThemeEbony() - : Q3DTheme(QDataVis::ThemeEbony) -{ - setBaseColor(QColor(QRgb(0xffffff))); - setBackgroundColor(QColor(QRgb(0x000000))); - setWindowColor(QColor(QRgb(0x000000))); - setTextColor(QColor(QRgb(0xaeadac))); - setTextBackgroundColor(QColor(0x00, 0x00, 0x00, 0xcd)); - setGridLineColor(QColor(QRgb(0x35322f))); - setSingleHighlightColor(QColor(QRgb(0xf5dc0d))); - setMultiHighlightColor(QColor(QRgb(0xd72222))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleUniform); -} - -BuiltIn3DThemeIsabelle::BuiltIn3DThemeIsabelle() - : Q3DTheme(QDataVis::ThemeIsabelle) -{ - setBaseColor(QColor(QRgb(0xf9d900))); - setBackgroundColor(QColor(QRgb(0x000000))); - setWindowColor(QColor(QRgb(0x000000))); - setTextColor(QColor(QRgb(0xaeadac))); - setTextBackgroundColor(QColor(0x00, 0x00, 0x00, 0xc0)); - setGridLineColor(QColor(QRgb(0x35322f))); - setSingleHighlightColor(QColor(QRgb(0xfff7cc))); - setMultiHighlightColor(QColor(QRgb(0xde0a0a))); - setLightStrength(5.0f); - setAmbientLightStrength(0.5f); - setHighlightLightStrength(5.0f); - setLabelBorderEnabled(false); - setColorStyle(QDataVis::ColorStyleUniform); -} - -QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/theme/builtin3dthemes_p.h b/src/datavisualization/theme/builtin3dthemes_p.h deleted file mode 100644 index 8f2c3d04..00000000 --- a/src/datavisualization/theme/builtin3dthemes_p.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the QtDataVisualization API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef BUILTIN3DTHEMES_P_H -#define BUILTIN3DTHEMES_P_H - -#include "datavisualizationglobal_p.h" -#include "q3dtheme_p.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class BuiltIn3DThemeQt : public Q3DTheme -{ -public: - BuiltIn3DThemeQt(); -}; - -class BuiltIn3DThemePrimaryColors : public Q3DTheme -{ -public: - BuiltIn3DThemePrimaryColors(); -}; - -class BuiltIn3DThemeDigia : public Q3DTheme -{ -public: - BuiltIn3DThemeDigia(); -}; - -class BuiltIn3DThemeStoneMoss : public Q3DTheme -{ -public: - BuiltIn3DThemeStoneMoss(); -}; - -class BuiltIn3DThemeArmyBlue : public Q3DTheme -{ -public: - BuiltIn3DThemeArmyBlue(); -}; - -class BuiltIn3DThemeRetro : public Q3DTheme -{ -public: - BuiltIn3DThemeRetro(); -}; - -class BuiltIn3DThemeEbony : public Q3DTheme -{ -public: - BuiltIn3DThemeEbony(); -}; - -class BuiltIn3DThemeIsabelle : public Q3DTheme -{ -public: - BuiltIn3DThemeIsabelle(); -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index c1915073..b35afb5f 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -19,10 +19,10 @@ #include "q3dtheme_p.h" #include "thememanager_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::Q3DTheme + * \class Q3DTheme * \inmodule QtDataVisualization * \brief Q3DTheme class provides a visual style for graphs. * \since Qt Data Visualization 1.0 @@ -209,16 +209,11 @@ namespace QtDataVisualization { */ /*! - * \class QtDataVisualization::Q3DThemeDirtyBitField - * \internal - */ - -/*! * \qmltype Theme3D * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::Q3DTheme + * \instantiates Q3DTheme * \brief A visual style for graphs. * * This type is used to specify visual properties that affect the whole graph. There are several @@ -895,10 +890,6 @@ Q3DTheme::Theme Q3DTheme::type() const // Q3DThemePrivate -/*! - * \class QtDataVisualization::Q3DThemePrivate - * \internal - */ Q3DThemePrivate::Q3DThemePrivate(Q3DTheme *q) : QObject(0), m_themeId(Q3DTheme::ThemeUserDefined), @@ -1081,4 +1072,4 @@ bool Q3DThemePrivate::sync(Q3DThemePrivate &other) return changed; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 632beb47..9baec05d 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -25,7 +25,7 @@ #include <QFont> #include <QColor> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DThemePrivate; @@ -184,6 +184,6 @@ private: Q_DISABLE_COPY(Q3DTheme) }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index 0180ddc3..6307d44d 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dtheme.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION struct Q3DThemeDirtyBitField { bool baseColorDirty : 1; @@ -144,6 +144,6 @@ protected: Q3DTheme *q_ptr; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index c695bd76..2d79e239 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -19,12 +19,7 @@ #include "thememanager_p.h" #include "q3dtheme_p.h" -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::ThemeManager - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes const float defaultColorLevel = 0.5f; // for built-in uniform themes @@ -595,4 +590,4 @@ void ThemeManager::setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style) theme->setColorStyle(style); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h index 343cf8a5..fce2cf49 100644 --- a/src/datavisualization/theme/thememanager_p.h +++ b/src/datavisualization/theme/thememanager_p.h @@ -33,7 +33,7 @@ #include "abstract3dcontroller_p.h" #include "q3dtheme.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ThemeManager : public QObject { @@ -81,6 +81,6 @@ private: Abstract3DController *m_controller; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index fd2921a0..21ebc826 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -20,12 +20,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::AbstractObjectHelper - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION AbstractObjectHelper::AbstractObjectHelper() : m_vertexbuffer(0), @@ -85,4 +80,4 @@ GLuint AbstractObjectHelper::indicesType() return m_indicesType; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h index 6f48238d..c3bf39a9 100644 --- a/src/datavisualization/utils/abstractobjecthelper_p.h +++ b/src/datavisualization/utils/abstractobjecthelper_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include <QOpenGLFunctions> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class AbstractObjectHelper: protected QOpenGLFunctions { @@ -60,6 +60,6 @@ public: GLuint m_indicesType; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // ABSTRACTOBJECTHELPER_H diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 1e9ce648..7800dfd1 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -22,12 +22,7 @@ #include <QMatrix4x4> #include <QVector3D> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::CameraHelper - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION CameraHelper::CameraHelper(QObject *parent) : QObject(parent), @@ -288,4 +283,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset) } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h index 9d411b74..f85164f7 100644 --- a/src/datavisualization/utils/camerahelper_p.h +++ b/src/datavisualization/utils/camerahelper_p.h @@ -39,7 +39,7 @@ class QVector3D; class QPoint; class QPointF; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class CameraHelper : public QObject { @@ -86,6 +86,6 @@ public: void setCameraPreset(Q3DCamera::CameraPreset preset); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index d8d74ec9..a5fb7880 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -26,12 +26,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::MeshLoader - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION QString slashTag = QStringLiteral("/"); @@ -127,4 +122,4 @@ bool MeshLoader::loadOBJ(const QString &path, return true; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h index 3add8c2d..e609c45e 100644 --- a/src/datavisualization/utils/meshloader_p.h +++ b/src/datavisualization/utils/meshloader_p.h @@ -34,7 +34,7 @@ class QVector2D; class QVector3D; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class MeshLoader { @@ -46,6 +46,6 @@ class MeshLoader // TODO: add loaders for other formats? }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index f6a7ef40..5c1bc43e 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -23,12 +23,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::ObjectHelper - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile) @@ -100,4 +95,4 @@ void ObjectHelper::load() m_meshDataLoaded = true; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index 6e325639..d448c8c8 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -33,7 +33,7 @@ #include "abstractobjecthelper_p.h" #include <QOpenGLFunctions> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ObjectHelper : public AbstractObjectHelper { @@ -49,6 +49,6 @@ private: QString m_objectFile; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index 895d2bd9..adc24e8d 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -20,12 +20,7 @@ #include <QOpenGLShader> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::ShaderHelper - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -273,4 +268,4 @@ GLuint ShaderHelper::normalAtt() return m_normalAttr; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index 996ad7fc..b4c71ca2 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -34,7 +34,7 @@ class QOpenGLShaderProgram; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper { @@ -110,6 +110,6 @@ class ShaderHelper GLboolean m_initialized; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 0fbec6dc..790ca3f8 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -24,12 +24,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::SurfaceObject - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION SurfaceObject::SurfaceObject() { @@ -686,4 +681,4 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV return QVector3D::crossProduct(v1, v2); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 91b42c76..6abbb8d4 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -36,7 +36,7 @@ #include <QOpenGLFunctions> #include <QRect> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class SurfaceObject : public AbstractObjectHelper { @@ -85,5 +85,6 @@ private: QVector<QVector3D> m_normals; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION + #endif // SURFACEOBJECT_P_H diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index ecfb6aec..6498fce4 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -24,12 +24,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::TextureHelper - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION TextureHelper::TextureHelper() { @@ -372,4 +367,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture } } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index e67904d8..bc69786a 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -34,7 +34,7 @@ #include <QRgb> #include <QLinearGradient> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class TextureHelper : protected QOpenGLFunctions { @@ -67,6 +67,6 @@ class TextureHelper : protected QOpenGLFunctions friend class Scatter3DRenderer; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 2a38c8f2..30291963 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -26,12 +26,7 @@ #include <QRegExp> #include <qmath.h> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::Utils - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION #define NUM_IN_POWER(y, x) for (;y<x;y<<=1) #define MIN_POWER 2 @@ -244,4 +239,4 @@ float Utils::wrapValue(float value, float min, float max) return value; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 434a366f..18337e0b 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -39,7 +39,7 @@ class QString; class QPoint; class QImage; -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Utils { @@ -75,6 +75,6 @@ private: static ParamType mapFormatCharToParamType(const QChar &formatChar); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index fd90e447..cb5d3ffc 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -23,12 +23,7 @@ #include <QDebug> -namespace QtDataVisualization { - -/*! - * \class QtDataVisualization::VertexIndexer - * \internal - */ +QT_BEGIN_NAMESPACE_DATAVISUALIZATION int unique_vertices = 0; @@ -155,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h index de8f7690..250c7a1b 100644 --- a/src/datavisualization/utils/vertexindexer_p.h +++ b/src/datavisualization/utils/vertexindexer_p.h @@ -35,7 +35,7 @@ #include <QVector2D> #include <QVector3D> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class VertexIndexer { @@ -83,6 +83,6 @@ class VertexIndexer unsigned short &result); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index 11ce2a58..e9574aa0 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -18,7 +18,7 @@ #include "colorgradient_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION ColorGradientStop::ColorGradientStop(QObject *parent) : QObject(parent) @@ -74,4 +74,4 @@ void ColorGradient::doUpdate() emit updated(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index f2fcae1f..25c3343d 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -33,7 +33,7 @@ #include <QColor> #include <QQmlListProperty> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ColorGradientStop : public QObject { @@ -83,6 +83,6 @@ Q_SIGNALS: void updated(); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 28f08500..0ba0bb17 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -20,7 +20,7 @@ #include <qqml.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) { @@ -80,5 +80,5 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) qmlRegisterType<DeclarativeSurface3DSeries>(uri, 1, 0, "Surface3DSeries"); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index fc18a1b6..54ff1a86 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -92,7 +92,7 @@ QML_DECLARE_TYPE(DeclarativeTheme3D) QML_DECLARE_TYPE(QAbstract3DInputHandler) -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin { @@ -103,7 +103,7 @@ public: void registerTypes(const char *uri); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif // DATAVISUALIZATIONQML2_PLUGIN_H diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 8634e91d..74d60138 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -21,7 +21,7 @@ #include "qitemmodelbardataproxy.h" #include "declarativescene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeBars::DeclarativeBars(QQuickItem *parent) : AbstractDeclarative(parent), @@ -185,4 +185,4 @@ void DeclarativeBars::handleAxisZChanged(QAbstract3DAxis *axis) emit rowAxisChanged(static_cast<QCategory3DAxis *>(axis)); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 9c89c5a2..43b619f1 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -43,7 +43,7 @@ #include <QObject> #include <QQuickWindow> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeBars : public AbstractDeclarative { @@ -108,6 +108,6 @@ private: Bars3DController *m_barsController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml2/declarativecolor.cpp index f0c9263f..1becec4f 100644 --- a/src/datavisualizationqml2/declarativecolor.cpp +++ b/src/datavisualizationqml2/declarativecolor.cpp @@ -18,7 +18,7 @@ #include "declarativecolor_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeColor::DeclarativeColor(QObject *parent) : QObject(parent) @@ -38,4 +38,4 @@ QColor DeclarativeColor::color() const return m_color; } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 5aa062c8..d37fe340 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include <QColor> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeColor : public QObject { @@ -52,6 +52,6 @@ private: QColor m_color; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 035736fd..6c2bba35 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -20,7 +20,7 @@ #include "qitemmodelscatterdataproxy.h" #include "declarativescene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeScatter::DeclarativeScatter(QQuickItem *parent) : AbstractDeclarative(parent), @@ -127,4 +127,4 @@ void DeclarativeScatter::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index 79636963..357c346d 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -41,7 +41,7 @@ #include <QQuickItem> #include <QObject> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeScatter : public AbstractDeclarative { @@ -85,6 +85,6 @@ protected: Scatter3DController *m_scatterController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativescene.cpp b/src/datavisualizationqml2/declarativescene.cpp index ab747f9c..ed029dd8 100644 --- a/src/datavisualizationqml2/declarativescene.cpp +++ b/src/datavisualizationqml2/declarativescene.cpp @@ -18,7 +18,7 @@ #include "declarativescene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION Declarative3DScene::Declarative3DScene(QObject *parent) : Q3DScene(parent) @@ -46,4 +46,4 @@ QPoint Declarative3DScene::invalidSelectionPoint() const return Q3DScene::invalidSelectionPoint(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h index 0a80d67f..4465751d 100644 --- a/src/datavisualizationqml2/declarativescene_p.h +++ b/src/datavisualizationqml2/declarativescene_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dscene.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Declarative3DScene : public Q3DScene { @@ -55,6 +55,6 @@ signals: void selectionQueryPositionChanged(const QPointF position); }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 388b3dd4..e852b506 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -22,7 +22,7 @@ #include "qsurfacedataproxy.h" #include <QMetaMethod> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type) { @@ -348,4 +348,4 @@ void DeclarativeSurface3DSeries::handleMultiHighlightGradientUpdate() setSeriesGradient(this, *m_multiHighlightGradient, GradientTypeMulti); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index c7e5efb9..6b40fcde 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -36,7 +36,7 @@ #include "colorgradient_p.h" #include <QQmlListProperty> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION enum GradientType { GradientTypeBase, @@ -185,6 +185,6 @@ private: ColorGradient *m_multiHighlightGradient; // Not owned }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index b8fe285d..64186293 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -21,7 +21,7 @@ #include "qitemmodelsurfacedataproxy.h" #include "declarativescene_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), @@ -128,4 +128,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 041d8506..46821a51 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -42,7 +42,7 @@ #include <QObject> #include <QQuickWindow> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeSurface : public AbstractDeclarative { @@ -86,6 +86,6 @@ private: Surface3DController *m_surfaceController; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp index e591f394..e64f156b 100644 --- a/src/datavisualizationqml2/declarativetheme.cpp +++ b/src/datavisualizationqml2/declarativetheme.cpp @@ -18,7 +18,7 @@ #include "declarativetheme_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent) : Q3DTheme(parent), @@ -390,4 +390,4 @@ void DeclarativeTheme3D::clearBaseGradientsFunc(QQmlListProperty<ColorGradient> reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients(); } -} +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 8f527f2f..21a70f2c 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -36,7 +36,7 @@ #include <QtQml/qqmlparserstatus.h> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus { @@ -121,6 +121,6 @@ private: bool m_dummyColors; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif |