kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: modernize C++11

Browse Source 
* use nullptr
This commit is contained in:
wmayer
2022-03-23 18:41:21 +01:00
parent be7e18757c
commit 1178df06b4
239 changed files with 1197 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Gui/NaviCube.cpp
View File

@@ -269,7 +269,7 @@ NaviCubeImplementation::NaviCubeImplementation(
OnChange(*hGrp, "ButtonColor");
OnChange(*hGrp, "CubeSize");
m_PickingFramebuffer = NULL;
m_PickingFramebuffer = nullptr;
m_Menu = createNaviCubeMenu();
}
@@ -669,7 +669,7 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) {
// first create front and backside of faces
float gap = 0.12f;
m_Textures[TEX_FRONT_FACE] = createCubeFaceTex(gl, gap, NULL, SHAPE_SQUARE);
m_Textures[TEX_FRONT_FACE] = createCubeFaceTex(gl, gap, nullptr, SHAPE_SQUARE);
vector<string> labels = NaviCubeImplementation::m_labels;
@@ -721,7 +721,7 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) {
addFace(x, z, TEX_BOTTOM, TEX_FRONT_FACE, TEX_BOTTOM, true);
// add corner faces
m_Textures[TEX_CORNER_FACE] = createCubeFaceTex(gl, gap, NULL, SHAPE_CORNER);
m_Textures[TEX_CORNER_FACE] = createCubeFaceTex(gl, gap, nullptr, SHAPE_CORNER);
// we need to rotate to the edge, thus matrix for rotation angle of 54.7 deg
cs = cos(atan(sqrt(2.0)));
sn = sin(atan(sqrt(2.0)));
@@ -758,7 +758,7 @@ void NaviCubeImplementation::initNaviCube(QtGLWidget* gl) {
addFace(x, z, TEX_CORNER_FACE, TEX_CORNER_FACE, TEX_TOP_REAR_RIGHT);
// add edge faces
m_Textures[TEX_EDGE_FACE] = createCubeFaceTex(gl, gap, NULL, SHAPE_EDGE);
m_Textures[TEX_EDGE_FACE] = createCubeFaceTex(gl, gap, nullptr, SHAPE_EDGE);
// first back to top side
x[0] = 1; x[1] = 0; x[2] = 0;
z[0] = 0; z[1] = 0; z[2] = 1;
@@ -872,7 +872,7 @@ void NaviCubeImplementation::drawNaviCube(bool pickMode) {
// FIXME actually now that we have Qt5, we could probably do this earlier (as we do not need the opengl context)
if (!m_NaviCubeInitialised) {
QtGLWidget* gl = static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport());
if (gl == NULL)
if (gl == nullptr)
return;
initNaviCube(gl);
m_NaviCubeInitialised = true;