Xcode wasn't happy about importing ZeroKit from the .pch file.

eczarny · Aug 26, 2012 · fc56f51 · fc56f51
1 parent 7c92a3b
commit fc56f51
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 33 deletions.
diff --git a/Spectacle.pch b/Spectacle.pch
@@ -1,5 +1,4 @@
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
     #import <QuartzCore/QuartzCore.h>
-    #import <ZeroKit/ZeroKit.h>
 #endif
diff --git a/SpectacleConstants.h b/SpectacleConstants.h
@@ -1,28 +1,7 @@
-#define SpectaclePreferencePaneName                   @"Spectacle"
-#define SpectacleHelperApplicationName                @"SpectacleHelper"
-#define SpectacleBundleIdentifier                     @"com.divisiblebyzero.Spectacle"
-#define SpectacleHelperBundleIdentifier               @"com.divisiblebyzero.SpectacleHelper"
-
-#define SpectacleApplicationBundleExtension           @"app"
-
-#pragma mark -
-
-#define SpectacleNibName                              @"Spectacle"
-#define SpectaclePreferencePaneNibName                @"SpectaclePreferencePane"
 #define SpectaclePreferencesWindowNibName             @"SpectaclePreferencesWindow"
 
 #pragma mark -
 
-#define SpectacleHelperControllerServiceName          @"SpectacleHelperControllerServiceName"
-
-#pragma mark -
-
-#define SpectacleHelperDidFinishLaunchingNotification @"SpectacleHelperDidFinishLaunchingNotification"
-#define SpectacleHelperDidTerminateNotification       @"SpectacleHelperDidTerminateNotification"
-#define SpectacleHelperShouldTerminateNotification    @"SpectacleHelperShouldTerminateNotification"
-
-#pragma mark -
-
 #define SpectacleStatusItemEnabledNotification        @"SpectacleStatusItemEnabledNotification"
 #define SpectacleStatusItemDisabledNotification       @"SpectacleStatusItemDisabledNotification"
 
@@ -62,11 +41,6 @@
 
 #pragma mark -
 
-#define SpectacleSliderBackgroundImage                @"Slider Background"
-#define SpectacleSliderMaskImage                      @"Slider Mask"
-#define SpectacleSliderHandleImage                    @"Slider Handle"
-#define SpectacleSliderPressedHandleImage             @"Slider Pressed Handle"
-
 #define SpectacleStatusItemIcon                       @"Spectacle Status Item"
 #define SpectacleAlternateStatusItemIcon              @"Spectacle Alternate Status Item"
 

diff --git a/SpectacleHistoryItem.h b/SpectacleHistoryItem.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
-
-@class ZeroKitAccessibilityElement;
+#import <ZeroKit/ZeroKit.h>
 
 @interface SpectacleHistoryItem : NSObject {
     ZeroKitAccessibilityElement *myAccessibilityElement;

diff --git a/SpectacleHotKeyManager.h b/SpectacleHotKeyManager.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
-
-@class ZeroKitHotKey;
+#import <ZeroKit/ZeroKit.h>
 
 @interface SpectacleHotKeyManager : NSObject {
     NSMutableDictionary *myRegisteredHotKeys;

diff --git a/SpectacleHotKeyValidator.h b/SpectacleHotKeyValidator.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <ZeroKit/ZeroKit.h>
 
 @interface SpectacleHotKeyValidator : NSObject<ZeroKitHotKeyValidatorProtocol>
 

diff --git a/SpectaclePreferencesController.h b/SpectaclePreferencesController.h
@@ -1,4 +1,5 @@
 #import <Cocoa/Cocoa.h>
+#import <ZeroKit/ZeroKit.h>
 
 @class SpectacleHotKeyManager, SpectacleApplicationController;
 

diff --git a/SpectacleUtilities.h b/SpectacleUtilities.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <ZeroKit/ZeroKit.h>
 
 #define FlipVerticalOriginOfRectInRect(a, b) (b.size.height - (a.origin.y + a.size.height) + ([[NSScreen mainScreen] frame].size.height - b.size.height))
 
@@ -23,8 +24,6 @@
 
 #pragma mark -
 
-@class ZeroKitHotKeyAction;
-
 @interface SpectacleUtilities : ZeroKitUtilities
 
 + (void)displayAccessibilityAPIAlert;

diff --git a/SpectacleWindowPositionManager.h b/SpectacleWindowPositionManager.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <ZeroKit/ZeroKit.h>
 
 typedef enum {
     SpectacleWindowActionUndo = -3,