Big rename part 2: 'config' etc. to 'mapping.

[enjoyable.git] / ApplicationController.h

diff --git a/ApplicationController.h b/ApplicationController.h
index 9d1607f..88c9d29 100644 (file)
--- a/ApplicationController.h
+++ b/ApplicationController.h
@@ -6,29 +6,23 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-@class JoystickController;
+@class NJInputController;
 @class TargetController;
-@class ConfigsController;
+@class NJMappingsController;
 
-@interface ApplicationController : NSObject {
-       IBOutlet JoystickController *jsController;
-       IBOutlet TargetController *targetController;
-       IBOutlet ConfigsController *configsController;
-       
-       IBOutlet NSDrawer *drawer;
-       IBOutlet NSWindow *mainWindow;
-       IBOutlet NSToolbarItem* activeButton;
-       IBOutlet NSMenuItem* activeMenuItem;
-       IBOutlet NSMenu* dockMenuBase;
+@interface ApplicationController : NSObject <NSApplicationDelegate> {
+    IBOutlet NSDrawer *drawer;
+    IBOutlet NSWindow *mainWindow;
+    IBOutlet NSToolbarItem *activeButton;
+    IBOutlet NSMenuItem *activeMenuItem;
+    IBOutlet NSMenu *dockMenuBase;
 }
 
-@property(readwrite) BOOL active;
-@property(readonly) JoystickController * jsController;
-@property(readonly) TargetController * targetController;
-@property(readonly) ConfigsController * configsController;
--(IBAction) toggleActivity: (id)sender;
--(void) configsChanged;
--(void) configChanged;
+@property (nonatomic, strong) IBOutlet NJInputController *inputController;
+@property (nonatomic, strong) IBOutlet TargetController *targetController;
+@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
+
+- (IBAction)toggleActivity:(id)sender;
+- (void)mappingsChanged;
 
 @end