Skip to content

Commit 5a224cf

Browse files
committed
Not including headers in headers FTW
This took ages, but now if you change one thing it won't rebuild the fucking world.
1 parent 3cf9aca commit 5a224cf

File tree

76 files changed

+215
-227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+215
-227
lines changed

English.lproj/MainMenu.xib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@
786786
<string key="NSClassName">GXAppDelegate</string>
787787
</object>
788788
<object class="NSCustomObject" id="189246969">
789-
<string key="NSClassName">PBRepositoryDocumentController</string>
789+
<string key="NSClassName">GXDocumentController</string>
790790
</object>
791791
<object class="NSUserDefaultsController" id="391227374">
792792
<bool key="NSSharedInstance">YES</bool>

GXAppDelegate.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "PBGitRepository.h"
1111
#import "PBGitRevisionCell.h"
1212
#import "PBGitWindowController.h"
13-
#import "PBRepositoryDocumentController.h"
13+
#import "GXDocumentController.h"
1414
#import "PBServicesController.h"
1515
#import "PBGitXProtocol.h"
1616
#import "PBNSURLPathUserDefaultsTransfomer.h"
@@ -64,7 +64,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
6464

6565
[self registerServices];
6666

67-
NSArray *launchedDocuments = [[PBRepositoryDocumentController sharedDocumentController] documents];
67+
NSArray *launchedDocuments = [[GXDocumentController sharedDocumentController] documents];
6868

6969
// to bring the launched documents to the front
7070
for (PBGitRepository *document in launchedDocuments)
@@ -174,7 +174,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification {
174174
[PBGitDefaults removePreviousDocumentPaths];
175175

176176
if ([PBGitDefaults openPreviousDocumentsOnLaunch]) {
177-
NSArray *documents = [[PBRepositoryDocumentController sharedDocumentController] documents];
177+
NSArray *documents = [[GXDocumentController sharedDocumentController] documents];
178178
if ([documents count] > 0) {
179179
NSMutableArray *paths = [NSMutableArray array];
180180
for (PBGitRepository *repository in documents)

PBRepositoryDocumentController.h renamed to GXDocumentController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
#import <Cocoa/Cocoa.h>
1010

11-
@interface PBRepositoryDocumentController : NSDocumentController
11+
@interface GXDocumentController : NSDocumentController
1212
@end

PBRepositoryDocumentController.m renamed to GXDocumentController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright 2008 __MyCompanyName__. All rights reserved.
77
//
88

9-
#import "PBRepositoryDocumentController.h"
9+
#import "GXDocumentController.h"
1010
#import "PBGitDefaults.h"
1111
#import "PBGitRepository.h"
1212
#import "PBGitWindowController.h"
@@ -19,7 +19,7 @@ - (NSMutableArray *)arguments;
1919
//FIXME this code is shit. It was written by a noob. Make it proper.
2020

2121

22-
@implementation PBRepositoryDocumentController
22+
@implementation GXDocumentController
2323

2424
- (NSInteger)runModalOpenPanel:(NSOpenPanel *)openPanel forTypes:(NSArray *)extensions {
2525
// configure the open panel to only allow selection of directories

GitX.xcodeproj/project.pbxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
3131
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
3232
911111E20E58BD5A00BF76B4 /* RepositoryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 911111E00E58BD5A00BF76B4 /* RepositoryWindow.xib */; };
33-
911111F80E594F3F00BF76B4 /* PBRepositoryDocumentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 911111F70E594F3F00BF76B4 /* PBRepositoryDocumentController.m */; };
33+
911111F80E594F3F00BF76B4 /* GXDocumentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 911111F70E594F3F00BF76B4 /* GXDocumentController.m */; };
3434
911112370E5A097800BF76B4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 911112360E5A097800BF76B4 /* Security.framework */; };
3535
913D5E4D0E55644E00CECEA2 /* gitx-cli.m in Sources */ = {isa = PBXBuildFile; fileRef = 913D5E440E55640C00CECEA2 /* gitx-cli.m */; };
3636
913D5E500E55645900CECEA2 /* gitx in Resources */ = {isa = PBXBuildFile; fileRef = 913D5E490E55644600CECEA2 /* gitx */; };
@@ -194,8 +194,8 @@
194194
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
195195
8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; };
196196
911111E10E58BD5A00BF76B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/RepositoryWindow.xib; sourceTree = "<group>"; };
197-
911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRepositoryDocumentController.h; sourceTree = "<group>"; };
198-
911111F70E594F3F00BF76B4 /* PBRepositoryDocumentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRepositoryDocumentController.m; sourceTree = "<group>"; };
197+
911111F60E594F3F00BF76B4 /* GXDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXDocumentController.h; sourceTree = "<group>"; };
198+
911111F70E594F3F00BF76B4 /* GXDocumentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXDocumentController.m; sourceTree = "<group>"; };
199199
911112360E5A097800BF76B4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
200200
913D5E440E55640C00CECEA2 /* gitx-cli.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "gitx-cli.m"; sourceTree = "<group>"; };
201201
913D5E490E55644600CECEA2 /* gitx */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gitx; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -544,6 +544,8 @@
544544
children = (
545545
77C8280B06725ACE000B614F /* GXAppDelegate.h */,
546546
77C8280C06725ACE000B614F /* GXAppDelegate.m */,
547+
911111F60E594F3F00BF76B4 /* GXDocumentController.h */,
548+
911111F70E594F3F00BF76B4 /* GXDocumentController.m */,
547549
F57CC43E0E05E472000472E2 /* Aux */,
548550
F57CC3850E05DDC1000472E2 /* Controllers */,
549551
F56174540E05887E001DCD79 /* Git */,
@@ -641,8 +643,6 @@
641643
93CB42C10EAB7B2200530609 /* PBGitDefaults.m */,
642644
F57CC43F0E05E496000472E2 /* PBGitWindowController.h */,
643645
F57CC4400E05E496000472E2 /* PBGitWindowController.m */,
644-
911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */,
645-
911111F70E594F3F00BF76B4 /* PBRepositoryDocumentController.m */,
646646
F5E926040E8827D300056E75 /* PBViewController.h */,
647647
F5E926050E8827D300056E75 /* PBViewController.m */,
648648
F5EF8C8C0E9D4A5D0050906B /* PBWebController.h */,
@@ -721,8 +721,8 @@
721721
children = (
722722
F5E424140EA3E4E10046E362 /* PBDiffWindowController.h */,
723723
F5E424130EA3E4E10046E362 /* PBDiffWindowController.m */,
724-
F5E424160EA3E4EB0046E362 /* PBWebDiffController.m */,
725724
F5E424170EA3E4EB0046E362 /* PBWebDiffController.h */,
725+
F5E424160EA3E4EB0046E362 /* PBWebDiffController.m */,
726726
);
727727
name = Diff;
728728
sourceTree = "<group>";
@@ -979,7 +979,7 @@
979979
F50FE0E30E07BE9600854FCD /* PBGitRevisionCell.m in Sources */,
980980
F5FF4E180E0829C20006317A /* PBGitRevList.mm in Sources */,
981981
F5FF4E7A0E082E440006317A /* PBGitGrapher.mm in Sources */,
982-
911111F80E594F3F00BF76B4 /* PBRepositoryDocumentController.m in Sources */,
982+
911111F80E594F3F00BF76B4 /* GXDocumentController.m in Sources */,
983983
F56CC7320E65E0E5004307B4 /* PBGraphCellInfo.m in Sources */,
984984
F5C6F68D0E65FF9300478D97 /* PBGitLane.mm in Sources */,
985985
F5C007750E731B48007B84B2 /* PBGitRef.m in Sources */,

GitXTextFieldCell.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10-
#import "PBRefContextDelegate.h"
1110

1211

1312
@interface GitXTextFieldCell : NSTextFieldCell {
1413
IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
1514
}
16-
1715
@end

NSApplication+GitXScripting.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#import "NSApplication+GitXScripting.h"
1010
#import "GitXScriptingConstants.h"
1111
#import "PBDiffWindowController.h"
12-
#import "PBRepositoryDocumentController.h"
12+
#import "GXDocumentController.h"
1313

1414

1515
@implementation NSApplication (GitXScripting)

PBChangedFile.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10-
#import "PBGitRepository.h"
1110

1211
typedef enum {
1312
NEW,
1413
MODIFIED,
1514
DELETED
1615
} PBChangedFileStatus;
1716

17+
1818
@interface PBChangedFile : NSObject {
1919
NSString *path;
2020
BOOL hasStagedChanges;
@@ -26,14 +26,10 @@ typedef enum {
2626

2727
PBChangedFileStatus status;
2828
}
29-
30-
29+
- (id)initWithPath:(NSString *)p;
30+
- (NSImage *)icon;
31+
- (NSString *)indexInfo;
3132
@property (copy) NSString *path, *commitBlobSHA, *commitBlobMode;
3233
@property (assign) PBChangedFileStatus status;
3334
@property (assign) BOOL hasStagedChanges, hasUnstagedChanges;
34-
35-
- (NSImage *)icon;
36-
- (NSString *)indexInfo;
37-
38-
- (id) initWithPath:(NSString *)p;
3935
@end

PBChangedFile.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
#import "PBChangedFile.h"
1010
#import "PBEasyPipe.h"
11+
#import "PBGitRepository.h"
1112

12-
@implementation PBChangedFile
1313

14+
@implementation PBChangedFile
1415
@synthesize path, status, hasStagedChanges, hasUnstagedChanges, commitBlobSHA, commitBlobMode;
1516

1617
- (id) initWithPath:(NSString *)p

PBCommitHookFailedSheet.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10-
11-
#import "PBGitCommitController.h"
1210
#import "PBGitXMessageSheet.h"
1311

1412

15-
@interface PBCommitHookFailedSheet : PBGitXMessageSheet
16-
{
13+
@interface PBCommitHookFailedSheet : PBGitXMessageSheet {
1714
PBGitCommitController *commitController;
1815
}
1916

0 commit comments

Comments
 (0)