Qt4's qglobal.h defined TRUE and FALSE. Qt5 does not do it anymore. Replace it with true and false.
158f39ec78
This change is Qt4/Qt5 neutral.
This commit is contained in:
committed by
wmayer
parent
db345cb624
commit
7d0e892d36
@@ -400,7 +400,7 @@ void SoQtOffscreenRenderer::init(const SbViewportRegion & vpr,
|
||||
this->renderaction->setTransparencyType(SoGLRenderAction::SORTED_OBJECT_BLEND);
|
||||
}
|
||||
|
||||
this->didallocation = glrenderaction ? FALSE : TRUE;
|
||||
this->didallocation = glrenderaction ? false : true;
|
||||
this->viewport = vpr;
|
||||
|
||||
this->pixelbuffer = NULL; // constructed later
|
||||
@@ -492,7 +492,7 @@ SoQtOffscreenRenderer::setGLRenderAction(SoGLRenderAction * action)
|
||||
|
||||
if (PRIVATE(this)->didallocation) { delete PRIVATE(this)->renderaction; }
|
||||
PRIVATE(this)->renderaction = action;
|
||||
PRIVATE(this)->didallocation = FALSE;
|
||||
PRIVATE(this)->didallocation = false;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -534,7 +534,7 @@ void
|
||||
SoQtOffscreenRenderer::pre_render_cb(void * userdata, SoGLRenderAction * action)
|
||||
{
|
||||
glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT);
|
||||
action->setRenderingIsRemote(FALSE);
|
||||
action->setRenderingIsRemote(false);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -632,7 +632,7 @@ SoQtOffscreenRenderer::renderFromBase(SoBase * base)
|
||||
else if (base->isOfType(SoPath::getClassTypeId()))
|
||||
this->renderaction->apply((SoPath *)base);
|
||||
else {
|
||||
assert(FALSE && "Cannot apply to anything else than an SoNode or an SoPath");
|
||||
assert(false && "Cannot apply to anything else than an SoNode or an SoPath");
|
||||
}
|
||||
|
||||
this->renderaction->removePreRenderCallback(pre_render_cb, NULL);
|
||||
@@ -646,7 +646,7 @@ SoQtOffscreenRenderer::renderFromBase(SoBase * base)
|
||||
|
||||
this->renderaction->setCacheContext(oldcontext); // restore old
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
Reference in New Issue
Block a user