Skip to content

Commit 0281c23

Browse files
committed
PBGitRevList isn't Objective-C++ anymore
1 parent 5982a16 commit 0281c23

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

Classes/git/PBGitHistoryList.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ - (void) updateProjectHistoryForRev:(PBGitRevSpecifier *)rev
318318
lastRemoteRef = nil;
319319
lastOID = nil;
320320
self.commits = [NSMutableArray array];
321-
[projectRevList loadRevisonsWithCompletionBlock:^{
321+
[projectRevList loadRevisionsWithCompletionBlock:^{
322322
dispatch_async(dispatch_get_main_queue(), ^{
323323
[self finishedGraphing];
324324
});
@@ -340,7 +340,7 @@ - (void) updateHistoryForRev:(PBGitRevSpecifier *)rev
340340
lastOID = nil;
341341
self.commits = [NSMutableArray array];
342342

343-
[otherRevListParser loadRevisonsWithCompletionBlock:^{
343+
[otherRevListParser loadRevisionsWithCompletionBlock:^{
344344
dispatch_async(dispatch_get_main_queue(), ^{
345345
[self finishedGraphing];
346346
});

Classes/git/PBGitRevList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@property (nonatomic, strong) NSMutableArray<PBGitCommit *> *commits;
1919

2020
- (id) initWithRepository:(PBGitRepository *)repo rev:(PBGitRevSpecifier *)rev shouldGraph:(BOOL)graph;
21-
- (void)loadRevisonsWithCompletionBlock:(void(^)(void))completionBlock;
21+
- (void)loadRevisionsWithCompletionBlock:(void(^)(void))completionBlock;
2222
- (void)cancel;
2323

2424
@end

Classes/git/PBGitRevList.mm renamed to Classes/git/PBGitRevList.m

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@
1717
#import <ObjectiveGit/ObjectiveGit.h>
1818
#import "ObjectiveGit+PBCategories.h"
1919

20-
#import <iostream>
21-
#import <string>
22-
#import <map>
2320
#import <ObjectiveGit/GTOID.h>
2421

25-
using namespace std;
26-
27-
2822
@interface PBGitRevList ()
2923

3024
@property (nonatomic, assign) BOOL isGraphing;
@@ -62,7 +56,7 @@ - (id) initWithRepository:(PBGitRepository *)repo rev:(PBGitRevSpecifier *)rev s
6256
return self;
6357
}
6458

65-
- (void)loadRevisonsWithCompletionBlock:(void(^)(void))completionBlock
59+
- (void)loadRevisionsWithCompletionBlock:(void(^)(void))completionBlock
6660
{
6761
[self cancel];
6862

GitX.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
4A5D76FE14A9A9CC00DF6C68 /* PBGitRef.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766314A9A9CC00DF6C68 /* PBGitRef.m */; };
8585
4A5D76FF14A9A9CC00DF6C68 /* PBGitRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766614A9A9CC00DF6C68 /* PBGitRepository.m */; };
8686
4A5D770014A9A9CC00DF6C68 /* PBGitRepositoryWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766814A9A9CC00DF6C68 /* PBGitRepositoryWatcher.m */; };
87-
4A5D770214A9A9CC00DF6C68 /* PBGitRevList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.mm */; };
87+
4A5D770214A9A9CC00DF6C68 /* PBGitRevList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.m */; };
8888
4A5D770314A9A9CC00DF6C68 /* PBGitRevSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D766E14A9A9CC00DF6C68 /* PBGitRevSpecifier.m */; };
8989
4A5D770514A9A9CC00DF6C68 /* PBSourceViewGitBranchItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D767214A9A9CC00DF6C68 /* PBSourceViewGitBranchItem.m */; };
9090
4A5D770614A9A9CC00DF6C68 /* PBSourceViewFolderItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D767414A9A9CC00DF6C68 /* PBSourceViewFolderItem.m */; };
@@ -462,7 +462,7 @@
462462
4A5D766714A9A9CC00DF6C68 /* PBGitRepositoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRepositoryWatcher.h; sourceTree = "<group>"; };
463463
4A5D766814A9A9CC00DF6C68 /* PBGitRepositoryWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRepositoryWatcher.m; sourceTree = "<group>"; };
464464
4A5D766B14A9A9CC00DF6C68 /* PBGitRevList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevList.h; sourceTree = "<group>"; };
465-
4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = PBGitRevList.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
465+
4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PBGitRevList.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
466466
4A5D766D14A9A9CC00DF6C68 /* PBGitRevSpecifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevSpecifier.h; sourceTree = "<group>"; };
467467
4A5D766E14A9A9CC00DF6C68 /* PBGitRevSpecifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRevSpecifier.m; sourceTree = "<group>"; };
468468
4A5D767114A9A9CC00DF6C68 /* PBSourceViewGitBranchItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewGitBranchItem.h; sourceTree = "<group>"; };
@@ -957,7 +957,7 @@
957957
4A5D766714A9A9CC00DF6C68 /* PBGitRepositoryWatcher.h */,
958958
4A5D766814A9A9CC00DF6C68 /* PBGitRepositoryWatcher.m */,
959959
4A5D766B14A9A9CC00DF6C68 /* PBGitRevList.h */,
960-
4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.mm */,
960+
4A5D766C14A9A9CC00DF6C68 /* PBGitRevList.m */,
961961
4A5D766D14A9A9CC00DF6C68 /* PBGitRevSpecifier.h */,
962962
4A5D766E14A9A9CC00DF6C68 /* PBGitRevSpecifier.m */,
963963
4A5D767114A9A9CC00DF6C68 /* PBSourceViewGitBranchItem.h */,
@@ -1471,7 +1471,7 @@
14711471
4D843B1F1E5D27C3004C3A6F /* PBTask.m in Sources */,
14721472
4A5D76FF14A9A9CC00DF6C68 /* PBGitRepository.m in Sources */,
14731473
4A5D770014A9A9CC00DF6C68 /* PBGitRepositoryWatcher.m in Sources */,
1474-
4A5D770214A9A9CC00DF6C68 /* PBGitRevList.mm in Sources */,
1474+
4A5D770214A9A9CC00DF6C68 /* PBGitRevList.m in Sources */,
14751475
4A5D770314A9A9CC00DF6C68 /* PBGitRevSpecifier.m in Sources */,
14761476
4A5D770514A9A9CC00DF6C68 /* PBSourceViewGitBranchItem.m in Sources */,
14771477
4A5D770614A9A9CC00DF6C68 /* PBSourceViewFolderItem.m in Sources */,

0 commit comments

Comments
 (0)