diff options
author | Alexandre Fournier <fou@leila.(none)> | 2010-11-06 01:33:05 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-11-06 18:21:27 -0500 |
commit | a93c9517dc52b1d9c22a0e69f9d92c119983f7fe (patch) | |
tree | 10d0f65563b4c93e9532ad2b2e351f60022a17c4 /starmath/source/visitors.cxx | |
parent | c27759cbf40a99632112cf2e2d21d64f2d3ae749 (diff) |
Removes a fair amount of BOOL variables in starmath
I uses the native bool type instead.
Some signatures containing BOOL have been left untouched when belonging to an inheritance hierarchy beyond the scope of starmath
Diffstat (limited to 'starmath/source/visitors.cxx')
-rw-r--r-- | starmath/source/visitors.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index c385b3b2d084..8f69b2e63cc8 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -456,7 +456,7 @@ class SmTmpDevice2 Color Impl_GetColor( const Color& rColor ); public: - SmTmpDevice2( OutputDevice &rTheDev, BOOL bUseMap100th_mm ); + SmTmpDevice2( OutputDevice &rTheDev, bool bUseMap100th_mm ); ~SmTmpDevice2( ) { rOutDev.Pop( ); } void SetFont( const Font &rNewFont ); @@ -468,7 +468,7 @@ public: operator OutputDevice & ( ) { return rOutDev; } }; -SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, BOOL bUseMap100th_mm ) : +SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, bool bUseMap100th_mm ) : rOutDev( rTheDev ) { rOutDev.Push( PUSH_FONT | PUSH_MAPMODE | @@ -641,7 +641,7 @@ void SmDrawingVisitor::Visit( SmRootSymbolNode* pNode ) // draw root-sign itself DrawSpecialNode( pNode ); - SmTmpDevice2 aTmpDev( ( OutputDevice & ) rDev, TRUE ); + SmTmpDevice2 aTmpDev( ( OutputDevice & ) rDev, true ); aTmpDev.SetFillColor( pNode->GetFont( ).GetColor( ) ); rDev.SetLineColor( ); aTmpDev.SetFont( pNode->GetFont( ) ); @@ -690,7 +690,7 @@ void SmDrawingVisitor::Visit( SmPolyLineNode* pNode ) aPos ( Position + aOffset ); pNode->GetPolygon( ).Move( aPos.X( ), aPos.Y( ) ); //Works because Polygon wraps a pointer - SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, FALSE ); + SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, false ); aTmpDev.SetLineColor( pNode->GetFont( ).GetColor( ) ); rDev.DrawPolyLine( pNode->GetPolygon( ), aInfo ); @@ -709,7 +709,7 @@ void SmDrawingVisitor::Visit( SmRectangleNode* pNode ) if ( pNode->IsPhantom( ) ) return; - SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, FALSE ); + SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, false ); aTmpDev.SetFillColor( pNode->GetFont( ).GetColor( ) ); rDev.SetLineColor( ); aTmpDev.SetFont( pNode->GetFont( ) ); @@ -749,7 +749,7 @@ void SmDrawingVisitor::DrawTextNode( SmTextNode* pNode ) if ( pNode->IsPhantom( ) || pNode->GetText( ).Len( ) == 0 || pNode->GetText( ).GetChar( 0 ) == xub_Unicode( '\0' ) ) return; - SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, FALSE ); + SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, false ); aTmpDev.SetFont( pNode->GetFont( ) ); Point aPos ( Position ); @@ -860,8 +860,8 @@ void SmSetSelectionVisitor::DefaultVisit( SmNode* pNode ) { IsSelecting = !IsSelecting; //Cache current state - BOOL WasSelecting = IsSelecting; - BOOL ChangedState = FALSE; + bool WasSelecting = IsSelecting; + bool ChangedState = false; //Set selected pNode->SetSelected( IsSelecting ); @@ -1047,7 +1047,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){ void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){ SmCaretPosGraphEntry *left = pRightMost, *right = pGraph->Add( SmCaretPos( pNode, 1) ); - BOOL bIsFirst = TRUE; + bool bIsFirst = true; SmNodeIterator it( pNode ); while( it.Next() ){ pRightMost = pGraph->Add( SmCaretPos( it.Current(), 0 ), left); @@ -1057,7 +1057,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){ pRightMost->SetRight(right); if(bIsFirst) right->SetLeft(pRightMost); - bIsFirst = FALSE; + bIsFirst = false; } pRightMost = right; } @@ -2071,7 +2071,7 @@ void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode ) SmSelectionDrawingVisitor::SmSelectionDrawingVisitor( OutputDevice& rDevice, SmNode* pTree, Point Offset ) : rDev( rDevice ) { - bHasSelectionArea = FALSE; + bHasSelectionArea = false; //Visit everything j_assert( pTree, "pTree can't be null!" ); |