diff options
Diffstat (limited to 'Framework')
| -rw-r--r-- | Framework/MASShortcut.h | 4 | ||||
| -rw-r--r-- | Framework/MASShortcut.m | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Framework/MASShortcut.h b/Framework/MASShortcut.h index aa3dfb0..2168952 100644 --- a/Framework/MASShortcut.h +++ b/Framework/MASShortcut.h @@ -2,8 +2,8 @@ @interface MASShortcut : NSObject <NSSecureCoding> -@property (nonatomic) NSUInteger keyCode; -@property (nonatomic) NSUInteger modifierFlags; +@property (nonatomic, readonly) NSUInteger keyCode; +@property (nonatomic, readonly) NSUInteger modifierFlags; @property (nonatomic, readonly) UInt32 carbonKeyCode; @property (nonatomic, readonly) UInt32 carbonFlags; @property (nonatomic, readonly) NSString *keyCodeString; diff --git a/Framework/MASShortcut.m b/Framework/MASShortcut.m index 133ce38..3852a9a 100644 --- a/Framework/MASShortcut.m +++ b/Framework/MASShortcut.m @@ -3,10 +3,7 @@ static NSString *const MASShortcutKeyCode = @"KeyCode"; static NSString *const MASShortcutModifierFlags = @"ModifierFlags"; -@implementation MASShortcut { - NSUInteger _keyCode; // NSNotFound if empty - NSUInteger _modifierFlags; // 0 if empty -} +@implementation MASShortcut #pragma mark Initialization @@ -212,8 +209,8 @@ static NSString *const MASShortcutModifierFlags = @"ModifierFlags"; self = [super init]; if (self) { NSInteger code = [decoder decodeIntegerForKey:MASShortcutKeyCode]; - self.keyCode = (code < 0 ? NSNotFound : (NSUInteger)code); - self.modifierFlags = [decoder decodeIntegerForKey:MASShortcutModifierFlags]; + _keyCode = (code < 0 ? NSNotFound : (NSUInteger)code); + _modifierFlags = [decoder decodeIntegerForKey:MASShortcutModifierFlags]; } return self; } |