projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename methods uniquely between mapping/device controllers.
[enjoyable.git]
/
Classes
/
NJMappingsController.m
diff --git
a/Classes/NJMappingsController.m
b/Classes/NJMappingsController.m
index
44a9c43
..
6902504
100644
(file)
--- a/
Classes/NJMappingsController.m
+++ b/
Classes/NJMappingsController.m
@@
-27,17
+27,13
@@
return self;
}
return self;
}
-- (NJMapping *)
objectForKeyedSubscript
:(NSString *)name {
+- (NJMapping *)
mappingForKey
:(NSString *)name {
for (NJMapping *mapping in _mappings)
if ([name isEqualToString:mapping.name])
return mapping;
return nil;
}
for (NJMapping *mapping in _mappings)
if ([name isEqualToString:mapping.name])
return mapping;
return nil;
}
-- (NJMapping *)objectAtIndexedSubscript:(NSUInteger)idx {
- return idx < _mappings.count ? _mappings[idx] : nil;
-}
-
- (void)mappingsSet {
[self postLoadProcess];
[NSNotificationCenter.defaultCenter
- (void)mappingsSet {
[self postLoadProcess];
[NSNotificationCenter.defaultCenter
@@
-52,20
+48,12
@@
[self mappingsSet];
}
[self mappingsSet];
}
-- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
- objects:(__unsafe_unretained id [])buffer
- count:(NSUInteger)len {
- return [_mappings countByEnumeratingWithState:state
- objects:buffer
- count:len];
-}
-
- (void)activateMappingForProcess:(NSRunningApplication *)app {
NJMapping *oldMapping = _manualMapping;
NSArray *names = app.possibleMappingNames;
BOOL found = NO;
for (NSString *name in names) {
- (void)activateMappingForProcess:(NSRunningApplication *)app {
NJMapping *oldMapping = _manualMapping;
NSArray *names = app.possibleMappingNames;
BOOL found = NO;
for (NSString *name in names) {
- NJMapping *mapping =
self[
name];
+ NJMapping *mapping =
[self mappingForKey:
name];
if (mapping) {
[self activateMapping:mapping];
found = YES;
if (mapping) {
[self activateMapping:mapping];
found = YES;
@@
-114,8
+102,8
@@
}
- (void)postLoadProcess {
}
- (void)postLoadProcess {
- for (NJMapping *mapping in self)
- [mapping postLoadProcess:self];
+ for (NJMapping *mapping in self
.mappings
)
+ [mapping postLoadProcess:self
.mappings
];
}
- (void)load {
}
- (void)load {
@@
-166,7
+154,7
@@
- (void)removeMappingAtIndex:(NSInteger)idx {
NSInteger currentIdx = [self indexOfMapping:_currentMapping];
[_mappings removeObjectAtIndex:idx];
- (void)removeMappingAtIndex:(NSInteger)idx {
NSInteger currentIdx = [self indexOfMapping:_currentMapping];
[_mappings removeObjectAtIndex:idx];
- [self activateMapping:self[MIN(currentIdx, _mappings.count - 1)]];
+ [self activateMapping:self
.mappings
[MIN(currentIdx, _mappings.count - 1)]];
[self mappingsChanged];
}
[self mappingsChanged];
}
@@
-175,8
+163,4
@@
[self mappingsChanged];
}
[self mappingsChanged];
}
-- (NSUInteger)count {
- return _mappings.count;
-}
-
@end
@end