Revision: 14836
http://sourceforge.net/p/skim-app/code/14836
Author: hofman
Date: 2024-12-15 17:39:09 +0000 (Sun, 15 Dec 2024)
Log Message:
-----------
remove custom class factory methods for NSPointerArray
Modified Paths:
--------------
trunk/NSPointerArray_SKExtensions.h
trunk/NSPointerArray_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/NSPointerArray_SKExtensions.h
===================================================================
--- trunk/NSPointerArray_SKExtensions.h 2024-12-15 17:32:22 UTC (rev 14835)
+++ trunk/NSPointerArray_SKExtensions.h 2024-12-15 17:39:09 UTC (rev 14836)
@@ -42,9 +42,6 @@
@interface NSPointerArray (SKExtensions)
-@property (class, nonatomic, readonly) NSPointerArray *rectPointerArray;
-@property (class, nonatomic, readonly) NSPointerArray *rangePointerArray;
-
- (instancetype)initForRectPointers;
- (instancetype)initForRangePointers;
Modified: trunk/NSPointerArray_SKExtensions.m
===================================================================
--- trunk/NSPointerArray_SKExtensions.m 2024-12-15 17:32:22 UTC (rev 14835)
+++ trunk/NSPointerArray_SKExtensions.m 2024-12-15 17:39:09 UTC (rev 14836)
@@ -42,10 +42,6 @@
@implementation NSPointerArray (SKExtensions)
-+ (instancetype)rectPointerArray { return [[self alloc] initForRectPointers]; }
-
-+ (instancetype)rangePointerArray { return [[self alloc]
initForRangePointers]; }
-
- (instancetype)initForRectPointers {
return [self initWithPointerFunctions:[NSPointerFunctions
rectPointerFunctions]];
}
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2024-12-15 17:32:22 UTC (rev 14835)
+++ trunk/PDFPage_SKExtensions.m 2024-12-15 17:39:09 UTC (rev 14836)
@@ -384,7 +384,7 @@
}
- (NSPointerArray *)lineRects {
- NSPointerArray *lines = [NSPointerArray rectPointerArray];
+ NSPointerArray *lines = [[NSPointerArray alloc] initForRectPointers];
PDFSelection *sel = [self selectionForRect:[self
boundsForBox:kPDFDisplayBoxCropBox]];
CGFloat lastOrder = -CGFLOAT_MAX;
NSUInteger i;
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2024-12-15 17:32:22 UTC (rev
14835)
+++ trunk/SKMainWindowController_Actions.m 2024-12-15 17:39:09 UTC (rev
14836)
@@ -582,7 +582,7 @@
NSInteger i, count = [[pdfView document] pageCount];
NSInteger rectCount = [rects count];
- NSPointerArray *oldRects = [NSPointerArray rectPointerArray];
+ NSPointerArray *oldRects = [[NSPointerArray alloc] initForRectPointers];
for (i = 0; i < count; i++) {
PDFPage *page = [[pdfView document] pageAtIndex:i];
NSRect rect = NSIntersectionRect([rects rectAtIndex:i % rectCount],
[page boundsForBox:kPDFDisplayBoxMediaBox]);
@@ -605,7 +605,7 @@
- (IBAction)cropAll:(id)sender {
NSRect rect[2] = {NSIntegralRect([pdfView currentSelectionRect]),
NSZeroRect};
- NSPointerArray *rectArray = [NSPointerArray rectPointerArray];
+ NSPointerArray *rectArray = [[NSPointerArray alloc] initForRectPointers];
BOOL emptySelection = NSIsEmptyRect(rect[0]);
if (emptySelection) {
@@ -651,7 +651,7 @@
}
- (IBAction)autoCropAll:(id)sender {
- NSPointerArray *rectArray = [NSPointerArray rectPointerArray];
+ NSPointerArray *rectArray = [[NSPointerArray alloc] initForRectPointers];
PDFDocument *pdfDoc = [pdfView document];
NSInteger i, iMax = [[pdfView document] pageCount];
@@ -671,7 +671,7 @@
}
- (IBAction)smartAutoCropAll:(id)sender {
- NSPointerArray *rectArray = [NSPointerArray rectPointerArray];
+ NSPointerArray *rectArray = [[NSPointerArray alloc] initForRectPointers];
PDFDocument *pdfDoc = [pdfView document];
NSInteger i, iMax = [pdfDoc pageCount];
NSSize size = NSZeroSize;
@@ -711,7 +711,7 @@
}
- (IBAction)resetCrop:(id)sender {
- NSPointerArray *rectArray = [NSPointerArray rectPointerArray];
+ NSPointerArray *rectArray = [[NSPointerArray alloc] initForRectPointers];
BOOL hasChanges = NO;
for (PDFPage *page in [pdfView document]) {
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
