diff options
Diffstat (limited to 'src/datavisualization/data')
8 files changed, 8 insertions, 9 deletions
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index 9bdd8683..64e61838 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -65,6 +65,8 @@ private: Q_DISABLE_COPY(AbstractItemModelHandler) }; +static constexpr int noRoleIndex = -1; + QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp index dfc0640e..4a8c8faa 100644 --- a/src/datavisualization/data/baritemmodelhandler.cpp +++ b/src/datavisualization/data/baritemmodelhandler.cpp @@ -5,8 +5,6 @@ QT_BEGIN_NAMESPACE -static const int noRoleIndex = -1; - BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index 64979781..74e23cc9 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE * item models where doing search and replace is not necessary to get the desired values. * * For example about using the search patterns in conjunction with the roles, see - * \l{Qt Quick 2 Bars Example}. + * \l{Simple Bar Graph} example. * * \sa {Qt Data Visualization Data Handling} */ diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index 556cd06b..63392cc0 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE * item models where doing search and replace is not necessary to get the desired values. * * For example about using the search patterns in conjunction with the roles, see - * ItemModelBarDataProxy usage in \l{Qt Quick 2 Bars Example}. + * ItemModelBarDataProxy usage in \l{Simple Bar Graph} example. * * \sa {Qt Data Visualization Data Handling} */ diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index ef648f4f..75fe3691 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE * item models where doing search and replace is not necessary to get the desired values. * * For example about using the search patterns in conjunction with the roles, see - * ItemModelBarDataProxy usage in \l{Qt Quick 2 Bars Example}. + * ItemModelBarDataProxy usage in \l{Simple Bar Graph} example. * * \sa {Qt Data Visualization Data Handling} */ diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index 8ddb138a..60804e8f 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -30,6 +30,7 @@ public: DrawSurface = 2, DrawSurfaceAndWireframe = DrawWireframe | DrawSurface }; + Q_ENUM(DrawFlag) Q_DECLARE_FLAGS(DrawFlags, DrawFlag) explicit QSurface3DSeries(QObject *parent = nullptr); @@ -80,6 +81,8 @@ private: friend class Surface3DController; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QSurface3DSeries::DrawFlags) + QT_END_NAMESPACE #endif diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index d7e61a92..8aa4ba7d 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -5,8 +5,6 @@ QT_BEGIN_NAMESPACE -static const int noRoleIndex = -1; - ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp index 31af3f6e..bdec0308 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler.cpp +++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp @@ -5,8 +5,6 @@ QT_BEGIN_NAMESPACE -static const int noRoleIndex = -1; - SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), |