Adium

Changeset 25531

Show
Ignore:
Timestamp:
11/05/2008 01:22:17 AM (2 months ago)
Author:
catfish_man
Message:

Propertyize a bunch of stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Adium Framework/Source/AIAccountMenu.h

    r24705 r25531  
    5050 * 
    5151 *      @par    By default, menu items in the account menu use the menu font, but a client can request them with the system font instead. 
    52  * 
    53  *      @return \c NO if the menu font should be used (the default); \c YES if the system font should be used instead. 
    5452 */ 
    55 - (BOOL) useSystemFont; 
    56 /*!     @brief  Change whether to use the system font instead of the menu font. 
    57  * 
    58  *      @par    By default, menu items in the account menu use the menu font, but a client can request them with the system font instead. 
    59  * 
    60  *      @par    One situation in which it's appropriate to use the system font instead of the menu font is in the case of an NSPopUpButton, in which case the menu font is too big. 
    61  * 
    62  *      @param  flag    \c NO if the menu font should be used (the default); \c YES if the system font should be used instead. 
    63  */ 
    64 - (void) setUseSystemFont:(BOOL)flag; 
     53@property (readwrite, nonatomic) BOOL useSystemFont; 
    6554 
    66 - (void)setDelegate:(id)inDelegate; 
    67 - (id)delegate; 
     55@property (readwrite, nonatomic, assign) id delegate; 
    6856 
    6957- (NSMenuItem *)menuItemForAccount:(AIAccount *)account; 

  • trunk/Frameworks/Adium Framework/Source/AIContactMenu.h

    r24705 r25531  
    2727+ (id)contactMenuWithDelegate:(id)inDelegate forContactsInObject:(AIListObject *)inContainingObject; 
    2828 
    29 - (void)setDelegate:(id)inDelegate; 
    30 - (id)delegate; 
     29@property (readwrite, nonatomic, assign) id delegate; 
    3130 
    3231@end 

  • trunk/Frameworks/Adium Framework/Source/AIListBookmark.h

    r24452 r25531  
    1818 
    1919- (id)initWithChat:(AIChat *)inChat; 
    20  
    21 - (NSString*)name; 
    22 - (NSDictionary*)chatCreationDictionary; 
     20@property (readonly, nonatomic) NSString *name; 
     21@property (readonly, nonatomic) NSDictionary *chatCreationDictionary; 
    2322 
    2423- (void)openChat; 

  • trunk/Frameworks/Adium Framework/Source/AIListOutlineView.h

    r24119 r25531  
    5454 
    5555- (void)setDelegate:(id)delegate; 
    56 - (int)desiredHeight; 
    57 - (int)desiredWidth; 
     56@property (readonly, nonatomic) int desiredHeight; 
     57@property (readonly, nonatomic) int desiredWidth; 
    5858- (void)setMinimumDesiredWidth:(int)inMinimumDesiredWidth; 
    5959- (void)setDesiredHeightPadding:(int)inPadding; 
    …… 
    6565 
    6666//Contact menu 
    67 - (AIListObject *)listObject; 
    68 - (NSArray *)arrayOfListObjects; 
     67@property (readonly, nonatomic) AIListObject *listObject; 
     68@property (readonly, nonatomic) NSArray *arrayOfListObjects; 
    6969 
    7070//Contacts 
    …… 
    7474 * @result The index, or -1 if no list contact is visible 
    7575 */ 
    76 - (int)indexOfFirstVisibleListContact; 
     76@property (readonly, nonatomic) int indexOfFirstVisibleListContact; 
    7777 
    7878//Shadows 
    …… 
    8484- (void)setBackgroundOpacity:(float)opacity forWindowStyle:(AIContactListWindowStyle)windowStyle; 
    8585- (void)setBackgroundFade:(float)fade; 
    86 - (void)setBackgroundColor:(NSColor *)inColor; 
    87 - (NSColor *)backgroundColor; 
    88 - (void)setHighlightColor:(NSColor *)inColor; 
    89 - (NSColor *)highlightColor; 
    90 - (void)setAlternatingRowColor:(NSColor *)color; 
    91 - (NSColor *)alternatingRowColor; 
     86@property (readwrite, nonatomic, retain) NSColor *backgroundColor; 
     87@property (readwrite, nonatomic, retain) NSColor *highlightColor; 
     88@property (readwrite, nonatomic, retain) NSColor *alternatingRowColor; 
    9289@end 

  • trunk/Frameworks/Adium Framework/Source/AIStatusMenu.h

    r24450 r25531  
    1717 
    1818+ (id)statusMenuWithDelegate:(id)inDelegate; 
    19 - (void)setDelegate:(id)inDelegate; 
     19 
     20@property (readwrite, nonatomic, assign) id delegate; 
    2021 
    2122- (void)delegateWillReplaceAllMenuItems; 

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

    r25443 r25531  
    524524+ (void)dummyAction:(id)sender {}; 
    525525 
     526@synthesize delegate; 
     527 
    526528@end 

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

    r24137 r25531  
    4545 * @brief The priority at which this source should be used. See the \#defines in AIUserIcons.h for posible values. 
    4646 */ 
    47 - (AIUserIconPriority)priority; 
     47@property (readonly, nonatomic) AIUserIconPriority priority; 
    4848@end 
    4949 

  • trunk/Frameworks/Adium Framework/Source/DCJoinChatViewController.h

    r24450 r25531  
    3030 
    3131- (id)init; 
    32 - (NSView *)view; 
    33 - (NSString *)nibName; 
     32@property (readonly, nonatomic) NSView *view; 
     33@property (readonly, nonatomic) NSString *nibName; 
    3434 
    3535- (void)configureForAccount:(AIAccount *)inAccount; 
    …… 
    4848- (NSArray *)contactsFromNamesSeparatedByCommas:(NSString *)namesSeparatedByCommas onAccount:(AIAccount *)inAccount; 
    4949 
    50 - (void)setDelegate:(id)inDelegate; 
    51 - (id)delegate; 
     50@property (readwrite, nonatomic, assign) id delegate; 
    5251 
    5352//roomlistWindowController delegate 
    54 - (void)setSharedChatInstance:(id)newInstance; 
    55 - (id)sharedChatInstance; 
     53@property (readwrite, nonatomic, assign) id sharedChatInstance; 
     54 
    5655@end 
    5756 

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

    r25443 r25531  
    6363} 
    6464 
    65 - (NSView *)view 
    66 { 
    67         return view; 
    68 } 
     65@synthesize view; 
    6966 
    7067//Stubs for subclasses 
    …… 
    7269        return nil; 
    7370}; 
     71 
    7472- (void)joinChatWithAccount:(AIAccount *)inAccount 
    7573{ 
    …… 
    329327} 
    330328 
    331 #pragma mark Delegate handling 
    332 - (void)setDelegate:(id)inDelegate 
    333 { 
    334         delegate = inDelegate; 
    335 } 
    336 - (id)delegate; 
    337 { 
    338         return delegate; 
    339 } 
    340  
    341 #pragma mark Roomlist Delegate 
    342 - (void)setSharedChatInstance:(id)newInstance 
    343 { 
    344         NSLog(@"sharedChatInstance: %@",newInstance); 
    345         sharedChatInstance = newInstance; 
    346 } 
    347  
    348 -(id)sharedChatInstance 
    349 { 
    350         return sharedChatInstance; 
    351 } 
    352  
     329@synthesize delegate; 
     330 
     331@synthesize sharedChatInstance; 
    353332 
    354333@end 

  • trunk/Frameworks/Adium Framework/Source/ESFileTransfer.h

    r24450 r25531  
    6666- (unsigned long long)size; 
    6767 
    68 - (void)setIsDirectory:(BOOL)inIsDirectory; 
    69 - (BOOL)isDirectory; 
    70  
    71 - (void)setFileTransferType:(AIFileTransferType)inType; 
    72 - (AIFileTransferType)fileTransferType; 
    73  
    74 - (void)setStatus:(AIFileTransferStatus)inStatus; 
    75 - (AIFileTransferStatus)status; 
     68@property (readwrite, nonatomic) BOOL isDirectory; 
     69@property (readwrite, nonatomic) AIFileTransferType fileTransferType; 
     70@property (readwrite, nonatomic) AIFileTransferStatus status; 
    7671 
    7772- (void)setPercentDone:(float)inPercent bytesSent:(unsigned long long)inBytesSent; 
    78 - (float)percentDone; 
    79 - (unsigned long long)bytesSent; 
     73@property (readonly, nonatomic) float percentDone; 
     74@property (readonly, nonatomic) unsigned long long bytesSent; 
    8075 
    81 - (void)setAccountData:(id)inAccountData; 
    82 - (id)accountData; 
     76@property (readwrite, nonatomic, retain) id accountData; 
    8377 
    84 - (void)setDelegate:(id <FileTransferDelegate>)inDelegate; 
    85 - (id <FileTransferDelegate>)delegate; 
     78@property (readwrite, nonatomic, retain) id <FileTransferDelegate> delegate; 
    8679 
    8780- (BOOL)isStopped; 

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

    r25486 r25531  
    286286} 
    287287 
    288 - (void)setAccountData:(id)inAccountData 
    289 { 
    290     if (accountData != inAccountData) { 
    291         [accountData release]; 
    292         accountData = [inAccountData retain]; 
    293     } 
    294 } 
    295 - (id)accountData 
    296 { 
    297     return accountData;    
    298 } 
     288@synthesize accountData; 
    299289 
    300290- (void)setDelegate:(id <FileTransferDelegate>)inDelegate 

  • trunk/Source/AIMenuItemView.h

    r24691 r25531  
    1818} 
    1919 
    20 - (void)setMenu:(NSMenu *)inMenu; 
    21 - (void)setDelegate:(id)inDelegate; 
     20@property (readwrite, nonatomic, retain) NSMenu *menu; 
     21@property (readwrite, nonatomic, assign) id delegate; 
    2222- (void)sizeToFit; 
    2323 

  • trunk/Source/AIMenuItemView.m

    r24783 r25531  
    8484} 
    8585 
    86 /*! 
    87  * @brief Set our delegate 
    88  */ 
    89 - (void)setDelegate:(id)inDelegate 
    90 { 
    91         delegate = inDelegate; 
    92 } 
     86@synthesize delegate; 
    9387 
    9488#pragma mark Index and Point/Rect Correlation