Rename from Enjoy/Enjoy2 to 'Enjoyable'. While I'm mucking in the project file, enabl...

[enjoyable.git] / Joystick.h

diff --git a/Joystick.h b/Joystick.h
index 99587a7..1c254a7 100644 (file)
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,22 +6,19 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
 @class JSAction;
 
 @interface Joystick : NSObject
 
-@property (assign) int vendorId;
-@property (assign) int productId;
 @property (assign) int index;
 @property (copy) NSString *productName;
 @property (assign) IOHIDDeviceRef device;
-@property (readonly) NSArray *children;
+@property (copy) NSArray *children;
 @property (readonly) NSString *name;
+@property (readonly) NSString *uid;
 
--(void) populateActions;
--(id) handlerForEvent: (IOHIDValueRef) value;
--(id)initWithDevice: (IOHIDDeviceRef) newDevice;
--(JSAction*) actionForEvent: (IOHIDValueRef) value;
+- (id)initWithDevice:(IOHIDDeviceRef)device;
+- (id)handlerForEvent:(IOHIDValueRef)value;
+- (JSAction *)actionForEvent:(IOHIDValueRef)value;
 
 @end