Rename methods uniquely between mapping/device controllers.

[enjoyable.git] / Classes / NJDeviceController.h

diff --git a/Classes/NJDeviceController.h b/Classes/NJDeviceController.h
index 3691d59..41017db 100644 (file)
--- a/Classes/NJDeviceController.h
+++ b/Classes/NJDeviceController.h
@@ -7,28 +7,25 @@
 //
 
 #import "NJHIDManager.h"
-#import "NJDeviceViewController.h"
 
+@class NJDevice;
 @class NJInput;
+@class NJInputPathElement;
 @class NJMappingsController;
 
 @protocol NJDeviceControllerDelegate;
 
 @interface NJDeviceController : NSObject <NJHIDManagerDelegate> {
     IBOutlet NJMappingsController *mappingsController;
-    IBOutlet NSButton *simulatingEventsButton;
 }
 
 @property (nonatomic, weak) IBOutlet id <NJDeviceControllerDelegate> delegate;
 
 @property (nonatomic, assign) NSPoint mouseLoc;
 @property (nonatomic, assign) BOOL simulatingEvents;
+@property (nonatomic, readonly) NSArray *devices;
 
-- (IBAction)simulatingEventsChanged:(NSButton *)sender;
-
-- (NJDevice *)objectAtIndexedSubscript:(NSUInteger)idx;
-- (NJInputPathElement *)objectForKeyedSubscript:(NSString *)uid;
-- (NSUInteger)count;
+- (NJInputPathElement *)elementForUID:(NSString *)uid;
 
 @end