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

[enjoyable.git] / ApplicationController.h

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