Remove project headers from the prefix header; having everything in the prefix header...

diff --git a/ApplicationController.h b/ApplicationController.h
index 581abc2..6bb37b9 100644 (file)
--- a/ApplicationController.h
+++ b/ApplicationController.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 @class JoystickController;
 @class TargetController;
 @class ConfigsController;

diff --git a/ApplicationController.m b/ApplicationController.m
index 09be1c0..8fed5d6 100644 (file)
--- a/ApplicationController.m
+++ b/ApplicationController.m
@@ -5,6 +5,13 @@
 //  Created by Sam McCall on 4/05/09.
 //
 
+#import "ApplicationController.h"
+
+#import "Config.h"
+#import "ConfigsController.h"
+#import "JoystickController.h"
+#import "TargetController.h"
+
 @implementation ApplicationController {
     BOOL active;
 }

diff --git a/Config.h b/Config.h
index 12ee219..2572669 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-
 @class Target;
 @class JSAction;
 

diff --git a/Config.m b/Config.m
index fcc1828..84e6c32 100644 (file)
--- a/Config.m
+++ b/Config.m
@@ -7,6 +7,8 @@
 
 #import "Config.h"
 
+#import "JSAction.h"
+
 @implementation Config {
     NSMutableDictionary *entries;
 }

diff --git a/ConfigsController.h b/ConfigsController.h
index 32e0c61..a408d3b 100644 (file)
--- a/ConfigsController.h
+++ b/ConfigsController.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 @class Config;
 @class TargetController;
 

diff --git a/ConfigsController.m b/ConfigsController.m
index 65732e2..7db30bf 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -5,6 +5,14 @@
 //  Created by Sam McCall on 4/05/09.
 //
 
+#import "ConfigsController.h"
+
+#import "ApplicationController.h"
+#import "Config.h"
+#import "ConfigsController.h"
+#import "Target.h"
+#import "TargetController.h"
+
 @implementation ConfigsController {
     NSMutableArray *configs;
        Config *manualConfig;

diff --git a/Enjoy_Prefix.pch b/Enjoy_Prefix.pch
index 2105ca7..d6e96a6 100644 (file)
--- a/Enjoy_Prefix.pch
+++ b/Enjoy_Prefix.pch
@@ -7,22 +7,3 @@
 #endif
 
 #import <IOKit/hid/IOHIDLib.h>
-
-#import "ApplicationController.h"
-#import "Config.h"
-#import "ConfigsController.h"
-#import "Joystick.h"
-#import "JoystickController.h"
-#import "JSAction.h"
-#import "JSActionAnalog.h"
-#import "JSActionButton.h"
-#import "JSActionHat.h"
-#import "KeyInputTextView.h"
-#import "Target.h"
-#import "TargetConfig.h"
-#import "TargetController.h"
-#import "TargetKeyboard.h"
-#import "TargetMouseMove.h"
-#import "TargetMouseBtn.h"
-#import "TargetMouseScroll.h"
-#import "TargetToggleMouseScope.h"
\ No newline at end of file

diff --git a/JSAction.h b/JSAction.h
index 94d56f0..fc0971b 100644 (file)
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,9 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
-
 @interface JSAction : NSObject
 
 @property (assign) void *cookie;

diff --git a/JSActionButton.h b/JSActionButton.h
index 5a9a4c0..c4ba063 100644 (file)
--- a/JSActionButton.h
+++ b/JSActionButton.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 #import "JSAction.h"
 
 @interface JSActionButton : JSAction

diff --git a/JSActionButton.m b/JSActionButton.m
index f6a0fa7..58503c8 100644 (file)
--- a/JSActionButton.m
+++ b/JSActionButton.m
@@ -5,6 +5,8 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "JSActionButton.h"
+
 @implementation JSActionButton {
     BOOL active;
 }

diff --git a/JSActionHat.h b/JSActionHat.h
index 5a1fa22..114d82e 100644 (file)
--- a/JSActionHat.h
+++ b/JSActionHat.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 #import "JSAction.h"
 
 @interface JSActionHat : JSAction

diff --git a/JSActionHat.m b/JSActionHat.m
index 41d3728..6ed0ad1 100644 (file)
--- a/JSActionHat.m
+++ b/JSActionHat.m
@@ -5,6 +5,8 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "JSActionHat.h"
+
 static BOOL active_eightway[36] = {
     NO,  NO,  NO,  NO , // center
     YES, NO,  NO,  NO , // N

diff --git a/Joystick.h b/Joystick.h
index 831b10b..2aea487 100644 (file)
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,9 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
-
 @class JSAction;
 
 @interface Joystick : NSObject

diff --git a/Joystick.m b/Joystick.m
index 3f21818..7870ce0 100644 (file)
--- a/Joystick.m
+++ b/Joystick.m
@@ -7,6 +7,11 @@
 
 #import "Joystick.h"
 
+#import "JSAction.h"
+#import "JSActionAnalog.h"
+#import "JSActionButton.h"
+#import "JSActionHat.h"
+
 static NSArray *ActionsForElement(IOHIDDeviceRef device, id base) {
     CFArrayRef elements = IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone);
     NSMutableArray *children = [NSMutableArray arrayWithCapacity:CFArrayGetCount(elements)];

diff --git a/JoystickController.h b/JoystickController.h
index 2306ea1..498ea39 100644 (file)
--- a/JoystickController.h
+++ b/JoystickController.h
@@ -6,9 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hid/IOHIDLib.h>
-
 @class Joystick;
 @class JSAction;
 @class ConfigsController;

diff --git a/JoystickController.m b/JoystickController.m
index d87dca7..864a917 100644 (file)
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -7,6 +7,14 @@
 
 #import "JoystickController.h"
 
+#import "ApplicationController.h"
+#import "Config.h"
+#import "ConfigsController.h"
+#import "Joystick.h"
+#import "JSAction.h"
+#import "Target.h"
+#import "TargetController.h"
+
 @implementation JoystickController {
     IOHIDManagerRef hidManager;
     BOOL programmaticallySelecting;

diff --git a/KeyInputTextView.h b/KeyInputTextView.h
index 9927385..0551509 100644 (file)
--- a/KeyInputTextView.h
+++ b/KeyInputTextView.h
@@ -6,7 +6,7 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@class TargetController;
 
 @interface KeyInputTextView : NSTextField {
        IBOutlet NSWindow *window;

diff --git a/KeyInputTextView.m b/KeyInputTextView.m
index 288d903..cde2547 100644 (file)
--- a/KeyInputTextView.m
+++ b/KeyInputTextView.m
@@ -7,6 +7,8 @@
 
 #import "KeyInputTextView.h"
 
+#import "TargetController.h"
+
 @implementation KeyInputTextView {
     int vk;
     BOOL enabled;

diff --git a/Target.h b/Target.h
index f7d4ec1..e1d1ff7 100644 (file)
--- a/Target.h
+++ b/Target.h
@@ -6,7 +6,7 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@class JoystickController;
 
 @interface Target : NSObject
 

diff --git a/Target.m b/Target.m
index 9666c8a..6b208e8 100644 (file)
--- a/Target.m
+++ b/Target.m
@@ -5,6 +5,15 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "Target.h"
+
+#import "TargetKeyboard.h"
+#import "TargetConfig.h"
+#import "TargetMouseMove.h"
+#import "TargetMouseBtn.h"
+#import "TargetMouseScroll.h"
+#import "TargetToggleMouseScope.h"
+
 @implementation Target {
     BOOL running;
 }

diff --git a/TargetConfig.h b/TargetConfig.h
index addf2eb..0df0835 100644 (file)
--- a/TargetConfig.h
+++ b/TargetConfig.h
@@ -6,8 +6,6 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 #import "Target.h"
 
 @class Config;

diff --git a/TargetConfig.m b/TargetConfig.m
index 469edab..763bbac 100644 (file)
--- a/TargetConfig.m
+++ b/TargetConfig.m
@@ -7,6 +7,10 @@
 
 #import "TargetConfig.h"
 
+#import "ApplicationController.h"
+#import "Config.h"
+#import "ConfigsController.h"
+
 @implementation TargetConfig
 
 - (NSString *)stringify {

diff --git a/TargetController.h b/TargetController.h
index 2d499b7..589023b 100644 (file)
--- a/TargetController.h
+++ b/TargetController.h
@@ -6,12 +6,10 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
 @class KeyInputTextView;
 @class ConfigsController;
 @class JoystickController;
 @class Target;
-
 @class TargetMouseMove;
 
 @interface TargetController : NSObject {

diff --git a/TargetController.m b/TargetController.m
index 074c487..3fc0f28 100644 (file)
--- a/TargetController.m
+++ b/TargetController.m
@@ -5,6 +5,21 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "TargetController.h"
+
+#import "ConfigsController.h"
+#import "Config.h"
+#import "JSAction.h"
+#import "JoystickController.h"
+#import "KeyInputTextView.h"
+#import "TargetConfig.h"
+#import "TargetController.h"
+#import "TargetKeyboard.h"
+#import "TargetMouseBtn.h"
+#import "TargetMouseMove.h"
+#import "TargetMouseScroll.h"
+#import "TargetToggleMouseScope.h"
+
 @implementation TargetController
 
 -(void) keyChanged {

diff --git a/TargetKeyboard.h b/TargetKeyboard.h
index a968a9a..6ff088b 100644 (file)
--- a/TargetKeyboard.h
+++ b/TargetKeyboard.h
@@ -6,8 +6,7 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-@class Target;
+#import "Target.h"
 
 @interface TargetKeyboard : Target {
        CGKeyCode vk;

diff --git a/TargetKeyboard.m b/TargetKeyboard.m
index eb1f4d7..e7bd8e7 100644 (file)
--- a/TargetKeyboard.m
+++ b/TargetKeyboard.m
@@ -5,6 +5,8 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "TargetKeyboard.h"
+
 @implementation TargetKeyboard
 
 @synthesize vk, descr;

diff --git a/TargetMouseMove.h b/TargetMouseMove.h
index a3e2fdf..f486a96 100644 (file)
--- a/TargetMouseMove.h
+++ b/TargetMouseMove.h
@@ -6,7 +6,6 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "Target.h"
 
 @interface TargetMouseMove : Target {

diff --git a/TargetMouseMove.m b/TargetMouseMove.m
index aa50306..5f83dbf 100644 (file)
--- a/TargetMouseMove.m
+++ b/TargetMouseMove.m
@@ -8,6 +8,8 @@
 
 #import "TargetMouseMove.h"
 
+#import "JoystickController.h"
+
 @implementation TargetMouseMove
 
 -(BOOL) isContinuous {

diff --git a/TargetMouseScroll.h b/TargetMouseScroll.h
index ddafef4..a53a02e 100644 (file)
--- a/TargetMouseScroll.h
+++ b/TargetMouseScroll.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import "Target.h"
 
 @interface TargetMouseScroll : Target {
     int howMuch;

diff --git a/TargetToggleMouseScope.m b/TargetToggleMouseScope.m
index 9e986df..d6833fc 100644 (file)
--- a/TargetToggleMouseScope.m
+++ b/TargetToggleMouseScope.m
@@ -8,6 +8,9 @@
 
 #import "TargetToggleMouseScope.h"
 
+#import "ApplicationController.h"
+#import "JoystickController.h"
+
 @implementation TargetToggleMouseScope
 
 -(NSString*) stringify {