Changeset 1270 for trunk

Show
Ignore:
Timestamp:
06/06/10 18:50:15 (2 years ago)
Author:
gbooker
Message:

Corrected spelling of invocation

Location:
trunk/SapphireFrappliance
Files:
15 modified

Legend:

Unmodified
Added
Removed

  • trunk/SapphireFrappliance/Browser/SapphireMarkMenu.m

    r1269 r1270  
    436436        SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene: [self scene] 
    437437                                                                                                                                         title: BRLocalizedString(@"Getting artwork selection", @"Getting artwork selection") 
    438                                                                                                                                 invokation: invoke]; 
     438                                                                                                                                invocation: invoke]; 
    439439         
    440440        [invoke setArgument: &fileMeta atIndex: 2]; 
    … …  
    456456        [invoke retainArguments]; 
    457457        [invoke setArgument:&fileMeta atIndex:2]; 
    458         [controller setRefreshInvokation:invoke]; 
     458        [controller setRefreshInvocation:invoke]; 
    459459         
    460460        return [controller autorelease]; 
    … …  
    673673                                break; 
    674674                        case COMMAND_RENAME_TO_PRETTY: 
    675                                 doSubtreeInvokation(dirMeta, @selector(renameToPrettyName), nil); 
     675                                doSubtreeInvocation(dirMeta, @selector(renameToPrettyName), nil); 
    676676                                break; 
    677677                        case COMMAND_CUT_PATH: 
    … …  
    686686                                [invoke setArgument:&dirMeta atIndex:2]; 
    687687                                 
    688                                 SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene:[self scene] title:[NSString stringWithFormat:BRLocalizedString(@"Moving %@", @"parameter is file/dir that is being moved"), [movingPath lastPathComponent]] invokation:invoke]; 
     688                                SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene:[self scene] title:[NSString stringWithFormat:BRLocalizedString(@"Moving %@", @"parameter is file/dir that is being moved"), [movingPath lastPathComponent]] invocation:invoke]; 
    689689                                 
    690690                                replaceController = [wait autorelease]; 
    … …  
    699699                                [invoke retainArguments]; 
    700700                                 
    701                                 SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete Directory?", @"Delete Directory Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[dirMeta path] lastPathComponent]] invokation:invoke]; 
     701                                SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete Directory?", @"Delete Directory Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[dirMeta path] lastPathComponent]] invocation:invoke]; 
    702702                                 
    703703                                replaceController = [confirm autorelease]; 
    … …  
    750750                                [invoke setTarget:self]; 
    751751                                 
    752                                 SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene:[self scene] title:BRLocalizedString(@"Joining Files", @"Title for wait display while joining files") invokation:invoke]; 
     752                                SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene:[self scene] title:BRLocalizedString(@"Joining Files", @"Title for wait display while joining files") invocation:invoke]; 
    753753                                [invoke setArgument:&wait atIndex:2]; 
    754754                                 
    … …  
    790790                                [invoke retainArguments]; 
    791791                                 
    792                                 SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete File?", @"Delete File Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[fileMeta path] lastPathComponent]] invokation:invoke]; 
     792                                SapphireConfirmPrompt *confirm = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Delete File?", @"Delete File Prompt Title") subtitle:[NSString stringWithFormat:BRLocalizedString(@"Are you sure you wish to delete %@?", @"parameter is file/dir that is being deleted"), [[fileMeta path] lastPathComponent]] invocation:invoke]; 
    793793                                 
    794794                                replaceController = [confirm autorelease]; 

  • trunk/SapphireFrappliance/FRAppliance/SapphireConfirmPrompt.h

    r1268 r1270  
    2929 
    3030@interface SapphireConfirmPrompt : SapphireCenteredMenuController <SapphireLayoutDelegate>{ 
    31         NSInvocation                    *invoke;                        /*!< @brief The invokation to make*/ 
     31        NSInvocation                    *invoke;                        /*!< @brief The invocation to make*/ 
    3232        BRTextControl                   *subtitle;                      /*!< @brief The sub-title message*/ 
    3333        NSString                                *subText;                       /*!< @brief The text of the sub-title message*/ 
    … …  
    4040 * @param title The title for the display 
    4141 * @param sub The secondary title 
    42  * @param invokation The invokation to make to start the process 
     42 * @param invocation The invocation to make to start the process 
    4343 */ 
    44 - (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title subtitle:(NSString *)sub invokation:(NSInvocation *)invokation; 
     44- (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title subtitle:(NSString *)sub invocation:(NSInvocation *)invocation; 
    4545 
    4646@end 

  • trunk/SapphireFrappliance/FRAppliance/SapphireConfirmPrompt.m

    r1268 r1270  
    2424@implementation SapphireConfirmPrompt 
    2525 
    26 - (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title subtitle:(NSString *)sub invokation:(NSInvocation *)invokation; 
     26- (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title subtitle:(NSString *)sub invocation:(NSInvocation *)invocation; 
    2727{ 
    2828        self = [super initWithScene:scene]; 
    … …  
    3131         
    3232        [self setListTitle:title]; 
    33         invoke = [invokation retain]; 
     33        invoke = [invocation retain]; 
    3434        [invoke retainArguments]; 
    3535        subText = [sub retain]; 

  • trunk/SapphireFrappliance/FRAppliance/SapphireWaitDisplay.h

    r767 r1270  
    2525        BRWaitSpinnerControl    *spinner;                       /*!< @brief The spinner*/ 
    2626        BRTextControl                   *status;                        /*!< @brief Status message*/ 
    27         NSInvocation                    *invoke;                        /*!< @brief The invokation to make*/ 
     27        NSInvocation                    *invoke;                        /*!< @brief The invocation to make*/ 
    2828        BOOL                                    runInThread;            /*!< @brief run in a thread*/ 
    2929        BOOL                                    noPopWhenComplete;      /*!< @brief don't pop the controller on completion*/ 
    … …  
    3636 * @param scene The scene 
    3737 * @param title The title for the display 
    38  * @param invokation The invokation to make to start the process 
     38 * @param invocation The invocation to make to start the process 
    3939 */ 
    40 - (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title invokation:(NSInvocation *)invokation; 
     40- (id)initWithScene:(BRRenderScene *)scene title:(NSString *)title invocation:(NSInvocation *)invocation; 
    4141 
    4242/*! 

  • trunk/SapphireFrappliance/FRAppliance/SapphireWaitDisplay.m

    r967 r1270  
    2626@implementation SapphireWaitDisplay 
    2727 
    28 - (id) initWithScene:(BRRenderScene *)scene title:(NSString *)title invokation:(NSInvocation *)invokation 
     28- (id) initWithScene:(BRRenderScene *)scene title:(NSString *)title invocation:(NSInvocation *)invocation 
    2929{ 
    3030        self = [super initWithScene:scene]; 
    … …  
    3333         
    3434        [self setListTitle:title]; 
    35         invoke = [invokation retain]; 
     35        invoke = [invocation retain]; 
    3636        [invoke retainArguments]; 
    3737         

  • trunk/SapphireFrappliance/MetaData/Support/SapphireDirectory.h

    r1251 r1270  
    188188 * @brief Invoke a command on all files contained within this directory within filter 
    189189 * 
    190  * @param fileInv The invokation to invoke 
     190 * @param fileInv The invocation to invoke 
    191191 */ 
    192192- (void)invokeOnAllFiles:(NSInvocation *)fileInv; 

  • trunk/SapphireFrappliance/MetaData/Support/SapphireDirectory.m

    r889 r1270  
    3131NSString *VIRTUAL_DIR_OSCAR_PATH =                      @"@MOVIES/Academy Award Winning"; 
    3232 
    33 void doSubtreeInvokation(id <SapphireDirectory> dir, SEL select, id object) 
     33void doSubtreeInvocation(id <SapphireDirectory> dir, SEL select, id object) 
    3434{ 
    3535        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[SapphireFileMetaData class] instanceMethodSignatureForSelector:select]]; 
    … …  
    4444{ 
    4545        SEL select = @selector(setWatched:); 
    46         doSubtreeInvokation(dir, select, [NSNumber numberWithBool:watched]); 
     46        doSubtreeInvocation(dir, select, [NSNumber numberWithBool:watched]); 
    4747} 
    4848 
    … …  
    5050{ 
    5151        SEL select = @selector(setFavorite:); 
    52         doSubtreeInvokation(dir, select, [NSNumber numberWithBool:favorite]); 
     52        doSubtreeInvocation(dir, select, [NSNumber numberWithBool:favorite]); 
    5353} 
    5454 
    … …  
    5656{ 
    5757        SEL select = @selector(setToReimportFromMask:); 
    58         doSubtreeInvokation(dir, select, [NSNumber numberWithInt:mask]); 
     58        doSubtreeInvocation(dir, select, [NSNumber numberWithInt:mask]); 
    5959} 
    6060 
    … …  
    6262{ 
    6363        SEL select = @selector(clearMetaData); 
    64         doSubtreeInvokation(dir, select, nil); 
     64        doSubtreeInvocation(dir, select, nil); 
    6565} 
    6666 
    … …  
    6868{ 
    6969        SEL select = @selector(setToResetImportDecisions); 
    70         doSubtreeInvokation(dir, select, nil); 
     70        doSubtreeInvocation(dir, select, nil); 
    7171} 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.h

    r1204 r1270  
    4747 
    4848/*! 
    49  * @brief Sets the invokation to refresh 
     49 * @brief Sets the invocation to refresh 
    5050 * 
    51  * @param[in] invoke The invokation to refresh 
     51 * @param[in] invoke The invocation to refresh 
    5252 */ 
    53 - (void)setRefreshInvokation: (NSInvocation *)invoke; 
     53- (void)setRefreshInvocation: (NSInvocation *)invoke; 
    5454 
    5555/*! 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

    r1251 r1270  
    124124} 
    125125 
    126 - (void)setRefreshInvokation:(NSInvocation *)invoke; 
     126- (void)setRefreshInvocation:(NSInvocation *)invoke; 
    127127{ 
    128128        [refreshInvoke release]; 
    … …  
    526526                SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene: [self scene] 
    527527                                                                                                                                                 title: BRLocalizedString(@"Getting artwork selection", @"Getting artwork selection") 
    528                                                                                                                                         invokation: invoke]; 
     528                                                                                                                                        invocation: invoke]; 
    529529                [[self stack] swapController:[wait autorelease]]; 
    530530        } 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireSiteScraper.h

    r1251 r1270  
    4141        id                                                                      referenceObject; 
    4242        SapphireURLLoader                                       *loader; 
    43         NSInvocation                                            *finishedInvokation; 
     43        NSInvocation                                            *finishedInvocation; 
    4444        NSMutableSet                                            *pendingUrlElements; 
    4545} 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireSiteScraper.m

    r1132 r1270  
    4747        myCopy->referenceObject = [referenceObject retain]; 
    4848        myCopy->loader = [loader retain]; 
    49         myCopy->finishedInvokation = [finishedInvokation retain]; 
     49        myCopy->finishedInvocation = [finishedInvocation retain]; 
    5050        myCopy->pendingUrlElements = [pendingUrlElements retain]; 
    5151         
    … …  
    5959        [loader release]; 
    6060        [pendingUrlElements release]; 
    61         [finishedInvokation release]; 
     61        [finishedInvocation release]; 
    6262        [super dealloc]; 
    6363} 
    … …  
    113113        if([urlsToFetch count] == 0) 
    114114        { 
    115                 [finishedInvokation invoke]; 
    116                 [finishedInvokation release]; 
    117                 finishedInvokation = nil; 
     115                [finishedInvocation invoke]; 
     116                [finishedInvocation release]; 
     117                finishedInvocation = nil; 
    118118        } 
    119119        else 
    … …  
    139139                document = [[NSXMLDocument alloc] initWithXMLString:xmlResults options:0 error:&error]; 
    140140         
    141         [finishedInvokation release]; 
    142         finishedInvokation = [[NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:selector]] retain]; 
    143         [finishedInvokation retainArguments]; 
    144         [finishedInvokation setTarget:delegate]; 
    145         [finishedInvokation setSelector:selector]; 
    146         [finishedInvokation setArgument:&document atIndex:2]; 
    147         [finishedInvokation setArgument:&referenceObject atIndex:3]; 
     141        [finishedInvocation release]; 
     142        finishedInvocation = [[NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:selector]] retain]; 
     143        [finishedInvocation retainArguments]; 
     144        [finishedInvocation setTarget:delegate]; 
     145        [finishedInvocation setSelector:selector]; 
     146        [finishedInvocation setArgument:&document atIndex:2]; 
     147        [finishedInvocation setArgument:&referenceObject atIndex:3]; 
    148148         
    149149        [self scanForURLs:document]; 

  • trunk/SapphireFrappliance/Settings/SapphireCollectionSettings.h

    r541 r1270  
    2727 * @brief The Settings specific to collections 
    2828 * 
    29  * This is a bit abstract in its opperation.  It is a SapphireMediaMenuController subclass that displays a list of collections, with or without a checkbox next to them, and a title.  Finally, it has an invokation for settings a value and getting a value. 
     29 * This is a bit abstract in its opperation.  It is a SapphireMediaMenuController subclass that displays a list of collections, with or without a checkbox next to them, and a title.  Finally, it has an invocation for settings a value and getting a value. 
    3030 */ 
    3131@interface SapphireCollectionSettings : SapphireMediaMenuController { 
    3232        NSArray                                                 *collections;           /*!< @brief The collections, in order*/ 
    3333        NSManagedObjectContext                  *moc;                           /*!< @brief The context*/ 
    34         NSInvocation                                    *setInv;                        /*!< @brief The set value invokation*/ 
    35         NSInvocation                                    *getInv;                        /*!< @brief The get value invokation*/ 
     34        NSInvocation                                    *setInv;                        /*!< @brief The set value invocation*/ 
     35        NSInvocation                                    *getInv;                        /*!< @brief The get value invocation*/ 
    3636} 
    3737 

  • trunk/SapphireFrappliance/Settings/SapphireRadioSetting.h

    r541 r1270  
    2929@interface SapphireRadioSetting : SapphireMediaMenuController { 
    3030        NSArray                         *choices;                               /*!< @brief The choicess the user has to select from*/ 
    31         NSInvocation            *settingInvokation;             /*!< @brief The invokation to set the choice*/ 
    32         NSInvocation            *gettingInvokation;             /*!< @brief The invokation to get the choice*/ 
     31        NSInvocation            *settingInvocation;             /*!< @brief The invocation to set the choice*/ 
     32        NSInvocation            *gettingInvocation;             /*!< @brief The invocation to get the choice*/ 
    3333        NSObject                        *target;                                /*!< @brief The target to set and get the choice*/ 
    3434        int                                     selected;                               /*!< @brief The current selected choice*/ 

  • trunk/SapphireFrappliance/Settings/SapphireRadioSetting.m

    r739 r1270  
    4040{ 
    4141        [choices release]; 
    42         [gettingInvokation release]; 
    43         [settingInvokation release]; 
     42        [gettingInvocation release]; 
     43        [settingInvocation release]; 
    4444        [super dealloc]; 
    4545} 
    … …  
    4747- (void)setSettingSelector:(SEL)setter 
    4848{ 
    49         [settingInvokation release]; 
    50         settingInvokation = [[NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:setter]] retain]; 
    51         [settingInvokation setTarget:target]; 
    52         [settingInvokation setSelector:setter]; 
     49        [settingInvocation release]; 
     50        settingInvocation = [[NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:setter]] retain]; 
     51        [settingInvocation setTarget:target]; 
     52        [settingInvocation setSelector:setter]; 
    5353} 
    5454 
    5555- (void)setGettingSelector:(SEL)getter 
    5656{ 
    57         [gettingInvokation release]; 
    58         gettingInvokation = [[NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:getter]] retain]; 
    59         [gettingInvokation setTarget:target]; 
    60         [gettingInvokation setSelector:getter]; 
     57        [gettingInvocation release]; 
     58        gettingInvocation = [[NSInvocation invocationWithMethodSignature:[target methodSignatureForSelector:getter]] retain]; 
     59        [gettingInvocation setTarget:target]; 
     60        [gettingInvocation setSelector:getter]; 
    6161         
    62         [gettingInvokation invoke]; 
    63         [gettingInvokation getReturnValue:&selected]; 
     62        [gettingInvocation invoke]; 
     63        [gettingInvocation getReturnValue:&selected]; 
    6464        [[self list] reload]; 
    6565} 
    … …  
    123123{ 
    124124    // This is called when the user changed a setting 
    125         [settingInvokation setArgument:&row atIndex:2]; 
    126         [settingInvokation invoke]; 
     125        [settingInvocation setArgument:&row atIndex:2]; 
     126        [settingInvocation invoke]; 
    127127         
    128128        /*Redraw*/ 

  • trunk/SapphireFrappliance/Settings/SapphireSettings.m

    r1269 r1270  
    473473                question = [NSString stringWithFormat:BRLocalizedString(@"Do you want to delete the show path for %@?", @"Prompt for deleting a show's path, argument is show name"), [show name]]; 
    474474         
    475         SapphireConfirmPrompt *prompt = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Show Path", @"Show Path") subtitle:question invokation:invoke]; 
     475        SapphireConfirmPrompt *prompt = [[SapphireConfirmPrompt alloc] initWithScene:[self scene] title:BRLocalizedString(@"Show Path", @"Show Path") subtitle:question invocation:invoke]; 
    476476        return [prompt autorelease]; 
    477477}