Changeset 1174 for branches

Timestamp:

02/25/10 07:44:29 (2 years ago)

Author:

gbooker

Message:

Removed errors/warnings for GCC

Location:

branches/PlayerFramework/SapphireFrappliance

Files:

• FRAppliance/SapphireURLLoader.m (modified) (1 diff)
• MetaDataImporting/SapphireMovieImporter.m (modified) (8 diffs)
• MetaDataImporting/SapphireScraper.m (modified) (7 diffs)
• MetaDataImporting/SapphireTVShowImporter.m (modified) (8 diffs)

branches/PlayerFramework/SapphireFrappliance/FRAppliance/SapphireURLLoader.m

@@ -132 +132 @@
 - (int)cancelForTarget:(id)target
 {
-        for(int i=0; i<[informers count]; i++)
+        int i;
+        for(i=0; i<[informers count]; i++)
         {
                 NSInvocation *invoke = [informers objectAtIndex:i];

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -97 +97 @@
                 return self;
         
-        NSError *error = nil;
         scraper = [[SapphireScraper scrapperWithName:@"IMDb.com"] retain];
         
@@ -120 +119 @@
 }
 
-- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(SapphireMovieImportStateData *)state
-{
+- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(id)stateObj
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -206 +206 @@
 }
 
-- (void)retrievedMovieDetails:(NSXMLDocument *)details forObject:(SapphireMovieImportStateData *)state
-{
+- (void)retrievedMovieDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
 
@@ -473 +474 @@
         SapphireMovieImportStateData *state = [[[SapphireMovieImportStateData alloc] initWithFile:metaData atPath:path scraper:siteScraper] autorelease];
         [state setLookupName:lookupName];
-        /*Get the movie title*/
-        NSString *movieDataLink = nil ;
         /*Check to see if we know this movie*/
         
@@ -483 +482 @@
         BOOL success = YES;
         success &= [titleYearScanner scanUpToString:@"(" intoString:&normalTitle];
-        NSString *junk = nil;
         success &= [titleYearScanner scanString:@"(" intoString:nil];
         success &= [titleYearScanner scanInt:&year];
@@ -571 +569 @@
 }
 
-- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireMovieImportStateData *)state
-{
+- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)context;
         if([chooser isKindOfClass:[SapphireMovieChooser class]])
         {
-                SapphireMovieChooser *movieChooser = (SapphireMovieChooser *)chooser;
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
                 SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
@@ -588 +586 @@
         else if([chooser isKindOfClass:[SapphirePosterChooser class]])
         {
-                SapphirePosterChooser *posterChooser = (SapphirePosterChooser *)chooser;
-                NSManagedObjectContext *moc = [state->file managedObjectContext];
                 SapphireMovieTranslation *tran = state->translation;
                 if([[tran selectedPoster] link])
@@ -601 +597 @@
 }
 
-- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireMovieImportStateData *)state
-{
+- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)context;
         /*See if it was a movie chooser*/
         if([chooser isKindOfClass:[SapphireMovieChooser class]])

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireScraper.m

@@ -228 +228 @@
 - (void)clearBuffers
 {
-        for(int i=0; i<SCRAPER_BUFFER_COUNT; i++)
+        int i;
+        for(i=0; i<SCRAPER_BUFFER_COUNT; i++)
         {       
                 [scraperBuffers[i] release];
@@ -243 +244 @@
 - (void)clearStorchMatches
 {
-        for(int i=0; i<SCRAPER_MATCH_COUNT; i++)
+        int i;
+        for(i=0; i<SCRAPER_MATCH_COUNT; i++)
         {
                 [storedMatches[i] release];
@@ -286 +288 @@
         NSArray *settingDescs = [rootSetting elementsForName:@"setting"];
         
-        int count = [settingDescs count];
-        for(int i=0; i<count; i++)
+        int count = [settingDescs count], i;
+        for(i=0; i<count; i++)
         {
                 [self parseSetting:[settingDescs objectAtIndex:i]];
@@ -341 +343 @@
 void bufferBooleanAttributeWithDefault(NSXMLElement *element, NSString *attributeName, BOOL defaultValue, BOOL *values)
 {
+        int i;
         if(defaultValue)
-                for(int i=0; i<SCRAPER_MATCH_COUNT; i++)
+                for(i=0; i<SCRAPER_MATCH_COUNT; i++)
                         values[i] = YES;
         else
@@ -352 +355 @@
                 NSArray *valueStrings = [attr componentsSeparatedByString:@","];
                 int count = [valueStrings count];
-                for(int i=0; i<count; i++)
+                for(i=0; i<count; i++)
                 {
                         int index = [[valueStrings objectAtIndex:i] intValue];
@@ -575 +578 @@
         if(count)
         {
-                for(int i=0; i<count; i++)
+                int i;
+                for(i=0; i<count; i++)
                         [self parseElement:[regexChildren objectAtIndex:i]];
         }
@@ -610 +614 @@
         NSXMLElement *functionElement = [elements objectAtIndex:0];
         elements = [functionElement elementsForName:@"RegExp"];
-        int count = [elements count];
-        for(int i=0; i<count; i++)
+        int count = [elements count], i;
+        for(i=0; i<count; i++)
         {
                 [self parseElement:[elements objectAtIndex:i]];

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -231 +231 @@
 }
 
-- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -307 +308 @@
         {
                 NSString *coverArtPath = [[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"@TV/%@/cover.jpg", [show name]]];
-                BOOL isDir = NO;
                 if(![[NSFileManager defaultManager] fileExistsAtPath:coverArtPath])
                         fetchShowData = YES;
@@ -325 +325 @@
 }
 
-- (void)retrievedShowDetails:(NSXMLDocument *)details forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedShowDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -408 +409 @@
 }
 
-- (void)retrievedEpisodeList:(NSXMLDocument *)episodeList forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedEpisodeList:(NSXMLDocument *)episodeList forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -441 +443 @@
 }
 
-- (void)retrievedEpisodeDetails:(NSXMLDocument *)details forObject:(SapphireSingleTVShowEpisodeImportStateData *)state
-{
+- (void)retrievedEpisodeDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireSingleTVShowEpisodeImportStateData *state = (SapphireSingleTVShowEpisodeImportStateData *)stateObj;
         SapphireTVShowImportStateData *tvState = state->state;
         [state->siteScraper setObject:nil];     //Avoid retain loop
@@ -525 +528 @@
         if(state->episodesCompleted == [infoArray count])
         {
-                for(int i=0; i<[infoArray count]; i++)
+                int i;
+                for(i=0; i<[infoArray count]; i++)
                 {
                         if(![[infoArray objectAtIndex:i] count])
@@ -772 +776 @@
 }
 
-- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireTVShowImportStateData *)state
-{
+- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)context;
         /*Check for a match done earlier*/
         NSManagedObjectContext *moc = [state->file managedObjectContext];
@@ -786 +791 @@
 }
 
-- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)aChooser withContext:(SapphireTVShowImportStateData *)state;
-{
+- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)aChooser withContext:(id)context
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)context;
         if(![aChooser isKindOfClass:[SapphireShowChooser class]])
                 return;