aboutsummaryrefslogtreecommitdiffstats
path: root/Framework
diff options
context:
space:
mode:
authorTomáš Znamenáček2014-08-06 10:19:11 +0200
committerTomáš Znamenáček2015-01-07 15:33:45 +0100
commit1bdadb166d7ac60a9ea8947e110146bf39a7fb9b (patch)
tree4af85c3654483216c9fb6a71c128cc8cffbda97d /Framework
parent4223f9b6b87675effad767ed51f352f529ad670b (diff)
downloadMASShortcut-1bdadb166d7ac60a9ea8947e110146bf39a7fb9b.tar.bz2
Made the keyCode and modifierFlags properties read-only.
A shortcut is a good value type, it makes good sense to represent it using an immutable object like NSNumber or NSString.
Diffstat (limited to 'Framework')
-rw-r--r--Framework/MASShortcut.h4
-rw-r--r--Framework/MASShortcut.m9
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;
}