Fix some compiler warnings on Xcode 4.2 final

git-svn-id: http://gdata-objectivec-client.googlecode.com/svn/trunk@704 f334b912-182a-0410-b59a-f50d4d03ee1a
nparry · Oct 5, 2011 · 2ebc7b7 · 2ebc7b7
1 parent fff70cd
commit 2ebc7b7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/Examples/FinanceSample/FinanceSampleWindowController.m b/Examples/FinanceSample/FinanceSampleWindowController.m
@@ -47,8 +47,8 @@ - (void)setPositionFeed:(GDataFeedFinancePosition *)feed;
 - (NSError *)positionFetchError;
 - (void)setPositionFetchError:(NSError *)error;
 
-- (GDataFeedBase *)transactionFeed;
-- (void)setTransactionFeed:(GDataFeedBase *)feed;
+- (GDataFeedFinanceTransaction *)transactionFeed;
+- (void)setTransactionFeed:(GDataFeedFinanceTransaction *)feed;
 - (NSError *)transactionFetchError;
 - (void)setTransactionFetchError:(NSError *)error;
 @end
@@ -770,11 +770,11 @@ - (void)setPositionFetchError:(NSError *)error {
 }
 
 
-- (GDataFeedBase *)transactionFeed {
+- (GDataFeedFinanceTransaction *)transactionFeed {
   return mTransactionFeed; 
 }
 
-- (void)setTransactionFeed:(GDataFeedBase *)feed {
+- (void)setTransactionFeed:(GDataFeedFinanceTransaction *)feed {
   [mTransactionFeed autorelease];
   mTransactionFeed = [feed retain];
 }

diff --git a/Examples/YouTubeSample/YouTubeSampleWindowController.m b/Examples/YouTubeSample/YouTubeSampleWindowController.m
@@ -40,8 +40,8 @@ - (void)fetchAllEntries;
 - (void)uploadVideoFile;
 - (void)restartUpload;
 
-- (GDataFeedBase *)entriesFeed;
-- (void)setEntriesFeed:(GDataFeedBase *)feed;
+- (GDataFeedYouTubeVideo *)entriesFeed;
+- (void)setEntriesFeed:(GDataFeedYouTubeVideo *)feed;
 
 - (NSError *)entriesFetchError;
 - (void)setEntriesFetchError:(NSError *)error;
@@ -523,7 +523,7 @@ - (void)fetchAllEntries {
 
 // feed fetch callback
 - (void)entryListFetchTicket:(GDataServiceTicket *)ticket
-            finishedWithFeed:(GDataFeedBase *)feed
+            finishedWithFeed:(GDataFeedYouTubeVideo *)feed
                        error:(NSError *)error {
 
   [self setEntriesFeed:feed];
@@ -834,11 +834,11 @@ - (void)categoryFetcher:(GTMHTTPFetcher *)fetcher finishedWithData:(NSData *)dat
 
 #pragma mark Setters and Getters
 
-- (GDataFeedBase *)entriesFeed {
+- (GDataFeedYouTubeVideo *)entriesFeed {
   return mEntriesFeed;
 }
 
-- (void)setEntriesFeed:(GDataFeedBase *)feed {
+- (void)setEntriesFeed:(GDataFeedYouTubeVideo *)feed {
   [mEntriesFeed autorelease];
   mEntriesFeed = [feed retain];
 }

diff --git a/Source/Clients/YouTube/GDataYouTubePublicationState.h b/Source/Clients/YouTube/GDataYouTubePublicationState.h
@@ -49,8 +49,8 @@ _EXTERN NSString* const kGDataYouTubePubStateRestricted _INITIALIZE_AS(@"restric
 
 @interface GDataYouTubePublicationState : GDataObject <GDataExtension>
 
-- (NSString *)state;
-- (void)setState:(NSString *)str;
+- (NSString *)name;  // this method was previously "state"
+- (void)setName:(NSString *)str;
 
 - (NSString *)reasonCode;
 - (void)setReasonCode:(NSString *)str;

diff --git a/Source/Clients/YouTube/GDataYouTubePublicationState.m b/Source/Clients/YouTube/GDataYouTubePublicationState.m
@@ -55,11 +55,11 @@ - (void)addParseDeclarations {
 
 #pragma mark -
 
-- (NSString *)state {
+- (NSString *)name {
   return [self stringValueForAttribute:kNameAttr];
 }
 
-- (void)setState:(NSString *)str {
+- (void)setName:(NSString *)str {
   [self setStringValue:str forAttribute:kNameAttr];
 }
 

diff --git a/Source/ReleaseNotes.txt b/Source/ReleaseNotes.txt
@@ -35,6 +35,9 @@ Changes
 
 - The YouTube upload URL is now https
 
+- Renamed GDataYouTubePublicationState's "state" method to "name" to avoid a
+  compiler warning under Xcode 4
+
 - Removed Translator Toolkit support
 
 - Remove upload callbacks on systems without NSURLConnection's didSendBodyData:

diff --git a/Source/Tests/GDataFeedTest.m b/Source/Tests/GDataFeedTest.m
@@ -1652,7 +1652,7 @@ - (void)testYouTubeFeeds {
     { @"entries.0.mediaGroup.mediaRatings.0.youTubeCountry", @"KR" },
     { @"entries.0.mediaGroup.mediaThumbnails.0.height", @"97" },
     { @"entries.0.mediaGroup.mediaThumbnails.0.youTubeName", @"abc987" },
-    { @"entries.0.publicationState.state", @"rejected" },
+    { @"entries.0.publicationState.name", @"rejected" },
     { @"entries.0.publicationState.reasonCode", @"32" },
     { @"entries.0.publicationState.helpURLString", @"http://www.youtube.com/" },
     { @"entries.0.publicationState.errorDescription", @"incorrect format" },
@@ -1756,7 +1756,7 @@ - (void)testYouTubeFeeds {
     { @"entries.0.title", @"captrack name" },
     { @"entries.0.categories.0.term", kGDataCategoryYouTubeCaptionTrack },
 
-    { @"entries.0.publicationState.state", @"failed" },
+    { @"entries.0.publicationState.name", @"failed" },
     { @"entries.0.publicationState.reasonCode", @"invalidFormat" },
     { @"entries.0.derived", kGDataYouTubeDerivedSpeechRecogniion },