From 6dbd0baafc6c2006fd60c408959e4f336f234566 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 25 Sep 2012 18:53:53 +0200
Subject: [PATCH] Remove conditional code for Leopard.

---
 CMakeLists.txt                       | 12 +-----------
 src/config.h.in                      |  2 --
 src/core/macglobalshortcutbackend.mm | 12 ------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9b085d44..f556cc80c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,17 +90,7 @@ if (APPLE)
 
   add_subdirectory(3rdparty/SPMediaKeyTap)
   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
-  set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)  
-
-  # Uses Darwin kernel version.
-  # 9.8.0  -> 10.5/Leopard
-  # 10.4.0 -> 10.6/Snow Leopard
-  string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${CMAKE_HOST_SYSTEM_VERSION})
-  if (DARWIN_VERSION GREATER 9)
-    SET(SNOW_LEOPARD 1)
-  elseif (DARWIN_VERSION GREATER 8)
-    SET(LEOPARD 1)
-  endif (DARWIN_VERSION GREATER 9)
+  set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
 endif (APPLE)
 
 find_package(Threads)
diff --git a/src/config.h.in b/src/config.h.in
index 11b5e0d98..ac2acda8a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -43,8 +43,6 @@
 #cmakedefine HAVE_STATIC_SQLITE
 #cmakedefine HAVE_WIIMOTEDEV
 #cmakedefine IMOBILEDEVICE_USES_UDIDS
-#cmakedefine LEOPARD
-#cmakedefine SNOW_LEOPARD
 #cmakedefine USE_INSTALL_PREFIX
 #cmakedefine USE_SYSTEM_PROJECTM
 
diff --git a/src/core/macglobalshortcutbackend.mm b/src/core/macglobalshortcutbackend.mm
index 96d173892..63d938d95 100644
--- a/src/core/macglobalshortcutbackend.mm
+++ b/src/core/macglobalshortcutbackend.mm
@@ -44,7 +44,6 @@ class MacGlobalShortcutBackendPrivate : boost::noncopyable {
   }
 
   bool Register() {
-  #ifdef SNOW_LEOPARD
     global_monitor_ = [NSEvent addGlobalMonitorForEventsMatchingMask:NSKeyDownMask
         handler:^(NSEvent* event) {
       HandleKeyEvent(event);
@@ -55,16 +54,11 @@ class MacGlobalShortcutBackendPrivate : boost::noncopyable {
       return HandleKeyEvent(event) ? nil : event;
     }];
     return true;
-  #else
-    return false;
-  #endif
   }
 
   void Unregister() {
-  #ifdef SNOW_LEOPARD
     [NSEvent removeMonitor:global_monitor_];
     [NSEvent removeMonitor:local_monitor_];
-  #endif
   }
 
  private:
@@ -133,15 +127,10 @@ bool MacGlobalShortcutBackend::KeyPressed(const QKeySequence& sequence) {
 }
 
 bool MacGlobalShortcutBackend::IsAccessibilityEnabled() const {
-#ifdef SNOW_LEOPARD
   return AXAPIEnabled();
-#else
-  return true;  // It's not really enabled but it doesn't matter.
-#endif
 }
 
 void MacGlobalShortcutBackend::ShowAccessibilityDialog() {
-#ifdef SNOW_LEOPARD
   NSArray* paths = NSSearchPathForDirectoriesInDomains(
       NSPreferencePanesDirectory, NSSystemDomainMask, YES);
   if ([paths count] == 1) {
@@ -149,5 +138,4 @@ void MacGlobalShortcutBackend::ShowAccessibilityDialog() {
         [[paths objectAtIndex:0] stringByAppendingPathComponent:@"UniversalAccessPref.prefPane"]];
     [[NSWorkspace sharedWorkspace] openURL:prefpane_url];
   }
-#endif
 }