QUARTZ is equivalent to MACOSX

So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.

Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20

9 files changed, 24 insertions, 25 deletions

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 6800e01ed506..a55cb21ab43f 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -68,7 +68,7 @@ using ::rtl::OUStringToOString;
  *  static helpers
  */
 
-#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS )  || defined( ANDROID ) )
+#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS )  || defined( ANDROID ) )
 static oslModule driverLib                  = NULL;
 #endif
 extern "C"
@@ -100,7 +100,7 @@ static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
 
 static void getPaLib()
 {
-#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS )  || defined( ANDROID ) )
+#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS )  || defined( ANDROID ) )
     if( ! driverLib )
     {
         OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) );
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index dce82ce1f913..0614ccccde4c 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -22,7 +22,7 @@
 
 #ifdef WNT
 #include "win/svsys.h"
-#elif defined QUARTZ
+#elif defined MACOSX
 #include "aqua/svsys.h"
 #elif defined OS2
 #include "os2/svsys.h"
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index ea52068160c9..7e1fced00998 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -321,7 +321,7 @@ struct BitmapSystemData
     #if defined( WNT )
     void* pDIB; // device independent byte buffer
     void* pDDB; // if not NULL then this is actually an HBITMAP
-    #elif defined( QUARTZ ) || defined( IOS )
+    #elif defined( MACOSX ) || defined( IOS )
     void* rImageContext;     //Image context (CGContextRef)
     #else
     void* aPixmap;
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index bf5f337e6d87..b032a0401ddd 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -23,7 +23,7 @@
 #include <vector>
 #include <cstddef>
 
-#ifdef QUARTZ
+#ifdef MACOSX
 // predeclare the native classes to avoid header/include problems
 typedef struct CGContext *CGContextRef;
 typedef struct CGLayer   *CGLayerRef;
@@ -65,7 +65,7 @@ struct SystemEnvData
     unsigned long       nSize;          // size in bytes of this structure
 #if defined( WNT )
     HWND                hWnd;           // the window hwnd
-#elif defined( QUARTZ )
+#elif defined( MACOSX )
     NSView*               pView;          // the cocoa (NSView *) implementing this object
 #elif defined( IOS )
     UIView*               pView;          // the CocoaTouch (UIView *) implementing this object
@@ -95,7 +95,7 @@ struct SystemParentData
     unsigned long   nSize;            // size in bytes of this structure
 #if defined( WNT )
     HWND            hWnd;             // the window hwnd
-#elif defined( QUARTZ )
+#elif defined( MACOSX )
     NSView*         pView;            // the cocoa (NSView *) implementing this object
 #elif defined( IOS )
     UIView*         pView;            // the CocoaTouch (UIView *) implementing this object
@@ -115,7 +115,7 @@ struct SystemMenuData
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )
     HMENU           hMenu;          // the menu handle of the menu bar
-#elif defined( QUARTZ )
+#elif defined( MACOSX )
     //not defined
 #elif defined( UNX )
     long            aMenu;          // ???
@@ -131,7 +131,7 @@ struct SystemGraphicsData
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )
     HDC             hDC;            // handle to a device context
-#elif defined( QUARTZ ) || defined( IOS )
+#elif defined( MACOSX ) || defined( IOS )
     CGContextRef    rCGContext;     // CoreGraphics graphic context
 #elif defined( UNX )
     void*           pDisplay;       // the relevant display connection
@@ -146,7 +146,7 @@ struct SystemGraphicsData
         : nSize( sizeof( SystemGraphicsData ) )
 #if defined( WNT )
         , hDC( 0 )
-#elif defined( QUARTZ ) || defined( IOS )
+#elif defined( MACOSX ) || defined( IOS )
 #elif defined( UNX )
         , pDisplay( NULL )
         , hDrawable( 0 )
@@ -168,7 +168,7 @@ struct SystemWindowData
 {
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )                  // meaningless on Windows
-#elif defined( QUARTZ )             // meaningless on Mac OS X / Quartz
+#elif defined( MACOSX )             // meaningless on Mac OS X
 #elif defined( IOS )                // and maybe on iOS, too, then
 #elif defined( UNX )
     void*           pVisual;        // the visual to be used
@@ -197,7 +197,7 @@ struct SystemFontData
     unsigned long   nSize;          // size in bytes of this structure
 #if defined( WNT )
     HFONT           hFont;          // native font object
-#elif defined( QUARTZ )
+#elif defined( MACOSX )
 #ifdef ENABLE_CORETEXT
     void*           rCTFont;
 #else
@@ -218,7 +218,7 @@ struct SystemFontData
         : nSize( sizeof( SystemFontData ) )
 #if defined( WNT )
         , hFont( 0 )
-#elif defined( QUARTZ )
+#elif defined( MACOSX )
 #ifdef ENABLE_CORETEXT
 #else
         , aATSUFontID( NULL )
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 9285c96b606b..88242e5e8849 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -271,7 +271,7 @@ OUString SAL_CALL Clipboard_getImplementationName()
 {
     #if defined UNX
     return OUString(
-    #if ! defined QUARTZ
+    #if ! defined MACOSX
     "com.sun.star.datatransfer.X11ClipboardSupport"
     #else
     "com.sun.star.datatransfer.clipboard.AquaClipboard"
@@ -361,7 +361,7 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
 {
     #if defined UNX
     OUString aServiceName(
-    #if ! defined QUARTZ
+    #if ! defined MACOSX
     "com.sun.star.datatransfer.dnd.X11DragSource"
     #else
     "com.sun.star.datatransfer.dnd.OleDragSource"
@@ -377,7 +377,7 @@ OUString SAL_CALL DragSource_getImplementationName()
 {
     #if defined UNX
     return OUString(
-    #if ! defined QUARTZ
+    #if ! defined MACOSX
     "com.sun.star.datatransfer.dnd.XdndSupport"
     #else
     "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
@@ -475,7 +475,7 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
 {
     #if defined UNX
     OUString aServiceName(
-    #if ! defined QUARTZ
+    #if ! defined MACOSX
     "com.sun.star.datatransfer.dnd.X11DropTarget"
     #else
     "com.sun.star.datatransfer.dnd.OleDropTarget"
@@ -491,7 +491,7 @@ OUString SAL_CALL DropTarget_getImplementationName()
 {
     #if defined UNX
     return OUString(
-    #if ! defined QUARTZ
+    #if ! defined MACOSX
     "com.sun.star.datatransfer.dnd.XdndDropTarget"
     #else
     "com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 46eb689356ff..4341a1ed2a80 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -259,7 +259,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
     // try hard to draw it directly, because the emulation layers are slower
     if( !pDisableNative
         && mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
-#if defined UNX && ! defined QUARTZ
+#if defined UNX && ! defined MACOSX
             && GetBitCount() > 8
 #endif
 #ifdef WIN32
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3542ee4ce438..fa827ecbe6a6 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1142,7 +1142,7 @@ void Menu::Select()
     }
 }
 
-#if defined(QUARTZ)
+#if defined(MACOSX)
 void Menu::ImplSelectWithStart( Menu* pSMenu )
 {
     Menu* pOldStartedFrom = pStartedFrom;
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 56f6cca4d854..5bd71f54f913 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -220,7 +220,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 #if defined WNT
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
     (void)bUseJava;
-#elif defined QUARTZ
+#elif defined MACOSX
     // FIXME: this is wrong
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
     (void)bUseJava;
@@ -313,7 +313,6 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
         }
     }
 #endif // SOLAR_JAVA
-#else // WNT || QUARTZ || UNX
 #endif
 
     return nRet;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d935f359821e..f4f6f3deda86 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8355,7 +8355,7 @@ uno::Reference< XDragSource > Window::GetDragSource()
                     aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
                     aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
                     aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
-#elif defined QUARTZ
+#elif defined MACOSX
             /* FIXME: Mac OS X specific dnd interface does not exist! *
              * Using Windows based dnd as a temporary solution        */
                     aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource");
@@ -8433,7 +8433,7 @@ uno::Reference< XClipboard > Window::GetClipboard()
                 if( !mpWindowImpl->mpFrameData->mxClipboard.is() )
                     mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboard") ), UNO_QUERY );
 
-#if defined(UNX) && !defined(QUARTZ)          // unix clipboard needs to be initialized
+#if defined(UNX) && !defined(MACOSX)          // unix clipboard needs to be initialized
                 if( mpWindowImpl->mpFrameData->mxClipboard.is() )
                 {
                     uno::Reference< XInitialization > xInit = uno::Reference< XInitialization >( mpWindowImpl->mpFrameData->mxClipboard, UNO_QUERY );
@@ -8479,7 +8479,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
             {
                 uno::Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
 
-#if defined(UNX) && !defined(QUARTZ)
+#if defined(UNX) && !defined(MACOSX)
                 Sequence< Any > aArgumentList( 3 );
                 aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() );
                 aArgumentList[ 1 ] = makeAny( OUString("PRIMARY") );