• change didModifyString: method to textMateDidModifyString:

• prefix NSString category methods with “TM_” This to prevent clashes with other programs which add category methods. git-svn-id: http://svn.textmate.org/trunk/Tools/Edit%20in%20TextMate@5822 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
textmate · Oct 31, 2006 · 0941f6e · 0941f6e
1 parent 9fd6780
commit 0941f6e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/Edit in TextMate.mm b/src/Edit in TextMate.mm
@@ -169,9 +169,9 @@ + (void)handleModifiedFileEvent:(NSAppleEventDescriptor*)event withReplyEvent:(N
 	NSString* fileName = [[[NSURL URLWithString:urlString] path] stringByStandardizingPath];
 
 	NSView* view = [[OpenFiles objectForKey:fileName] objectForKey:@"view"];
-	if([view window] && [view respondsToSelector:@selector(didModifyString:)])
+	if([view window] && [view respondsToSelector:@selector(textMateDidModifyString:)])
 	{
-		[view performSelector:@selector(didModifyString:) withObject:[[[NSString alloc] initWithData:[NSData dataWithContentsOfFile:fileName] encoding:NSUTF8StringEncoding] autorelease]];
+		[view performSelector:@selector(textMateDidModifyString:) withObject:[[[NSString alloc] initWithData:[NSData dataWithContentsOfFile:fileName] encoding:NSUTF8StringEncoding] autorelease]];
 		[FailedFiles removeObject:fileName];
 	}
 	else

diff --git a/src/NSTextView: Edit in TextMate.mm b/src/NSTextView: Edit in TextMate.mm
@@ -36,7 +36,7 @@ - (void)editInTextMate:(id)sender
 	[EditInTextMate externalEditString:[str substringWithRange:selectedRange] startingAtLine:lineNumber forView:self];
 }
 
-- (void)didModifyString:(NSString*)newString
+- (void)textMateDidModifyString:(NSString*)newString
 {
 	NSRange selectedRange = [self selectedRange];
 	BOOL hadSelection = selectedRange.length != 0;

diff --git a/src/WebView: Edit in TextMate.mm b/src/WebView: Edit in TextMate.mm
@@ -13,13 +13,13 @@ - (void)editInTextMate:(id)sender;
 @end
 
 @interface NSString (EditInTextMate)
-- (NSString*)stringByTrimmingWhitespace;
-- (NSString*)stringByReplacingString:(NSString*)aSearchString withString:(NSString*)aReplaceString;
-- (NSString*)stringByNbspEscapingSpaces;
+- (NSString*)TM_stringByTrimmingWhitespace;
+- (NSString*)TM_stringByReplacingString:(NSString*)aSearchString withString:(NSString*)aReplaceString;
+- (NSString*)TM_stringByNbspEscapingSpaces;
 @end
 
 @implementation NSString (EditInTextMate)
-- (NSString*)stringByTrimmingWhitespace
+- (NSString*)TM_stringByTrimmingWhitespace
 {
 	NSString* str = self;
 	while([str hasPrefix:@" "])
@@ -30,12 +30,12 @@ - (NSString*)stringByTrimmingWhitespace
 	return str;
 }
 
-- (NSString*)stringByReplacingString:(NSString*)aSearchString withString:(NSString*)aReplaceString
+- (NSString*)TM_stringByReplacingString:(NSString*)aSearchString withString:(NSString*)aReplaceString
 {
 	return [[self componentsSeparatedByString:aSearchString] componentsJoinedByString:aReplaceString];
 }
 
-- (NSString*)stringByNbspEscapingSpaces
+- (NSString*)TM_stringByNbspEscapingSpaces
 {
 	unsigned len = [self length];
 	unichar* buf = new unichar[len];
@@ -70,11 +70,11 @@ void leave_block_tag ()
 
 	void output_text (NSString* str)
 	{
-		str = [str stringByTrimmingWhitespace];
+		str = [str TM_stringByTrimmingWhitespace];
 		if([str isEqualToString:@""])
 			return;
 
-		str = [str stringByReplacingString:[NSString stringWithUTF8String:" "] withString:@" "];
+		str = [str TM_stringByReplacingString:[NSString stringWithUTF8String:" "] withString:@" "];
 
 		if(pendingFlush)
 		{
@@ -178,7 +178,7 @@ - (void)editInTextMate:(id)sender
 	[EditInTextMate externalEditString:str startingAtLine:lineNumber forView:self];
 }
 
-- (void)didModifyString:(NSString*)newString
+- (void)textMateDidModifyString:(NSString*)newString
 {
 	NSArray* lines = [newString componentsSeparatedByString:@"\n"];
 	NSMutableString* res = [NSMutableString string];
@@ -218,10 +218,10 @@ - (void)didModifyString:(NSString*)newString
 		}
 		else
 		{
-			line = [line stringByNbspEscapingSpaces];
-			line = [line stringByReplacingString:@"&" withString:@"&amp;"];
-			line = [line stringByReplacingString:@"<" withString:@"&lt;"];
-			line = [line stringByReplacingString:@">" withString:@"&gt;"];
+			line = [line TM_stringByNbspEscapingSpaces];
+			line = [line TM_stringByReplacingString:@"&" withString:@"&amp;"];
+			line = [line TM_stringByReplacingString:@"<" withString:@"&lt;"];
+			line = [line TM_stringByReplacingString:@">" withString:@"&gt;"];
 			[res appendFormat:@"<DIV>%@</DIV>", line];
 		}
 	}