diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-26 08:11:31 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-26 08:56:24 +0100 |
commit | 309066052eec6cafa8ef7ac5d165fe328ef0e509 (patch) | |
tree | 0920904fbaba97e122a3d364a118af147758f204 /src | |
parent | daf6381fd18fad67765e5127bf9502f1acd55b4e (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 11 | ||||
-rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 12 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 6e15d081..f9e4181e 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -35,17 +35,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION SurfaceObject::SurfaceObject(Surface3DRenderer *renderer) - : m_surfaceType(Undefined), - m_columns(0), - m_rows(0), - m_gridIndexCount(0), - m_axisCacheX(renderer->m_axisCacheX), + : m_axisCacheX(renderer->m_axisCacheX), m_axisCacheY(renderer->m_axisCacheY), m_axisCacheZ(renderer->m_axisCacheZ), - m_renderer(renderer), - m_returnTextureBuffer(false), - m_dataDimension(0), - m_oldDataDimension(-1) + m_renderer(renderer) { glGenBuffers(1, &m_vertexbuffer); glGenBuffers(1, &m_normalbuffer); diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index a42fe244..41b6ad5f 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -111,11 +111,11 @@ private: bool flipXZ); private: - SurfaceType m_surfaceType; - int m_columns; - int m_rows; + SurfaceType m_surfaceType = Undefined; + int m_columns = 0; + int m_rows = 0; GLuint m_gridElementbuffer; - GLuint m_gridIndexCount; + GLuint m_gridIndexCount = 0; QVector<QVector3D> m_vertices; QVector<QVector3D> m_normals; // Caches are not owned @@ -126,9 +126,9 @@ private: float m_minY; float m_maxY; GLuint m_uvTextureBuffer; - bool m_returnTextureBuffer; + bool m_returnTextureBuffer = false; SurfaceObject::DataDimensions m_dataDimension; - SurfaceObject::DataDimensions m_oldDataDimension; + SurfaceObject::DataDimensions m_oldDataDimension = DataDimensions(-1); }; QT_END_NAMESPACE_DATAVISUALIZATION |