projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big rename part 2: 'config' etc. to 'mapping.
[enjoyable.git]
/
ApplicationController.h
diff --git
a/ApplicationController.h
b/ApplicationController.h
index
a5dcb6a
..
88c9d29
100644
(file)
--- a/
ApplicationController.h
+++ b/
ApplicationController.h
@@
-6,9
+6,9
@@
// Copyright 2009 University of Otago. All rights reserved.
//
// Copyright 2009 University of Otago. All rights reserved.
//
-@class
Joystick
Controller;
+@class
NJInput
Controller;
@class TargetController;
@class TargetController;
-@class
Confi
gsController;
+@class
NJMappin
gsController;
@interface ApplicationController : NSObject <NSApplicationDelegate> {
IBOutlet NSDrawer *drawer;
@interface ApplicationController : NSObject <NSApplicationDelegate> {
IBOutlet NSDrawer *drawer;
@@
-18,12
+18,11
@@
IBOutlet NSMenu *dockMenuBase;
}
IBOutlet NSMenu *dockMenuBase;
}
-@property (nonatomic, strong) IBOutlet
JoystickController *js
Controller;
+@property (nonatomic, strong) IBOutlet
NJInputController *input
Controller;
@property (nonatomic, strong) IBOutlet TargetController *targetController;
@property (nonatomic, strong) IBOutlet TargetController *targetController;
-@property (nonatomic, strong) IBOutlet
ConfigsController *confi
gsController;
+@property (nonatomic, strong) IBOutlet
NJMappingsController *mappin
gsController;
- (IBAction)toggleActivity:(id)sender;
- (IBAction)toggleActivity:(id)sender;
-- (void)configsChanged;
-- (void)configChanged;
+- (void)mappingsChanged;
@end
@end