From: Joe Wreschnig Date: Wed, 13 Mar 2013 17:32:10 +0000 (+0100) Subject: Style issues. Remove dead code. X-Git-Tag: version-1.1~34 X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=bdd3587bb3eadc9ddfe2ae385134de25bc13d770;p=enjoyable.git Style issues. Remove dead code. --- diff --git a/Classes/NJDevice.m b/Classes/NJDevice.m index a5efd96..3b0cc6a 100644 --- a/Classes/NJDevice.m +++ b/Classes/NJDevice.m @@ -61,16 +61,16 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) { } @implementation NJDevice { - int vendorId; - int productId; + int _vendorId; + int _productId; } - (id)initWithDevice:(IOHIDDeviceRef)dev { if ((self = [super initWithName:nil did:nil base:nil])) { self.device = dev; self.productName = (__bridge NSString *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductKey)); - vendorId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDVendorIDKey)) intValue]; - productId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductIDKey)) intValue]; + _vendorId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDVendorIDKey)) intValue]; + _productId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductIDKey)) intValue]; self.children = InputsForElement(dev, self); } return self; @@ -80,12 +80,8 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) { return [NSString stringWithFormat:@"%@ #%d", _productName, _index]; } -- (id)base { - return nil; -} - - (NSString *)uid { - return [NSString stringWithFormat: @"%d:%d:%d", vendorId, productId, _index]; + return [NSString stringWithFormat: @"%d:%d:%d", _vendorId, _productId, _index]; } - (NJInput *)findInputByCookie:(IOHIDElementCookie)cookie {