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
@@ -155,7 +155,7 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node)
|
||||
// Keyboard events
|
||||
if (ev->getTypeId().isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
|
||||
SoKeyboardEvent * ke = (SoKeyboardEvent *)ev;
|
||||
const SbBool press = ke->getState() == SoButtonEvent::DOWN ? TRUE : FALSE;
|
||||
const SbBool press = ke->getState() == SoButtonEvent::DOWN ? true : false;
|
||||
switch (ke->getKey()) {
|
||||
case SoKeyboardEvent::ESCAPE:
|
||||
if (self->keyPressed (press, ke->getKey()))
|
||||
@@ -175,7 +175,7 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node)
|
||||
|
||||
const SoMouseButtonEvent * const event = (const SoMouseButtonEvent *) ev;
|
||||
const int button = event->getButton();
|
||||
const SbBool press = event->getState() == SoButtonEvent::DOWN ? TRUE : FALSE;
|
||||
const SbBool press = event->getState() == SoButtonEvent::DOWN ? true : false;
|
||||
|
||||
// call the virtual method
|
||||
if (self->mouseButtonPressed(button,press,ev->getPosition(),viewer))
|
||||
|
||||
Reference in New Issue
Block a user