1. Perry Metzger
  2. growl

Commits

Peter Hosey  committed 3f7c778

Added identifying prefixes to the remaining category methods that didn't have them, to avert collisions.

Comments (0)

Files changed (1)

File Extras/GrowlMail/Message+GrowlMail.m Modified

View file
  • Ignore whitespace
  • Hide word diff
 
 @interface NSString (GrowlMail_KeywordReplacing)
 
-- (NSString *) stringByReplacingKeywords:(NSArray *)keywords
-                              withValues:(NSArray *)values;
+- (NSString *) GMStringByReplacingKeywords:(NSArray *)keywords
+                                withValues:(NSArray *)values;
 
 @end
 
 @interface NSMutableString (GrowlMail_LineOrientedTruncation)
 
-- (void) trimStringToFirstNLines:(NSUInteger)n;
+- (void) GMTrimStringToFirstNLines:(NSUInteger)n;
 
 @end
 
 		if (originalBody) {
 			NSMutableString *transformedBody = [[[originalBody stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] mutableCopy] autorelease];
 			NSUInteger lengthWithoutWhitespace = [transformedBody length];
-			[transformedBody trimStringToFirstNLines:4U];
+			[transformedBody GMTrimStringToFirstNLines:4U];
 			NSUInteger length = [transformedBody length];
 			if (length > 200U) {
 				[transformedBody deleteCharactersInRange:NSMakeRange(200U, length - 200U)];
 		(body ? body : @""),
 		(account ? account : @""),
 		 nil];
-	NSString *title = [titleFormat stringByReplacingKeywords:keywords withValues:values];
-	NSString *description = [descriptionFormat stringByReplacingKeywords:keywords withValues:values];
+	NSString *title = [titleFormat GMStringByReplacingKeywords:keywords withValues:values];
+	NSString *description = [descriptionFormat GMStringByReplacingKeywords:keywords withValues:values];
 
 	/*
 	NSLog(@"Subject: '%@'", subject);
 
 @implementation NSString (GrowlMail_KeywordReplacing)
 
-- (NSString *) stringByReplacingKeywords:(NSArray *)keywords
-                              withValues:(NSArray *)values
+- (NSString *) GMStringByReplacingKeywords:(NSArray *)keywords
+                                withValues:(NSArray *)values
 {
 	NSParameterAssert([keywords count] == [values count]);
 	NSMutableString *str = [[self mutableCopy] autorelease];
 
 @implementation NSMutableString (GrowlMail_LineOrientedTruncation)
 
-- (void) trimStringToFirstNLines:(NSUInteger)n {
+- (void) GMTrimStringToFirstNLines:(NSUInteger)n {
 	NSRange range;
 	NSUInteger end = 0U;
 	NSUInteger length;