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

diff --git a/ApplicationController.h b/ApplicationController.h
index 581abc2b95b371c2b900eab99bc3ac4b0056a0a4..6bb37b923abd493b71a6655fa211e3a4c865a3f9 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 09be1c04d6811747fc928e7ab18fb42fd2e43ba6..8fed5d61f3d047ce6d46586f86e7ba41811a47ed 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 12ee2198054fff0c32cac3d49ed895d6c8af726a..2572669cb3b86d029a210874f7c33fcc579b71a2 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 fcc18283a8230b959fd6bfe1c60c7d34e7b5f963..84e6c324a782a09f22fba76fc41f4e6ef38c2c83 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 32e0c6132a2a32b0b39c92a3fc0df079874cb78d..a408d3bfaa8d5eb18031ade6675b8db5c6197cce 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 65732e24656f0070dc56a09dcb64b1d915b2aeb7..7db30bf9318d3a6c8bb7d6ddb48bdb75c034fa65 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 2105ca7e93f0480c31504f1ae1089168390c7d7c..d6e96a630c7a535e68ddb9456b782ffbacd60308 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 94d56f012583e1451f39014b6db0b2857324d10c..fc0971b3ec778c8f34b575ec48f84d38f7c008b8 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 5a9a4c0629039e0842c8bf7ae4d5ae8ed6fc7695..c4ba0633d279be646537d358b8ea32f2724cbad8 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 f6a0fa76f003edc5ab89c3242c64e245de4f9bde..58503c82de69560f91c3d30f1b438d4d6c148a7a 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 5a1fa22de7aa6bb4ef5f25f5f7c6db357b39a61a..114d82e5e4f125be4d05eddd1b64a2ce021b8c06 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 41d372870a33a519497adc4fdbde75e1b8bf57cd..6ed0ad13443b3c19737d6c6367f646c341c7b63d 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 831b10b6f3a3e15a93a38bde8bd9c665d32f9081..2aea4873ce7de522a9204ce9d34b1b38ef2148c5 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 3f218184fe8810fd8af83cd939f644d4ae97f4b1..7870ce0589ec6e6a44f0d54790726eb0bf664d0b 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 2306ea1c9c8fb3c929200a46e86a286eb4d8a299..498ea397153b217ddf1705c72910cffa608cb2d1 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 d87dca7d8fdb0fead42e07ae70aa0023eeb2e028..864a917cff446ae613f8282deb856f7537c7a8fc 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 9927385ed13c90542598fc6708ab2c0193f77627..05515097c4c55f6fce5d00d64edbd3656556ceca 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 288d903fa156bde99ff12c9c1f1c830e4c746cee..cde2547d8c8ac455db7e9e2f4741627e919f73c6 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 f7d4ec119320ce19737d0eef2bcf0ecabbfee9cf..e1d1ff7b3d15c4d6896d4c3a039b0a631119f008 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 9666c8a80f27280f02d1d3219e45dd3180ccfd5b..6b208e8785626f9d4f27614b36a709f7b3baaa2c 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 addf2ebb5965b4dbbcf5a91d703498f468b546c9..0df08352b7d207acee6f1743c49049899b7f0e49 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 469edabe0bb9898386c1705b9987b06361b34111..763bbac7157001ff217aad3fc06f07da458a57f3 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 2d499b7472e392cf732ea636210b183383f3cf07..589023b4574634bf2c7bc789c5f5bb21192c323e 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 074c4876ff8717ffac5ed1f3f8b7966314f7d850..3fc0f288ad9ce7033e17e70732e0cf5028a316b9 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 a968a9a5c9d35d6aa861da06c8a6740ced0c1075..6ff088b78412e28f2097069fe89b23622501a3fa 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 eb1f4d780ca48674f33acd267f48a4257b590e22..e7bd8e761694dc0459f17ea10c472d37464beb3a 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 a3e2fdf6aa7b4d7c771b0e03904b6ad8d0bacc92..f486a96f53c45b4b2cbe9bdd13bca57207f424d8 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 aa503069441645295ebe4bf9551a485eaa646735..5f83dbfdc9cc167b69d2360a678fb6da4f6b7437 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 ddafef4497c231831510d91ce734f8a54099b2a2..a53a02e79a2660331227a758ec41e8cd6aeef85f 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 9e986df79d8af98dffc1682a1374b811659869fe..d6833fcd1888e08f2733731b171313c22d465417 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 {