Revision: 13860
http://sourceforge.net/p/skim-app/code/13860
Author: hofman
Date: 2023-12-08 23:57:39 +0000 (Fri, 08 Dec 2023)
Log Message:
-----------
Allow weak variables and replace assign properties with weak properties
Modified Paths:
--------------
trunk/Configurations/Skim-Common.xcconfig
trunk/SKAttachmentEmailer.h
trunk/SKBookmark.h
trunk/SKColorPicker.h
trunk/SKControlTableCellView.h
trunk/SKDragImageView.h
trunk/SKFindController.h
trunk/SKMainToolbarController.h
trunk/SKMainTouchBarController.h
trunk/SKNoteTypeSheetController.h
trunk/SKPDFDocument.h
trunk/SKPDFSynchronizer.h
trunk/SKPDFView.m
trunk/SKProgressTableCellView.h
trunk/SKReadingBar.h
trunk/SKShareMenuController.h
trunk/SKSideViewController.h
trunk/SKSnapshotWindowController.h
trunk/SKThumbnail.h
trunk/SKThumbnailView.h
trunk/SKTransitionController.h
trunk/SKTypeSelectHelper.h
Modified: trunk/Configurations/Skim-Common.xcconfig
===================================================================
--- trunk/Configurations/Skim-Common.xcconfig 2023-12-08 17:15:19 UTC (rev
13859)
+++ trunk/Configurations/Skim-Common.xcconfig 2023-12-08 23:57:39 UTC (rev
13860)
@@ -16,6 +16,9 @@
LD_RUNPATH_SEARCH_PATHS = @loader_path/../Frameworks
+CLANG_ENABLE_OBJC_WEAK = YES
+
+
GCC_ENABLE_CPP_EXCEPTIONS = NO
GCC_ENABLE_CPP_RTTI = NO
GCC_ENABLE_OBJC_EXCEPTIONS = YES
Modified: trunk/SKAttachmentEmailer.h
===================================================================
--- trunk/SKAttachmentEmailer.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKAttachmentEmailer.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -42,7 +42,7 @@
@interface SKAttachmentEmailer : NSObject {
NSString *mailAppID;
- id<SKAttachmentEmailerDelegate> delegate;
+ __weak id<SKAttachmentEmailerDelegate> delegate;
NSString *subject;
}
@@ -50,7 +50,7 @@
@property (nonatomic, readonly) NSString *title;
@property (nonatomic, readonly) NSImage *image;
-@property (nonatomic, assign) id<SKAttachmentEmailerDelegate> delegate;
+@property (nonatomic, weak) id<SKAttachmentEmailerDelegate> delegate;
@property (nonatomic, retain) NSString *subject;
Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKBookmark.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -47,7 +47,7 @@
};
@interface SKBookmark : NSObject <NSCopying, QLPreviewItem> {
- SKBookmark *parent;
+ __weak SKBookmark *parent;
}
+ (instancetype)bookmarkWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel;
@@ -79,7 +79,7 @@
@property (nonatomic, retain) NSNumber *pageNumber;
@property (nonatomic, readonly) BOOL hasSetup;
@property (nonatomic, readonly) NSString *tabs;
-@property (nonatomic, assign) SKBookmark *parent;
+@property (nonatomic, weak) SKBookmark *parent;
@property (nonatomic, readonly) NSArray *containingBookmarks;
- (NSArray *)children;
Modified: trunk/SKColorPicker.h
===================================================================
--- trunk/SKColorPicker.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKColorPicker.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -43,12 +43,12 @@
@interface SKColorPicker : NSViewController <NSScrubberDataSource,
NSScrubberDelegate> {
NSScrubber *scrubber;
NSArray *colors;
- id <SKColorPickerDelegate> delegate;
+ __weak id <SKColorPickerDelegate> delegate;
}
@property (nonatomic, readonly) NSArray *colors;
-@property (nonatomic, assign) id <SKColorPickerDelegate> delegate;
+@property (nonatomic, weak) id <SKColorPickerDelegate> delegate;
@end
Modified: trunk/SKControlTableCellView.h
===================================================================
--- trunk/SKControlTableCellView.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKControlTableCellView.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -40,9 +40,9 @@
@interface SKControlTableCellView : NSTableCellView {
- NSControl *control;
+ __weak NSControl *control;
}
-@property (nonatomic, assign) IBOutlet NSControl *control;
+@property (nonatomic, weak) IBOutlet NSControl *control;
@end
Modified: trunk/SKDragImageView.h
===================================================================
--- trunk/SKDragImageView.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKDragImageView.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -41,10 +41,10 @@
@protocol SKDragImageViewDelegate;
@interface SKDragImageView : NSImageView <NSDraggingSource> {
- id <SKDragImageViewDelegate> delegate;
+ __weak id <SKDragImageViewDelegate> delegate;
}
-@property (nonatomic, assign) id <SKDragImageViewDelegate> delegate;
+@property (nonatomic, weak) id <SKDragImageViewDelegate> delegate;
- (IBAction)show:(id)sender;
- (IBAction)togglePreviewPanel:(id)sender;
Modified: trunk/SKFindController.h
===================================================================
--- trunk/SKFindController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKFindController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -41,7 +41,7 @@
@protocol SKFindControllerDelegate;
@interface SKFindController : NSViewController {
- id <SKFindControllerDelegate> delegate;
+ __weak id <SKFindControllerDelegate> delegate;
NSSearchField *findField;
NSTextField *messageField;
NSButton *doneButton;
@@ -57,7 +57,7 @@
@property (nonatomic, retain) IBOutlet NSButton *doneButton;
@property (nonatomic, retain) IBOutlet NSSegmentedControl *navigationButton;
@property (nonatomic, retain) IBOutlet NSObjectController *ownerController;
-@property (nonatomic, assign) id <SKFindControllerDelegate> delegate;
+@property (nonatomic, weak) id <SKFindControllerDelegate> delegate;
@property (nonatomic, retain) NSString *findString;
- (void)findForward:(BOOL)forward;
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKMainToolbarController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -41,7 +41,7 @@
@class SKMainWindowController, SKPDFView, SKColorSwatch, SKShareMenuController;
@interface SKMainToolbarController : NSViewController <NSToolbarDelegate> {
- SKMainWindowController *mainController;
+ __weak SKMainWindowController *mainController;
NSSegmentedControl *backForwardButton;
NSTextField *pageNumberField;
NSSegmentedControl *previousNextPageButton;
@@ -93,7 +93,7 @@
NSMutableDictionary *toolbarItems;
}
-@property (nonatomic, assign) IBOutlet SKMainWindowController *mainController;
+@property (nonatomic, weak) IBOutlet SKMainWindowController *mainController;
@property (nonatomic, retain) IBOutlet NSSegmentedControl *backForwardButton,
*previousNextPageButton, *previousPageButton, *nextPageButton,
*previousNextFirstLastPageButton, *zoomInOutButton, *zoomInActualOutButton,
*zoomActualButton, *zoomFitButton, *zoomSelectionButton, *autoScalesButton,
*rotateLeftButton, *rotateRightButton, *rotateLeftRightButton, *cropButton,
*fullScreenButton, *presentationButton, *leftPaneButton, *rightPaneButton,
*splitPDFButton, *toolModeButton, *textNoteButton, *circleNoteButton,
*markupNoteButton, *lineNoteButton, *singleTwoUpButton, *continuousButton,
*displayModeButton, *displayDirectionButton, *displaysRTLButton,
*bookModeButton, *pageBreaksButton, *displayBoxButton, *infoButton,
*colorsButton, *fontsButton, *linesButton, *printButton, *customizeButton,
*noteButton, *pacerButton, *shareButton;
@property (nonatomic, retain) IBOutlet NSTextField *pageNumberField,
*scaleField, *pacerSpeedField;
@property (nonatomic, retain) IBOutlet SKColorSwatch *colorSwatch;
Modified: trunk/SKMainTouchBarController.h
===================================================================
--- trunk/SKMainTouchBarController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKMainTouchBarController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -42,7 +42,7 @@
@class SKMainWindowController;
@interface SKMainTouchBarController : NSObject <NSTouchBarDelegate,
SKColorPickerDelegate> {
- SKMainWindowController *mainController;
+ __weak SKMainWindowController *mainController;
NSSegmentedControl *previousNextPageButton;
NSSegmentedControl *previousNextFirstLastPageButton;
NSSegmentedControl *zoomInActualOutButton;
@@ -55,7 +55,7 @@
NSMutableDictionary *touchBarItems;
}
-@property (nonatomic, assign) SKMainWindowController *mainController;
+@property (nonatomic, weak) SKMainWindowController *mainController;
- (NSTouchBar *)makeTouchBar;
Modified: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKNoteTypeSheetController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -42,12 +42,12 @@
@interface SKNoteTypeSheetController : NSWindowController {
NSMenu *noteTypeMenu;
- id <SKNoteTypeSheetControllerDelegate> delegate;
+ __weak id <SKNoteTypeSheetControllerDelegate> delegate;
}
- (instancetype)initIncludingWidgets:(BOOL)includeWidgets;
-@property (nonatomic, assign) id <SKNoteTypeSheetControllerDelegate> delegate;
+@property (nonatomic, weak) id <SKNoteTypeSheetControllerDelegate> delegate;
@property (nonatomic, readonly) NSArray *noteTypes;
@property (nonatomic, readonly) NSMenu *noteTypeMenu;
Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKPDFDocument.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -44,10 +44,10 @@
@interface SKPDFDocument : PDFDocument {
SKLanguageDirectionAngles *languageDirectionAngles;
- NSDocument *containingDocument;
+ __weak NSDocument *containingDocument;
NSMutableArray *detectedWidgets;
}
-@property (nonatomic, assign) NSDocument *containingDocument;
+@property (nonatomic, weak) NSDocument *containingDocument;
@property (nonatomic, readonly) NSArray *detectedWidgets;
- (id <SKPDFDocumentDelegate>)delegate;
- (void)setDelegate:(id <SKPDFDocumentDelegate>)newDelegate;
Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKPDFSynchronizer.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -50,7 +50,7 @@
@protocol SKPDFSynchronizerDelegate;
@interface SKPDFSynchronizer : NSObject {
- id <SKPDFSynchronizerDelegate> delegate;
+ __weak id <SKPDFSynchronizerDelegate> delegate;
dispatch_queue_t queue;
dispatch_queue_t lockQueue;
@@ -71,7 +71,7 @@
_Atomic(BOOL) shouldKeepRunning;
}
-@property (nonatomic, assign) id <SKPDFSynchronizerDelegate> delegate;
+@property (nonatomic, weak) id <SKPDFSynchronizerDelegate> delegate;
@property (copy) NSString *fileName;
@property (readonly) BOOL shouldKeepRunning;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKPDFView.m 2023-12-08 23:57:39 UTC (rev 13860)
@@ -179,12 +179,12 @@
// to avoid overriding NSView's CALayerDelegate methods
@interface SKLayerController : NSObject <CALayerDelegate> {
CALayer *layer;
- id<SKLayerDelegate> delegate;
+ __weak id<SKLayerDelegate> delegate;
NSRect rect;
NSInteger type;
}
@property (nonatomic, retain) CALayer *layer;
-@property (nonatomic, assign) id<SKLayerDelegate> delegate;
+@property (nonatomic, weak) id<SKLayerDelegate> delegate;
@property (nonatomic) NSRect rect;
@property (nonatomic) NSInteger type;
@end
Modified: trunk/SKProgressTableCellView.h
===================================================================
--- trunk/SKProgressTableCellView.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKProgressTableCellView.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -40,11 +40,11 @@
@interface SKProgressTableCellView : NSTableCellView {
- NSTextField *statusField;
- NSProgressIndicator *progressIndicator;
+ __weak NSTextField *statusField;
+ __weak NSProgressIndicator *progressIndicator;
}
-@property (nonatomic, assign) IBOutlet NSTextField *statusField;
-@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, weak) IBOutlet NSTextField *statusField;
+@property (nonatomic, weak) IBOutlet NSProgressIndicator *progressIndicator;
@end
Modified: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKReadingBar.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -49,7 +49,7 @@
NSInteger currentLine;
NSUInteger numberOfLines;
NSRect currentBounds;
- id <SKReadingBarDelegate> delegate;
+ __weak id <SKReadingBarDelegate> delegate;
}
@property (readonly, retain) PDFPage *page;
@@ -57,7 +57,7 @@
@property (nonatomic) NSUInteger numberOfLines;
@property (nonatomic) NSInteger maxLine;
@property (readonly) NSRect currentBounds;
-@property (nonatomic, assign) id <SKReadingBarDelegate> delegate;
+@property (nonatomic, weak) id <SKReadingBarDelegate> delegate;
- (instancetype)initWithPage:(PDFPage *)aPage line:(NSInteger)line
delegate:(id <SKReadingBarDelegate>)aDelegate;
Modified: trunk/SKShareMenuController.h
===================================================================
--- trunk/SKShareMenuController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKShareMenuController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -40,11 +40,11 @@
@interface SKShareMenuController : NSObject <NSMenuDelegate, NSCoding> {
- NSDocument *document;
+ __weak NSDocument *document;
}
- (instancetype)initForDocument:(NSDocument *)aDocument;
-@property (nonatomic, assign) NSDocument *document;
+@property (nonatomic, weak) NSDocument *document;
@end
Modified: trunk/SKSideViewController.h
===================================================================
--- trunk/SKSideViewController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKSideViewController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -46,11 +46,11 @@
NSSegmentedControl *alternateButton;
NSSearchField *searchField;
NSView *currentView;
- SKMainWindowController *mainController;
+ __weak SKMainWindowController *mainController;
BOOL isAnimating;
}
-@property (nonatomic, assign) IBOutlet SKMainWindowController *mainController;
+@property (nonatomic, weak) IBOutlet SKMainWindowController *mainController;
@property (nonatomic, retain) IBOutlet SKTopBarView *topBar;
@property (nonatomic, retain) IBOutlet NSSegmentedControl *button,
*alternateButton;
@property (nonatomic, retain) IBOutlet NSSearchField *searchField;
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKSnapshotWindowController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -54,7 +54,7 @@
@interface SKSnapshotWindowController : NSWindowController <NSWindowDelegate,
NSFilePromiseProviderDelegate, SKSnapshotPDFViewDelegate> {
SKSnapshotPDFView* pdfView;
NSImage *thumbnail;
- id <SKSnapshotWindowControllerDelegate> delegate;
+ __weak id <SKSnapshotWindowControllerDelegate> delegate;
NSString *pageLabel;
NSImage *windowImage;
NSString *string;
@@ -64,7 +64,7 @@
}
@property (nonatomic, retain) IBOutlet SKSnapshotPDFView *pdfView;
-@property (nonatomic, assign) id <SKSnapshotWindowControllerDelegate> delegate;
+@property (nonatomic, weak) id <SKSnapshotWindowControllerDelegate> delegate;
@property (nonatomic, retain) NSImage *thumbnail;
@property (nonatomic, readonly) NSRect bounds;
@property (nonatomic, readonly) NSUInteger pageIndex;
Modified: trunk/SKThumbnail.h
===================================================================
--- trunk/SKThumbnail.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKThumbnail.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -49,10 +49,10 @@
NSUInteger pageIndex;
BOOL dirty;
BOOL notedDirty;
- id <SKThumbnailDelegate> delegate;
+ __weak id <SKThumbnailDelegate> delegate;
}
-@property (nonatomic, assign) id <SKThumbnailDelegate> delegate;
+@property (nonatomic, weak) id <SKThumbnailDelegate> delegate;
@property (nonatomic, getter=isDirty) BOOL dirty;
@property (nonatomic, retain) NSImage *image;
@property (nonatomic, retain) NSString *label;
Modified: trunk/SKThumbnailView.h
===================================================================
--- trunk/SKThumbnailView.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKThumbnailView.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -52,7 +52,7 @@
NSImageView *markView;
NSVisualEffectView *imageHighlightView;
NSVisualEffectView *labelHighlightView;
- NSCollectionViewItem *controller;
+ __weak NSCollectionViewItem *controller;
}
@property (nonatomic, retain) SKThumbnail *thumbnail;
@@ -61,7 +61,7 @@
@property (nonatomic) NSBackgroundStyle backgroundStyle;
@property (nonatomic) NSInteger highlightLevel;
@property (nonatomic, getter=isMarked) BOOL marked;
-@property (nonatomic, assign) NSCollectionViewItem *controller;
+@property (nonatomic, weak) NSCollectionViewItem *controller;
+ (NSSize)sizeForImageSize:(NSSize)size;
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKTransitionController.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -44,7 +44,7 @@
@interface SKTransitionController : NSObject {
NSView <SKTransitionView> *transitionView;
NSWindow *window;
- NSView *view;
+ __weak NSView *view;
BOOL animating;
SKTransitionInfo *transition;
@@ -51,7 +51,7 @@
NSArray *pageTransitions;
}
-@property (nonatomic, assign) NSView *view;
+@property (nonatomic, weak) NSView *view;
@property (nonatomic, retain) SKTransitionInfo *transition;
@property (nonatomic, copy) NSArray *pageTransitions;
@property (nonatomic) BOOL hasTransition;
Modified: trunk/SKTypeSelectHelper.h
===================================================================
--- trunk/SKTypeSelectHelper.h 2023-12-08 17:15:19 UTC (rev 13859)
+++ trunk/SKTypeSelectHelper.h 2023-12-08 23:57:39 UTC (rev 13860)
@@ -48,7 +48,7 @@
@protocol SKTypeSelectDelegate;
@interface SKTypeSelectHelper : NSObject <NSTextViewDelegate> {
- id <SKTypeSelectDelegate> delegate;
+ __weak id <SKTypeSelectDelegate> delegate;
SKTypeSelectMatchOption matchOption;
BOOL isProcessing;
NSArray *searchCache;
@@ -57,7 +57,7 @@
NSWindow *observedWindow;
}
-@property (assign) id <SKTypeSelectDelegate> delegate;
+@property (weak) id <SKTypeSelectDelegate> delegate;
@property SKTypeSelectMatchOption matchOption;
+ (instancetype)typeSelectHelper;
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
