Adium

Changeset 25599

Show
Ignore:
Timestamp:
11/20/2008 03:27:04 AM (2 months ago)
Author:
catfish_man
Message:

Warnings -= a ton

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Plugins/Bonjour/AWBonjourService.m

    r24803 r25599  
    5050        return [NSCharacterSet characterSetWithCharactersInString:@""]; 
    5151} 
    52 - (int)allowedLength{ 
     52- (NSUInteger)allowedLength{ 
    5353        return 999; 
    5454} 

  • trunk/Plugins/Bonjour/libezv/Classes/AWEzvContact.h

    r25597 r25599  
    3636 
    3737@interface AWEzvContact : NSObject { 
    38     NSString *_name; 
    39     NSString *_uniqueID; 
    40     NSData *_contactImageData; 
    41     AWEzvStatus _status; 
    42     NSDate *_idleSinceDate; 
    43     AWEzvXMLStream *_stream; 
    44     AWEzvRendezvousData *_rendezvous; 
    45     NSString *_ipAddr; 
     38       NSString *_name; 
     39       NSString *_uniqueID; 
     40       NSData *_contactImageData; 
     41       AWEzvStatus _status; 
     42       NSDate *_idleSinceDate; 
     43       AWEzvXMLStream *_stream; 
     44       AWEzvRendezvousData *_rendezvous; 
     45       NSString *_ipAddr; 
    4646        NSString *imageHash; 
    47     u_int16_t _port; 
    48     AWEzvContactManager *_manager; 
     47       u_int16_t _port; 
     48       AWEzvContactManager *_manager; 
    4949        ServiceController *_resolveServiceController; 
    5050        ServiceController *_imageServiceController; 

  • trunk/Plugins/Bonjour/libezv/Classes/AWEzvContact.m

    r25598 r25599  
    8282} 
    8383 
    84 - (void) setContactImageData:(NSImage *)contactImageData 
    85 { 
     84- (void) setContactImageData:(NSData *)contactImageData 
     85{ 
     86         
    8687    if (_contactImageData != contactImageData) { 
    8788                [_contactImageData release]; 
    …… 
    9091} 
    9192 
    92 - (NSImage *) contactImageData 
     93- (NSData *) contactImageData 
    9394{ 
    9495    return _contactImageData; 

  • trunk/Plugins/Bonjour/libezv/Classes/AWEzv.h

    r25597 r25599  
    6969 
    7070 
    71 @protocol AWEzvClientProtocol 
     71@protocol AWEzvClientProtocol <NSObject> 
    7272- (void) reportLoggedIn; 
    7373- (void) reportLoggedOut; 
    …… 
    9090- (void)remoteUserFinishedDownload:(EKEzvOutgoingFileTransfer *)fileTransfer; 
    9191 
    92  
    93  
    94  
    9592- (void) reportError:(NSString *)error ofLevel:(AWEzvErrorSeverity)severity; 
    9693- (void) reportError:(NSString *)error ofLevel:(AWEzvErrorSeverity)severity forUser:(NSString *)contact; 

  • trunk/Plugins/Bonjour/libezv/Classes/AWEzv.m

    r25597 r25599  
    6565} 
    6666 
    67 - (id <AWEzvClientProtocol, NSObject>) client { 
     67- (id <AWEzvClientProtocol>) client { 
    6868    return client; 
    6969} 

  • trunk/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.m

    r25597 r25599  
    11#import "EKEzvFileTransfer.h" 
     2#import "EKEzvIncomingFileTransfer.h" 
    23 
    34@implementation EKEzvFileTransfer 

  • trunk/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m

    r25497 r25599  
    77 
    88#import "EKEzvIncomingFileTransfer.h" 
     9#import "AWEzv.h" 
    910 
    1011#define APPLE_SINGLE_HEADER_LENGTH 26 
    …… 
    512513                FSRef ref; 
    513514                OSStatus err; 
    514                 BOOL isDirectory = NO; 
     515                Boolean isDirectory = NO; 
    515516                err = FSPathMakeRef((const UInt8 *)[path fileSystemRepresentation], &ref, &isDirectory); 
    516517                if (err != noErr) { 

  • trunk/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m

    r24783 r25599  
    148148          bufferOffset:(CFIndex)b 
    149149{ 
    150         if(self = [super init]) 
     150        if ((self = [super init])) 
    151151        { 
    152152                buffer = [d retain]; 
    …… 
    187187@implementation AsyncWritePacket 
    188188 
    189 - (id)initWithData:(NSData *)d timeout:(NSTimeInterval)t tag:(long)i; 
    190 { 
    191         if(self = [super init]) 
     189- (id)initWithData:(NSData *)d timeout:(NSTimeInterval)t tag:(long)i 
     190{ 
     191        if ((self = [super init])) 
    192192        { 
    193193                buffer = [d retain]; 

  • trunk/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPAuthenticationRequest.m

    r21789 r25599  
    1111- (id)initWithRequest:(CFHTTPMessageRef)request 
    1212{ 
    13         if (self = [super init]) { 
     13        if ((self = [super init])) { 
    1414                NSString *authInfo = (NSString *)CFHTTPMessageCopyHeaderFieldValue(request, CFSTR("Authorization")); 
    1515                 

  • trunk/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m

    r24418 r25599  
    22#import "HTTPServer.h" 
    33#import "HTTPAuthenticationRequest.h" 
     4#import "EKEzvOutgoingFileTransfer.h" 
    45#import <SystemConfiguration/SystemConfiguration.h> 
    56 
    …… 
    3132- (id)init 
    3233{ 
    33         if (self = [super init]) 
     34        if ((self = [super init])) 
    3435        { 
    3536                // Initialize underlying asynchronous tcp/ip socket 
    …… 
    141142 
    142143- (NSString *)localHost{ 
    143         NSEnumerator* e = [[[NSHost currentHost] addresses] objectEnumerator]; 
    144         NSString* addr; 
    145         while (addr = (NSString*)[e nextObject]) 
     144        for (NSString *addr in [[NSHost currentHost] addresses]) 
    146145        { 
    147146                if ([[addr componentsSeparatedByString:@"."] count] == 4 && ![addr isEqual:@"127.0.0.1"])