Rename Mac OS X to official name macOS in comments and documentation

Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>

15 files changed, 26 insertions, 26 deletions

diff --git a/vcl/README b/vcl/README
index 5a869ef77b9f..1169cdf1f660 100644
--- a/vcl/README
+++ b/vcl/README
@@ -17,13 +17,13 @@ android/
 	+ Android backend
 
 osx/
-	+ OS X backend
+	+ macOS backend
 
 ios/
 	+ iOS backend
 
 quartz/
-	+ code common to OS X and iOS
+	+ code common to macOS and iOS
 
 win/
 	+ Windows backend
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 50a899c9da4d..2a8eeb0b0af1 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1185,7 +1185,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
     aStyleSettings.SetToolbarIconSize( ToolbarIconSize::Large );
 
-    // TODO: better mapping of OS X<->LibreOffice font settings
+    // TODO: better mapping of macOS<->LibreOffice font settings
     vcl::Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) );
     aStyleSettings.BatchSetFonts( aAppFont, aLabelFont );
     vcl::Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) );
@@ -1220,7 +1220,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
     aStyleSettings.SetCursorBlinkTime( 500 );
 
-    // no mnemonics on OS X
+    // no mnemonics on macOS
     aStyleSettings.SetOptions( aStyleSettings.GetOptions() | StyleSettingsOptions::NoMnemonics );
 
     getAppleScrollBarVariant(aStyleSettings);
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 0026d68a0dbd..cab5ae940a3c 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -803,7 +803,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTextDrawInfo.state=getState( nState );
                 aTextDrawInfo.isFocused=false;
 
-                rc.size.width+=1;//else there's a white space because an OS X theme has no 3D border
+                rc.size.width+=1; // else there's a white space because a macOS theme has no 3D border
                 rc.size.height+=1;
                 HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
 
@@ -825,7 +825,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
             aTextDrawInfo.state=getState( nState );
             aTextDrawInfo.isFocused=false;
 
-            rc.size.width  += 1; // else there may be a white space because an OS X theme has no 3D border
+            rc.size.width  += 1; // else there may be a white space because a macOS theme has no 3D border
             // change rc so that the frame will encompass only the content region
             // see counterpart in GetNativeControlRegion
             rc.size.width  += 2;
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index e98fac83b0f6..314756391664 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -371,7 +371,7 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont
     // get font-enabled status
     if( bFontEnabled )
     {
-        int bEnabled = TRUE; // by default (and when we're on OS X < 10.6) it's "enabled"
+        int bEnabled = TRUE; // by default (and when we're on macOS < 10.6) it's "enabled"
         CFNumberRef pEnabled = static_cast<CFNumberRef>(CTFontDescriptorCopyAttribute( pFD, kCTFontEnabledAttribute ));
         CFNumberGetValue( pEnabled, kCFNumberIntType, &bEnabled );
         *bFontEnabled = bEnabled;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 795f1e828f4e..c1337c5dfe24 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -441,7 +441,7 @@ void Edit::ImplInvalidateOrRepaint()
     if( IsPaintTransparent() )
     {
         Invalidate();
-        // FIXME: this is currently only on OS X
+        // FIXME: this is currently only on macOS
         if( ImplGetSVData()->maNWFData.mbNoFocusRects )
             Update();
     }
@@ -1874,7 +1874,7 @@ void Edit::GetFocus()
 
         ImplShowCursor();
 
-        // FIXME: this is currently only on OS X
+        // FIXME: this is currently only on macOS
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
@@ -1908,7 +1908,7 @@ void Edit::LoseFocus()
 
     if ( !mpSubEdit )
     {
-        // FIXME: this is currently only on OS X
+        // FIXME: this is currently only on macOS
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
@@ -2359,7 +2359,7 @@ void Edit::Modify()
 
         // #i13677# notify edit listeners about caret position change
         CallEventListeners( VclEventId::EditCaretChanged );
-        // FIXME: this is currently only on OS X
+        // FIXME: this is currently only on macOS
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index e2b000cdd2ea..7ff22a104b60 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -30,9 +30,9 @@
 
 /*  #i77549#
     HACK: for scrollbars in case of thumb rect, page up and page down rect we
-    abuse the HitTestNativeScrollbar interface. All theming engines but OS X
+    abuse the HitTestNativeScrollbar interface. All theming engines but macOS
     are actually able to draw the thumb according to our internal representation.
-    However OS X draws a little outside. The canonical way would be to enhance the
+    However macOS draws a little outside. The canonical way would be to enhance the
     HitTestNativeScrollbar passing a ScrollbarValue additionally so all necessary
     information is available in the call.
     .
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index dd7d6561c554..263af6f90179 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -848,7 +848,7 @@ bool SpinField::PreNotify(NotifyEvent& rNEvt)
                 tools::Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() );
                 if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) )
                 {
-                    // FIXME: this is currently only on OS X
+                    // FIXME: this is currently only on macOS
                     // check for other platforms that need similar handling
                     if (ImplGetSVData()->maNWFData.mbNoFocusRects && IsNativeWidgetEnabled() &&
                         IsNativeControlSupported(ControlType::Editbox, ControlPart::Entire))
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 22b916ca0198..745440853f55 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -192,7 +192,7 @@ void GIFReader::CreateBitmaps(long nWidth, long nHeight, BitmapPalette* pPal,
     // 32-bit system. We have at least one unit tests that is expected
     // to fail (loading a 65535*65535 size GIF
     // svtools/qa/cppunit/data/gif/fail/CVE-2008-5937-1.gif), but
-    // which doesn't fail on 64-bit Mac OS X at least. Why the loading
+    // which doesn't fail on 64-bit macOS at least. Why the loading
     // fails on 64-bit Linux, no idea.
     if (nCombinedPixSize >= SAL_MAX_INT32/3*2)
     {
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 4d6ef1f9b1cf..40110d951b43 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -970,7 +970,7 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct
 
     const Point aPt( pWindow->GetPointerPosPixel() );
 
-    // On Mac OS X we are forced to execute 'startDrag' synchronously
+    // On macOS we are forced to execute 'startDrag' synchronously
     // contrary to the XDragSource interface specification because
     // we can receive drag events from the system only in the main
     // thread
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9428ee709599..549db302ba9f 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -436,7 +436,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
     }
     else
     {
-        // FIXME: this is currently only on OS X, check with other
+        // FIXME: this is currently only on macOS, check with other
         // platforms
         if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & WindowBorderStyle::NWF ) )
         {
@@ -673,9 +673,9 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, c
             nState |= ControlState::FOCUSED;
         else if(mbNWFBorder)
         {
-            // FIXME: this is currently only on OS X, see if other platforms can profit
+            // FIXME: this is currently only on macOS, see if other platforms can profit
 
-            // FIXME: for OS X focus rings all controls need to support GetNativeControlRegion
+            // FIXME: for macOS focus rings all controls need to support GetNativeControlRegion
             // for the dropdown style
             if (pCtrl->HasFocus() || pCtrl->HasChildPathFocus())
                 nState |= ControlState::FOCUSED;
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 19851303499b..f0297d26a1e4 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -742,7 +742,7 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
                     aDragSourceAL[ 1 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->hWnd) );
                     aDropTargetAL[ 0 ] <<= static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->hWnd) );
 #elif defined MACOSX
-            /* FIXME: Mac OS X specific dnd interface does not exist! *
+            /* FIXME: macOS specific dnd interface does not exist! *
              * Using Windows based dnd as a temporary solution        */
                     aDragSourceSN = "com.sun.star.datatransfer.dnd.OleDragSource";
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget";
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2b835fd81796..99e3db2abc97 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1188,7 +1188,7 @@ void Window::ImplInitAppFontData( vcl::Window const * pWindow )
     pSVData->maGDIData.mnAppFontY = nTextHeight * 10;
 
 #ifdef MACOSX
-    // FIXME: this is currently only on OS X, check with other
+    // FIXME: this is currently only on macOS, check with other
     // platforms
     if( pSVData->maNWFData.mbNoFocusRects )
     {
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index ab0700e948e2..face14778fd0 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2542,7 +2542,7 @@ static sal_uInt16 sal_GetCode( int state )
         nCode |= KEY_MOD2;
 
     // Map Meta/Super modifier to MOD3 on all Unix systems
-    // except Mac OS X
+    // except macOS
     if( state & Mod3Mask )
         nCode |= KEY_MOD3;
 
@@ -3132,7 +3132,7 @@ bool X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
                 nModMask = KEY_SHIFT;
                 break;
             // Map Meta/Super keys to MOD3 modifier on all Unix systems
-            // except Mac OS X
+            // except macOS
             case XK_Meta_L:
             case XK_Super_L:
                 nExtModMask = ModKeyFlags::LeftMod3;
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 305a1c3048bf..899f1a1a291f 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -105,7 +105,7 @@ sal_uInt16 GtkSalFrame::GetKeyModCode( guint state )
         nCode |= KEY_MOD2;
 
     // Map Meta/Super keys to MOD3 modifier on all Unix systems
-    // except Mac OS X
+    // except macOS
     if ( (state & GDK_META_MASK ) || ( state & GDK_SUPER_MASK ) )
         nCode |= KEY_MOD3;
     return nCode;
@@ -3025,7 +3025,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
                 nModMask = KEY_SHIFT;
                 break;
             // Map Meta/Super to MOD3 modifier on all Unix systems
-            // except Mac OS X
+            // except macOS
             case GDK_KEY_Meta_L:
             case GDK_KEY_Super_L:
                 nExtModMask = ModKeyFlags::LeftMod3;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 4e5271801b4d..d2d38b58f23c 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3270,7 +3270,7 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointe
                 nModMask = KEY_SHIFT;
                 break;
             // Map Meta/Super to MOD3 modifier on all Unix systems
-            // except Mac OS X
+            // except macOS
             case GDK_KEY_Meta_L:
             case GDK_KEY_Super_L:
                 nExtModMask = ModKeyFlags::LeftMod3;