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

Qt4's qglobal.h defined TRUE and FALSE. Qt5 does not do it anymore. Replace it with true and false.

Browse Source 
158f39ec78

This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-21 06:15:07 +01:00
committed by wmayer
parent db345cb624
commit 7d0e892d36
96 changed files with 560 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Mod/Mesh/Gui/SoFCMeshObject.cpp
View File

@@ -176,7 +176,7 @@ void SoSFMeshObject::initClass()
SO_SFIELD_INIT_CLASS(SoSFMeshObject, SoSField);
}
// This reads the value of a field from a file. It returns FALSE if the value could not be read
// This reads the value of a field from a file. It returns false if the value could not be read
// successfully.
SbBool SoSFMeshObject::readValue(SoInput *in)
{
@@ -191,7 +191,7 @@ SbBool SoSFMeshObject::readValue(SoInput *in)
// during initial scene graph import.
this->valueChanged();
return TRUE;
return true;
}
int32_t countPt;
@@ -235,7 +235,7 @@ SbBool SoSFMeshObject::readValue(SoInput *in)
// during initial scene graph import.
this->valueChanged();
return TRUE;
return true;
}
// This writes the value of a field to a file.
@@ -626,9 +626,9 @@ void SoFCMeshObjectShape::GLRender(SoGLRenderAction *action)
SbBool needNormals = !mb.isColorOnly()/* || tb.isFunction()*/;
mb.sendFirst(); // make sure we have the correct material
SbBool ccw = TRUE;
SbBool ccw = true;
if (SoShapeHintsElement::getVertexOrdering(state) == SoShapeHintsElement::CLOCKWISE)
ccw = FALSE;
ccw = false;
if (mode == false || mesh->countFacets() <= this->renderTriangleLimit) {
if (mbind != OVERALL)
@@ -708,16 +708,16 @@ void SoFCMeshObjectShape::drawFaces(const Mesh::MeshObject * mesh, SoMaterialBun
n[2] = (v1.x-v0.x)*(v2.y-v0.y)-(v1.y-v0.y)*(v2.x-v0.x);
if(perFace)
mb->send(it-rFacets.begin(), TRUE);
mb->send(it-rFacets.begin(), true);
glNormal(n);
if(perVertex)
mb->send(it->_aulPoints[0], TRUE);
mb->send(it->_aulPoints[0], true);
glVertex(v0);
if(perVertex)
mb->send(it->_aulPoints[1], TRUE);
mb->send(it->_aulPoints[1], true);
glVertex(v1);
if(perVertex)
mb->send(it->_aulPoints[2], TRUE);
mb->send(it->_aulPoints[2], true);
glVertex(v2);
}
}
@@ -852,7 +852,7 @@ void SoFCMeshObjectShape::doAction(SoAction * action)
// thus we search there for it.
SoSearchAction sa;
sa.setInterest(SoSearchAction::FIRST);
sa.setSearchingAll(FALSE);
sa.setSearchingAll(false);
sa.setType(SoFCMeshObjectNode::getClassTypeId(), 1);
sa.apply(node);
SoPath * path = sa.getPath();
@@ -961,8 +961,8 @@ void SoFCMeshObjectShape::renderSelectionGeometry(const Mesh::MeshObject* mesh)
//static SbBool
//SoFCMeshObjectShape_ray_intersect(SoRayPickAction * action, const SbBox3f & box)
//{
// if (box.isEmpty()) return FALSE;
// return action->intersect(box, TRUE);
// if (box.isEmpty()) return false;
// return action->intersect(box, true);
//}
/**
@@ -1163,9 +1163,9 @@ void SoFCMeshSegmentShape::GLRender(SoGLRenderAction *action)
SbBool needNormals = !mb.isColorOnly()/* || tb.isFunction()*/;
mb.sendFirst(); // make sure we have the correct material
SbBool ccw = TRUE;
SbBool ccw = true;
if (SoShapeHintsElement::getVertexOrdering(state) == SoShapeHintsElement::CLOCKWISE)
ccw = FALSE;
ccw = false;
if (mode == false || mesh->countFacets() <= this->renderTriangleLimit) {
if (mbind != OVERALL)
@@ -1250,16 +1250,16 @@ void SoFCMeshSegmentShape::drawFaces(const Mesh::MeshObject * mesh, SoMaterialBu
n[2] = (v1.x-v0.x)*(v2.y-v0.y)-(v1.y-v0.y)*(v2.x-v0.x);
if(perFace)
mb->send(*it, TRUE);
mb->send(*it, true);
glNormal(n);
if(perVertex)
mb->send(f._aulPoints[0], TRUE);
mb->send(f._aulPoints[0], true);
glVertex(v0);
if(perVertex)
mb->send(f._aulPoints[1], TRUE);
mb->send(f._aulPoints[1], true);
glVertex(v1);
if(perVertex)
mb->send(f._aulPoints[2], TRUE);
mb->send(f._aulPoints[2], true);
glVertex(v2);
}
}
@@ -1556,7 +1556,7 @@ void SoFCMeshObjectBoundary::GLRender(SoGLRenderAction *action)
if (!mesh) return;
SoMaterialBundle mb(action);
SoTextureCoordinateBundle tb(action, TRUE, FALSE);
SoTextureCoordinateBundle tb(action, true, false);
SoLazyElement::setLightModel(state, SoLazyElement::BASE_COLOR);
mb.sendFirst(); // make sure we have the correct material