Rename methods uniquely between mapping/device controllers.

[enjoyable.git] / Classes / NJMappingsController.h

diff --git a/Classes/NJMappingsController.h b/Classes/NJMappingsController.h
index 85ba54f..b9d3e67 100644 (file)
--- a/Classes/NJMappingsController.h
+++ b/Classes/NJMappingsController.h
@@ -7,20 +7,13 @@
 //
 
 @class NJMapping;
-@class NJOutputController;
 
-#import "NJMappingsViewController.h"
-
-@interface NJMappingsController : NSObject <NSFastEnumeration,
-                                            NJMappingsViewControllerDelegate>
+@interface NJMappingsController : NSObject
 
 @property (nonatomic, readonly) NJMapping *currentMapping;
-@property (nonatomic, readonly) NSUInteger count;
-
-@property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc;
+@property (nonatomic, readonly) NSArray *mappings;
 
-- (NJMapping *)objectForKeyedSubscript:(NSString *)name;
-- (NJMapping *)objectAtIndexedSubscript:(NSUInteger)idx;
+- (NJMapping *)mappingForKey:(NSString *)name;
 - (NSInteger)indexOfMapping:(NJMapping *)mapping;
 
 - (void)addMapping:(NJMapping *)mapping;
@@ -28,14 +21,11 @@
 - (void)removeMappingAtIndex:(NSInteger)idx;
 - (void)mergeMapping:(NJMapping *)mapping intoMapping:(NJMapping *)existing;
 - (void)moveMoveMappingFromIndex:(NSInteger)fromIdx toIndex:(NSInteger)toIdx;
-
-- (void)mappingsChanged;
-
-- (void)promptForMapping:(NJMapping *)mapping atIndex:(NSInteger)idx;
-    // FIXME: Doesn't belong here.
+- (void)renameMapping:(NJMapping *)mapping to:(NSString *)name;
 
 - (void)activateMapping:(NJMapping *)mapping;
 - (void)activateMappingForProcess:(NSRunningApplication *)app;
+
 - (void)save;
 - (void)load;