Revision: 7837
http://skim-app.svn.sourceforge.net/skim-app/?rev=7837&view=rev
Author: amaxwell
Date: 2012-12-10 18:30:18 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Fix Xcode 4 type warnings. Again, none of these are really gratifying.
Modified Paths:
--------------
trunk/SKNotesDocument.m
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2012-12-10 18:29:09 UTC (rev 7836)
+++ trunk/SKNotesDocument.m 2012-12-10 18:30:18 UTC (rev 7837)
@@ -490,7 +490,7 @@
}
for (id item in items) {
- if ([item type]) {
+ if ([(PDFAnnotation *)item type]) {
[cell setObjectValue:[item string]];
height = [cell cellSizeForBounds:rect].height;
} else {
@@ -578,7 +578,7 @@
}
}
-- (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn
*)tableColumn byItem:(id)item {
+- (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn
*)tableColumn byItem:(PDFAnnotation *)item {
NSString *tcID = [tableColumn identifier];
if (tableColumn == nil) {
return [item text];
@@ -594,7 +594,7 @@
return nil;
}
-- (NSCell *)outlineView:(NSOutlineView *)ov
dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
+- (NSCell *)outlineView:(NSOutlineView *)ov
dataCellForTableColumn:(NSTableColumn *)tableColumn item:(PDFAnnotation *)item {
if (tableColumn == nil && [item type] == nil) {
return [[ov tableColumnWithIdentifier:NOTE_COLUMNID]
dataCellForRow:[ov rowForItem:item]];
}
@@ -646,11 +646,11 @@
NSMutableArray *copiedItems = [NSMutableArray array];
NSMutableAttributedString *attrString = [[[NSMutableAttributedString
alloc] init] autorelease];
BOOL isAttributed = NO;
- id item;
+ PDFAnnotation *item;
for (item in items) {
if ([item type] == nil)
- item = [item note];
+ item = [(SKNoteText *)item note];
if ([copiedItems containsObject:item] == NO &&
([[item type] isEqualToString:SKNHighlightString] == NO && [[item
type] isEqualToString:SKNUnderlineString] == NO && [[item type]
isEqualToString:SKNStrikeOutString] == NO))
@@ -680,7 +680,7 @@
return [items count] > 0;
}
-- (CGFloat)outlineView:(NSOutlineView *)ov heightOfRowByItem:(id)item {
+- (CGFloat)outlineView:(NSOutlineView *)ov heightOfRowByItem:(PDFAnnotation
*)item {
CGFloat rowHeight = [rowHeights floatForKey:item];
return (rowHeight > 0.0 ? rowHeight : ([item type] ? [ov rowHeight] + 2.0
: 85.0));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
