From 88392d1a6963cca5009b9b0c20b054ad9e911b6c Mon Sep 17 00:00:00 2001
From: Tomáš Znamenáček
Date: Tue, 5 Aug 2014 15:16:59 +0200
Subject: Introduced a separate header file for keycode definitions.

---
 Framework/MASKeyCodes.h               | 23 +++++++++++++++++++++++
 Framework/MASShortcut.h               | 23 +----------------------
 MASShortcut.xcodeproj/project.pbxproj |  4 ++++
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 Framework/MASKeyCodes.h

diff --git a/Framework/MASKeyCodes.h b/Framework/MASKeyCodes.h
new file mode 100644
index 0000000..69b2a97
--- /dev/null
+++ b/Framework/MASKeyCodes.h
@@ -0,0 +1,23 @@
+#import <Carbon/Carbon.h>
+
+// These glyphs are missed in Carbon.h
+enum {
+    kMASShortcutGlyphEject = 0x23CF,
+    kMASShortcutGlyphClear = 0x2715,
+	kMASShortcutGlyphDeleteLeft = 0x232B,
+	kMASShortcutGlyphDeleteRight = 0x2326,
+    kMASShortcutGlyphLeftArrow = 0x2190,
+	kMASShortcutGlyphRightArrow = 0x2192,
+	kMASShortcutGlyphUpArrow = 0x2191,
+	kMASShortcutGlyphDownArrow = 0x2193,
+	kMASShortcutGlyphEscape = 0x238B,
+	kMASShortcutGlyphHelp = 0x003F,
+    kMASShortcutGlyphPageDown = 0x21DF,
+	kMASShortcutGlyphPageUp = 0x21DE,
+	kMASShortcutGlyphTabRight = 0x21E5,
+	kMASShortcutGlyphReturn = 0x2305,
+	kMASShortcutGlyphReturnR2L = 0x21A9,	
+	kMASShortcutGlyphPadClear = 0x2327,
+	kMASShortcutGlyphNorthwestArrow = 0x2196,
+	kMASShortcutGlyphSoutheastArrow = 0x2198,
+} MASShortcutGlyph;
diff --git a/Framework/MASShortcut.h b/Framework/MASShortcut.h
index c9081a2..f1e489c 100644
--- a/Framework/MASShortcut.h
+++ b/Framework/MASShortcut.h
@@ -1,4 +1,4 @@
-#import <Carbon/Carbon.h>
+#import "MASKeyCodes.h"
 #import <AppKit/AppKit.h>
 
 #define MASShortcutChar(char) [NSString stringWithFormat:@"%C", (unsigned short)(char)]
@@ -9,27 +9,6 @@
     (cocoaFlags & NSControlKeyMask ? controlKey : 0) | \
     (cocoaFlags & NSShiftKeyMask ? shiftKey : 0))
 
-// These glyphs are missed in Carbon.h
-enum {
-    kMASShortcutGlyphEject = 0x23CF,
-    kMASShortcutGlyphClear = 0x2715,
-	kMASShortcutGlyphDeleteLeft = 0x232B,
-	kMASShortcutGlyphDeleteRight = 0x2326,
-    kMASShortcutGlyphLeftArrow = 0x2190,
-	kMASShortcutGlyphRightArrow = 0x2192,
-	kMASShortcutGlyphUpArrow = 0x2191,
-	kMASShortcutGlyphDownArrow = 0x2193,
-	kMASShortcutGlyphEscape = 0x238B,
-	kMASShortcutGlyphHelp = 0x003F,
-    kMASShortcutGlyphPageDown = 0x21DF,
-	kMASShortcutGlyphPageUp = 0x21DE,
-	kMASShortcutGlyphTabRight = 0x21E5,
-	kMASShortcutGlyphReturn = 0x2305,
-	kMASShortcutGlyphReturnR2L = 0x21A9,	
-	kMASShortcutGlyphPadClear = 0x2327,
-	kMASShortcutGlyphNorthwestArrow = 0x2196,
-	kMASShortcutGlyphSoutheastArrow = 0x2198,
-} MASShortcutGlyph;
 
 @interface MASShortcut : NSObject <NSSecureCoding>
 
diff --git a/MASShortcut.xcodeproj/project.pbxproj b/MASShortcut.xcodeproj/project.pbxproj
index 724b730..b55ace6 100644
--- a/MASShortcut.xcodeproj/project.pbxproj
+++ b/MASShortcut.xcodeproj/project.pbxproj
@@ -28,6 +28,7 @@
 		0D827D8419910AFF0010B8EF /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CEB1990D4420010B8EF /* XCTest.framework */; };
 		0D827D9419910B740010B8EF /* MASShortcutTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D827D9319910B740010B8EF /* MASShortcutTests.m */; };
 		0D827D9519910C1E0010B8EF /* MASShortcut.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D827CD31990D4420010B8EF /* MASShortcut.framework */; };
+		0D827D9719910FF70010B8EF /* MASKeyCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D827D9619910FF70010B8EF /* MASKeyCodes.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -84,6 +85,7 @@
 		0D827D8719910AFF0010B8EF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0D827D8D19910AFF0010B8EF /* Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
 		0D827D9319910B740010B8EF /* MASShortcutTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MASShortcutTests.m; path = Framework/MASShortcutTests.m; sourceTree = "<group>"; };
+		0D827D9619910FF70010B8EF /* MASKeyCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MASKeyCodes.h; path = Framework/MASKeyCodes.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -152,6 +154,7 @@
 		0D827D151990D4D70010B8EF /* Framework */ = {
 			isa = PBXGroup;
 			children = (
+				0D827D9619910FF70010B8EF /* MASKeyCodes.h */,
 				0D827D1B1990D55E0010B8EF /* MASShortcut.h */,
 				0D827D1C1990D55E0010B8EF /* MASShortcut.m */,
 				0D827D9319910B740010B8EF /* MASShortcutTests.m */,
@@ -200,6 +203,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0D827D2B1990D55E0010B8EF /* MASShortcutView.h in Headers */,
+				0D827D9719910FF70010B8EF /* MASKeyCodes.h in Headers */,
 				0D827D251990D55E0010B8EF /* MASShortcut.h in Headers */,
 				0D827D2D1990D55E0010B8EF /* MASShortcutView+UserDefaults.h in Headers */,
 				0D827D271990D55E0010B8EF /* MASShortcut+Monitoring.h in Headers */,
-- 
cgit v1.2.3