X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Joystick.h;h=4b60ba84d75c563d14763f8d9cb9b32bd78ce7b1;hp=99587a7f50ba4bc292c8ecca16fb8a841ad51bb9;hb=19f40be5b645e44ffb55bdce0b6cc5c5615f68e7;hpb=d2b45b2c32dcc7c3cc553b62252ca48842e08d48

diff --git a/Joystick.h b/Joystick.h
index 99587a7..4b60ba8 100644
--- 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 (readonly) NSString *name;
+@property (nonatomic, assign) int index;
+@property (nonatomic, copy) NSString *productName;
+@property (nonatomic, assign) IOHIDDeviceRef device;
+@property (nonatomic, copy) NSArray *children;
+@property (nonatomic, 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