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

40
src/Mod/Part/Gui/TaskDimension.cpp
View File

@@ -322,12 +322,12 @@ PartGui::DimensionLinear::DimensionLinear()
{
SO_KIT_CONSTRUCTOR(PartGui::DimensionLinear);
SO_KIT_ADD_CATALOG_ENTRY(transformation, SoTransform, TRUE, topSeparator,"" , TRUE);
SO_KIT_ADD_CATALOG_ENTRY(annotate, SoAnnotation, TRUE, topSeparator,"" , TRUE);
SO_KIT_ADD_CATALOG_ENTRY(leftArrow, SoShapeKit, TRUE, topSeparator,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(rightArrow, SoShapeKit, TRUE, topSeparator,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(line, SoShapeKit, TRUE, annotate,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(textSep, SoSeparator, TRUE, annotate,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(transformation, SoTransform, true, topSeparator,"" , true);
SO_KIT_ADD_CATALOG_ENTRY(annotate, SoAnnotation, true, topSeparator,"" , true);
SO_KIT_ADD_CATALOG_ENTRY(leftArrow, SoShapeKit, true, topSeparator,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(rightArrow, SoShapeKit, true, topSeparator,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(line, SoShapeKit, true, annotate,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(textSep, SoSeparator, true, annotate,"" ,true);
SO_KIT_INIT_INSTANCE();
@@ -350,13 +350,13 @@ PartGui::DimensionLinear::~DimensionLinear()
SbBool PartGui::DimensionLinear::affectsState() const
{
return FALSE;
return false;
}
void PartGui::DimensionLinear::setupDimension()
{
//transformation
SoTransform *trans = static_cast<SoTransform *>(getPart("transformation", TRUE));
SoTransform *trans = static_cast<SoTransform *>(getPart("transformation", true));
trans->translation.connectFrom(&point1);
//build engine for vector subtraction and length.
SoCalculator *hyp = new SoCalculator();
@@ -389,7 +389,7 @@ void PartGui::DimensionLinear::setupDimension()
//have use local here to do the offset because the main is wired up to length of dimension.
set("rightArrow.localTransform", "translation 0.0 -0.25 0.0"); //half cone height.
SoTransform *transform = static_cast<SoTransform *>(getPart("rightArrow.transform", FALSE));
SoTransform *transform = static_cast<SoTransform *>(getPart("rightArrow.transform", false));
if (!transform)
return;//what to do here?
SoComposeVec3f *vec = new SoComposeVec3f;
@@ -420,7 +420,7 @@ void PartGui::DimensionLinear::setupDimension()
setPart("line.material", material);
//text
SoSeparator *textSep = static_cast<SoSeparator *>(getPart("textSep", TRUE));
SoSeparator *textSep = static_cast<SoSeparator *>(getPart("textSep", true));
if (!textSep)
return;
@@ -1014,12 +1014,12 @@ PartGui::DimensionAngular::DimensionAngular()
{
SO_KIT_CONSTRUCTOR(PartGui::DimensionAngular);
SO_KIT_ADD_CATALOG_ENTRY(transformation, SoMatrixTransform, TRUE, topSeparator,"" , TRUE);
SO_KIT_ADD_CATALOG_ENTRY(annotate, SoAnnotation, TRUE, topSeparator,"" , TRUE);
SO_KIT_ADD_CATALOG_ENTRY(arrow1, SoShapeKit, TRUE, topSeparator,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(arrow2, SoShapeKit, TRUE, topSeparator,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(arcSep, SoSeparator, TRUE, annotate,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(textSep, SoSeparator, TRUE, annotate,"" ,TRUE);
SO_KIT_ADD_CATALOG_ENTRY(transformation, SoMatrixTransform, true, topSeparator,"" , true);
SO_KIT_ADD_CATALOG_ENTRY(annotate, SoAnnotation, true, topSeparator,"" , true);
SO_KIT_ADD_CATALOG_ENTRY(arrow1, SoShapeKit, true, topSeparator,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(arrow2, SoShapeKit, true, topSeparator,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(arcSep, SoSeparator, true, annotate,"" ,true);
SO_KIT_ADD_CATALOG_ENTRY(textSep, SoSeparator, true, annotate,"" ,true);
SO_KIT_INIT_INSTANCE();
@@ -1042,14 +1042,14 @@ PartGui::DimensionAngular::~DimensionAngular()
SbBool PartGui::DimensionAngular::affectsState() const
{
return FALSE;
return false;
}
void PartGui::DimensionAngular::setupDimension()
{
//transformation
SoMatrixTransform *trans = static_cast<SoMatrixTransform *>(getPart("transformation", TRUE));
SoMatrixTransform *trans = static_cast<SoMatrixTransform *>(getPart("transformation", true));
trans->matrix.connectFrom(&matrix);
//color
@@ -1110,14 +1110,14 @@ void PartGui::DimensionAngular::setupDimension()
lineSet->numVertices.connectFrom(&arcEngine->pointCount);
lineSet->startIndex.setValue(0);
SoSeparator *arcSep = static_cast<SoSeparator *>(getPart("arcSep", TRUE));
SoSeparator *arcSep = static_cast<SoSeparator *>(getPart("arcSep", true));
if (!arcSep)
return;
arcSep->addChild(material);
arcSep->addChild(lineSet);
//text
SoSeparator *textSep = static_cast<SoSeparator *>(getPart("textSep", TRUE));
SoSeparator *textSep = static_cast<SoSeparator *>(getPart("textSep", true));
if (!textSep)
return;