Revision: 15784
http://sourceforge.net/p/skim-app/code/15784
Author: hofman
Date: 2025-11-10 15:31:40 +0000 (Mon, 10 Nov 2025)
Log Message:
-----------
use const and extern macros
Modified Paths:
--------------
trunk/SkimNotes/PDFAnnotation_SKNExtensions.h
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
trunk/SkimNotes/SKNExtendedAttributeManager.h
trunk/SkimNotes/SKNPDFAnnotationNote.h
trunk/SkimNotes/SKNPDFAnnotationNote.m
trunk/SkimNotes/SKNUtilities.h
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.h
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.h 2025-11-10 15:21:47 UTC
(rev 15783)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.h 2025-11-10 15:31:40 UTC
(rev 15784)
@@ -56,195 +56,195 @@
/*!
@discussion Global string for Free Text note type.
*/
-extern NSString *SKNFreeTextString;
+PDFKIT_EXTERN NSString * const SKNFreeTextString;
/*!
@discussion Global string for Text note type.
*/
-extern NSString *SKNTextString;
+PDFKIT_EXTERN NSString * const SKNTextString;
/*!
@discussion Global string for Stamp note type.
*/
-extern NSString *SKNStampString;
+PDFKIT_EXTERN NSString * const SKNStampString;
/*!
@discussion Global string for Note note type.
*/
-extern NSString *SKNNoteString;
+PDFKIT_EXTERN NSString * const SKNNoteString;
/*!
@discussion Global string for Circle note type.
*/
-extern NSString *SKNCircleString;
+PDFKIT_EXTERN NSString * const SKNCircleString;
/*!
@discussion Global string for Square note type.
*/
-extern NSString *SKNSquareString;
+PDFKIT_EXTERN NSString * const SKNSquareString;
/*!
@discussion Global string for Mark Up note type.
*/
-extern NSString *SKNMarkUpString;
+PDFKIT_EXTERN NSString * const SKNMarkUpString;
/*!
@discussion Global string for Highlight note type.
*/
-extern NSString *SKNHighlightString;
+PDFKIT_EXTERN NSString * const SKNHighlightString;
/*!
@discussion Global string for Underline note type.
*/
-extern NSString *SKNUnderlineString;
+PDFKIT_EXTERN NSString * const SKNUnderlineString;
/*!
@discussion Global string for Strike Out note type.
*/
-extern NSString *SKNStrikeOutString;
+PDFKIT_EXTERN NSString * const SKNStrikeOutString;
/*!
@discussion Global string for Line note type.
*/
-extern NSString *SKNLineString;
+PDFKIT_EXTERN NSString * const SKNLineString;
/*!
@discussion Global string for Ink note type.
*/
-extern NSString *SKNInkString;
+PDFKIT_EXTERN NSString * const SKNInkString;
/*!
@discussion Global string for Widget note type.
*/
-extern NSString *SKNWidgetString;
+PDFKIT_EXTERN NSString * const SKNWidgetString;
/*!
@discussion Global string for annotation type key.
*/
-extern NSString *SKNPDFAnnotationTypeKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationTypeKey;
/*!
@discussion Global string for annotation bounds key.
*/
-extern NSString *SKNPDFAnnotationBoundsKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationBoundsKey;
/*!
@discussion Global string for annotation page key.
*/
-extern NSString *SKNPDFAnnotationPageKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationPageKey;
/*!
@discussion Global string for annotation page index key.
*/
-extern NSString *SKNPDFAnnotationPageIndexKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationPageIndexKey;
/*!
@discussion Global string for annotation contents key.
*/
-extern NSString *SKNPDFAnnotationContentsKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationContentsKey;
/*!
@discussion Global string for annotation string key.
*/
-extern NSString *SKNPDFAnnotationStringKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationStringKey;
/*!
@discussion Global string for annotation color key.
*/
-extern NSString *SKNPDFAnnotationColorKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationColorKey;
/*!
@discussion Global string for annotation border key.
*/
-extern NSString *SKNPDFAnnotationBorderKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationBorderKey;
/*!
@discussion Global string for annotation line width key.
*/
-extern NSString *SKNPDFAnnotationLineWidthKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationLineWidthKey;
/*!
@discussion Global string for annotation border style key.
*/
-extern NSString *SKNPDFAnnotationBorderStyleKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationBorderStyleKey;
/*!
@discussion Global string for annotation dash pattern key.
*/
-extern NSString *SKNPDFAnnotationDashPatternKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationDashPatternKey;
/*!
@discussion Global string for annotation modification date key.
*/
-extern NSString *SKNPDFAnnotationModificationDateKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationModificationDateKey;
/*!
@discussion Global string for annotation user name key.
*/
-extern NSString *SKNPDFAnnotationUserNameKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationUserNameKey;
/*!
@discussion Global string for annotation interior color key.
*/
-extern NSString *SKNPDFAnnotationInteriorColorKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationInteriorColorKey;
/*!
@discussion Global string for annotation start line style key.
*/
-extern NSString *SKNPDFAnnotationStartLineStyleKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationStartLineStyleKey;
/*!
@discussion Global string for annotation end line style key.
*/
-extern NSString *SKNPDFAnnotationEndLineStyleKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationEndLineStyleKey;
/*!
@discussion Global string for annotation start point key.
*/
-extern NSString *SKNPDFAnnotationStartPointKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationStartPointKey;
/*!
@discussion Global string for annotation end point key.
*/
-extern NSString *SKNPDFAnnotationEndPointKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationEndPointKey;
/*!
@discussion Global string for annotation font key.
*/
-extern NSString *SKNPDFAnnotationFontKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationFontKey;
/*!
@discussion Global string for annotation font color key.
*/
-extern NSString *SKNPDFAnnotationFontColorKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationFontColorKey;
/*!
@discussion Global string for annotation font name key.
*/
-extern NSString *SKNPDFAnnotationFontNameKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationFontNameKey;
/*!
@discussion Global string for annotation font size key.
*/
-extern NSString *SKNPDFAnnotationFontSizeKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationFontSizeKey;
/*!
@discussion Global string for annotation text alignment key.
*/
-extern NSString *SKNPDFAnnotationAlignmentKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationAlignmentKey;
/*!
@discussion Global string for annotation rotation key.
*/
-extern NSString *SKNPDFAnnotationRotationKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationRotationKey;
/*!
@discussion Global string for annotation quadrilateral points key.
*/
-extern NSString *SKNPDFAnnotationQuadrilateralPointsKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationQuadrilateralPointsKey;
/*!
@discussion Global string for annotation icon type key.
*/
-extern NSString *SKNPDFAnnotationIconTypeKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationIconTypeKey;
/*!
@discussion Global string for annotation icon or stamp name key.
*/
-extern NSString *SKNPDFAnnotationNameKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationNameKey;
/*!
@discussion Global string for annotation point lists key.
*/
-extern NSString *SKNPDFAnnotationPointListsKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationPointListsKey;
/*!
@discussion Global string for annotation string value key.
*/
-extern NSString *SKNPDFAnnotationStringValueKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationStringValueKey;
/*!
@discussion Global string for annotation state key.
*/
-extern NSString *SKNPDFAnnotationStateKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationStateKey;
/*!
@discussion Global string for annotation widget type key.
*/
-extern NSString *SKNPDFAnnotationWidgetTypeKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationWidgetTypeKey;
/*!
@discussion Global string for annotation field name key.
*/
-extern NSString *SKNPDFAnnotationFieldNameKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationFieldNameKey;
/*!
@enum SKNWidgetType
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2025-11-10 15:21:47 UTC
(rev 15783)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2025-11-10 15:31:40 UTC
(rev 15784)
@@ -78,60 +78,60 @@
#endif
-NSString *SKNFreeTextString = @"FreeText";
-NSString *SKNTextString = @"Text";
-NSString *SKNStampString = @"Stamp";
-NSString *SKNNoteString = @"Note";
-NSString *SKNCircleString = @"Circle";
-NSString *SKNSquareString = @"Square";
-NSString *SKNMarkUpString = @"MarkUp";
-NSString *SKNHighlightString = @"Highlight";
-NSString *SKNUnderlineString = @"Underline";
-NSString *SKNStrikeOutString = @"StrikeOut";
-NSString *SKNLineString = @"Line";
-NSString *SKNInkString = @"Ink";
-NSString *SKNWidgetString = @"Widget";
+NSString * const SKNFreeTextString = @"FreeText";
+NSString * const SKNTextString = @"Text";
+NSString * const SKNStampString = @"Stamp";
+NSString * const SKNNoteString = @"Note";
+NSString * const SKNCircleString = @"Circle";
+NSString * const SKNSquareString = @"Square";
+NSString * const SKNMarkUpString = @"MarkUp";
+NSString * const SKNHighlightString = @"Highlight";
+NSString * const SKNUnderlineString = @"Underline";
+NSString * const SKNStrikeOutString = @"StrikeOut";
+NSString * const SKNLineString = @"Line";
+NSString * const SKNInkString = @"Ink";
+NSString * const SKNWidgetString = @"Widget";
-NSString *SKNPDFAnnotationTypeKey = @"type";
-NSString *SKNPDFAnnotationBoundsKey = @"bounds";
-NSString *SKNPDFAnnotationPageKey = @"page";
-NSString *SKNPDFAnnotationPageIndexKey = @"pageIndex";
-NSString *SKNPDFAnnotationContentsKey = @"contents";
-NSString *SKNPDFAnnotationStringKey = @"string";
-NSString *SKNPDFAnnotationColorKey = @"color";
-NSString *SKNPDFAnnotationBorderKey = @"border";
-NSString *SKNPDFAnnotationLineWidthKey = @"lineWidth";
-NSString *SKNPDFAnnotationBorderStyleKey = @"borderStyle";
-NSString *SKNPDFAnnotationDashPatternKey = @"dashPattern";
-NSString *SKNPDFAnnotationModificationDateKey = @"modificationDate";
-NSString *SKNPDFAnnotationUserNameKey = @"userName";
+NSString * const SKNPDFAnnotationTypeKey = @"type";
+NSString * const SKNPDFAnnotationBoundsKey = @"bounds";
+NSString * const SKNPDFAnnotationPageKey = @"page";
+NSString * const SKNPDFAnnotationPageIndexKey = @"pageIndex";
+NSString * const SKNPDFAnnotationContentsKey = @"contents";
+NSString * const SKNPDFAnnotationStringKey = @"string";
+NSString * const SKNPDFAnnotationColorKey = @"color";
+NSString * const SKNPDFAnnotationBorderKey = @"border";
+NSString * const SKNPDFAnnotationLineWidthKey = @"lineWidth";
+NSString * const SKNPDFAnnotationBorderStyleKey = @"borderStyle";
+NSString * const SKNPDFAnnotationDashPatternKey = @"dashPattern";
+NSString * const SKNPDFAnnotationModificationDateKey = @"modificationDate";
+NSString * const SKNPDFAnnotationUserNameKey = @"userName";
-NSString *SKNPDFAnnotationInteriorColorKey = @"interiorColor";
+NSString * const SKNPDFAnnotationInteriorColorKey = @"interiorColor";
-NSString *SKNPDFAnnotationStartLineStyleKey = @"startLineStyle";
-NSString *SKNPDFAnnotationEndLineStyleKey = @"endLineStyle";
-NSString *SKNPDFAnnotationStartPointKey = @"startPoint";
-NSString *SKNPDFAnnotationEndPointKey = @"endPoint";
+NSString * const SKNPDFAnnotationStartLineStyleKey = @"startLineStyle";
+NSString * const SKNPDFAnnotationEndLineStyleKey = @"endLineStyle";
+NSString * const SKNPDFAnnotationStartPointKey = @"startPoint";
+NSString * const SKNPDFAnnotationEndPointKey = @"endPoint";
-NSString *SKNPDFAnnotationFontKey = @"font";
-NSString *SKNPDFAnnotationFontColorKey = @"fontColor";
-NSString *SKNPDFAnnotationFontNameKey = @"fontName";
-NSString *SKNPDFAnnotationFontSizeKey = @"fontSize";
-NSString *SKNPDFAnnotationAlignmentKey = @"alignment";
-NSString *SKNPDFAnnotationRotationKey = @"rotation";
+NSString * const SKNPDFAnnotationFontKey = @"font";
+NSString * const SKNPDFAnnotationFontColorKey = @"fontColor";
+NSString * const SKNPDFAnnotationFontNameKey = @"fontName";
+NSString * const SKNPDFAnnotationFontSizeKey = @"fontSize";
+NSString * const SKNPDFAnnotationAlignmentKey = @"alignment";
+NSString * const SKNPDFAnnotationRotationKey = @"rotation";
-NSString *SKNPDFAnnotationQuadrilateralPointsKey = @"quadrilateralPoints";
+NSString * const SKNPDFAnnotationQuadrilateralPointsKey =
@"quadrilateralPoints";
-NSString *SKNPDFAnnotationIconTypeKey = @"iconType";
+NSString * const SKNPDFAnnotationIconTypeKey = @"iconType";
-NSString *SKNPDFAnnotationNameKey = @"name";
+NSString * const SKNPDFAnnotationNameKey = @"name";
-NSString *SKNPDFAnnotationPointListsKey = @"pointLists";
+NSString * const SKNPDFAnnotationPointListsKey = @"pointLists";
-NSString *SKNPDFAnnotationStringValueKey = @"stringValue";
-NSString *SKNPDFAnnotationStateKey = @"state";
-NSString *SKNPDFAnnotationWidgetTypeKey = @"widgetType";
-NSString *SKNPDFAnnotationFieldNameKey = @"fieldName";
+NSString * const SKNPDFAnnotationStringValueKey = @"stringValue";
+NSString * const SKNPDFAnnotationStateKey = @"state";
+NSString * const SKNPDFAnnotationWidgetTypeKey = @"widgetType";
+NSString * const SKNPDFAnnotationFieldNameKey = @"fieldName";
#define SKNSquigglyString @"Squiggly"
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.h
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.h 2025-11-10 15:21:47 UTC
(rev 15783)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.h 2025-11-10 15:31:40 UTC
(rev 15784)
@@ -71,7 +71,7 @@
/*!
@discussion Error domain for the extended attribute manager used for
non-POSIX errors.
*/
-extern NSErrorDomain const SKNSkimNotesErrorDomain;
+FOUNDATION_EXTERN NSErrorDomain const SKNSkimNotesErrorDomain;
/*!
@enum SKNErrorCodes
Modified: trunk/SkimNotes/SKNPDFAnnotationNote.h
===================================================================
--- trunk/SkimNotes/SKNPDFAnnotationNote.h 2025-11-10 15:21:47 UTC (rev
15783)
+++ trunk/SkimNotes/SKNPDFAnnotationNote.h 2025-11-10 15:31:40 UTC (rev
15784)
@@ -56,20 +56,20 @@
/*!
@discussion Global string for annotation text key.
*/
-extern NSString *SKNPDFAnnotationTextKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationTextKey;
/*!
@discussion Global string for annotation image key.
*/
-extern NSString *SKNPDFAnnotationImageKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationImageKey;
/*!
@discussion Global string for annotation drawsImage key.
*/
-extern NSString *SKNPDFAnnotationDrawsImageKey;
+PDFKIT_EXTERN NSString * const SKNPDFAnnotationDrawsImageKey;
/*!
@discussion Default size of an anchored note.
*/
-extern PDFSize SKNPDFAnnotationNoteSize;
+PDFKIT_EXTERN const PDFSize SKNPDFAnnotationNoteSize;
#if !defined(PDFKIT_PLATFORM_IOS)
#pragma clang diagnostic push
Modified: trunk/SkimNotes/SKNPDFAnnotationNote.m
===================================================================
--- trunk/SkimNotes/SKNPDFAnnotationNote.m 2025-11-10 15:21:47 UTC (rev
15783)
+++ trunk/SkimNotes/SKNPDFAnnotationNote.m 2025-11-10 15:31:40 UTC (rev
15784)
@@ -39,11 +39,11 @@
#import "SKNPDFAnnotationNote.h"
#import "PDFAnnotation_SKNExtensions.h"
-NSString *SKNPDFAnnotationTextKey = @"text";
-NSString *SKNPDFAnnotationImageKey = @"image";
-NSString *SKNPDFAnnotationDrawsImageKey = @"drawsImage";
+NSString * const SKNPDFAnnotationTextKey = @"text";
+NSString * const SKNPDFAnnotationImageKey = @"image";
+NSString * const SKNPDFAnnotationDrawsImageKey = @"drawsImage";
-PDFSize SKNPDFAnnotationNoteSize = {16.0, 16.0};
+const PDFSize SKNPDFAnnotationNoteSize = {16.0, 16.0};
#if !defined(PDFKIT_PLATFORM_IOS)
Modified: trunk/SkimNotes/SKNUtilities.h
===================================================================
--- trunk/SkimNotes/SKNUtilities.h 2025-11-10 15:21:47 UTC (rev 15783)
+++ trunk/SkimNotes/SKNUtilities.h 2025-11-10 15:31:40 UTC (rev 15784)
@@ -44,7 +44,7 @@
@param data The data object to extract the notes from, either an
archive or plist data.
@result An array of dictionaries containing Skim notes properties.
*/
-extern NSArray<NSDictionary<NSString *, id> *> * _Nullable
SKNSkimNotesFromData(NSData * _Nullable data);
+FOUNDATION_EXTERN NSArray<NSDictionary<NSString *, id> *> * _Nullable
SKNSkimNotesFromData(NSData * _Nullable data);
/*!
@abstract Returns data for the Skim notes.
@@ -53,7 +53,7 @@
@param asPlist Whether to create universal plist data rather than
archived data. Always returns plist data on iOS.
@result A data representation of the notes.
*/
-extern NSData * _Nullable SKNDataFromSkimNotes(NSArray<NSDictionary<NSString
*, id> *> * _Nullable notes, BOOL asPlist);
+FOUNDATION_EXTERN NSData * _Nullable
SKNDataFromSkimNotes(NSArray<NSDictionary<NSString *, id> *> * _Nullable notes,
BOOL asPlist);
/*!
@abstract Returns a string representation of Skim notes.
@@ -61,7 +61,7 @@
@param noteDicts An array of dictionaries containing Skim note
properties, as returned by the properties of a <code>PDFAnnotation</code>.
@result A string representation of the notes.
*/
-extern NSString * _Nullable SKNSkimTextNotes(NSArray<NSDictionary<NSString *,
id> *> * _Nullable noteDicts);
+FOUNDATION_EXTERN NSString * _Nullable
SKNSkimTextNotes(NSArray<NSDictionary<NSString *, id> *> * _Nullable noteDicts);
/*!
@abstract Returns an RTF data representation of Skim notes.
@@ -69,4 +69,4 @@
@param noteDicts An array of dictionaries containing Skim note
properties, as returned by the properties of a <code>PDFAnnotation</code>.
@result An RTF data representation of the notes.
*/
-extern NSData * _Nullable SKNSkimRTFNotes(NSArray<NSDictionary<NSString *, id>
*> * _Nullable noteDicts);
+FOUNDATION_EXTERN NSData * _Nullable
SKNSkimRTFNotes(NSArray<NSDictionary<NSString *, id> *> * _Nullable noteDicts);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
