From 71ca974838b5f98f1be750f3698e0714f0e1c4a1 Mon Sep 17 00:00:00 2001
From: Li Linfeng <lilinfeng303@outlook.com>
Date: Wed, 21 Aug 2019 08:40:59 +0800
Subject: [PATCH] Replace the apple macro in qt project

---
 CMakeLists.txt                 |  3 ---
 src/celestia/qt/qtappwin.cpp   | 10 ++++------
 src/celestia/qt/qtglwidget.cpp |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 905b1380..09751db3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,9 +267,6 @@ if(WIN32)
 endif()
 
 if(APPLE)
-  # Dirty hack to prevent AIFF.h inclusion which provides `struct Marker`
-  # conflicting with out `class Marker`.
-  add_definitions(-D__AIFF__)
   if (NATIVE_OSX_APP)
     add_definitions(-DNATIVE_OSX_APP)
   endif()
diff --git a/src/celestia/qt/qtappwin.cpp b/src/celestia/qt/qtappwin.cpp
index 5d8f7543..6c2153fd 100644
--- a/src/celestia/qt/qtappwin.cpp
+++ b/src/celestia/qt/qtappwin.cpp
@@ -10,9 +10,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
-#ifdef TARGET_OS_MAC
-#include <Carbon/Carbon.h>
-#endif
+
 #include <ctime>
 
 #include <QIcon>
@@ -64,7 +62,7 @@
 #if defined(_WIN32)
 #include "celestia/avicapture.h"
 // TODO: Add Mac support
-#elif !defined(TARGET_OS_MAC)
+#elif !defined(__APPLE__)
 #ifdef THEORA
 #include "celestia/oggtheoracapture.h"
 #endif
@@ -638,7 +636,7 @@ void CelestiaAppWindow::slotGrabImage()
 void CelestiaAppWindow::slotCaptureVideo()
 {
 // TODO: Add Mac support
-#if defined(_WIN32) || (defined(THEORA) && !defined(TARGET_OS_MAC))
+#if defined(_WIN32) || (defined(THEORA) && !defined(__APPLE__))
     QString dir;
     QSettings settings;
     settings.beginGroup("Preferences");
@@ -1117,7 +1115,7 @@ void CelestiaAppWindow::createMenus()
     QAction* captureVideoAction = new QAction(QIcon(":/icons/capture-video.png"),
                                               _("Capture &video"), this);
     // TODO: Add Mac support for video capture
-#if defined(TARGET_OS_MAC) || (!defined(_WIN32) && !defined(THEORA))
+#if defined(__APPLE__) || (!defined(_WIN32) && !defined(THEORA))
     captureVideoAction->setEnabled(false);
 #endif
     captureVideoAction->setShortcut(QString(_("Shift+F10")));
diff --git a/src/celestia/qt/qtglwidget.cpp b/src/celestia/qt/qtglwidget.cpp
index c7f42b5c..428051dc 100644
--- a/src/celestia/qt/qtglwidget.cpp
+++ b/src/celestia/qt/qtglwidget.cpp
@@ -186,7 +186,7 @@ void CelestiaGlWidget::mouseMoveEvent(QMouseEvent* m)
     if (m->modifiers() & ControlModifier)
         buttons |= CelestiaCore::ControlKey;
 
-#ifdef TARGET_OS_MAC
+#ifdef __APPLE__
     // On the Mac, right dragging is be simulated with Option+left drag.
     // We may want to enable this on other platforms, though it's mostly only helpful
     // for users with single button mice.