aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2010-02-10 04:00:35 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2010-02-10 04:00:35 +0000
commit782d59ac084205f1ca998a65ca0d46b47db6b627 (patch)
treea259a492a34b588c6b037bc11bedce27ee1e8d39
parent24520303528338589b543a72e3c8194899688607 (diff)
[Author: dmaclach]
Clean up a pile of API upgrade warnings from clang, and the dead store. R=thomasvl DELTA=13 (0 added, 3 deleted, 10 changed)
-rw-r--r--AppKit/GTMGetURLHandler.m2
-rw-r--r--AppKit/GTMTheme.m3
-rw-r--r--DebugUtils/GTMMethodCheck.m2
-rw-r--r--Foundation/GTMNSAppleEventDescriptor+Foundation.m12
-rw-r--r--Foundation/GTMNSAppleScript+Handler.m2
-rw-r--r--UnitTesting/GTMUnitTestingUtilities.m2
6 files changed, 10 insertions, 13 deletions
diff --git a/AppKit/GTMGetURLHandler.m b/AppKit/GTMGetURLHandler.m
index dcac292..e038530 100644
--- a/AppKit/GTMGetURLHandler.m
+++ b/AppKit/GTMGetURLHandler.m
@@ -108,7 +108,7 @@ GTM_METHOD_CHECK(NSString, gtm_appleEventDescriptor);
andSelector:@selector(getUrl:withReplyEvent:)
forEventClass:kInternetEventClass
andEventID:kAEGetURL];
- [pool release];
+ [pool drain];
}
+ (void)getUrl:(NSAppleEventDescriptor *)event
diff --git a/AppKit/GTMTheme.m b/AppKit/GTMTheme.m
index bb197fe..f1c3ecd 100644
--- a/AppKit/GTMTheme.m
+++ b/AppKit/GTMTheme.m
@@ -217,11 +217,8 @@ NSString *const kGTMThemeBackgroundColorKey = @"GTMThemeBackgroundColor";
if (value) return value;
if (style == GTMThemeStyleWindow) {
- NSColor *color = nil;
if (!state) {
// TODO(alcor): dim images when disabled
- color = [NSColor colorWithPatternImage:backgroundImage_];
- // TODO(alcor): |color| is never used!
if ((state & GTMThemeStateActiveWindow) != GTMThemeStateActiveWindow) {
// TODO(alcor): this recursive call will also return nil since when you
diff --git a/DebugUtils/GTMMethodCheck.m b/DebugUtils/GTMMethodCheck.m
index 0d55e11..0331a67 100644
--- a/DebugUtils/GTMMethodCheck.m
+++ b/DebugUtils/GTMMethodCheck.m
@@ -154,7 +154,7 @@ void GTMMethodCheckMethodChecker(void) {
free(methods);
}
free(classes);
- [pool release];
+ [pool drain];
}
#endif // DEBUG
diff --git a/Foundation/GTMNSAppleEventDescriptor+Foundation.m b/Foundation/GTMNSAppleEventDescriptor+Foundation.m
index b355607..40a52de 100644
--- a/Foundation/GTMNSAppleEventDescriptor+Foundation.m
+++ b/Foundation/GTMNSAppleEventDescriptor+Foundation.m
@@ -264,7 +264,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_arrayValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
@@ -294,7 +294,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_dictionaryValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
@@ -354,7 +354,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_nullValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
@@ -378,7 +378,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(stringValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
@@ -404,7 +404,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_numberValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
@@ -492,7 +492,7 @@ static NSMutableDictionary *gTypeMap = nil;
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_fourCharCodeValue)
forTypes:types
count:sizeof(types)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor*)gtm_appleEventDescriptor {
diff --git a/Foundation/GTMNSAppleScript+Handler.m b/Foundation/GTMNSAppleScript+Handler.m
index 5bb1f46..01e15e1 100644
--- a/Foundation/GTMNSAppleScript+Handler.m
+++ b/Foundation/GTMNSAppleScript+Handler.m
@@ -119,7 +119,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:);
[NSAppleEventDescriptor gtm_registerSelector:@selector(gtm_osaIDValue)
forTypes:types3
count:sizeof(types3)/sizeof(DescType)];
- [pool release];
+ [pool drain];
}
- (NSAppleEventDescriptor *)gtm_executeAppleEvent:(NSAppleEventDescriptor *)event
diff --git a/UnitTesting/GTMUnitTestingUtilities.m b/UnitTesting/GTMUnitTestingUtilities.m
index 2d78f23..5ce4219 100644
--- a/UnitTesting/GTMUnitTestingUtilities.m
+++ b/UnitTesting/GTMUnitTestingUtilities.m
@@ -96,7 +96,7 @@ static CGKeyCode GTMKeyCodeForCharCode(CGCharCode charCode);
if ([self areWeBeingUnitTested]) {
[self setUpForUIUnitTests];
}
- [pool release];
+ [pool drain];
}
+ (BOOL)isScreenSaverActive {