Adium

Changeset 25620

Show
Ignore:
Timestamp:
11/24/2008 07:49:22 PM (2 months ago)
Author:
catfish_man
Message:

Convert remaining non-propertyized calls to -containingObject so it is easier for me to search for

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Adium Framework/Source/AIContactObserverManager.m

    r25587 r25620  
    282282                 
    283283                //If this contact is within a meta contact, update the meta contact too 
    284                 AIListObject<AIContainingObject>        *containingObject = [listObject containingObject]; 
     284                AIListObject<AIContainingObject>        *containingObject = listObject.containingObject; 
    285285                if (containingObject && [containingObject isKindOfClass:[AIMetaContact class]]) { 
    286286                        NSSet   *attributes = [inObserver updateListObject:containingObject 

  • trunk/Frameworks/Adium Framework/Source/AIListContact.m

    r25596 r25620  
    599599        AIListContact   *parentContact = self; 
    600600 
    601         while ([[parentContact containingObject] isKindOfClass:[AIListContact class]]) { 
     601        while ([parentContact.containingObject isKindOfClass:[AIListContact class]]) { 
    602602                parentContact = (AIListContact *)parentContact.containingObject; 
    603603        } 

  • trunk/Frameworks/Adium Framework/Source/AIListGroup.m

    r25588 r25620  
    200200        if ([self containsObject:inObject]) {            
    201201                //Remove the object 
    202                 if ([inObject containingObject] == self) 
     202                if (inObject.containingObject == self) 
    203203                        [inObject setContainingObject:nil]; 
    204204                [_containedObjects removeObject:inObject]; 

  • trunk/Frameworks/Adium Framework/Source/AIUserIcons.m

    r24884 r25620  
    130130+ (void)notifyOfChangedIconForObject:(AIListObject *)inObject 
    131131{ 
    132         AIListObject    *containingObject = [inObject containingObject]; 
     132        AIListObject    *containingObject = inObject.containingObject; 
    133133        NSSet                   *modifiedKeys = [NSSet setWithObject:KEY_USER_ICON]; 
    134134         

  • trunk/Source/AISCLViewPlugin.m

    r25592 r25620  
    363363         
    364364        // If this group isn't part of the main contact list, provide a menu item to add it back. 
    365         if ((AIContactList *)[selectedObject containingObject] != adium.contactController.contactList) { 
     365        if ((AIContactList *)selectedObject.containingObject != adium.contactController.contactList) { 
    366366                [menu addItemWithTitle:AILocalizedString(@"Main Window", "Option in the 'Attach to Window' for the main contact list window") 
    367367                                                target:self 
    …… 
    421421- (void)moveListGroup:(AIListGroup *)listGroup toContactList:(AIContactList *)destinationList 
    422422{ 
    423         AIContactList *sourceList = (AIContactList *)[listGroup containingObject]; 
     423        AIContactList *sourceList = (AIContactList *)listGroup.containingObject; 
    424424 
    425425        [sourceList moveGroup:listGroup to:destinationList]; 
    …… 
    600600        AIContactList *contactList = [adium.contactController createDetachedContactList]; 
    601601 
    602         NSString *groupUID; 
    603         for (groupUID in groups) { 
     602        for (NSString *groupUID in groups) { 
    604603                AIListGroup             *group = [adium.contactController groupWithUID:groupUID]; 
    605                 [(AIContactList *)[group containingObject] moveGroup:group to:contactList]; 
     604                [(AIContactList *)group.containingObject moveGroup:group to:contactList]; 
    606605        } 
    607606