Clean up a bunch of properties; remove unused ones, use automatic ones where possible...

[enjoyable.git] / KeyInputTextView.m

diff --git a/KeyInputTextView.m b/KeyInputTextView.m
index 288d903..1bb7952 100644 (file)
--- a/KeyInputTextView.m
+++ b/KeyInputTextView.m
@@ -7,13 +7,13 @@
 
 #import "KeyInputTextView.h"
 
+#import "TargetController.h"
+
 @implementation KeyInputTextView {
     int vk;
     BOOL enabled;
 }
 
-@synthesize descr;
-
 - (id)initWithFrame:(NSRect)frameRect {
     if ((self = [super initWithFrame:frameRect])) {
         self.alignment = NSCenterTextAlignment;
@@ -31,7 +31,7 @@
     return self.vk >= 0;
 }
 
-- (NSString *)stringForKeyCode:(int)keycode {
++ (NSString *)stringForKeyCode:(int)keycode {
     switch(keycode) {
         case   -1: return @"";
         case 0x7a: return @"F1";
@@ -155,7 +155,7 @@
 }
 
 - (BOOL)acceptsFirstResponder {
-    return enabled;
+    return self.enabled;
 }
 
 - (BOOL)becomeFirstResponder {
@@ -174,8 +174,7 @@
 
 - (void)setVk:(int)key {
     vk = key;
-    descr = [self stringForKeyCode:key];
-    [self setStringValue:descr];
+    [self setStringValue:[KeyInputTextView stringForKeyCode:key]];
     if (self.hasKey)
         [targetController keyChanged];
 }
@@ -187,7 +186,7 @@
 - (void)keyDown:(NSEvent *)evt {
     if (!evt.isARepeat) {
         self.vk = evt.keyCode;
-        [[self window] makeFirstResponder:nil];
+        [self.window makeFirstResponder:nil];
     }
 }