qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid initializing QFlags with 0 or nullptr 

It is being deprecated.

Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Friedemann Kleint 2019-11-26 08:11:31 +01:00
parent daf6381fd1
commit 309066052e
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/datavisualization/utils/surfaceobject.cpp
View File

@ -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);

12
src/datavisualization/utils/surfaceobject_p.h
View File

@ -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