Changeset 3763 for trunk/Models

Show
Ignore:
Timestamp:
10/15/07 09:32:28 (1 year ago)
Author:
timothy
Message:

Rip out 10.3.9 support and worarounds. Mac OS 10.4 is now required.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Models/JVEmoticonSet.m

    r3615 r3763  
    244244 
    245245- (NSString *) contentsOfStyleSheet { 
    246         NSString *contents = nil; 
    247         if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3 
    248                 contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self styleSheetLocation]]; 
    249         else contents = [NSString stringWithContentsOfURL:[self styleSheetLocation] encoding:NSUTF8StringEncoding error:NULL]; 
     246        NSString *contents = [NSString stringWithContentsOfURL:[self styleSheetLocation] encoding:NSUTF8StringEncoding error:NULL]; 
    250247        return ( contents ? contents : @"" ); 
    251248} 

  • trunk/Models/JVSQLChatTranscript.m

    r3638 r3763  
    611611 
    612612- (BOOL) _initializeDatabase { 
    613         NSString *setup = nil; 
    614         if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3 
    615                 setup = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"]]; 
    616         else setup = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"] encoding:NSUTF8StringEncoding error:NULL]; 
     613        NSString *setup = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"] encoding:NSUTF8StringEncoding error:NULL]; 
    617614 
    618615        @synchronized( self ) { 

  • trunk/Models/JVStyle.m

    r3695 r3763  
    494494 
    495495- (NSString *) contentsOfMainStyleSheet { 
    496         NSString *contents = nil; 
    497         if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3 
    498                 contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self mainStyleSheetLocation]]; 
    499         else contents = [NSString stringWithContentsOfURL:[self mainStyleSheetLocation] encoding:NSUTF8StringEncoding error:NULL]; 
     496        NSString *contents = [NSString stringWithContentsOfURL:[self mainStyleSheetLocation] encoding:NSUTF8StringEncoding error:NULL]; 
    500497        return ( contents ? contents : @"" ); 
    501498} 
    502499 
    503500- (NSString *) contentsOfVariantStyleSheetWithName:(NSString *) name { 
    504         NSString *contents = nil; 
    505         if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3 
    506                 contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self variantStyleSheetLocationWithName:name]]; 
    507         else contents = [NSString stringWithContentsOfURL:[self variantStyleSheetLocationWithName:name] encoding:NSUTF8StringEncoding error:NULL]; 
     501        NSString *contents = [NSString stringWithContentsOfURL:[self variantStyleSheetLocationWithName:name] encoding:NSUTF8StringEncoding error:NULL]; 
    508502        return ( contents ? contents : @"" ); 
    509503} 
    …… 
    513507        if( ! url ) return @""; 
    514508 
    515         NSString *contents = nil; 
    516         if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3 
    517                 contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:url]; 
    518         else contents = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL]; 
     509        NSString *contents = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL]; 
    519510 
    520511        NSURL *resources = [NSURL fileURLWithPath:[[NSBundle mainBundle] resourcePath]];