Permalink
Browse files

Fixing conformance to naming convention.

  • Loading branch information...
1 parent 31d70a1 commit b695eb3cff65df31834d6dd797aa8acf5697b9fd @JanX2 committed Jan 3, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 DiffMatchPatch.h
  2. +2 −2 DiffMatchPatch.m
View
@@ -148,7 +148,7 @@ typedef enum {
- (NSMutableArray *)patch_makeFromDiffs:(NSMutableArray *)diffs;
- (NSMutableArray *)patch_makeFromOldString:(NSString *)text1 newString:(NSString *)text2 diffs:(NSMutableArray *)diffs;
- (NSMutableArray *)patch_makeFromOldString:(NSString *)text1 andDiffs:(NSMutableArray *)diffs;
-- (NSMutableArray *)patch_deepCopy:(NSArray *)patches; // Copy rule applies!
+- (NSMutableArray *)patch_deepCopiedPatches:(NSArray *)patches; // Copy rule applies!
- (NSArray *)patch_apply:(NSArray *)sourcePatches toString:(NSString *)text;
- (NSString *)patch_addPadding:(NSMutableArray *)patches;
- (void)patch_splitMax:(NSMutableArray *)patches;
View
@@ -2257,7 +2257,7 @@ - (NSMutableArray *)patch_makeFromOldString:(NSString *)text1
* @param patches NSArray of patch objects.
* @return NSMutableArray of patch objects.
*/
-- (NSMutableArray *)patch_deepCopy:(NSArray *)patches;
+- (NSMutableArray *)patch_deepCopiedPatches:(NSArray *)patches;
{
NSMutableArray *patchesCopy = [[NSMutableArray alloc] initWithArray:patches copyItems:YES];
return [patchesCopy autorelease];
@@ -2279,7 +2279,7 @@ - (NSArray *)patch_apply:(NSArray *)sourcePatches
}
// Deep copy the patches so that no changes are made to originals.
- NSMutableArray *patches = [self patch_deepCopy:sourcePatches];
+ NSMutableArray *patches = [self patch_deepCopiedPatches:sourcePatches];
NSMutableString *textMutable = [[text mutableCopy] autorelease];

0 comments on commit b695eb3

Please sign in to comment.