loplugin:fakebool and loplugin:consttobool (macOS)

Change-Id: I42d6546a9a400d8edb9ecef82614c6c88d4e6e83
Reviewed-on: https://gerrit.libreoffice.org/82806
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

17 files changed, 54 insertions, 54 deletions

diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index 6d062af593e3..523ee0b43eac 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -73,7 +73,7 @@ Window::~Window()
 
 bool Window::handleObservation( NSString* /*pKeyPath*/ )
 {
-    const BOOL bReadyForDisplay = [mpPlayerLayer isReadyForDisplay];
+    const bool bReadyForDisplay = [mpPlayerLayer isReadyForDisplay];
     [mpPlayerLayer setHidden:!bReadyForDisplay];
     return true;
 }
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index 70cbbf190238..100e00dc662a 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -477,7 +477,7 @@ void ControlHelper::createUserPane()
                 nCheckboxMaxWidth = nControlWidth;
             }
 
-            bButtonControlPresent = YES;
+            bButtonControlPresent = true;
             nControlWidth -= 2 * kAquaSpaceSwitchButtonFrameBoundsDiff;
             nControlHeight -= 2 * kAquaSpaceSwitchButtonFrameBoundsDiff;
         }
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 331a262dbc91..bfe990d73c8f 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -268,7 +268,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
    event: mLastMouseEventBeforeStartDrag
    pasteboard: clipb->getPasteboard()
    source: mDragSourceHelper
-   slideBack: 1];
+   slideBack: true];
    SAL_WNODEPRECATED_DECLARATIONS_POP
 
   [dragImage release];
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 9ad57085e35c..ebaa0a97fb40 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -262,7 +262,7 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
         fire_dragOver(dtde);
 
         // drag over callbacks likely have rendered something
-        [mView setNeedsDisplay: TRUE];
+        [mView setNeedsDisplay: true];
 
         dragOp = OfficeToSystemDragActions(mSelectedDropAction);
 
@@ -290,7 +290,7 @@ void DropTarget::draggingExited(id /*sender*/)
 
 BOOL DropTarget::prepareForDragOperation()
 {
-    return 1;
+    return true;
 }
 
 BOOL DropTarget::performDragOperation()
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index fda099643c06..a818cb5e752d 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -28,7 +28,7 @@
 bool ImageToPNG( css::uno::Sequence<sal_Int8> const & rImgData,
                  css::uno::Sequence<sal_Int8>& rPngData)
 {
-    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8 *>(rImgData.getConstArray()) length: rImgData.getLength() freeWhenDone: 0];
+    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8 *>(rImgData.getConstArray()) length: rImgData.getLength() freeWhenDone: false];
     if( !pData)
         return false;
 
@@ -51,7 +51,7 @@ bool PNGToImage( css::uno::Sequence<sal_Int8> const & rPngData,
                  NSBitmapImageFileType eOutFormat
                 )
 {
-    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(rPngData.getConstArray()) length: rPngData.getLength() freeWhenDone: 0];
+    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(rPngData.getConstArray()) length: rPngData.getLength() freeWhenDone: false];
     if( !pData)
         return false;
 
diff --git a/vcl/osx/a11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm
index 4595ee096b7e..d9d6db175428 100644
--- a/vcl/osx/a11ycomponentwrapper.mm
+++ b/vcl/osx/a11ycomponentwrapper.mm
@@ -66,12 +66,12 @@ using namespace ::com::sun::star::uno;
 }
 
 +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper {
-    BOOL isSettable = NO;
+    bool isSettable = false;
     NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
     if ( [ attribute isEqualToString: NSAccessibilityFocusedAttribute ] 
       && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper accessibleContext ] ] isEqualToString: NSAccessibilityScrollBarRole ] 
       && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper accessibleContext ] ] isEqualToString: NSAccessibilityStaticTextRole ] ) {
-        isSettable = YES;
+        isSettable = true;
     }
     [ pool release ];
     return isSettable;
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index c4f5c5567d66..28489268f4ee 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -141,22 +141,22 @@ using namespace ::com::sun::star::uno;
 }
 
 +(BOOL)isStrikethrough:(PropertyValue)property {
-    BOOL strikethrough = NO;
+    bool strikethrough = false;
     sal_Int16 value = 0;
     property.Value >>= value;
     if ( value != ::css_awt::FontStrikeout::NONE
       && value != ::css_awt::FontStrikeout::DONTKNOW ) {
-        strikethrough = YES;
+        strikethrough = true;
     }
     return strikethrough;
 }
 
 +(BOOL)convertBoolean:(PropertyValue)property {
-    BOOL myBoolean = NO;
+    bool myBoolean = false;
     bool value = false;
     property.Value >>= value;
     if ( value ) {
-        myBoolean = YES;
+        myBoolean = true;
     }
     return myBoolean;
 }
@@ -210,7 +210,7 @@ using namespace ::com::sun::star::uno;
     static const OUString attrTextAlignment("ParaAdjust");
     // vars
     sal_Int32 underlineColor = 0;
-    BOOL underlineHasColor = NO;
+    bool underlineHasColor = false;
     // add attributes to string
     for ( int attrIndex = 0; attrIndex < attributes.getLength(); attrIndex++ ) {
         PropertyValue property = attributes [ attrIndex ];
diff --git a/vcl/osx/a11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm
index d1a251b1bc74..a39037f079b1 100644
--- a/vcl/osx/a11ytextwrapper.mm
+++ b/vcl/osx/a11ytextwrapper.mm
@@ -279,13 +279,13 @@ using namespace ::com::sun::star::uno;
 }
 
 +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper {
-    BOOL isSettable = NO;
+    bool isSettable = false;
     if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ]
       || [ attribute isEqualToString: NSAccessibilitySelectedTextAttribute ]
       || [ attribute isEqualToString: NSAccessibilitySelectedTextRangeAttribute ]
       || [ attribute isEqualToString: NSAccessibilityVisibleCharacterRangeAttribute ] ) {
         if ( ! [ [ wrapper accessibilityAttributeValue: NSAccessibilityRoleAttribute ] isEqualToString: NSAccessibilityStaticTextRole ] ) {
-            isSettable = YES;
+            isSettable = true;
         }
     }
     return isSettable;
diff --git a/vcl/osx/a11yvaluewrapper.mm b/vcl/osx/a11yvaluewrapper.mm
index ef6cf6e7a400..4882cd2eff97 100644
--- a/vcl/osx/a11yvaluewrapper.mm
+++ b/vcl/osx/a11yvaluewrapper.mm
@@ -73,11 +73,11 @@ using namespace ::com::sun::star::uno;
 }
 
 +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper {
-    BOOL isSettable = NO;
+    bool isSettable = false;
     if ( [ wrapper accessibleValue ]
       && [ attribute isEqualToString: NSAccessibilityValueAttribute ] 
       && ! [ wrapper isKindOfClass: [ AquaA11yWrapperStaticText class ] ] ) {
-        isSettable = YES;
+        isSettable = true;
     }
     return isSettable;
 }
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 5af3d5f3a8ef..ec09d61b479b 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno;
 -(Reference<XAccessibleContext>)accessibleContext;
 @end
 
-static BOOL isPopupMenuOpen = NO;
+static bool isPopupMenuOpen = false;
 
 static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
     return s << [[obj description] UTF8String];
@@ -710,7 +710,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
     if ( isPopupMenuOpen ) {
         return NO;
     }
-    BOOL ignored = NO;
+    bool ignored = false;
     sal_Int16 nRole = [ self accessibleContext ] -> getAccessibleRole();
     switch ( nRole ) {
         //case AccessibleRole::PANEL:
@@ -719,7 +719,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
         case AccessibleRole::SEPARATOR:
         case AccessibleRole::FILLER:
         case AccessibleRole::DIALOG:
-            ignored = YES;
+            ignored = true;
             break;
         default:
             ignored = ! ( [ self accessibleContext ] -> getAccessibleStateSet() -> contains ( AccessibleStateType::VISIBLE ) );
@@ -811,7 +811,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
 
 -(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute {
     SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeIsSettable:" << attribute << "]");
-    BOOL isSettable = NO;
+    bool isSettable = false;
     if ( [ self accessibleText ] ) {
         isSettable = [ AquaA11yTextWrapper isAttributeSettable: attribute forElement: self ];
     }
@@ -904,7 +904,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
     // get some information
     NSString * role = static_cast<NSString *>([ self accessibilityAttributeValue: NSAccessibilityRoleAttribute ]);
     id enabledAttr = [ self enabledAttribute ];
-    BOOL enabled = [ enabledAttr boolValue ];
+    bool enabled = [ enabledAttr boolValue ];
     NSView * parent = static_cast<NSView *>([ self accessibilityAttributeValue: NSAccessibilityParentAttribute ]);
     AquaA11yWrapper * parentAsWrapper = nil;
     if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) {
@@ -953,7 +953,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
 #pragma mark Hit Test
 
 -(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point {
-    BOOL hit = NO;
+    bool hit = false;
     NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
         //TODO: 10.10 accessibilityAttributeValue:
@@ -966,7 +966,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
         float maxX = minX + [ size sizeValue ].width;
         float maxY = minY + [ size sizeValue ].height;
         if ( minX < point.x && maxX > point.x && minY < point.y && maxY > point.y ) {
-            hit = YES;
+            hit = true;
         }
     }
     [ pool release ];
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 1ec999167046..c494ec7b2b7c 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -299,7 +299,7 @@ public:
             if( name_it != maTagToPropertyName.end() && name_it->second != "PrintContent" )
             {
                 vcl::PrinterController * mpController = [mpAccessoryController printerController];
-                BOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO;
+                bool bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO;
                 if( pCtrl )
                 {
                     [pCtrl setEnabled: bEnabled];
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 1bd88a810bc0..ce5ada142911 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -291,20 +291,20 @@ SalGraphics* AquaSalFrame::AcquireGraphics()
         mpGraphics->SetWindowGraphics( this );
     }
 
-    mbGraphics = TRUE;
+    mbGraphics = true;
     return mpGraphics;
 }
 
 void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
     SAL_WARN_IF( pGraphics != mpGraphics, "vcl", "graphics released on wrong frame" );
-    mbGraphics = FALSE;
+    mbGraphics = false;
 }
 
 bool AquaSalFrame::PostEvent(std::unique_ptr<ImplSVEvent> pData)
 {
     GetSalData()->mpInstance->PostEvent( this, pData.release(), SalEvent::UserEvent );
-    return TRUE;
+    return true;
 }
 
 void AquaSalFrame::SetTitle(const OUString& rTitle)
@@ -680,9 +680,9 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
             pState->mnWidth = maGeometry.nWidth;
             pState->mnHeight = maGeometry.nHeight;
             pState->mnState = WindowStateState::Normal;
-            return TRUE;
+            return true;
         }
-        return FALSE;
+        return false;
     }
 
     OSX_SALDATA_RUNINMAIN_UNION( GetWindowState( pState ), boolean )
@@ -708,7 +708,7 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
     else
         pState->mnState = WindowStateState::Maximized;
 
-    return TRUE;
+    return true;
 }
 
 void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
@@ -1543,7 +1543,7 @@ bool AquaSalFrame::SetPluginParent( SystemParentData* )
 bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& )
 {
     // not supported yet
-    return FALSE;
+    return false;
 }
 
 LanguageType AquaSalFrame::GetInputLanguage()
@@ -1593,7 +1593,7 @@ void AquaSalFrame::SetParent( SalFrame* pNewParent )
     bool bShown = mbShown;
     // remove from child list
     if (bShown)
-        Show(FALSE);
+        Show(false);
     mpParent = static_cast<AquaSalFrame*>(pNewParent);
     // insert to correct parent and paint
     Show( bShown );
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index c2c9169a40df..d26617eb3d15 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -225,7 +225,7 @@ static AquaSalFrame* getMouseContainerFrame()
     // is this event actually inside that NSWindow ?
     NSPoint aPt = [NSEvent mouseLocation];
     NSRect aFrameRect = [self frame];
-    BOOL bInRect = NSPointInRect( aPt, aFrameRect );
+    bool bInRect = NSPointInRect( aPt, aFrameRect );
     return bInRect;
 }
 
@@ -352,7 +352,7 @@ static AquaSalFrame* getMouseContainerFrame()
     (void)pNotification;
     SolarMutexGuard aGuard;
 
-    BOOL bRet = YES;
+    bool bRet = true;
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
     {
         // #i84461# end possible input
@@ -360,7 +360,7 @@ static AquaSalFrame* getMouseContainerFrame()
         if( AquaSalFrame::isAlive( mpFrame ) )
         {
             mpFrame->CallCallback( SalEvent::Close, nullptr );
-            bRet = NO; // application will close the window or not, AppKit shouldn't
+            bRet = false; // application will close the window or not, AppKit shouldn't
             AquaSalTimer *pTimer = static_cast<AquaSalTimer*>( ImplGetSVData()->maSchedCtx.mpSalTimer );
             assert( pTimer );
             pTimer->handleWindowShouldClose();
@@ -772,7 +772,7 @@ static AquaSalFrame* getMouseContainerFrame()
         aEvent.mnY              = static_cast<long>(aPt.y) - mpFrame->maGeometry.nY;
         aEvent.mnCode           = ImplGetModifierMask( mpFrame->mnLastModifierFlags );
         aEvent.mnCode           |= KEY_MOD1; // we want zooming, no scrolling
-        aEvent.mbDeltaIsPixel   = TRUE;
+        aEvent.mbDeltaIsPixel   = true;
 
         if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -781,7 +781,7 @@ static AquaSalFrame* getMouseContainerFrame()
         aEvent.mnNotchDelta = (nDeltaZ >= 0) ? +1 : -1;
         if( aEvent.mnDelta == 0 )
             aEvent.mnDelta = aEvent.mnNotchDelta;
-        aEvent.mbHorz = FALSE;
+        aEvent.mbHorz = false;
         sal_uInt32 nScrollLines = nDeltaZ;
         if (nScrollLines == 0)
             nScrollLines = 1;
@@ -831,7 +831,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
         aEvent.mnX              = static_cast<long>(aPt.x) - mpFrame->maGeometry.nX;
         aEvent.mnY              = static_cast<long>(aPt.y) - mpFrame->maGeometry.nY;
         aEvent.mnCode           = ImplGetModifierMask( mpFrame->mnLastModifierFlags );
-        aEvent.mbDeltaIsPixel   = TRUE;
+        aEvent.mbDeltaIsPixel   = true;
 
         if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -842,7 +842,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
             aEvent.mnNotchDelta = (dX < 0) ? -1 : +1;
             if( aEvent.mnDelta == 0 )
                 aEvent.mnDelta = aEvent.mnNotchDelta;
-            aEvent.mbHorz = TRUE;
+            aEvent.mbHorz = true;
             aEvent.mnScrollLines = SAL_WHEELMOUSE_EVENT_PAGESCROLL;
             mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent );
         }
@@ -852,7 +852,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
             aEvent.mnNotchDelta = (dY < 0) ? -1 : +1;
             if( aEvent.mnDelta == 0 )
                 aEvent.mnDelta = aEvent.mnNotchDelta;
-            aEvent.mbHorz = FALSE;
+            aEvent.mbHorz = false;
             aEvent.mnScrollLines = SAL_WHEELMOUSE_EVENT_PAGESCROLL;
             mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent );
         }
@@ -893,7 +893,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
         aEvent.mnX            = static_cast<long>(aPt.x) - mpFrame->maGeometry.nX;
         aEvent.mnY            = static_cast<long>(aPt.y) - mpFrame->maGeometry.nY;
         aEvent.mnCode         = ImplGetModifierMask( mpFrame->mnLastModifierFlags );
-        aEvent.mbDeltaIsPixel = FALSE;
+        aEvent.mbDeltaIsPixel = false;
 
         if( AllSettings::GetLayoutRTL() )
             aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
@@ -904,7 +904,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
             aEvent.mnNotchDelta = (dX < 0) ? -1 : +1;
             if( aEvent.mnDelta == 0 )
                 aEvent.mnDelta = aEvent.mnNotchDelta;
-            aEvent.mbHorz = TRUE;
+            aEvent.mbHorz = true;
             sal_uInt32 nScrollLines = fabs(dX) / WHEEL_EVENT_FACTOR;
             if (nScrollLines == 0)
                 nScrollLines = 1;
@@ -918,7 +918,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
             aEvent.mnNotchDelta = (dY < 0) ? -1 : +1;
             if( aEvent.mnDelta == 0 )
                 aEvent.mnDelta = aEvent.mnNotchDelta;
-            aEvent.mbHorz = FALSE;
+            aEvent.mbHorz = false;
             sal_uInt32 nScrollLines = fabs(dY) / WHEEL_EVENT_FACTOR;
             if (nScrollLines == 0)
                 nScrollLines = 1;
@@ -1509,7 +1509,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
             // don't send code points in the private use area
             if( keyChar >= 0xf700 && keyChar < 0xf780 )
                 keyChar = 0;
-            BOOL bRet = [self sendKeyToFrameDirect: nKeyCode character: keyChar modifiers: mpFrame->mnLastModifierFlags];
+            bool bRet = [self sendKeyToFrameDirect: nKeyCode character: keyChar modifiers: mpFrame->mnLastModifierFlags];
             mbInKeyInput = false;
 
             return bRet;
@@ -1527,7 +1527,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 - (BOOL)hasMarkedText
 {
-    BOOL bHasMarkedText;
+    bool bHasMarkedText;
 
     bHasMarkedText = ( mMarkedRange.location != NSNotFound ) &&
                      ( mMarkedRange.length != 0 );
@@ -1545,7 +1545,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
     // This is a hack, since it is not understood what a) causes that crash
     // and b) why we should have a marked range at this point.
     if( ! mbInKeyInput )
-        bHasMarkedText = YES;
+        bHasMarkedText = true;
 
     return bHasMarkedText;
 }
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 45f9ba3546f3..ae8074295c59 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -282,7 +282,7 @@ bool ImplSalYieldMutexTryToAcquire()
     if ( pInst )
         return pInst->GetYieldMutex()->tryToAcquire();
     else
-        return FALSE;
+        return false;
 }
 
 void ImplSalYieldMutexRelease()
@@ -453,7 +453,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
         {
             const Point aPoint;
             CommandMediaData aMediaData(nCommand);
-            CommandEvent aCEvt( aPoint, CommandEventId::Media, FALSE, &aMediaData );
+            CommandEvent aCEvt( aPoint, CommandEventId::Media, false, &aMediaData );
             NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt );
 
             if ( !ImplCallPreNotify( aNCmdEvt ) )
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index c0c71de2b4b6..9831bd24bd06 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -497,7 +497,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
                 bSuccess = true;
                 mbJob = true;
                 pInst->startedPrintJob();
-                BOOL wasSuccessful = [pPrintOperation runOperation];
+                bool wasSuccessful = [pPrintOperation runOperation];
                 pInst->endedPrintJob();
                 bSuccess = wasSuccessful;
                 bWasAborted = [[[pPrintOperation printInfo] jobDisposition] compare: NSPrintCancelJob] == NSOrderedSame;
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 65eece9bfbf0..55593e64ea0d 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -152,7 +152,7 @@ void AquaSalTimer::handleTimerElapsed()
         callTimerCallback();
     }
     else
-        queueDispatchTimerEvent( YES );
+        queueDispatchTimerEvent( true );
 }
 
 bool AquaSalTimer::handleDispatchTimerEvent( NSEvent *pEvent )
@@ -203,7 +203,7 @@ void AquaSalTimer::handleWindowShouldClose()
     // for whatever reason events get filtered on close, presumably by
     // timestamp so post a new timeout event, if there was one queued...
     if ( ExistsValidEvent() && !m_pRunningTimer )
-        queueDispatchTimerEvent( NO );
+        queueDispatchTimerEvent( false );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 19f74464622b..c7cc31a5555f 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -743,7 +743,7 @@ bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
 
     // draw the EPS
     const NSRect aDstRect = NSMakeRect( nX, nY, nWidth, nHeight);
-    const BOOL bOK = [xEpsImage drawInRect: aDstRect];
+    const bool bOK = [xEpsImage drawInRect: aDstRect];
 
     // restore the NSGraphicsContext
     [NSGraphicsContext setCurrentContext: pOrigNSCtx];