Revision: 3601
http://skim-app.svn.sourceforge.net/skim-app/?rev=3601&view=rev
Author: hofman
Date: 2008-04-02 16:34:15 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Use unsigned long for 4-char codes.
Modified Paths:
--------------
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKPDFAnnotationLine.h
trunk/SKPDFAnnotationLine.m
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/PDFAnnotation_SKExtensions.h 2008-04-02 23:34:15 UTC (rev 3601)
@@ -60,8 +60,8 @@
};
-extern int SKScriptingBorderStyleFromBorderStyle(int borderStyle);
-extern int SKBorderStyleFromScriptingBorderStyle(int borderStyle);
+extern unsigned long SKScriptingBorderStyleFromBorderStyle(int borderStyle);
+extern int SKBorderStyleFromScriptingBorderStyle(unsigned long borderStyle);
extern NSString *SKPDFAnnotationTypeKey;
@@ -122,8 +122,8 @@
+ (NSSet *)customScriptingKeys;
- (NSScriptObjectSpecifier *)objectSpecifier;
-- (int)scriptingNoteType;
-- (int)scriptingIconType;
+- (unsigned long)scriptingNoteType;
+- (unsigned long)scriptingIconType;
- (id)textContents;
- (void)setTextContents:(id)text;
- (id)richText;
@@ -131,12 +131,12 @@
- (NSData *)boundsAsQDRect;
- (NSString *)fontName;
- (float)fontSize;
-- (int)scriptingBorderStyle;
+- (unsigned long)scriptingBorderStyle;
- (void)setScriptingBorderStyle:(int)style;
- (NSData *)startPointAsQDPoint;
- (NSData *)endPointAsQDPoint;
-- (int)scriptingStartLineStyle;
-- (int)scriptingEndLineStyle;
+- (unsigned long)scriptingStartLineStyle;
+- (unsigned long)scriptingEndLineStyle;
- (id)selectionSpecifier;
@end
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-04-02 23:34:15 UTC (rev 3601)
@@ -53,7 +53,7 @@
#import "NSString_SKExtensions.h"
-int SKScriptingBorderStyleFromBorderStyle(int borderStyle) {
+unsigned long SKScriptingBorderStyleFromBorderStyle(int borderStyle) {
switch (borderStyle) {
case kPDFBorderStyleSolid: return SKScriptingBorderStyleSolid;
case kPDFBorderStyleDashed: return SKScriptingBorderStyleDashed;
@@ -64,7 +64,7 @@
}
}
-int SKBorderStyleFromScriptingBorderStyle(int borderStyle) {
+int SKBorderStyleFromScriptingBorderStyle(unsigned long borderStyle) {
switch (borderStyle) {
case SKScriptingBorderStyleSolid: return kPDFBorderStyleSolid;
case SKScriptingBorderStyleDashed: return kPDFBorderStyleDashed;
@@ -417,7 +417,7 @@
return properties;
}
-- (int)scriptingNoteType {
+- (unsigned long)scriptingNoteType {
if ([[self type] isEqualToString:SKFreeTextString])
return SKScriptingTextNote;
else if ([[self type] isEqualToString:SKNoteString])
@@ -437,7 +437,7 @@
return 0;
}
-- (int)scriptingIconType {
+- (unsigned long)scriptingIconType {
return SKScriptingTextAnnotationIconNote;
}
@@ -489,7 +489,7 @@
return 0;
}
-- (int)scriptingBorderStyle {
+- (unsigned long)scriptingBorderStyle {
return SKScriptingBorderStyleFromBorderStyle([self borderStyle]);
}
@@ -505,11 +505,11 @@
return (id)[NSNull null];
}
-- (int)scriptingStartLineStyle {
+- (unsigned long)scriptingStartLineStyle {
return SKScriptingLineStyleNone;
}
-- (int)scriptingEndLineStyle {
+- (unsigned long)scriptingEndLineStyle {
return SKScriptingLineStyleNone;
}
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/SKApplicationController.h 2008-04-02 23:34:15 UTC (rev 3601)
@@ -88,12 +88,12 @@
- (void)setDefaultLineStyles:(NSDictionary *)dict;
- (NSDictionary *)defaultDashPatterns;
- (void)setDefaultDashPattern:(NSDictionary *)dict;
-- (int)defaultStartLineStyle;
-- (void)setDefaultStartLineStyle:(int)style;
-- (int)defaultEndLineStyle;
-- (void)setDefaultEndLineStyle:(int)style;
-- (int)defaultIconType;
-- (void)setDefaultIconType:(int)type;
+- (unsigned long)defaultStartLineStyle;
+- (void)setDefaultStartLineStyle:(unsigned long)style;
+- (unsigned long)defaultEndLineStyle;
+- (void)setDefaultEndLineStyle:(unsigned long)style;
+- (unsigned long)defaultIconType;
+- (void)setDefaultIconType:(unsigned long)type;
- (unsigned int)countOfLines;
- (SKLine *)objectInLinesAtIndex:(unsigned int)index;
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/SKApplicationController.m 2008-04-02 23:34:15 UTC (rev 3601)
@@ -635,23 +635,23 @@
- (NSDictionary *)defaultLineStyles {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
return [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKFreeTextNoteLineStyleKey])], @"textNote",
- [NSNumber numberWithInt:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKCircleNoteLineStyleKey])], @"circleNote",
- [NSNumber numberWithInt:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKSquareNoteLineStyleKey])], @"squareNote",
- [NSNumber numberWithInt:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKLineNoteLineStyleKey])], @"lineNote", nil];
+ [NSNumber
numberWithUnsignedLong:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKFreeTextNoteLineStyleKey])], @"textNote",
+ [NSNumber
numberWithUnsignedLong:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKCircleNoteLineStyleKey])], @"circleNote",
+ [NSNumber
numberWithUnsignedLong:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKSquareNoteLineStyleKey])], @"squareNote",
+ [NSNumber
numberWithUnsignedLong:SKScriptingBorderStyleFromBorderStyle([sud
integerForKey:SKLineNoteLineStyleKey])], @"lineNote", nil];
}
- (void)setDefaultLineStyles:(NSDictionary *)dict {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
NSNumber *number;
if (number = [dict objectForKey:@"textNote"])
- [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
intValue]) forKey:SKFreeTextNoteLineStyleKey];
+ [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
unsignedLongValue]) forKey:SKFreeTextNoteLineStyleKey];
if (number = [dict objectForKey:@"circleNote"])
- [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
intValue]) forKey:SKCircleNoteLineStyleKey];
+ [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
unsignedLongValue]) forKey:SKCircleNoteLineStyleKey];
if (number = [dict objectForKey:@"squareNote"])
- [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
intValue]) forKey:SKSquareNoteLineStyleKey];
+ [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
unsignedLongValue]) forKey:SKSquareNoteLineStyleKey];
if (number = [dict objectForKey:@"lineNote"])
- [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
intValue]) forKey:SKLineNoteLineStyleKey];
+ [sud setInteger:SKBorderStyleFromScriptingBorderStyle([number
unsignedLongValue]) forKey:SKLineNoteLineStyleKey];
}
- (NSDictionary *)defaultDashPatterns {
@@ -676,27 +676,27 @@
[sud setObject:array forKey:SKLineNoteDashPatternKey];
}
-- (int)defaultStartLineStyle {
+- (unsigned long)defaultStartLineStyle {
return SKScriptingLineStyleFromLineStyle([[NSUserDefaults
standardUserDefaults] integerForKey:SKLineNoteStartLineStyleKey]);
}
-- (void)setDefaultStartLineStyle:(int)style {
+- (void)setDefaultStartLineStyle:(unsigned long)style {
return [[NSUserDefaults standardUserDefaults]
setInteger:SKLineStyleFromScriptingLineStyle(style)
forKey:SKLineNoteStartLineStyleKey];
}
-- (int)defaultEndLineStyle {
+- (unsigned long)defaultEndLineStyle {
return SKScriptingLineStyleFromLineStyle([[NSUserDefaults
standardUserDefaults] integerForKey:SKLineNoteEndLineStyleKey]);
}
-- (void)setDefaultEndLineStyle:(int)style {
+- (void)setDefaultEndLineStyle:(unsigned long)style {
return [[NSUserDefaults standardUserDefaults]
setInteger:SKLineStyleFromScriptingLineStyle(style)
forKey:SKLineNoteEndLineStyleKey];
}
-- (int)defaultIconType {
+- (unsigned long)defaultIconType {
return SKScriptingIconTypeFromIconType([[NSUserDefaults
standardUserDefaults] integerForKey:SKAnchoredNoteIconTypeKey]);
}
-- (void)setDefaultIconType:(int)type {
+- (void)setDefaultIconType:(unsigned long)type {
return [[NSUserDefaults standardUserDefaults]
setInteger:SKIconTypeFromScriptingIconType(type)
forKey:SKAnchoredNoteIconTypeKey];
}
Modified: trunk/SKPDFAnnotationLine.h
===================================================================
--- trunk/SKPDFAnnotationLine.h 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/SKPDFAnnotationLine.h 2008-04-02 23:34:15 UTC (rev 3601)
@@ -49,8 +49,8 @@
SKScriptingLineStyleClosedArrow = 'LSCA'
};
-extern int SKScriptingLineStyleFromLineStyle(int lineStyle);
-extern int SKLineStyleFromScriptingLineStyle(int lineStyle);
+extern unsigned long SKScriptingLineStyleFromLineStyle(int lineStyle);
+extern int SKLineStyleFromScriptingLineStyle(unsigned long lineStyle);
extern NSString *SKPDFAnnotationStartLineStyleKey;
@@ -68,7 +68,7 @@
- (void)setStartPointAsQDPoint:(NSData *)inQDPointAsData;
- (void)setEndPointAsQDPoint:(NSData *)inQDPointAsData;
-- (void)setScriptingStartLineStyle:(int)style;
-- (void)setScriptingEndLineStyle:(int)style;
+- (void)setScriptingStartLineStyle:(unsigned long)style;
+- (void)setScriptingEndLineStyle:(unsigned long)style;
@end
Modified: trunk/SKPDFAnnotationLine.m
===================================================================
--- trunk/SKPDFAnnotationLine.m 2008-04-02 18:09:54 UTC (rev 3600)
+++ trunk/SKPDFAnnotationLine.m 2008-04-02 23:34:15 UTC (rev 3601)
@@ -44,7 +44,7 @@
#import "NSGeometry_SKExtensions.h"
-int SKScriptingLineStyleFromLineStyle(int lineStyle) {
+unsigned long SKScriptingLineStyleFromLineStyle(int lineStyle) {
switch (lineStyle) {
case kPDFLineStyleNone: return SKScriptingLineStyleNone;
case kPDFLineStyleSquare: return SKScriptingLineStyleSquare;
@@ -56,7 +56,7 @@
}
}
-int SKLineStyleFromScriptingLineStyle(int lineStyle) {
+int SKLineStyleFromScriptingLineStyle(unsigned long lineStyle) {
switch (lineStyle) {
case kPDFLineStyleNone: return SKScriptingLineStyleNone;
case kPDFLineStyleSquare: return SKScriptingLineStyleSquare;
@@ -321,19 +321,19 @@
return [NSData dataWithBytes:&qdPoint length:sizeof(Point)];
}
-- (int)scriptingStartLineStyle {
+- (unsigned long)scriptingStartLineStyle {
return SKScriptingLineStyleFromLineStyle([self startLineStyle]);
}
-- (int)scriptingEndLineStyle {
+- (unsigned long)scriptingEndLineStyle {
return SKScriptingLineStyleFromLineStyle([self endLineStyle]);
}
-- (void)setScriptingStartLineStyle:(int)style {
+- (void)setScriptingStartLineStyle:(unsigned long)style {
[self setStartLineStyle:SKLineStyleFromScriptingLineStyle(style)];
}
-- (void)setScriptingEndLineStyle:(int)style {
+- (void)setScriptingEndLineStyle:(unsigned long)style {
[self setEndLineStyle:SKLineStyleFromScriptingLineStyle(style)];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
