aboutsummaryrefslogtreecommitdiffstats
path: root/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'Framework')
-rw-r--r--Framework/MASShortcut.h8
-rw-r--r--Framework/MASShortcut.m8
2 files changed, 8 insertions, 8 deletions
diff --git a/Framework/MASShortcut.h b/Framework/MASShortcut.h
index 123e25e..24bd125 100644
--- a/Framework/MASShortcut.h
+++ b/Framework/MASShortcut.h
@@ -12,10 +12,10 @@
@property (nonatomic, readonly) NSData *data;
@property (nonatomic, readonly) BOOL shouldBypass;
-- (id)initWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags;
+- (instancetype)initWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags;
-+ (MASShortcut *)shortcutWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags;
-+ (MASShortcut *)shortcutWithEvent:(NSEvent *)anEvent;
-+ (MASShortcut *)shortcutWithData:(NSData *)aData;
++ (instancetype)shortcutWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags;
++ (instancetype)shortcutWithEvent:(NSEvent *)anEvent;
++ (instancetype)shortcutWithData:(NSData *)aData;
@end
diff --git a/Framework/MASShortcut.m b/Framework/MASShortcut.m
index 0e834eb..d8a12e6 100644
--- a/Framework/MASShortcut.m
+++ b/Framework/MASShortcut.m
@@ -24,7 +24,7 @@ NSString *const MASShortcutModifierFlags = @"ModifierFlags";
[coder encodeInteger:(NSInteger)self.modifierFlags forKey:MASShortcutModifierFlags];
}
-- (id)initWithCoder:(NSCoder *)decoder
+- (instancetype)initWithCoder:(NSCoder *)decoder
{
self = [super init];
if (self) {
@@ -45,17 +45,17 @@ NSString *const MASShortcutModifierFlags = @"ModifierFlags";
return self;
}
-+ (MASShortcut *)shortcutWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags
++ (instancetype)shortcutWithKeyCode:(NSUInteger)code modifierFlags:(NSUInteger)flags
{
return [[self alloc] initWithKeyCode:code modifierFlags:flags];
}
-+ (MASShortcut *)shortcutWithEvent:(NSEvent *)event
++ (instancetype)shortcutWithEvent:(NSEvent *)event
{
return [[self alloc] initWithKeyCode:event.keyCode modifierFlags:event.modifierFlags];
}
-+ (MASShortcut *)shortcutWithData:(NSData *)data
++ (instancetype)shortcutWithData:(NSData *)data
{
id shortcut = (data ? [NSKeyedUnarchiver unarchiveObjectWithData:data] : nil);
return shortcut;