Revision: 4443
http://skim-app.svn.sourceforge.net/skim-app/?rev=4443&view=rev
Author: hofman
Date: 2008-08-23 18:06:57 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
use gcc ?: operator.
Modified Paths:
--------------
trunk/Files_SKExtensions.m
trunk/PDFDisplayView_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKBookmark.m
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKFindController.m
trunk/SKIndexCommand.m
trunk/SKInfoWindowController.m
trunk/SKLineInspector.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
trunk/SKNotesPanelController.m
trunk/SKPDFDocument.m
trunk/SKPDFHoverWindow.m
trunk/SKPSProgressController.m
trunk/SKPreferenceController.m
trunk/SKReleaseNotesController.m
trunk/SKSheetController.m
trunk/SKTemplateParser.m
trunk/SKTextCommand.m
trunk/SKTransitionController.m
Modified: trunk/Files_SKExtensions.m
===================================================================
--- trunk/Files_SKExtensions.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/Files_SKExtensions.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -122,7 +122,7 @@
FSResolveAliasFileWithMountFlags(&fileRef, TRUE, &isFolder,
&isAlias, kARMNoUI);
url = [(NSURL *)CFURLCreateFromFSRef(NULL, &fileRef) autorelease];
}
- return url ? url : [NSURL fileURLWithPath:path];
+ return url ?: [NSURL fileURLWithPath:path];
}
NSString *SKUniqueDirectoryCreating(NSString *basePath, BOOL create) {
Modified: trunk/PDFDisplayView_SKExtensions.m
===================================================================
--- trunk/PDFDisplayView_SKExtensions.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/PDFDisplayView_SKExtensions.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -210,7 +210,7 @@
id element = nil;
if ([pdfView respondsToSelector:@selector(accessibilityChildAtPoint:)])
element = [pdfView accessibilityChildAtPoint:point];
- return element ? element : originalAccessibilityHitTest(self, _cmd, point);
+ return element ?: originalAccessibilityHitTest(self, _cmd, point);
}
static id replacementAccessibilityFocusedUIElement(id self, SEL _cmd) {
@@ -218,7 +218,7 @@
id element = nil;
if ([pdfView respondsToSelector:@selector(accessibilityFocusedChild)])
element = [pdfView accessibilityFocusedChild];
- return element ? element : originalAccessibilityFocusedUIElement(self,
_cmd);
+ return element ?: originalAccessibilityFocusedUIElement(self, _cmd);
}
#pragma mark SKSwizzlePDFDisplayViewMethods
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/PDFPage_SKExtensions.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -332,7 +332,7 @@
NSString *label = nil;
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKLogicalPageNumberingKey] == NO)
label = [self label];
- return label ? label : [self logicalLabel];
+ return label ?: [self logicalLabel];
}
#pragma mark Scripting support
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKBookmark.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -385,7 +385,7 @@
}
- (NSString *)label {
- return label ? label : @"";
+ return label ?: @"";
}
- (void)setLabel:(NSString *)newLabel {
@@ -437,7 +437,7 @@
}
- (NSString *)label {
- return label ? label : @"";
+ return label ?: @"";
}
- (void)setLabel:(NSString *)newLabel {
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKBookmarkController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -102,11 +102,11 @@
static SKBookmarkController *sharedBookmarkController = nil;
+ (id)sharedBookmarkController {
- return sharedBookmarkController ? sharedBookmarkController : [[self alloc]
init];
+ return sharedBookmarkController ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedBookmarkController ? sharedBookmarkController : [super
allocWithZone:zone];
+ return sharedBookmarkController ?: [super allocWithZone:zone];
}
- (id)init {
@@ -202,7 +202,7 @@
message = count == 1 ? NSLocalizedString(@"1 item", @"Bookmark
folder description") : [NSString stringWithFormat:NSLocalizedString(@"%i
items", @"Bookmark folder description"), count];
}
}
- [statusBar setLeftStringValue:message ? message : @""];
+ [statusBar setLeftStringValue:message ?: @""];
}
#pragma mark Bookmarks
@@ -741,7 +741,7 @@
NSMutableArray *labels = [NSMutableArray arrayWithCapacity:count];
for (i = 0; i < count; i++) {
NSString *label = [[outlineView itemAtRow:i] label];
- [labels addObject:label ? label : @""];
+ [labels addObject:label ?: @""];
}
return labels;
}
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKDownloadController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -60,11 +60,11 @@
static SKDownloadController *sharedDownloadController = nil;
+ (id)sharedDownloadController {
- return sharedDownloadController ? sharedDownloadController : [[self alloc]
init];
+ return sharedDownloadController ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedDownloadController ? sharedDownloadController : [super
allocWithZone:zone];
+ return sharedDownloadController ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKFindController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -48,11 +48,11 @@
static SKFindController *sharedFindController = nil;
+ (id)sharedFindController {
- return sharedFindController ? sharedFindController : [[self alloc] init];
+ return sharedFindController ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedFindController ? sharedFindController : [super
allocWithZone:zone];
+ return sharedFindController ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKIndexCommand.m
===================================================================
--- trunk/SKIndexCommand.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKIndexCommand.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -61,7 +61,7 @@
} else if ([dPO isKindOfClass:[PDFPage class]]) {
idx = [dPO pageIndex];
} else if ([dPO isKindOfClass:[PDFAnnotation class]]) {
- idx = [[(page ? (id)page : (id)[page containingDocument])
valueForKey:@"notes"] indexOfObjectIdenticalTo:dPO];
+ idx = [[((id)page ?: (id)[page containingDocument])
valueForKey:@"notes"] indexOfObjectIdenticalTo:dPO];
} else {
PDFSelection *selection = [PDFSelection selectionWithSpecifier:dP
onPage:page];
NSArray *pages = [selection pages];
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKInfoWindowController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -70,11 +70,11 @@
}
+ (id)sharedInstance {
- return sharedInstance ? sharedInstance : [[self alloc] init];
+ return sharedInstance ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedInstance ? sharedInstance : [super allocWithZone:zone];
+ return sharedInstance ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKLineInspector.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -61,7 +61,7 @@
static SKLineInspector *sharedLineInspector = nil;
+ (id)sharedLineInspector {
- return sharedLineInspector ? sharedLineInspector : [[self alloc] init];
+ return sharedLineInspector ?: [[self alloc] init];
}
+ (BOOL)sharedLineInspectorExists {
@@ -69,7 +69,7 @@
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedLineInspector ? sharedLineInspector : [super
allocWithZone:zone];
+ return sharedLineInspector ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKMainWindowController_UI.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -858,7 +858,7 @@
for (i = 0; i < count; i++) {
id item = [noteOutlineView itemAtRow:i];
NSString *string = [item string];
- [texts addObject:string ? string : @""];
+ [texts addObject:string ?: @""];
}
return texts;
} else if ([typeSelectHelper isEqual:[outlineView typeSelectHelper]]) {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKNotesDocument.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -316,7 +316,7 @@
for (i = 0; i < count; i++) {
item = [items objectAtIndex:i];
- [cell setObjectValue:[item valueForKey:SKNPDFAnnotationTypeKey] ?
[item valueForKey:SKNPDFAnnotationStringKey] : [item
valueForKey:SKNPDFAnnotationTextKey]];
+ [cell setObjectValue:[item valueForKey:([item
valueForKey:SKNPDFAnnotationTypeKey] ? SKNPDFAnnotationStringKey :
SKNPDFAnnotationTextKey)]];
NSAttributedString *attrString = [cell attributedStringValue];
NSRect rect = [attrString boundingRectWithSize:[item type] ? size :
smallSize options:NSStringDrawingUsesLineFragmentOrigin];
[item setValue:[NSNumber numberWithFloat:fmaxf(NSHeight(rect) + 3.0,
rowHeight + 2.0)] forKey:SKNotesDocumentRowHeightKey];
@@ -378,7 +378,7 @@
- (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn
*)tableColumn byItem:(id)item {
NSString *tcID = [tableColumn identifier];
if ([tcID isEqualToString:SKNotesDocumentNoteColumnIdentifier]) {
- return [item valueForKey:SKNPDFAnnotationTypeKey] ? [item
valueForKey:SKNPDFAnnotationStringKey] : [item
valueForKey:SKNPDFAnnotationTextKey];
+ return [item valueForKey:[item valueForKey:([item
valueForKey:SKNPDFAnnotationTypeKey] ? SKNPDFAnnotationStringKey :
SKNPDFAnnotationTextKey)]];
} else if([tcID isEqualToString:SKNotesDocumentTypeColumnIdentifier]) {
return [NSDictionary dictionaryWithObjectsAndKeys:[item
valueForKey:SKNPDFAnnotationTypeKey], SKNPDFAnnotationTypeKey, nil];
} else if ([tcID isEqualToString:SKNotesDocumentPageColumnIdentifier]) {
@@ -521,7 +521,7 @@
for (i = 0; i < count; i++) {
id item = [outlineView itemAtRow:i];
NSString *string = [item valueForKey:SKNPDFAnnotationStringKey];
- [texts addObject:string ? string : @""];
+ [texts addObject:string ?: @""];
}
return texts;
}
Modified: trunk/SKNotesPanelController.m
===================================================================
--- trunk/SKNotesPanelController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKNotesPanelController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -46,7 +46,7 @@
static SKNotesPanelController *sharedController = nil;
+ (id)sharedController {
- return sharedController ? sharedController : [[self alloc] init];
+ return sharedController ?: [[self alloc] init];
}
+ (BOOL)sharedControllerExists {
@@ -54,7 +54,7 @@
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedController ? sharedController : [super allocWithZone:[self
zone]];
+ return sharedController ?: [super allocWithZone:[self zone]];
}
- (id)init {
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKPDFDocument.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -393,7 +393,7 @@
}
if (success == NO && outError != NULL)
- *outError = error ? error : [NSError
errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ? : [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return success;
}
@@ -483,7 +483,7 @@
}
if (didWrite == NO && outError != NULL)
- *outError = error ? error : [NSError
errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didWrite;
}
@@ -607,7 +607,7 @@
}
if (didRead == NO && outError != NULL)
- *outError = error ? error : [NSError
errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didRead;
}
@@ -723,7 +723,7 @@
}
if (didRead == NO && outError != NULL)
- *outError = error ? error : [NSError
errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didRead;
}
@@ -1808,7 +1808,7 @@
- (id)selectionPage {
PDFPage *page = [[self pdfView] currentSelectionPage];
- return page ? (id)page : (id)[NSNull null];
+ return (id)page ?: (id)[NSNull null];
}
- (void)setSelectionPage:(PDFPage *)page {
@@ -1971,7 +1971,7 @@
specifier = [selection objectSpecifier];
}
- return specifier ? specifier : [NSArray array];
+ return specifier ?: [NSArray array];
}
- (void)handleShowTeXScriptCommand:(NSScriptCommand *)command {
Modified: trunk/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKPDFHoverWindow.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -68,11 +68,11 @@
static SKPDFHoverWindow *sharedHoverWindow = nil;
+ (id)sharedHoverWindow {
- return sharedHoverWindow ? sharedHoverWindow : [[self alloc] init];
+ return sharedHoverWindow ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedHoverWindow ? sharedHoverWindow : [super allocWithZone:zone];
+ return sharedHoverWindow ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKPSProgressController.m
===================================================================
--- trunk/SKPSProgressController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKPSProgressController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -283,7 +283,7 @@
if (dviToolPath == nil) {
NSString *commandPath = [[NSUserDefaults standardUserDefaults]
stringForKey:SKDviConversionCommandKey];
- NSString *commandName = commandPath ? [commandPath lastPathComponent]
: nil;
+ NSString *commandName = [commandPath lastPathComponent];
NSArray *paths = [NSArray arrayWithObjects:@"/usr/texbin",
@"/usr/local/gwTeX/bin/powerpc-apple-darwin-current",
@"/usr/local/gwTeX/bin/i386-apple-darwin-current", @"/sw/bin",
@"/opt/local/bin", @"/usr/local/bin", nil];
int i = 0, iMax = [paths count];
NSFileManager *fm = [NSFileManager defaultManager];
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKPreferenceController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -62,11 +62,11 @@
static SKPreferenceController *sharedPrefenceController = nil;
+ (id)sharedPrefenceController {
- return sharedPrefenceController ? sharedPrefenceController : [[self alloc]
init];
+ return sharedPrefenceController ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedPrefenceController ? sharedPrefenceController : [super
allocWithZone:zone];
+ return sharedPrefenceController ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKReleaseNotesController.m
===================================================================
--- trunk/SKReleaseNotesController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKReleaseNotesController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -44,11 +44,11 @@
static SKReleaseNotesController *sharedReleaseNotesController = nil;
+ (id)sharedReleaseNotesController {
- return sharedReleaseNotesController ? sharedReleaseNotesController :
[[self alloc] init];
+ return sharedReleaseNotesController ?: [[self alloc] init];
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedReleaseNotesController ? sharedReleaseNotesController :
[super allocWithZone:zone];
+ return sharedReleaseNotesController ?: [super allocWithZone:zone];
}
- (id)init {
Modified: trunk/SKSheetController.m
===================================================================
--- trunk/SKSheetController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKSheetController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -135,7 +135,7 @@
SKBookmark *bm = [bookmarks objectAtIndex:i];
if ([bm bookmarkType] == SKBookmarkTypeFolder) {
NSString *label = [bm label];
- NSMenuItem *item = [menu addItemWithTitle:label ? label : @""
action:NULL keyEquivalent:@""];
+ NSMenuItem *item = [menu addItemWithTitle:label ?: @"" action:NULL
keyEquivalent:@""];
[item setImage:[bm icon]];
[item setIndentationLevel:level];
[item setRepresentedObject:bm];
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKTemplateParser.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -355,14 +355,14 @@
subTemplate = [subTemplate
substringToIndex:wsRange.location];
subTemplates = [[NSMutableArray alloc] init];
- matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString ? matchString : @"", nil];
+ matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString ?: @"", nil];
if (matchType != SKTemplateTagMatchOther) {
altTag = compareConditionTagWithTag(tag,
matchType);
altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
while (altTagRange.location != NSNotFound) {
[subTemplates addObject:[subTemplate
substringToIndex:altTagRange.location]];
- [matchStrings addObject:matchString ?
matchString : @""];
+ [matchStrings addObject:matchString ?: @""];
subTemplate = [subTemplate
substringFromIndex:NSMaxRange(altTagRange)];
altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
}
@@ -663,14 +663,14 @@
subTemplate = [template
attributedSubstringFromRange:NSMakeRange(start, [subTemplateString length] -
wsRange.length)];
subTemplates = [[NSMutableArray alloc] init];
- matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString ? matchString : @"", nil];
+ matchStrings = [[NSMutableArray alloc]
initWithObjects:matchString ?: @"", nil];
if (matchType != SKTemplateTagMatchOther) {
altTag = compareConditionTagWithTag(tag,
matchType);
altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
while (altTagRange.location != NSNotFound) {
[subTemplates addObject:[subTemplate
attributedSubstringFromRange:NSMakeRange(0, altTagRange.location)]];
- [matchStrings addObject:matchString ?
matchString : @""];
+ [matchStrings addObject:matchString ?: @""];
subTemplate = [subTemplate
attributedSubstringFromRange:NSMakeRange(NSMaxRange(altTagRange), [subTemplate
length] - NSMaxRange(altTagRange))];
altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
}
@@ -866,7 +866,7 @@
description = [self performSelector:@selector(stringValue)];
if ([self respondsToSelector:@selector(string)])
description = [self performSelector:@selector(string)];
- return description ? description : [self description];
+ return description ?: [self description];
}
- (NSAttributedString
*)templateAttributedStringValueWithAttributes:(NSDictionary *)attributes {
Modified: trunk/SKTextCommand.m
===================================================================
--- trunk/SKTextCommand.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKTextCommand.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -68,7 +68,7 @@
attrString = [[PDFSelection selectionWithSpecifier:dP onPage:page]
attributedString];
}
- return textStorage ? textStorage : attrString ? [[[NSTextStorage alloc]
initWithAttributedString:attrString] autorelease] : [[[NSTextStorage alloc]
init] autorelease];
+ return textStorage ?: attrString ? [[[NSTextStorage alloc]
initWithAttributedString:attrString] autorelease] : [[[NSTextStorage alloc]
init] autorelease];
}
@end
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2008-08-22 16:54:29 UTC (rev 4442)
+++ trunk/SKTransitionController.m 2008-08-23 18:06:57 UTC (rev 4443)
@@ -597,7 +597,7 @@
}
- (CIImage *)currentImage {
- return image ? image : [animation currentImage];
+ return image ?: [animation currentImage];
}
- (CIContext *)ciContext {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
