diff options
Diffstat (limited to 'src')
208 files changed, 403 insertions, 426 deletions
diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index 56b87c98..94a42521 100644 --- a/src/datavisualization/axis/qabstract3daxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -29,7 +29,7 @@ #include "qabstract3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QAbstract3DAxis @@ -574,4 +574,4 @@ void QAbstract3DAxisPrivate::setMax(float max) } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index fca8810e..5837a4ed 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -35,7 +35,7 @@ #include <QtCore/QScopedPointer> #include <QtCore/QStringList> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DAxisPrivate; @@ -128,6 +128,6 @@ private: friend class QSurfaceDataProxyPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h index 418fa449..76e376f7 100644 --- a/src/datavisualization/axis/qabstract3daxis_p.h +++ b/src/datavisualization/axis/qabstract3daxis_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qabstract3daxis.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DAxisPrivate : public QObject { @@ -88,6 +88,6 @@ protected: friend class QSurfaceDataProxyPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp index 17bfe490..e47706c0 100644 --- a/src/datavisualization/axis/qcategory3daxis.cpp +++ b/src/datavisualization/axis/qcategory3daxis.cpp @@ -30,7 +30,7 @@ #include "qcategory3daxis_p.h" #include "bars3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QCategory3DAxis @@ -171,4 +171,4 @@ QCategory3DAxis *QCategory3DAxisPrivate::qptr() return static_cast<QCategory3DAxis *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index f1bffa17..e394b4a3 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/qabstract3daxis.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCategory3DAxisPrivate; @@ -59,6 +59,6 @@ private: friend class Bars3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index 1ce8ed5e..842c07e6 100644 --- a/src/datavisualization/axis/qcategory3daxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -43,7 +43,7 @@ #include "qcategory3daxis.h" #include "qabstract3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -67,6 +67,6 @@ private: friend class QCategory3DAxis; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp index 77ea37c1..37cf22db 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp @@ -31,7 +31,7 @@ #include "qvalue3daxis_p.h" #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QLogValue3DAxisFormatter @@ -452,4 +452,4 @@ QLogValue3DAxisFormatter *QLogValue3DAxisFormatterPrivate::qptr() return static_cast<QLogValue3DAxisFormatter *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h index 6fd1d6c0..8f0e67a5 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/qvalue3daxisformatter.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QLogValue3DAxisFormatterPrivate; @@ -78,6 +78,6 @@ private: friend class QLogValue3DAxisFormatterPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter_p.h b/src/datavisualization/axis/qlogvalue3daxisformatter_p.h index 65b7844c..6b129030 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter_p.h @@ -44,7 +44,7 @@ #include "qlogvalue3daxisformatter.h" #include "qvalue3daxisformatter_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QLogValue3DAxisFormatterPrivate : public QValue3DAxisFormatterPrivate { @@ -77,6 +77,6 @@ private: friend class QLogValue3DAxisFormatter; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp index f0a72ed4..ebc548f2 100644 --- a/src/datavisualization/axis/qvalue3daxis.cpp +++ b/src/datavisualization/axis/qvalue3daxis.cpp @@ -31,7 +31,7 @@ #include "qvalue3daxisformatter_p.h" #include "abstract3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QValue3DAxis @@ -375,4 +375,4 @@ QValue3DAxis *QValue3DAxisPrivate::qptr() return static_cast<QValue3DAxis *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index 9cb28f70..80942e43 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -33,7 +33,7 @@ #include <QtDataVisualization/qabstract3daxis.h> #include <QtDataVisualization/qvalue3daxisformatter.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QValue3DAxisPrivate; @@ -85,6 +85,6 @@ private: friend class QValue3DAxisFormatterPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h index de617450..1e9cbfbf 100644 --- a/src/datavisualization/axis/qvalue3daxis_p.h +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -43,7 +43,7 @@ #include "qvalue3daxis.h" #include "qabstract3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QValue3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -83,6 +83,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qvalue3daxisformatter.cpp b/src/datavisualization/axis/qvalue3daxisformatter.cpp index 68a73a1d..26786f9d 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qvalue3daxisformatter.cpp @@ -30,7 +30,7 @@ #include "qvalue3daxisformatter_p.h" #include "qvalue3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QValue3DAxisFormatter @@ -468,4 +468,4 @@ void QValue3DAxisFormatterPrivate::markDirtyNoLabelChange() markDirty(false); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index e4efd14e..43a61fd8 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -37,7 +37,7 @@ #include <QtCore/QScopedPointer> #include <QtCore/QStringList> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QValue3DAxisFormatterPrivate; class QValue3DAxis; @@ -96,6 +96,6 @@ private: friend class QSurface3DSeriesPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h index d6abdb1b..9bc7b555 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h @@ -45,7 +45,7 @@ #include "utils_p.h" #include <QtCore/QLocale> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QValue3DAxis; @@ -105,6 +105,6 @@ protected: friend class QValue3DAxisFormatter; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp index 703a337f..c8c5bf25 100644 --- a/src/datavisualization/data/abstractitemmodelhandler.cpp +++ b/src/datavisualization/data/abstractitemmodelhandler.cpp @@ -29,7 +29,7 @@ #include "abstractitemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent) : QObject(parent), @@ -237,4 +237,4 @@ void AbstractItemModelHandler::handlePendingResolve() m_fullReset = false; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index 62a78103..fb215244 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -45,7 +45,7 @@ #include <QtCore/QPointer> #include <QtCore/QTimer> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AbstractItemModelHandler : public QObject { @@ -91,6 +91,6 @@ private: Q_DISABLE_COPY(AbstractItemModelHandler) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp index 8a932e3f..25b656b6 100644 --- a/src/datavisualization/data/abstractrenderitem.cpp +++ b/src/datavisualization/data/abstractrenderitem.cpp @@ -29,7 +29,7 @@ #include "abstractrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE AbstractRenderItem::AbstractRenderItem() { @@ -45,4 +45,4 @@ AbstractRenderItem::~AbstractRenderItem() { } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h index 28755d61..3c413a7b 100644 --- a/src/datavisualization/data/abstractrenderitem_p.h +++ b/src/datavisualization/data/abstractrenderitem_p.h @@ -46,7 +46,7 @@ #include <QtGui/QVector3D> #include <QtGui/QQuaternion> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AbstractRenderItem { @@ -75,6 +75,6 @@ protected: friend class QAbstractDataItem; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp index c09e97c9..8864948a 100644 --- a/src/datavisualization/data/baritemmodelhandler.cpp +++ b/src/datavisualization/data/baritemmodelhandler.cpp @@ -29,7 +29,7 @@ #include "baritemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const int noRoleIndex = -1; @@ -299,4 +299,4 @@ void BarItemModelHandler::resolveModel() m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h index 0363ad05..dbb95967 100644 --- a/src/datavisualization/data/baritemmodelhandler_p.h +++ b/src/datavisualization/data/baritemmodelhandler_p.h @@ -43,7 +43,7 @@ #include "abstractitemmodelhandler_p.h" #include "qitemmodelbardataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class BarItemModelHandler : public AbstractItemModelHandler { @@ -72,6 +72,6 @@ protected: bool m_haveRotationPattern; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp index 23e3f13c..3fa423d9 100644 --- a/src/datavisualization/data/barrenderitem.cpp +++ b/src/datavisualization/data/barrenderitem.cpp @@ -29,7 +29,7 @@ #include "barrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE BarRenderItem::BarRenderItem() : AbstractRenderItem(), @@ -99,4 +99,4 @@ const QString &BarRenderSliceItem::sliceLabel() const return m_sliceLabel; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h index 29147722..b336f087 100644 --- a/src/datavisualization/data/barrenderitem_p.h +++ b/src/datavisualization/data/barrenderitem_p.h @@ -42,7 +42,7 @@ #include "abstractrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class BarRenderItem : public AbstractRenderItem { @@ -96,6 +96,6 @@ protected: typedef QList<BarRenderItem> BarRenderItemRow; typedef QList<BarRenderItemRow> BarRenderItemArray; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp index ac998fba..68e84c44 100644 --- a/src/datavisualization/data/customrenderitem.cpp +++ b/src/datavisualization/data/customrenderitem.cpp @@ -29,7 +29,7 @@ #include "customrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE CustomRenderItem::CustomRenderItem() : AbstractRenderItem(), @@ -116,4 +116,4 @@ void CustomRenderItem::setSliceFrameColor(const QColor &color) float(1.0f)); // Alpha not supported for frames } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h index 3ee423cb..196e6aa0 100644 --- a/src/datavisualization/data/customrenderitem_p.h +++ b/src/datavisualization/data/customrenderitem_p.h @@ -46,7 +46,7 @@ #include <QtGui/QImage> #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCustom3DItem; class Abstract3DRenderer; @@ -198,6 +198,6 @@ private: }; typedef QHash<QCustom3DItem *, CustomRenderItem *> CustomRenderItemArray; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp index 9fa2e6b5..337c8008 100644 --- a/src/datavisualization/data/labelitem.cpp +++ b/src/datavisualization/data/labelitem.cpp @@ -29,7 +29,7 @@ #include "labelitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE LabelItem::LabelItem() : m_size(QSize(0, 0)), @@ -71,4 +71,4 @@ void LabelItem::clear() m_size = QSize(0, 0); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h index 788dffde..3b634496 100644 --- a/src/datavisualization/data/labelitem_p.h +++ b/src/datavisualization/data/labelitem_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include <QtCore/QSize> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class LabelItem { @@ -64,6 +64,6 @@ private: GLuint m_textureId; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp index 42579f62..a196ed66 100644 --- a/src/datavisualization/data/qabstract3dseries.cpp +++ b/src/datavisualization/data/qabstract3dseries.cpp @@ -31,7 +31,7 @@ #include "qabstractdataproxy_p.h" #include "abstract3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QAbstract3DSeries @@ -903,4 +903,4 @@ void QAbstract3DSeriesPrivate::setItemLabelVisible(bool visible) m_changeTracker.itemLabelVisibilityChanged = true; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index 80cb52c3..3114639f 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -37,7 +37,7 @@ #include <QtGui/QLinearGradient> #include <QtGui/QQuaternion> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DSeriesPrivate; @@ -53,7 +53,7 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject Q_PROPERTY(bool meshSmooth READ isMeshSmooth WRITE setMeshSmooth NOTIFY meshSmoothChanged) Q_PROPERTY(QQuaternion meshRotation READ meshRotation WRITE setMeshRotation NOTIFY meshRotationChanged) Q_PROPERTY(QString userDefinedMesh READ userDefinedMesh WRITE setUserDefinedMesh NOTIFY userDefinedMeshChanged) - Q_PROPERTY(QtDataVisualization::Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged) + Q_PROPERTY(Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged) Q_PROPERTY(QColor baseColor READ baseColor WRITE setBaseColor NOTIFY baseColorChanged) Q_PROPERTY(QLinearGradient baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged) Q_PROPERTY(QColor singleHighlightColor READ singleHighlightColor WRITE setSingleHighlightColor NOTIFY singleHighlightColorChanged) @@ -171,6 +171,6 @@ private: friend class Abstract3DRenderer; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h index 0762386f..d4ad11c9 100644 --- a/src/datavisualization/data/qabstract3dseries_p.h +++ b/src/datavisualization/data/qabstract3dseries_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dseries.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstractDataProxy; class Abstract3DController; @@ -168,6 +168,6 @@ public: bool m_itemLabelVisible; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp index a9703e02..248b9f4a 100644 --- a/src/datavisualization/data/qabstractdataproxy.cpp +++ b/src/datavisualization/data/qabstractdataproxy.cpp @@ -30,7 +30,7 @@ #include "qabstractdataproxy_p.h" #include "qabstract3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QAbstractDataProxy @@ -126,4 +126,4 @@ void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series) m_series = series; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h index d0260684..89d73bce 100644 --- a/src/datavisualization/data/qabstractdataproxy.h +++ b/src/datavisualization/data/qabstractdataproxy.h @@ -34,7 +34,7 @@ #include <QtCore/QObject> #include <QtCore/QScopedPointer> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstractDataProxyPrivate; @@ -69,6 +69,6 @@ private: friend class QAbstract3DSeriesPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h index abe1f4ce..6ab33661 100644 --- a/src/datavisualization/data/qabstractdataproxy_p.h +++ b/src/datavisualization/data/qabstractdataproxy_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qabstractdataproxy.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DSeries; @@ -66,6 +66,6 @@ private: friend class QAbstractDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp index 54b973e8..afc3b3ba 100644 --- a/src/datavisualization/data/qbar3dseries.cpp +++ b/src/datavisualization/data/qbar3dseries.cpp @@ -31,7 +31,7 @@ #include "bars3dcontroller_p.h" #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QBar3DSeries @@ -432,4 +432,4 @@ void QBar3DSeriesPrivate::connectSignals() &QBar3DSeriesPrivate::handleMeshRotationChanged); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h index 07a98ad5..c3a71205 100644 --- a/src/datavisualization/data/qbar3dseries.h +++ b/src/datavisualization/data/qbar3dseries.h @@ -34,7 +34,7 @@ #include <QtDataVisualization/qbardataproxy.h> #include <QtCore/QPoint> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBar3DSeriesPrivate; @@ -75,6 +75,6 @@ private: friend class Bars3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h index 0c8f5eb9..0f5bb43a 100644 --- a/src/datavisualization/data/qbar3dseries_p.h +++ b/src/datavisualization/data/qbar3dseries_p.h @@ -43,7 +43,7 @@ #include "qbar3dseries.h" #include "qabstract3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBar3DSeriesPrivate : public QAbstract3DSeriesPrivate { @@ -71,6 +71,6 @@ private: friend class QBar3DSeries; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp index 5827cf42..e1a04c83 100644 --- a/src/datavisualization/data/qbardataitem.cpp +++ b/src/datavisualization/data/qbardataitem.cpp @@ -29,7 +29,7 @@ #include "qbardataitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QBarDataItem @@ -140,4 +140,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate() { } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h index a8eef517..11a8e471 100644 --- a/src/datavisualization/data/qbardataitem.h +++ b/src/datavisualization/data/qbardataitem.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/qdatavisualizationglobal.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBarDataItemPrivate; @@ -62,6 +62,6 @@ private: float m_angle; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h index 11dad9bf..000bafdb 100644 --- a/src/datavisualization/data/qbardataitem_p.h +++ b/src/datavisualization/data/qbardataitem_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qbardataitem.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBarDataItemPrivate { @@ -52,6 +52,6 @@ public: virtual ~QBarDataItemPrivate(); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index c5d33535..36832137 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -30,7 +30,7 @@ #include "qbardataproxy_p.h" #include "qbar3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QBarDataProxy @@ -787,4 +787,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(barSeries); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 155e5794..80e5f063 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -37,7 +37,7 @@ Q_MOC_INCLUDE(<QtDataVisualization/qbar3dseries.h>) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBarDataProxyPrivate; class QBar3DSeries; @@ -119,6 +119,6 @@ private: friend class Bars3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h index f3ed2098..7b2cf22b 100644 --- a/src/datavisualization/data/qbardataproxy_p.h +++ b/src/datavisualization/data/qbardataproxy_p.h @@ -43,7 +43,7 @@ #include "qbardataproxy.h" #include "qabstractdataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QBarDataProxyPrivate : public QAbstractDataProxyPrivate { @@ -82,6 +82,6 @@ private: friend class QBarDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp index 11df7750..07e3c809 100644 --- a/src/datavisualization/data/qcustom3ditem.cpp +++ b/src/datavisualization/data/qcustom3ditem.cpp @@ -29,7 +29,7 @@ #include "qcustom3ditem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QCustom3DItem @@ -537,4 +537,4 @@ void QCustom3DItemPrivate::resetDirtyBits() m_dirtyBits.shadowCastingDirty = false; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index 0fbc1926..d16bd377 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -35,7 +35,7 @@ #include <QtGui/QVector3D> #include <QtGui/QQuaternion> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCustom3DItemPrivate; @@ -113,6 +113,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3ditem_p.h b/src/datavisualization/data/qcustom3ditem_p.h index d99db35a..d97c98c4 100644 --- a/src/datavisualization/data/qcustom3ditem_p.h +++ b/src/datavisualization/data/qcustom3ditem_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qcustom3ditem.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE struct QCustomItemDirtyBitField { bool textureDirty : 1; @@ -106,6 +106,6 @@ private: friend class QCustom3DItem; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3dlabel.cpp b/src/datavisualization/data/qcustom3dlabel.cpp index 5cc0a0e4..72379dd8 100644 --- a/src/datavisualization/data/qcustom3dlabel.cpp +++ b/src/datavisualization/data/qcustom3dlabel.cpp @@ -30,7 +30,7 @@ #include "qcustom3dlabel_p.h" #include "utils_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QCustom3DLabel @@ -382,4 +382,4 @@ void QCustom3DLabelPrivate::handleTextureChange() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h index fdfcb9f9..9ca68fe9 100644 --- a/src/datavisualization/data/qcustom3dlabel.h +++ b/src/datavisualization/data/qcustom3dlabel.h @@ -37,7 +37,7 @@ #include <QtGui/QFont> #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCustom3DLabelPrivate; @@ -99,6 +99,6 @@ private: friend class Abstract3DRenderer; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3dlabel_p.h b/src/datavisualization/data/qcustom3dlabel_p.h index c0608ec4..f607ac1b 100644 --- a/src/datavisualization/data/qcustom3dlabel_p.h +++ b/src/datavisualization/data/qcustom3dlabel_p.h @@ -43,7 +43,7 @@ #include "qcustom3dlabel.h" #include "qcustom3ditem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCustom3DLabelPrivate : public QCustom3DItemPrivate { @@ -79,6 +79,6 @@ private: friend class QCustom3DLabel; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3dvolume.cpp b/src/datavisualization/data/qcustom3dvolume.cpp index 8f524c2b..df944a58 100644 --- a/src/datavisualization/data/qcustom3dvolume.cpp +++ b/src/datavisualization/data/qcustom3dvolume.cpp @@ -30,7 +30,7 @@ #include "qcustom3dvolume_p.h" #include "utils_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QCustom3DVolume @@ -1338,4 +1338,4 @@ QCustom3DVolume *QCustom3DVolumePrivate::qptr() return static_cast<QCustom3DVolume *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 6967c608..886019d0 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -35,7 +35,7 @@ #include <QtGui/QColor> #include <QtGui/QImage> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QCustom3DVolumePrivate; @@ -154,6 +154,6 @@ private: friend class Abstract3DRenderer; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qcustom3dvolume_p.h b/src/datavisualization/data/qcustom3dvolume_p.h index e12b706d..f68473a4 100644 --- a/src/datavisualization/data/qcustom3dvolume_p.h +++ b/src/datavisualization/data/qcustom3dvolume_p.h @@ -43,7 +43,7 @@ #include "qcustom3dvolume.h" #include "qcustom3ditem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE struct QCustomVolumeDirtyBitField { bool textureDimensionsDirty : 1; @@ -114,6 +114,6 @@ private: friend class QCustom3DVolume; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index 1d762f88..fd4ffcbb 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -29,7 +29,7 @@ #include "qheightmapsurfacedataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Default ranges correspond value axis defaults const float defaultMinValue = 0.0f; @@ -594,4 +594,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve() emit qptr()->heightMapChanged(m_heightMap); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h index 4d815851..f9f9a23c 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h @@ -34,7 +34,7 @@ #include <QtGui/QImage> #include <QtCore/QString> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QHeightMapSurfaceDataProxyPrivate; @@ -89,6 +89,6 @@ private: friend class Surface3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h index 12219dd3..7dc2f41d 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h @@ -44,7 +44,7 @@ #include "qsurfacedataproxy_p.h" #include <QtCore/QTimer> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate { @@ -75,6 +75,6 @@ private: friend class QHeightMapSurfaceDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index d901b07d..c5e7c3c0 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -30,7 +30,7 @@ #include "qitemmodelbardataproxy_p.h" #include "baritemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QItemModelBarDataProxy @@ -959,4 +959,4 @@ void QItemModelBarDataProxyPrivate::connectItemModelHandler() m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 7ac5d64a..90f14f6b 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -34,7 +34,7 @@ #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QItemModelBarDataProxyPrivate; @@ -174,6 +174,6 @@ private: friend class BarItemModelHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h index 7b9b691a..4cd6e79d 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy_p.h +++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h @@ -43,7 +43,7 @@ #include "qitemmodelbardataproxy.h" #include "qbardataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class BarItemModelHandler; @@ -90,6 +90,6 @@ private: friend class QItemModelBarDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index a2c7e41a..c1ac496f 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -30,7 +30,7 @@ #include "qitemmodelscatterdataproxy_p.h" #include "scatteritemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QItemModelScatterDataProxy @@ -647,4 +647,4 @@ void QItemModelScatterDataProxyPrivate::connectItemModelHandler() m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index ae321b65..c0106e81 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -35,7 +35,7 @@ #include <QtCore/QString> #include <QtCore/QRegularExpression> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QItemModelScatterDataProxyPrivate; @@ -126,6 +126,6 @@ private: friend class ScatterItemModelHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h index cb433a30..dd957f0d 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h @@ -43,7 +43,7 @@ #include "qitemmodelscatterdataproxy.h" #include "qscatterdataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterItemModelHandler; @@ -79,6 +79,6 @@ private: friend class QItemModelScatterDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index 0fa50fb2..701f9cca 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -30,7 +30,7 @@ #include "qitemmodelsurfacedataproxy_p.h" #include "surfaceitemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QItemModelSurfaceDataProxy @@ -1124,4 +1124,4 @@ void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler() m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 52af2d19..168d6bae 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -35,7 +35,7 @@ #include <QtCore/QStringList> #include <QtCore/QRegularExpression> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QItemModelSurfaceDataProxyPrivate; @@ -191,6 +191,6 @@ private: friend class SurfaceItemModelHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h index 1c8380b6..dc9f96cb 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h @@ -43,7 +43,7 @@ #include "qitemmodelsurfacedataproxy.h" #include "qsurfacedataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class SurfaceItemModelHandler; @@ -93,6 +93,6 @@ private: friend class QItemModelSurfaceDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp index 1557a6c3..ec84ee96 100644 --- a/src/datavisualization/data/qscatter3dseries.cpp +++ b/src/datavisualization/data/qscatter3dseries.cpp @@ -30,7 +30,7 @@ #include "qscatter3dseries_p.h" #include "scatter3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QScatter3DSeries @@ -392,4 +392,4 @@ void QScatter3DSeriesPrivate::setItemSize(float size) m_controller->markSeriesVisualsDirty(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h index 0a1f93e9..e94aed85 100644 --- a/src/datavisualization/data/qscatter3dseries.h +++ b/src/datavisualization/data/qscatter3dseries.h @@ -33,7 +33,7 @@ #include <QtDataVisualization/qabstract3dseries.h> #include <QtDataVisualization/qscatterdataproxy.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QScatter3DSeriesPrivate; @@ -75,6 +75,6 @@ private: friend class Scatter3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h index fc2f3b39..16f20886 100644 --- a/src/datavisualization/data/qscatter3dseries_p.h +++ b/src/datavisualization/data/qscatter3dseries_p.h @@ -43,7 +43,7 @@ #include "qscatter3dseries.h" #include "qabstract3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QScatter3DSeriesPrivate : public QAbstract3DSeriesPrivate { @@ -68,6 +68,6 @@ private: friend class QScatter3DSeries; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp index 12ea47af..db06573b 100644 --- a/src/datavisualization/data/qscatterdataitem.cpp +++ b/src/datavisualization/data/qscatterdataitem.cpp @@ -29,7 +29,7 @@ #include "qscatterdataitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QScatterDataItem @@ -176,4 +176,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate() { } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h index 94be3a48..6fe749d0 100644 --- a/src/datavisualization/data/qscatterdataitem.h +++ b/src/datavisualization/data/qscatterdataitem.h @@ -33,7 +33,7 @@ #include <QtDataVisualization/qdatavisualizationglobal.h> #include <QtGui/QQuaternion> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QScatterDataItemPrivate; @@ -69,6 +69,6 @@ private: QQuaternion m_rotation; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h index 7eac8950..4fcfa58a 100644 --- a/src/datavisualization/data/qscatterdataitem_p.h +++ b/src/datavisualization/data/qscatterdataitem_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qscatterdataitem.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QScatterDataItemPrivate { @@ -52,6 +52,6 @@ public: virtual ~QScatterDataItemPrivate(); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 884d2da9..b6d1d0cc 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -31,7 +31,7 @@ #include "qscatter3dseries_p.h" #include "qabstract3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QScatterDataProxy @@ -451,4 +451,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr() return static_cast<QScatterDataProxy *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 0a2f73ba..790e37c3 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -35,7 +35,7 @@ Q_MOC_INCLUDE(<QtDataVisualization/qscatter3dseries.h>) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QScatterDataProxyPrivate; class QScatter3DSeries; @@ -92,6 +92,6 @@ private: friend class Scatter3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h index 38a3959a..17d967ff 100644 --- a/src/datavisualization/data/qscatterdataproxy_p.h +++ b/src/datavisualization/data/qscatterdataproxy_p.h @@ -44,7 +44,7 @@ #include "qabstractdataproxy_p.h" #include "qscatterdataitem.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DAxis; @@ -75,6 +75,6 @@ private: friend class QScatterDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp index 83d766bd..94241dbc 100644 --- a/src/datavisualization/data/qsurface3dseries.cpp +++ b/src/datavisualization/data/qsurface3dseries.cpp @@ -30,7 +30,7 @@ #include "qsurface3dseries_p.h" #include "surface3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QSurface3DSeries @@ -553,4 +553,4 @@ void QSurface3DSeriesPrivate::setTexture(const QImage &texture) static_cast<Surface3DController *>(m_controller)->updateSurfaceTexture(qptr()); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index b0b83ea3..eadc6622 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -33,7 +33,7 @@ #include <QtDataVisualization/qabstract3dseries.h> #include <QtDataVisualization/qsurfacedataproxy.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QSurface3DSeriesPrivate; @@ -101,6 +101,6 @@ private: friend class Surface3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h index 33afdce5..16a8cb23 100644 --- a/src/datavisualization/data/qsurface3dseries_p.h +++ b/src/datavisualization/data/qsurface3dseries_p.h @@ -43,7 +43,7 @@ #include "qsurface3dseries.h" #include "qabstract3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QSurface3DSeriesPrivate : public QAbstract3DSeriesPrivate { @@ -74,6 +74,6 @@ private: friend class QSurface3DSeries; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp index a4aeb18d..b35713f7 100644 --- a/src/datavisualization/data/qsurfacedataitem.cpp +++ b/src/datavisualization/data/qsurfacedataitem.cpp @@ -29,7 +29,7 @@ #include "qsurfacedataitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QSurfaceDataItem @@ -150,4 +150,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate() { } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index c4d9f7c8..a4685e3d 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -33,7 +33,7 @@ #include <QtDataVisualization/qdatavisualizationglobal.h> #include <QtGui/QVector3D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QSurfaceDataItemPrivate; @@ -65,6 +65,6 @@ private: QVector3D m_position; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h index 18babd90..6a738f33 100644 --- a/src/datavisualization/data/qsurfacedataitem_p.h +++ b/src/datavisualization/data/qsurfacedataitem_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qsurfacedataitem.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QSurfaceDataItemPrivate { @@ -52,6 +52,6 @@ public: virtual ~QSurfaceDataItemPrivate(); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 50514889..81bbcc63 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -31,7 +31,7 @@ #include "qsurface3dseries_p.h" #include "qabstract3daxis_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QSurfaceDataProxy @@ -634,4 +634,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(surfaceSeries); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 9f767ce2..0b652d97 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -35,7 +35,7 @@ Q_MOC_INCLUDE(<QtDataVisualization/qsurface3dseries.h>) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QSurfaceDataProxyPrivate; class QSurface3DSeries; @@ -101,6 +101,6 @@ private: friend class Surface3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h index bd92c15c..2e772508 100644 --- a/src/datavisualization/data/qsurfacedataproxy_p.h +++ b/src/datavisualization/data/qsurfacedataproxy_p.h @@ -43,7 +43,7 @@ #include "qsurfacedataproxy.h" #include "qabstractdataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DAxis; @@ -80,6 +80,6 @@ private: friend class QSurfaceDataProxy; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index 7cbaa8de..4c51e04a 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -29,7 +29,7 @@ #include "scatteritemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const int noRoleIndex = -1; @@ -241,4 +241,4 @@ void ScatterItemModelHandler::resolveModel() m_proxy->resetArray(m_proxyArray); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h index 41320d0c..e1a0b77b 100644 --- a/src/datavisualization/data/scatteritemmodelhandler_p.h +++ b/src/datavisualization/data/scatteritemmodelhandler_p.h @@ -43,7 +43,7 @@ #include "abstractitemmodelhandler_p.h" #include "qitemmodelscatterdataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterItemModelHandler : public AbstractItemModelHandler { @@ -84,6 +84,6 @@ private: bool m_haveRotationPattern; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp index 61fb85dd..6fea125b 100644 --- a/src/datavisualization/data/scatterrenderitem.cpp +++ b/src/datavisualization/data/scatterrenderitem.cpp @@ -29,7 +29,7 @@ #include "scatterrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE ScatterRenderItem::ScatterRenderItem() : AbstractRenderItem(), @@ -48,4 +48,4 @@ ScatterRenderItem::~ScatterRenderItem() { } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h index 4c0c30a4..d36a01bf 100644 --- a/src/datavisualization/data/scatterrenderitem_p.h +++ b/src/datavisualization/data/scatterrenderitem_p.h @@ -42,7 +42,7 @@ #include "abstractrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterRenderItem : public AbstractRenderItem { @@ -67,6 +67,6 @@ protected: }; typedef QList<ScatterRenderItem> ScatterRenderItemArray; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp index 7121d38a..59bbd4b4 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler.cpp +++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp @@ -29,7 +29,7 @@ #include "surfaceitemmodelhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const int noRoleIndex = -1; @@ -331,4 +331,4 @@ void SurfaceItemModelHandler::resolveModel() m_proxy->resetArray(m_proxyArray); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h index 21dfb0eb..68ec1994 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler_p.h +++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h @@ -43,7 +43,7 @@ #include "abstractitemmodelhandler_p.h" #include "qitemmodelsurfacedataproxy_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class SurfaceItemModelHandler : public AbstractItemModelHandler { @@ -75,6 +75,6 @@ protected: bool m_haveZPosPattern; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp index 38d67a21..53c3f515 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp @@ -30,8 +30,6 @@ //! [3] #include <QtDataVisualization> -using namespace QtDataVisualization; - int main(int argc, char **argv) { qputenv("QSG_RHI_BACKEND", "opengl"); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp index 561028d0..975b0d4e 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp @@ -30,8 +30,6 @@ //! [3] #include <QtDataVisualization> -using namespace QtDataVisualization; - int main(int argc, char **argv) { qputenv("QSG_RHI_BACKEND", "opengl"); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp index 9a8cf931..94fde08f 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp @@ -30,8 +30,6 @@ //! [5] #include <QtDataVisualization> -using namespace QtDataVisualization; - int main(int argc, char **argv) { qputenv("QSG_RHI_BACKEND", "opengl"); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp index 5528be4e..ed798ae4 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp @@ -30,8 +30,6 @@ #include <QtDataVisualization/Q3DBars> #include <QtDataVisualization/Q3DTheme> -using namespace QtDataVisualization; - int main(int argc, char **argv) { //! [0] diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp index 64e7751c..7d41cac4 100644 --- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp @@ -29,8 +29,6 @@ //! [0] #include <QtDataVisualization> - -using namespace QtDataVisualization; //! [0] //! [1] diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index 44049bf3..b433f262 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -50,7 +50,7 @@ \endqml If you intend to use Qt Data Visualization C++ classes in your application, use the - following include and using directives: + following include: \snippet doc_src_qtdatavisualization.cpp 0 diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 726db582..0f368616 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \namespace QtDataVisualization \inmodule QtDataVisualization \brief Contains the classes and enumerations in the Qt Data Visualization module. diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 40cbe88d..3481f4eb 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -41,7 +41,7 @@ #include <QtOpenGL/QOpenGLFramebufferObject> #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) : @@ -1744,4 +1744,4 @@ qreal Abstract3DController::margin() const } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 48a71dd9..5a99ecfc 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -54,7 +54,7 @@ QT_FORWARD_DECLARE_CLASS(QOpenGLFramebufferObject) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Abstract3DRenderer; class QAbstract3DSeries; @@ -435,6 +435,6 @@ private: friend class QAbstract3DGraphPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index b45cd756..54487ba1 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -42,7 +42,7 @@ #include <QtGui/QOffscreenSurface> #include <QtCore/QThread> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Defined in shaderhelper.cpp extern void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg); @@ -1995,4 +1995,4 @@ void Abstract3DRenderer::updateCameraViewport() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index bc7ca819..160225be 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -52,7 +52,7 @@ QT_FORWARD_DECLARE_CLASS(QOffscreenSurface) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class TextureHelper; class Theme; @@ -343,6 +343,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index cdf6c7ac..d6b0e24c 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -31,7 +31,7 @@ #include <QtGui/QFontMetrics> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE AxisRenderCache::AxisRenderCache() : m_type(QAbstract3DAxis::AxisTypeNone), @@ -208,4 +208,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const return labelWidth; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h index bf2e3f70..076fbe56 100644 --- a/src/datavisualization/engine/axisrendercache_p.h +++ b/src/datavisualization/engine/axisrendercache_p.h @@ -44,7 +44,7 @@ #include "drawer_p.h" #include <QtCore/QPointer> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AxisRenderCache : public QObject { @@ -154,6 +154,6 @@ private: Q_DISABLE_COPY(AxisRenderCache) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index a6bfd080..2a007360 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -37,7 +37,7 @@ #include "q3dtheme_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene) : Abstract3DController(boundRect, scene), @@ -730,4 +730,4 @@ QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrient return defaultAxis; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index dc50f773..52943cb0 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Bars3DRenderer; class QBar3DSeries; @@ -173,6 +173,6 @@ private: Q_DISABLE_COPY(Bars3DController) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index bfc0f5c8..952b235a 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -40,7 +40,7 @@ // You should see the scene from where the light is //#define SHOW_DEPTH_TEXTURE_SCENE -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const bool sliceGridLabels = true; @@ -2873,4 +2873,4 @@ void Bars3DRenderer::updateMargin(float margin) calculateSceneScalingFactors(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index afedeef7..6c96c3e2 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -50,7 +50,7 @@ class QPoint; class QSizeF; QT_END_NAMESPACE -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper; class LabelItem; @@ -197,6 +197,6 @@ private: Q_DISABLE_COPY(Bars3DRenderer) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/barseriesrendercache.cpp b/src/datavisualization/engine/barseriesrendercache.cpp index 65bc7a64..5935309c 100644 --- a/src/datavisualization/engine/barseriesrendercache.cpp +++ b/src/datavisualization/engine/barseriesrendercache.cpp @@ -29,7 +29,7 @@ #include "barseriesrendercache_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE BarSeriesRenderCache::BarSeriesRenderCache(QAbstract3DSeries *series, Abstract3DRenderer *renderer) @@ -50,4 +50,4 @@ void BarSeriesRenderCache::cleanup(TextureHelper *texHelper) SeriesRenderCache::cleanup(texHelper); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/barseriesrendercache_p.h b/src/datavisualization/engine/barseriesrendercache_p.h index f4ffd0c5..c725bcfe 100644 --- a/src/datavisualization/engine/barseriesrendercache_p.h +++ b/src/datavisualization/engine/barseriesrendercache_p.h @@ -45,7 +45,7 @@ #include "qbar3dseries_p.h" #include "barrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class BarSeriesRenderCache : public SeriesRenderCache { @@ -67,6 +67,6 @@ protected: int m_visualIndex; // order of the series is relevant }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index 4e5faada..e83a1715 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -50,7 +50,7 @@ public: }; StaticLibInitializer staticLibInitializer; -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Vertex array buffer for point const GLfloat point_data[] = {0.0f, 0.0f, 0.0f}; @@ -452,4 +452,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index 64b84eb2..e662ce26 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -46,7 +46,7 @@ #include "labelitem_p.h" #include "abstractrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper; class ObjectHelper; @@ -115,6 +115,6 @@ private: GLfloat m_scaledFontSize; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 2f2cf63b..53519a4d 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -29,7 +29,7 @@ #include "q3dbars_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DBars @@ -469,4 +469,4 @@ Q3DBars *Q3DBarsPrivate::qptr() return static_cast<Q3DBars *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 6bbe7600..5b782931 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -35,7 +35,7 @@ #include <QtDataVisualization/qcategory3daxis.h> #include <QtDataVisualization/qbar3dseries.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DBarsPrivate; @@ -108,6 +108,6 @@ private: Q_DISABLE_COPY(Q3DBars) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h index d9df2a6f..08ac2803 100644 --- a/src/datavisualization/engine/q3dbars_p.h +++ b/src/datavisualization/engine/q3dbars_p.h @@ -43,7 +43,7 @@ #include "bars3dcontroller_p.h" #include "qabstract3dgraph_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DBars; @@ -63,6 +63,6 @@ public: Bars3DController *m_shared; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 5b359a4e..6a0d224e 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -32,7 +32,7 @@ #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DCamera @@ -939,4 +939,4 @@ QVector3D Q3DCameraPrivate::calculatePositionRelativeToCamera(const QVector3D &r zPos + relativePosition.z()); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index ec146f5d..be1f48de 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/q3dobject.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DCameraPrivate; @@ -137,6 +137,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index 8c45d483..944e408e 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -44,7 +44,7 @@ #include "q3dcamera.h" #include <QtGui/QMatrix4x4> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DCamera; @@ -123,6 +123,6 @@ public: friend class QTouch3DInputHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp index bce35d99..144f2a10 100644 --- a/src/datavisualization/engine/q3dlight.cpp +++ b/src/datavisualization/engine/q3dlight.cpp @@ -29,7 +29,7 @@ #include "q3dlight_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DLight @@ -122,4 +122,4 @@ void Q3DLightPrivate::sync(Q3DLight &other) } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h index 546ac424..8c0a65a0 100644 --- a/src/datavisualization/engine/q3dlight.h +++ b/src/datavisualization/engine/q3dlight.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/q3dobject.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DLightPrivate; @@ -60,6 +60,6 @@ private: friend class Q3DScenePrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h index 6348deb9..54802a35 100644 --- a/src/datavisualization/engine/q3dlight_p.h +++ b/src/datavisualization/engine/q3dlight_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "q3dlight.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DScene; class Q3DLight; @@ -61,7 +61,7 @@ public: bool m_automaticLight; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp index 099fa2f0..5e7b039a 100644 --- a/src/datavisualization/engine/q3dobject.cpp +++ b/src/datavisualization/engine/q3dobject.cpp @@ -30,7 +30,7 @@ #include "q3dobject_p.h" #include "q3dscene_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! \class Q3DObject @@ -155,4 +155,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate() } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index 812e89cb..2b93e3aa 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -36,7 +36,7 @@ Q_MOC_INCLUDE(<QtDataVisualization/q3dscene.h>) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DObjectPrivate; class Q3DScene; @@ -73,6 +73,6 @@ private: friend class Q3DScenePrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h index ef1f2371..4b25cb7d 100644 --- a/src/datavisualization/engine/q3dobject_p.h +++ b/src/datavisualization/engine/q3dobject_p.h @@ -42,7 +42,7 @@ #include "datavisualizationglobal_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DObject; class Q3DScene; @@ -59,6 +59,6 @@ public: bool m_isDirty; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index b16b2513..37834322 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -30,7 +30,7 @@ #include "q3dscatter.h" #include "q3dscatter_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DScatter @@ -306,5 +306,5 @@ Q3DScatter *Q3DScatterPrivate::qptr() return static_cast<Q3DScatter *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index 9067ee0f..3a163aef 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -34,7 +34,7 @@ #include <QtDataVisualization/qvalue3daxis.h> #include <QtDataVisualization/qscatter3dseries.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DScatterPrivate; @@ -78,6 +78,6 @@ private: Q_DISABLE_COPY(Q3DScatter) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h index 424a0bd1..5a534b08 100644 --- a/src/datavisualization/engine/q3dscatter_p.h +++ b/src/datavisualization/engine/q3dscatter_p.h @@ -43,7 +43,7 @@ #include "scatter3dcontroller_p.h" #include "qabstract3dgraph_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DScatter; @@ -63,6 +63,6 @@ public: Scatter3DController *m_shared; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 75437c9c..1c1d4954 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -31,7 +31,7 @@ #include "q3dcamera_p.h" #include "q3dlight_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DScene @@ -832,4 +832,4 @@ bool Q3DScenePrivate::isInArea(const QRect &area, int x, int y) const return ( x >= areaMinX && x <= areaMaxX && y >= areaMinY && y <= areaMaxY ); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index de71255d..23884478 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -36,7 +36,7 @@ #include <QtCore/QObject> #include <QtCore/QRect> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DScenePrivate; @@ -121,6 +121,6 @@ private: friend class Q3DObject; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h index 4056e89d..48124e1c 100644 --- a/src/datavisualization/engine/q3dscene_p.h +++ b/src/datavisualization/engine/q3dscene_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "q3dscene.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DCamera; class Q3DLight; @@ -133,6 +133,6 @@ public: QRect m_defaultLargeViewport; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index f3fac1c7..0c3e401d 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -30,7 +30,7 @@ #include "q3dsurface.h" #include "q3dsurface_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DSurface @@ -356,4 +356,4 @@ Q3DSurface *Q3DSurfacePrivate::qptr() return static_cast<Q3DSurface *>(q_ptr); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 48a27c4f..ae1d67d4 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -34,7 +34,7 @@ #include <QtDataVisualization/qvalue3daxis.h> #include <QtDataVisualization/qsurface3dseries.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DSurfacePrivate; @@ -83,6 +83,6 @@ private: Q_DISABLE_COPY(Q3DSurface) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h index 2ca65194..db2ade45 100644 --- a/src/datavisualization/engine/q3dsurface_p.h +++ b/src/datavisualization/engine/q3dsurface_p.h @@ -43,7 +43,7 @@ #include "surface3dcontroller_p.h" #include "qabstract3dgraph_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DSurface; @@ -63,6 +63,6 @@ public: Surface3DController *m_shared; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index cb972779..78f3a7c5 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -45,7 +45,7 @@ #include <qpa/qplatformnativeinterface.h> #endif -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QAbstract3DGraph @@ -186,7 +186,7 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor // Make sure renderable type is correct surfaceFormat.setRenderableType(QSurfaceFormat::DefaultRenderableType); } else { - surfaceFormat = qDefaultSurfaceFormat(); + surfaceFormat = QtDataVisualization::qDefaultSurfaceFormat(); } d_ptr->m_context = new QOpenGLContext(this); @@ -1198,4 +1198,4 @@ QImage QAbstract3DGraphPrivate::renderToImage(int msaaSamples, const QSize &imag return image; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index a373f9f3..fd8610fa 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -38,7 +38,7 @@ #include <QtGui/QOpenGLFunctions> #include <QtCore/QLocale> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DGraphPrivate; class QCustom3DItem; @@ -241,6 +241,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::SelectionFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::OptimizationHints) -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h index 88962a6b..9eff32ee 100644 --- a/src/datavisualization/engine/qabstract3dgraph_p.h +++ b/src/datavisualization/engine/qabstract3dgraph_p.h @@ -47,7 +47,7 @@ class QOpenGLContext; class QOffscreenSurface; QT_END_NAMESPACE -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DGraph; class Abstract3DController; @@ -86,6 +86,6 @@ public: bool m_initialized; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index 365617e0..f78aa387 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -34,7 +34,7 @@ #include "qscatter3dseries_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const int insertRemoveRecordReserveSize = 31; @@ -485,4 +485,4 @@ void Scatter3DController::adjustAxisRanges() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 47231267..c4a73aea 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Scatter3DRenderer; class QScatterDataProxy; @@ -148,6 +148,6 @@ private: Q_DISABLE_COPY(Scatter3DController) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 5255b51e..cb0e780d 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -42,7 +42,7 @@ // You should see the scene from where the light is //#define SHOW_DEPTH_TEXTURE_SCENE -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const GLfloat defaultMinSize = 0.01f; const GLfloat defaultMaxSize = 0.1f; @@ -2528,4 +2528,4 @@ QVector3D Scatter3DRenderer::convertPositionToTranslation(const QVector3D &posit return QVector3D(xTrans, yTrans, zTrans); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index d41e3e0a..ce43aa9e 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -47,7 +47,7 @@ QT_FORWARD_DECLARE_CLASS(QSizeF) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper; class Q3DScene; @@ -158,6 +158,6 @@ private: Q_DISABLE_COPY(Scatter3DRenderer) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/scatterseriesrendercache.cpp b/src/datavisualization/engine/scatterseriesrendercache.cpp index ba511f6c..dbe9fad6 100644 --- a/src/datavisualization/engine/scatterseriesrendercache.cpp +++ b/src/datavisualization/engine/scatterseriesrendercache.cpp @@ -31,7 +31,7 @@ #include "scatterobjectbufferhelper_p.h" #include "scatterpointbufferhelper_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE ScatterSeriesRenderCache::ScatterSeriesRenderCache(QAbstract3DSeries *series, Abstract3DRenderer *renderer) @@ -60,4 +60,4 @@ void ScatterSeriesRenderCache::cleanup(TextureHelper *texHelper) SeriesRenderCache::cleanup(texHelper); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/scatterseriesrendercache_p.h b/src/datavisualization/engine/scatterseriesrendercache_p.h index 94832918..32752fc1 100644 --- a/src/datavisualization/engine/scatterseriesrendercache_p.h +++ b/src/datavisualization/engine/scatterseriesrendercache_p.h @@ -45,7 +45,7 @@ #include "qscatter3dseries_p.h" #include "scatterrenderitem_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterObjectBufferHelper; class ScatterPointBufferHelper; @@ -93,6 +93,6 @@ protected: bool m_visibilityChanged; // Used to detect if full buffer change needed }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index be4a52a9..4f7d2bf0 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -34,7 +34,7 @@ #include "q3dcamera_p.h" #include "utils_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const GLfloat sliceUnits = 2.5; @@ -305,4 +305,4 @@ void SelectionPointer::initShaders() m_pointShader->initialize(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index 0ba9b53a..bdb1d24c 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "surface3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper; class ObjectHelper; @@ -95,6 +95,6 @@ private: QQuaternion m_rotation; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp index 29c7a633..8fd1a7e1 100644 --- a/src/datavisualization/engine/seriesrendercache.cpp +++ b/src/datavisualization/engine/seriesrendercache.cpp @@ -32,7 +32,7 @@ #include "texturehelper_p.h" #include "utils_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const QString smoothString(QStringLiteral("Smooth")); @@ -206,4 +206,4 @@ void SeriesRenderCache::cleanup(TextureHelper *texHelper) } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h index c0932a4c..09547523 100644 --- a/src/datavisualization/engine/seriesrendercache_p.h +++ b/src/datavisualization/engine/seriesrendercache_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dseries_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Abstract3DRenderer; class ObjectHelper; @@ -110,7 +110,7 @@ protected: bool m_staticObjectUVDirty; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index ba845ac1..d79e8162 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -34,7 +34,7 @@ #include "qsurface3dseries_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE Surface3DController::Surface3DController(QRect rect, Q3DScene *scene) : Abstract3DController(rect, scene), @@ -602,4 +602,4 @@ void Surface3DController::adjustAxisRanges() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 1177f77d..78fa06c6 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -43,7 +43,7 @@ #include "abstract3dcontroller_p.h" #include "datavisualizationglobal_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Surface3DRenderer; class QSurface3DSeries; @@ -141,6 +141,6 @@ private: Q_DISABLE_COPY(Surface3DController) }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index ea4f23e7..0f977490 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -37,7 +37,7 @@ static const int ID_TO_RGBA_MASK = 0xff; -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE //#define SHOW_DEPTH_TEXTURE_SCENE @@ -3062,4 +3062,4 @@ void Surface3DRenderer::updateMargin(float margin) calculateSceneScalingFactors(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 9c45cdb5..957f44d2 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -45,7 +45,7 @@ #include "abstract3drenderer_p.h" #include "surfaceseriesrendercache_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper; class Q3DScene; @@ -164,6 +164,6 @@ private: friend class SurfaceObject; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/engine/surfaceseriesrendercache.cpp b/src/datavisualization/engine/surfaceseriesrendercache.cpp index 3d2b7363..918d0fb6 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache.cpp +++ b/src/datavisualization/engine/surfaceseriesrendercache.cpp @@ -31,7 +31,7 @@ #include "surface3drenderer_p.h" #include "texturehelper_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE SurfaceSeriesRenderCache::SurfaceSeriesRenderCache(QAbstract3DSeries *series, Surface3DRenderer *renderer) @@ -95,4 +95,4 @@ void SurfaceSeriesRenderCache::cleanup(TextureHelper *texHelper) SeriesRenderCache::cleanup(texHelper); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/engine/surfaceseriesrendercache_p.h b/src/datavisualization/engine/surfaceseriesrendercache_p.h index 4741e568..c8e89c8d 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache_p.h +++ b/src/datavisualization/engine/surfaceseriesrendercache_p.h @@ -48,7 +48,7 @@ #include <QtGui/QMatrix4x4> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Surface3DRenderer; @@ -121,6 +121,6 @@ protected: GLuint m_surfaceTexture; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index 7c1b7815..2302105a 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -47,7 +47,7 @@ #include <QtGui/QQuaternion> #include <QtCore/QDebug> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Constants used in several files // Distance from camera to origin @@ -84,6 +84,6 @@ static const GLfloat uniformTextureWidth = 2.0f; static const GLfloat labelMargin = 0.05f; static const GLfloat gridLineWidth = 0.005f; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 1755ba21..8ff90243 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -52,12 +52,4 @@ # define QT_DATAVISUALIZATION_EXPORT #endif -#ifndef Q_CLANG_QDOC -#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { -#define QT_END_NAMESPACE_DATAVISUALIZATION } -#else /* Let documentation be generated with the standard Qt namespace */ -#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION QT_BEGIN_NAMESPACE -#define QT_END_NAMESPACE_DATAVISUALIZATION QT_END_NAMESPACE -#endif // Q_CLANG_QDOC - #endif diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 3d5dd059..ce205bf6 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -31,7 +31,7 @@ #include "q3dinputhandler_p.h" #include "abstract3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const int halfSizeZoomLevel = 50; static const int oneToOneZoomLevel = 100; @@ -435,4 +435,4 @@ void Q3DInputHandlerPrivate::handleQueriedGraphPositionChange() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index bbc3ff0f..6e6d1845 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/qabstract3dinputhandler.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DInputHandlerPrivate; @@ -77,6 +77,6 @@ private: QScopedPointer<Q3DInputHandlerPrivate> d_ptr; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h index 248bd594..addd65fa 100644 --- a/src/datavisualization/input/q3dinputhandler_p.h +++ b/src/datavisualization/input/q3dinputhandler_p.h @@ -43,7 +43,7 @@ #include "qabstract3dinputhandler_p.h" #include "q3dinputhandler.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Abstract3DController; @@ -77,6 +77,6 @@ protected: friend class Q3DInputHandler; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 2809bee3..d439b793 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -29,7 +29,7 @@ #include "qabstract3dinputhandler_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class QAbstract3DInputHandler @@ -259,4 +259,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate() } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 21cabc47..c6e358c3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -38,7 +38,7 @@ #include <QtGui/QMouseEvent> #include <QtGui/QTouchEvent> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DInputHandlerPrivate; @@ -101,6 +101,6 @@ private: friend class QTouch3DInputHandlerPrivate; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index ee43fb37..c6fe14b3 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dinputhandler.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DInputHandler; class Q3DScene; @@ -77,6 +77,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index ce059dd1..5254d044 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -31,7 +31,7 @@ #include <QtCore/QTimer> #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static const float maxTapAndHoldJitter = 20.0f; static const int maxPinchJitter = 10; @@ -278,4 +278,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h index 8ef0fcbb..51f2e073 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.h +++ b/src/datavisualization/input/qtouch3dinputhandler.h @@ -32,7 +32,7 @@ #include <QtDataVisualization/q3dinputhandler.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QTouch3DInputHandlerPrivate; @@ -53,6 +53,6 @@ private: QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index 940c7653..fd94c12a 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -45,7 +45,7 @@ QT_FORWARD_DECLARE_CLASS(QTimer) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QAbstract3DInputHandler; @@ -71,6 +71,6 @@ public: QPointF m_touchHoldPos; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index 46a7a5c3..25f2f7c1 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -30,7 +30,7 @@ #include "q3dtheme_p.h" #include "thememanager_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DTheme @@ -1203,4 +1203,4 @@ bool Q3DThemePrivate::sync(Q3DThemePrivate &other) return updateDrawer; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index e0a49631..4023bc16 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -36,7 +36,7 @@ #include <QtGui/QFont> #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DThemePrivate; @@ -197,6 +197,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index 6061fd38..94d5f4ae 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "q3dtheme.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE struct Q3DThemeDirtyBitField { bool baseColorDirty : 1; @@ -155,6 +155,6 @@ protected: Q3DTheme *q_ptr; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index 01c7c10b..4f469506 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -30,7 +30,7 @@ #include "thememanager_p.h" #include "q3dtheme_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes const float defaultColorLevel = 0.5f; // for built-in uniform themes @@ -601,4 +601,4 @@ void ThemeManager::setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style) theme->setColorStyle(style); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h index 2e0be5f0..a04a0d49 100644 --- a/src/datavisualization/theme/thememanager_p.h +++ b/src/datavisualization/theme/thememanager_p.h @@ -44,7 +44,7 @@ #include "abstract3dcontroller_p.h" #include "q3dtheme.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ThemeManager : public QObject { @@ -92,6 +92,6 @@ private: Abstract3DController *m_controller; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index db0318ce..2510a65b 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -29,7 +29,7 @@ #include "abstractobjecthelper_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE AbstractObjectHelper::AbstractObjectHelper() : m_vertexbuffer(0), @@ -85,4 +85,4 @@ GLuint AbstractObjectHelper::indexCount() return m_indexCount; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h index cb03b156..2a51d001 100644 --- a/src/datavisualization/utils/abstractobjecthelper_p.h +++ b/src/datavisualization/utils/abstractobjecthelper_p.h @@ -42,7 +42,7 @@ #include "datavisualizationglobal_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AbstractObjectHelper: protected QOpenGLFunctions { @@ -67,6 +67,6 @@ public: GLboolean m_meshDataLoaded; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 38091b49..05ba7c98 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -32,7 +32,7 @@ #include <QtCore/qmath.h> #include <QtGui/QMatrix4x4> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE CameraHelper::CameraHelper(QObject *parent) : QObject(parent), @@ -265,4 +265,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset) } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h index fd28e3e6..26c7ee38 100644 --- a/src/datavisualization/utils/camerahelper_p.h +++ b/src/datavisualization/utils/camerahelper_p.h @@ -48,7 +48,7 @@ class QMatrix4x4; class QPoint; QT_END_NAMESPACE -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class CameraHelper : public QObject { @@ -95,6 +95,6 @@ public: void setCameraPreset(Q3DCamera::CameraPreset preset); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 2069b444..274d4a13 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -34,7 +34,7 @@ #include <QtCore/QList> #include <QtGui/QVector2D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE QString slashTag = QStringLiteral("/"); @@ -123,4 +123,4 @@ bool MeshLoader::loadOBJ(const QString &path, QList<QVector3D> &out_vertices, return true; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h index e8f60ffc..7479f19e 100644 --- a/src/datavisualization/utils/meshloader_p.h +++ b/src/datavisualization/utils/meshloader_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include <QtGui/QVector2D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class MeshLoader { @@ -52,6 +52,6 @@ class MeshLoader QList<QVector2D> &out_uvs, QList<QVector3D> &out_normals); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index 410a22d7..f8fa01de 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -31,7 +31,7 @@ #include "vertexindexer_p.h" #include "objecthelper_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile) @@ -177,4 +177,4 @@ void ObjectHelper::load() m_meshDataLoaded = true; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index d1c2ea78..d642bc3b 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "abstractobjecthelper_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Abstract3DRenderer; @@ -76,6 +76,6 @@ private: QList<QVector3D> m_indexedNormals; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp index 8e06617b..04aa350a 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp +++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp @@ -33,7 +33,7 @@ #include <QtGui/QMatrix4x4> #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const GLfloat itemScaler = 3.0f; @@ -386,4 +386,4 @@ void ScatterObjectBufferHelper::update(ScatterSeriesRenderCache *cache, qreal do m_meshDataLoaded = true; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/scatterobjectbufferhelper_p.h b/src/datavisualization/utils/scatterobjectbufferhelper_p.h index fac5e922..2f9dfd7d 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper_p.h +++ b/src/datavisualization/utils/scatterobjectbufferhelper_p.h @@ -44,7 +44,7 @@ #include "abstractobjecthelper_p.h" #include "scatterseriesrendercache_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterObjectBufferHelper : public AbstractObjectHelper { @@ -65,6 +65,6 @@ private: float m_scaleY; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp index d3621423..751e5639 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper.cpp +++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp @@ -30,7 +30,7 @@ #include "scatterpointbufferhelper_p.h" #include <QtGui/QVector2D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const QVector3D hiddenPos(-1000.0f, -1000.0f, -1000.0f); @@ -215,4 +215,4 @@ void ScatterPointBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache * } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h index d1e8f5b0..0240b529 100644 --- a/src/datavisualization/utils/scatterpointbufferhelper_p.h +++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h @@ -44,7 +44,7 @@ #include "abstractobjecthelper_p.h" #include "scatterseriesrendercache_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ScatterPointBufferHelper : public AbstractObjectHelper { @@ -73,6 +73,6 @@ private: float m_scaleY; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index 113eefd3..31535225 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -31,7 +31,7 @@ #include <QtOpenGL/QOpenGLShader> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -421,4 +421,4 @@ GLint ShaderHelper::normalAtt() return m_normalAttr; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index c4e4a717..e00e16c7 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -44,7 +44,7 @@ QT_FORWARD_DECLARE_CLASS(QOpenGLShaderProgram) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ShaderHelper { @@ -146,6 +146,6 @@ class ShaderHelper GLboolean m_initialized; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 96a75422..6734ac86 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -32,7 +32,7 @@ #include <QtGui/QVector2D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE SurfaceObject::SurfaceObject(Surface3DRenderer *renderer) : m_axisCacheX(renderer->m_axisCacheX), @@ -992,4 +992,4 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV return normal; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 6193d98e..4532a671 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -46,7 +46,7 @@ #include <QtCore/QRect> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Surface3DRenderer; class AxisRenderCache; @@ -131,6 +131,6 @@ private: SurfaceObject::DataDimensions m_oldDataDimension = DataDimensions(-1); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index d424234c..bc1bc4c6 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -34,7 +34,7 @@ #include <QtGui/QPainter> #include <QtCore/QTime> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE // Defined in shaderhelper.cpp extern void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg); @@ -483,4 +483,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index b9a4fa92..8a4c7694 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -48,7 +48,7 @@ # include <QtOpenGL/QOpenGLFunctions_2_1> #endif -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class TextureHelper : protected QOpenGLFunctions { @@ -86,6 +86,6 @@ class TextureHelper : protected QOpenGLFunctions friend class Abstract3DRenderer; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 6b4c9727..7d5a4c08 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -36,7 +36,7 @@ #include <QtCore/QRegularExpression> #include <QLocale> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE #define NUM_IN_POWER(y, x) for (;y<x;y<<=1) #define MIN_POWER 2 @@ -389,4 +389,4 @@ void Utils::resolveStatics() staticsResolved = true; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 08f036c8..afeed6d3 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -44,7 +44,7 @@ QT_FORWARD_DECLARE_CLASS(QLinearGradient) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Utils { @@ -87,6 +87,6 @@ private: static ParamType mapFormatCharToParamType(char formatSpec); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index 5b770366..a96a7756 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -31,7 +31,7 @@ #include <QtCore/qmath.h> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE int unique_vertices = 0; @@ -78,4 +78,4 @@ void VertexIndexer::indexVBO(const QList<QVector3D> &in_vertices, const QList<QV } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h index 42a48465..2f4809bf 100644 --- a/src/datavisualization/utils/vertexindexer_p.h +++ b/src/datavisualization/utils/vertexindexer_p.h @@ -45,7 +45,7 @@ #include <QtCore/QList> #include <QtGui/QVector2D> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class VertexIndexer { @@ -70,6 +70,6 @@ private: GLuint &result); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index daec035e..d0830f70 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -44,7 +44,7 @@ #include "glstatestore_p.h" #endif -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static QList<const QQuickWindow *> clearList; static QHash<AbstractDeclarative *, QQuickWindow *> graphWindowList; @@ -849,4 +849,4 @@ void AbstractDeclarative::destroyContext() } } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 72622d35..f0ebf4cf 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -52,7 +52,7 @@ class GLStateStore; -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class AbstractDeclarative : public QQuickItem { @@ -305,6 +305,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::SelectionFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::OptimizationHints) -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index edcca2ec..3f6881b0 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -29,7 +29,7 @@ #include "colorgradient_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE ColorGradientStop::ColorGradientStop(QObject *parent) : QObject(parent) @@ -85,4 +85,4 @@ void ColorGradient::doUpdate() emit updated(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index 6973ac4b..3e5162a7 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -44,7 +44,7 @@ #include <QtGui/QColor> #include <QtQml/QQmlListProperty> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ColorGradientStop : public QObject { @@ -94,6 +94,6 @@ Q_SIGNALS: void updated(); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index a54971cc..9a92e42c 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -113,7 +113,7 @@ QML_DECLARE_TYPE(QCustom3DItem) QML_DECLARE_TYPE(QCustom3DLabel) QML_DECLARE_TYPE(QCustom3DVolume) -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE @@ -234,5 +234,5 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) qmlRegisterModule(uri, 1, 15); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 73c7b1e1..9c6074ce 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -33,11 +33,7 @@ #include <QtQml/QQmlExtensionPlugin> #include "datavisualizationglobal_p.h" -using namespace QtDataVisualization; - - - -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin { @@ -49,7 +45,7 @@ public: void registerTypes(const char *uri) override; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif // DATAVISUALIZATIONQML2_PLUGIN_H diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 88a80058..fe90e159 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -30,7 +30,7 @@ #include "declarativebars_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeBars::DeclarativeBars(QQuickItem *parent) : AbstractDeclarative(parent), @@ -230,4 +230,4 @@ void DeclarativeBars::handleAxisZChanged(QAbstract3DAxis *axis) emit rowAxisChanged(static_cast<QCategory3DAxis *>(axis)); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index f7db771b..97359ede 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -44,7 +44,7 @@ #include "abstractdeclarative_p.h" #include "bars3dcontroller_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class DeclarativeBars : public AbstractDeclarative { @@ -122,6 +122,6 @@ private: Bars3DController *m_barsController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml2/declarativecolor.cpp index 0c0a1f6c..177c0fbe 100644 --- a/src/datavisualizationqml2/declarativecolor.cpp +++ b/src/datavisualizationqml2/declarativecolor.cpp @@ -29,7 +29,7 @@ #include "declarativecolor_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeColor::DeclarativeColor(QObject *parent) : QObject(parent) @@ -49,4 +49,4 @@ QColor DeclarativeColor::color() const return m_color; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 1ea66530..54be5397 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class DeclarativeColor : public QObject { @@ -63,6 +63,6 @@ private: QColor m_color; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index d262f63f..f99e1375 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -32,7 +32,7 @@ #include <QtOpenGL/QOpenGLFramebufferObject> #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeRenderNode::DeclarativeRenderNode(AbstractDeclarative *declarative, const QSharedPointer<QMutex> &nodeMutex) @@ -180,4 +180,4 @@ void DeclarativeRenderNode::handleControllerDestroyed() m_controller = 0; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h index 99ae2aac..4e3653f7 100644 --- a/src/datavisualizationqml2/declarativerendernode_p.h +++ b/src/datavisualizationqml2/declarativerendernode_p.h @@ -49,7 +49,7 @@ #include <QtCore/QSharedPointer> #include <QtCore/QObject> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Abstract3DController; class AbstractDeclarative; @@ -97,6 +97,6 @@ private: }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 287ca964..1417bc6d 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -30,7 +30,7 @@ #include "declarativescatter_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeScatter::DeclarativeScatter(QQuickItem *parent) : AbstractDeclarative(parent), @@ -149,4 +149,4 @@ void DeclarativeScatter::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index 6c88b121..348112f2 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -45,7 +45,7 @@ #include "scatter3dcontroller_p.h" #include "qscatter3dseries.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class DeclarativeScatter : public AbstractDeclarative { @@ -93,6 +93,6 @@ protected: Scatter3DController *m_scatterController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativescene.cpp b/src/datavisualizationqml2/declarativescene.cpp index 54bb52da..f4e5ae00 100644 --- a/src/datavisualizationqml2/declarativescene.cpp +++ b/src/datavisualizationqml2/declarativescene.cpp @@ -29,7 +29,7 @@ #include "declarativescene_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE Declarative3DScene::Declarative3DScene(QObject *parent) : Q3DScene(parent) @@ -57,4 +57,4 @@ QPoint Declarative3DScene::invalidSelectionPoint() const return Q3DScene::invalidSelectionPoint(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h index b4c03e26..70e3da82 100644 --- a/src/datavisualizationqml2/declarativescene_p.h +++ b/src/datavisualizationqml2/declarativescene_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "q3dscene.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Declarative3DScene : public Q3DScene { @@ -66,6 +66,6 @@ Q_SIGNALS: void selectionQueryPositionChanged(const QPointF position); }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 119c960a..38263a32 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -30,7 +30,7 @@ #include "declarativeseries_p.h" #include <QtCore/QMetaMethod> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type) @@ -359,4 +359,4 @@ void DeclarativeSurface3DSeries::handleMultiHighlightGradientUpdate() setSeriesGradient(this, *m_multiHighlightGradient, GradientTypeMulti); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index 3c070006..5f5a535a 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -47,7 +47,7 @@ #include "colorgradient_p.h" #include <QtQml/QQmlListProperty> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE enum GradientType { GradientTypeBase, @@ -196,6 +196,6 @@ private: ColorGradient *m_multiHighlightGradient; // Not owned }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 580390bb..d422992a 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -30,7 +30,7 @@ #include "declarativesurface_p.h" #include <QtCore/QMutexLocker> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), @@ -161,4 +161,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 5b9bb8fa..c8720519 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -45,7 +45,7 @@ #include "surface3dcontroller_p.h" #include "qsurface3dseries.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class DeclarativeSurface : public AbstractDeclarative { @@ -97,6 +97,6 @@ private: Surface3DController *m_surfaceController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp index 7d65c586..282f14b1 100644 --- a/src/datavisualizationqml2/declarativetheme.cpp +++ b/src/datavisualizationqml2/declarativetheme.cpp @@ -29,7 +29,7 @@ #include "declarativetheme_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent) : Q3DTheme(parent), @@ -409,4 +409,4 @@ void DeclarativeTheme3D::clearBaseGradientsFunc(QQmlListProperty<ColorGradient> reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients(); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 8562b982..11623406 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -47,7 +47,7 @@ #include <QtQml/QQmlParserStatus> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus { @@ -134,6 +134,6 @@ private: bool m_dummyColors; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |