Use [at] class in headers, and #import in implementations.

tiennou · tiennou · commit 057866570dd0 · 2014-03-02T15:08:07.000+01:00
diff --git a/Classes/Controllers/PBGitHistoryController.h b/Classes/Controllers/PBGitHistoryController.h
@@ -7,10 +7,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitCommit.h"
-#import "PBGitTree.h"
 #import "PBViewController.h"
-#import "PBCollapsibleSplitView.h"
+
+@class PBGitCommit;
+@class PBGitTree;
+@class PBCollapsibleSplitView;
 
 @class PBGitSidebarController;
 @class PBWebHistoryController;
diff --git a/Classes/Controllers/PBGitHistoryController.m b/Classes/Controllers/PBGitHistoryController.m
@@ -6,6 +6,13 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 
+#import "PBGitSHA.h"
+#import "PBGitCommit.h"
+#import "PBGitTree.h"
+#import "PBGitRef.h"
+#import "PBGitHistoryList.h"
+#import "PBGitRevSpecifier.h"
+#import "PBCollapsibleSplitView.h"
 #import "PBGitHistoryController.h"
 #import "PBWebHistoryController.h"
 #import "CWQuickLook.h"
diff --git a/Classes/Controllers/PBGitSidebarController.m b/Classes/Controllers/PBGitSidebarController.m
@@ -15,6 +15,7 @@
 #import "NSOutlineViewExt.h"
 #import "PBAddRemoteSheet.h"
 #import "PBGitDefaults.h"
+#import "PBGitSubmodule.h"
 #import "PBHistorySearchController.h"
 
 @interface PBGitSidebarController ()
diff --git a/Classes/Controllers/PBHistorySearchController.m b/Classes/Controllers/PBHistorySearchController.m
@@ -6,16 +6,17 @@
 //  Copyright 2010 Nathan Kinsinger. All rights reserved.
 //
 
+#import <QuartzCore/CoreAnimation.h>
+
 #import "PBHistorySearchController.h"
 #import "PBGitHistoryController.h"
 #import "PBGitRepository.h"
 #import "PBGitDefaults.h"
 #import "PBCommitList.h"
 #import "PBEasyPipe.h"
 #import "PBGitBinary.h"
-
-#import <QuartzCore/CoreAnimation.h>
-
+#import "PBGitCommit.h"
+#import "PBGitSHA.h"
 
 @interface PBHistorySearchController ()
 
diff --git a/Classes/Controllers/PBRefController.m b/Classes/Controllers/PBRefController.m
@@ -13,8 +13,7 @@
 #import "PBCreateTagSheet.h"
 #import "PBGitDefaults.h"
 #import "PBDiffWindowController.h"
-
-#import <ObjectiveGit/ObjectiveGit.h>
+#import "PBGitRevSpecifier.h"
 
 #define kDialogAcceptDroppedRef @"Accept Dropped Ref"
 #define kDialogConfirmPush @"Confirm Push"
diff --git a/Classes/Controllers/PBWebHistoryController.m b/Classes/Controllers/PBWebHistoryController.m
@@ -9,7 +9,8 @@
 #import "PBWebHistoryController.h"
 #import "PBGitDefaults.h"
 #import "PBGitSHA.h"
-#import <ObjectiveGit/GTConfiguration.h>
+#import "PBGitRef.h"
+#import "PBGitRevSpecifier.h"
 
 @implementation PBWebHistoryController
 
diff --git a/Classes/PBCLIProxy.h b/Classes/PBCLIProxy.h
@@ -8,7 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-
 @interface PBCLIProxy : NSObject
 {
 	NSConnection *connection;
diff --git a/Classes/PBChangedFile.h b/Classes/PBChangedFile.h
@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
 
 typedef enum {
 	NEW,
diff --git a/Classes/PBCommitList.h b/Classes/PBCommitList.h
@@ -8,9 +8,10 @@
 
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebView.h>
-#import "PBGitHistoryController.h"
 
+@class PBGitHistoryController;
 @class PBWebHistoryController;
+@class PBHistorySearchController;
 
 typedef void(^PBFindPanelActionBlock)(id sender);
 
diff --git a/Classes/Views/GLFileView.h b/Classes/Views/GLFileView.h
@@ -7,13 +7,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBWebController.h"
 #import <MGScopeBar/MGScopeBarDelegateProtocol.h>
-#import "PBGitCommit.h"
-#import "PBGitHistoryController.h"
-#import "PBRefContextDelegate.h"
 
-@class PBGitGradientBarView;
+#import "PBWebController.h"
+
+@class PBGitHistoryController;
 
 @interface GLFileView : PBWebController <MGScopeBarDelegate> {
 	IBOutlet PBGitHistoryController* historyController;
diff --git a/Classes/Views/GLFileView.m b/Classes/Views/GLFileView.m
@@ -6,10 +6,15 @@
 //  Copyright 2010 __MyCompanyName__. All rights reserved.
 //
 
-#import "GLFileView.h"
-#import "PBGitGradientBarView.h"
 #import <MGScopeBar/MGScopeBar.h>
 
+#import "GLFileView.h"
+#import "PBGitTree.h"
+#import "PBGitSHA.h"
+#import "PBGitCommit.h"
+#import "PBGitHistoryController.h"
+
+
 #define GROUP_LABEL				@"Label"			// string
 #define GROUP_SEPARATOR			@"HasSeparator"		// BOOL as NSNumber
 #define GROUP_SELECTION_MODE	@"SelectionMode"	// MGScopeBarGroupSelectionMode (int) as NSNumber
diff --git a/Classes/Views/GitXTextFieldCell.h b/Classes/Views/GitXTextFieldCell.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBRefContextDelegate.h"
 
+@protocol PBRefContextDelegate;
 
 @interface GitXTextFieldCell : NSTextFieldCell {
 	IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
diff --git a/Classes/Views/GitXTextFieldCell.m b/Classes/Views/GitXTextFieldCell.m
@@ -9,6 +9,7 @@
 #import "GitXTextFieldCell.h"
 #import "PBGitCommit.h"
 #import "PBRefController.h"
+#import "PBRefContextDelegate.h"
 
 
 @implementation GitXTextFieldCell
diff --git a/Classes/Views/PBCreateTagSheet.m b/Classes/Views/PBCreateTagSheet.m
@@ -9,7 +9,9 @@
 #import "PBCreateTagSheet.h"
 #import "PBGitRepository.h"
 #import "PBGitCommit.h"
+#import "PBGitRef.h"
 #import "PBGitWindowController.h"
+#import "PBGitRevSpecifier.h"
 
 @interface PBCreateTagSheet ()
 
diff --git a/Classes/Views/PBGitRevisionCell.m b/Classes/Views/PBGitRevisionCell.m
@@ -8,6 +8,9 @@
 
 #import "PBGitRevisionCell.h"
 #import "PBGitRef.h"
+#import "PBGitSHA.h"
+#import "PBGitCommit.h"
+#import "PBGitRevSpecifier.h"
 #import "RoundedRectangle.h"
 #import "GitXTextFieldCell.h"
 
diff --git a/Classes/Views/PBQLOutlineView.m b/Classes/Views/PBQLOutlineView.m
@@ -7,7 +7,7 @@
 //
 
 #import "PBQLOutlineView.h"
-
+#import "PBGitTree.h"
 
 @implementation PBQLOutlineView
 
diff --git a/Classes/Views/PBRefMenuItem.m b/Classes/Views/PBRefMenuItem.m
@@ -7,7 +7,9 @@
 //
 
 #import "PBRefMenuItem.h"
-
+#import "PBGitRepository.h"
+#import "PBGitRevSpecifier.h"
+#import "PBGitSHA.h"
 
 @implementation PBRefMenuItem
 @synthesize refish;
diff --git a/Classes/git/PBGitCommit.h b/Classes/git/PBGitCommit.h
@@ -7,17 +7,16 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
-#import "PBGitTree.h"
-#import "PBGitRefish.h"
-#import "PBGitSHA.h"
+#import "PBGitRefish.h" // for @protocol PBGitRefish
 
-#import <ObjectiveGit/git2/oid.h>
+@class PBGitRepository;
+@class PBGitTree;
+@class PBGitRef;
+@class PBGitSHA;
+@class PBGraphCellInfo;
 
 extern NSString * const kGitXCommitType;
 
-@class PBGraphCellInfo;
-@class GTCommit;
 
 @interface PBGitCommit : NSObject <PBGitRefish>
 
diff --git a/Classes/git/PBGitCommit.m b/Classes/git/PBGitCommit.m
@@ -6,12 +6,13 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 
+#import "PBGitRepository.h"
 #import "PBGitCommit.h"
+#import "PBGitTree.h"
 #import "PBGitSHA.h"
+#import "PBGitRef.h"
 #import "PBGitDefaults.h"
 
-#import <ObjectiveGit/ObjectiveGit.h>
-
 NSString * const kGitXCommitType = @"commit";
 
 @interface PBGitCommit ()
diff --git a/Classes/git/PBGitGrapher.mm b/Classes/git/PBGitGrapher.mm
@@ -6,16 +6,16 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 
+#include <vector>
+#include <algorithm>
+
 #import "PBGraphCellInfo.h"
 #import "PBGitGrapher.h"
 #import "PBGitCommit.h"
+#import "PBGitSHA.h"
 #import "PBGitLane.h"
 #import "PBGitGraphLine.h"
 
-#import <vector>
-#import <git2/oid.h>
-#include <algorithm>
-
 using namespace std;
 typedef std::vector<PBGitLane *> LaneCollection;
 
diff --git a/Classes/git/PBGitHistoryList.m b/Classes/git/PBGitHistoryList.m
@@ -12,8 +12,8 @@
 #import "PBGitGrapher.h"
 #import "PBGitHistoryGrapher.h"
 #import "PBGitSHA.h"
-
-
+#import "PBGitRef.h"
+#import "PBGitRevSpecifier.h"
 
 @interface PBGitHistoryList ()
 
diff --git a/Classes/git/PBGitLane.h b/Classes/git/PBGitLane.h
@@ -5,8 +5,8 @@
 //  Created by Pieter de Bie on 27-08-08.
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
+
 #import <Cocoa/Cocoa.h>
-#include <git2/oid.h>
 
 class PBGitLane {
 	static int s_colorIndex;
diff --git a/Classes/git/PBGitRef.h b/Classes/git/PBGitRef.h
@@ -9,7 +9,6 @@
 #import <Cocoa/Cocoa.h>
 #import "PBGitRefish.h"
 
-
 extern NSString * const kGitXTagType;
 extern NSString * const kGitXBranchType;
 extern NSString * const kGitXRemoteType;
diff --git a/Classes/git/PBGitRepository.h b/Classes/git/PBGitRepository.h
@@ -7,10 +7,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitHistoryList.h"
-#import "PBGitRevSpecifier.h"
-#import "PBGitRefish.h"
 
+@class PBGitHistoryList;
+@class PBGitRevSpecifier;
+@protocol PBGitRefish;
+@class PBGitRef;
 @class GTRepository;
 @class GTConfiguration;
 
diff --git a/Classes/git/PBGitRepository.m b/Classes/git/PBGitRepository.m
@@ -23,10 +23,9 @@
 #import "PBGitRepositoryWatcher.h"
 #import "GitRepoFinder.h"
 #import "PBGitSubmodule.h"
+#import "PBGitHistoryList.h"
+#import "PBGitSHA.h"
 
-#import <ObjectiveGit/GTRepository.h>
-#import <ObjectiveGit/GTIndex.h>
-#import <ObjectiveGit/GTConfiguration.h>
 
 NSString *PBGitRepositoryDocumentType = @"Git Repository";
 
diff --git a/Classes/git/PBGitRepositoryWatcher.h b/Classes/git/PBGitRepositoryWatcher.h
@@ -9,7 +9,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "PBGitRepository.h"
+@class PBGitRepository;
 
 typedef UInt32 PBGitRepositoryWatcherEventType;
 enum {
diff --git a/Classes/git/PBGitRepositoryWatcher.m b/Classes/git/PBGitRepositoryWatcher.m
@@ -6,18 +6,17 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
 #import <CoreServices/CoreServices.h>
+
 #import "PBGitRepositoryWatcher.h"
+#import "PBGitRepository.h"
 #import "PBEasyPipe.h"
 #import "PBGitDefaults.h"
 #import "PBGitRepositoryWatcherEventPath.h"
 
-#import <ObjectiveGit/ObjectiveGit.h>
-
 NSString *PBGitRepositoryEventNotification = @"PBGitRepositoryModifiedNotification";
 NSString *kPBGitRepositoryEventTypeUserInfoKey = @"kPBGitRepositoryEventTypeUserInfoKey";
 NSString *kPBGitRepositoryEventPathsUserInfoKey = @"kPBGitRepositoryEventPathsUserInfoKey";
 
-
 @interface PBGitRepositoryWatcher ()
 
 @property (nonatomic, strong) NSMutableDictionary *statusCache;
diff --git a/Classes/git/PBGitRevSpecifier.h b/Classes/git/PBGitRevSpecifier.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRef.h"
+@class PBGitRef;
 
 @interface PBGitRevSpecifier : NSObject  <NSCopying> {
 	NSString *description;
diff --git a/Classes/git/PBGitRevSpecifier.m b/Classes/git/PBGitRevSpecifier.m
@@ -7,7 +7,7 @@
 //
 
 #import "PBGitRevSpecifier.h"
-
+#import "PBGitRef.h"
 
 @implementation PBGitRevSpecifier
 
diff --git a/Classes/git/PBGitSHA.h b/Classes/git/PBGitSHA.h
@@ -7,8 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#include <git2/oid.h>
-
 
 @interface PBGitSHA : NSObject <NSCopying>
 
diff --git a/Classes/git/PBGitSHA.m b/Classes/git/PBGitSHA.m
@@ -8,8 +8,6 @@
 
 #import "PBGitSHA.h"
 
-#import <git2/errors.h>
-
 @interface PBGitSHA ()
 
 @property (nonatomic, assign) git_oid oid;
diff --git a/Classes/git/PBGitSVBranchItem.h b/Classes/git/PBGitSVBranchItem.h
@@ -9,7 +9,6 @@
 #import <Cocoa/Cocoa.h>
 #import "PBSourceViewItem.h"
 
-
 @interface PBGitSVBranchItem : PBSourceViewItem {
 
 }
diff --git a/Classes/git/PBGitSVFolderItem.h b/Classes/git/PBGitSVFolderItem.h
@@ -9,7 +9,6 @@
 #import <Cocoa/Cocoa.h>
 #import "PBSourceViewItem.h"
 
-
 @interface PBGitSVFolderItem : PBSourceViewItem {
 
 }
diff --git a/Classes/git/PBGitSVOtherRevItem.h b/Classes/git/PBGitSVOtherRevItem.h
diff --git a/Classes/git/PBGitSVRemoteBranchItem.h b/Classes/git/PBGitSVRemoteBranchItem.h
diff --git a/Classes/git/PBGitSVRemoteItem.h b/Classes/git/PBGitSVRemoteItem.h
diff --git a/Classes/git/PBGitSVStageItem.h b/Classes/git/PBGitSVStageItem.h
diff --git a/Classes/git/PBGitSVSubmoduleItem.h b/Classes/git/PBGitSVSubmoduleItem.h
diff --git a/Classes/git/PBGitSVSubmoduleItem.m b/Classes/git/PBGitSVSubmoduleItem.m
diff --git a/Classes/git/PBGitSVTagItem.h b/Classes/git/PBGitSVTagItem.h
diff --git a/Classes/git/PBGitTree.h b/Classes/git/PBGitTree.h
diff --git a/Classes/git/PBGitTree.m b/Classes/git/PBGitTree.m
diff --git a/Classes/git/PBGitXProtocol.h b/Classes/git/PBGitXProtocol.h
diff --git a/Classes/git/PBGitXProtocol.m b/Classes/git/PBGitXProtocol.m
diff --git a/GitX_Prefix.pch b/GitX_Prefix.pch

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`#import <Cocoa/Cocoa.h>`
`10`	`10`
`11`		`-`
`12`	`11`	`@interface PBCLIProxy : NSObject`
`13`	`12`	`{`
`14`	`13`	`NSConnection *connection;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`#import <Cocoa/Cocoa.h>`
`10`	`10`	`#import "PBSourceViewItem.h"`
`11`	`11`
`12`		`-`
`13`	`12`	`@interface PBGitSVBranchItem : PBSourceViewItem {`
`14`	`13`
`15`	`14`	`}`