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

12
src/Gui/SoTextLabel.cpp
View File

@@ -105,7 +105,7 @@ SoTextLabel::SoTextLabel()
{
SO_NODE_CONSTRUCTOR(SoTextLabel);
SO_NODE_ADD_FIELD(backgroundColor, (SbVec3f(1.0f,1.0f,1.0f)));
SO_NODE_ADD_FIELD(background, (TRUE));
SO_NODE_ADD_FIELD(background, (true));
SO_NODE_ADD_FIELD(frameSize, (10.0f));
}
@@ -131,7 +131,7 @@ void SoTextLabel::GLRender(SoGLRenderAction *action)
SbVec3f center;
this->computeBBox(action, box, center);
if (!SoCullElement::cullTest(state, box, TRUE)) {
if (!SoCullElement::cullTest(state, box, true)) {
SoMaterialBundle mb(action);
mb.sendFirst();
const SbMatrix & mat = SoModelMatrixElement::get(state);
@@ -254,11 +254,11 @@ void SoTextLabel::GLRender(SoGLRenderAction *action)
state->push();
// disable textures for all units
SoGLTextureEnabledElement::set(state, this, FALSE);
SoGLTextureEnabledElement::set(state, this, false);
#if COIN_MAJOR_VERSION > 3
SoMultiTextureEnabledElement::set(state, this, FALSE);
SoMultiTextureEnabledElement::set(state, this, false);
#else
SoGLTexture3EnabledElement::set(state, this, FALSE);
SoGLTexture3EnabledElement::set(state, this, false);
#endif
glPushAttrib(GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
@@ -406,7 +406,7 @@ SoFrameLabel::SoFrameLabel()
SO_NODE_ADD_FIELD(justification, (LEFT));
SO_NODE_ADD_FIELD(name, ("Helvetica"));
SO_NODE_ADD_FIELD(size, (12));
SO_NODE_ADD_FIELD(frame, (TRUE));
SO_NODE_ADD_FIELD(frame, (true));
//SO_NODE_ADD_FIELD(image, (SbVec2s(0,0), 0, NULL));
}