Revision: 13777
http://sourceforge.net/p/skim-app/code/13777
Author: hofman
Date: 2023-11-19 16:53:21 +0000 (Sun, 19 Nov 2023)
Log Message:
-----------
Don't pass delegator to several delegate methods
Modified Paths:
--------------
trunk/SKColorPicker.h
trunk/SKColorPicker.m
trunk/SKDragImageView.h
trunk/SKDragImageView.m
trunk/SKMainDocument.m
trunk/SKMainTouchBarController.m
trunk/SKMainWindowController_UI.m
trunk/SKNoteTypeSheetController.h
trunk/SKNoteTypeSheetController.m
trunk/SKNoteWindowController.m
trunk/SKNotesDocument.m
trunk/SKPDFSynchronizer.h
trunk/SKPDFSynchronizer.m
trunk/SKPDFView.m
trunk/SKReadingBar.h
trunk/SKReadingBar.m
Modified: trunk/SKColorPicker.h
===================================================================
--- trunk/SKColorPicker.h 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKColorPicker.h 2023-11-19 16:53:21 UTC (rev 13777)
@@ -54,5 +54,5 @@
@protocol SKColorPickerDelegate <NSObject>
-- (void)colorPicker:(SKColorPicker *)colorPicker didSelectColor:(NSColor
*)color;
+- (void)colorPickerDidSelectColor:(NSColor *)color;
@end
Modified: trunk/SKColorPicker.m
===================================================================
--- trunk/SKColorPicker.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKColorPicker.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -119,7 +119,7 @@
- (void)scrubber:(NSScrubber *)aScrubber
didSelectItemAtIndex:(NSInteger)selectedIndex {
if (selectedIndex >= 0 && selectedIndex < (NSInteger)[[self colors]
count]) {
NSColor *color = [[self colors] objectAtIndex:selectedIndex];
- [[self delegate] colorPicker:self didSelectColor:color];
+ [[self delegate] colorPickerDidSelectColor:color];
}
[aScrubber setSelectedIndex:-1];
}
Modified: trunk/SKDragImageView.h
===================================================================
--- trunk/SKDragImageView.h 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKDragImageView.h 2023-11-19 16:53:21 UTC (rev 13777)
@@ -55,7 +55,7 @@
@protocol SKDragImageViewDelegate <NSObject>
@optional
-- (id<NSPasteboardWriting>)draggedObjectForDragImageView:(SKDragImageView
*)view;
-- (void)showImageForDragImageView:(SKDragImageView *)view;
+- (id<NSPasteboardWriting>)draggedObjectForDragImageView;
+- (void)showImageForDragImageView;
@end
Modified: trunk/SKDragImageView.m
===================================================================
--- trunk/SKDragImageView.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKDragImageView.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -49,8 +49,8 @@
@synthesize delegate;
- (IBAction)show:(id)sender {
- if ([self isEditable] && [delegate
respondsToSelector:@selector(showImageForDragImageView:)])
- [delegate showImageForDragImageView:self];
+ if ([self isEditable] && [delegate
respondsToSelector:@selector(showImageForDragImageView)])
+ [delegate showImageForDragImageView];
}
- (IBAction)togglePreviewPanel:(id)sender {
@@ -119,8 +119,8 @@
isInside = [self mouse:mouseLoc inRect:[self bounds]];
switch ([theEvent type]) {
case NSEventTypeLeftMouseDragged:
- if(isInside && [delegate
respondsToSelector:@selector(draggedObjectForDragImageView:)]) {
- id<NSPasteboardWriting> object = [delegate
draggedObjectForDragImageView:self];
+ if(isInside && [delegate
respondsToSelector:@selector(draggedObjectForDragImageView)]) {
+ id<NSPasteboardWriting> object = [delegate
draggedObjectForDragImageView];
if (object) {
NSRect bounds = [self bounds];
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKMainDocument.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -1470,7 +1470,7 @@
}
}
-- (void)synchronizer:(SKPDFSynchronizer *)aSynchronizer
foundLine:(NSInteger)line inFile:(NSString *)file {
+- (void)synchronizerFoundLine:(NSInteger)line inFile:(NSString *)file {
if ([[NSFileManager defaultManager] fileExistsAtPath:file]) {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
@@ -1552,7 +1552,7 @@
}
}
-- (void)synchronizer:(SKPDFSynchronizer *)aSynchronizer
foundLocation:(NSPoint)point atPageIndex:(NSUInteger)pageIndex
options:(SKPDFSynchronizerOption)options {
+- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOption)options {
PDFDocument *pdfDoc = [self pdfDocument];
if (pageIndex < [pdfDoc pageCount]) {
PDFPage *page = [pdfDoc pageAtIndex:pageIndex];
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKMainTouchBarController.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -283,7 +283,7 @@
#pragma mark SKColorPickerDelegate
-- (void)colorPicker:(SKColorPicker *)colorPicker didSelectColor:(NSColor
*)color {
+- (void)colorPickerDidSelectColor:(NSColor *)color {
PDFAnnotation *annotation = [mainController.pdfView currentAnnotation];
BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
BOOL isAlt = ([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0;
@@ -299,7 +299,7 @@
#pragma mark Actions
- (void)chooseColor:(id)sender {
- [self colorPicker:nil didSelectColor:[sender color]];
+ [self colorPickerDidSelectColor:[sender color]];
}
- (void)goToPreviousNextPage:(id)sender {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKMainWindowController_UI.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -1382,11 +1382,11 @@
#pragma mark SKNoteTypeSheetController delegate protocol
-- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController
*)controller {
+- (void)noteTypeSheetControllerNoteTypesDidChange {
[self updateNoteFilterPredicate];
}
-- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController
*)controller {
+- (NSWindow *)windowForNoteTypeSheetController {
return [self window];
}
Modified: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKNoteTypeSheetController.h 2023-11-19 16:53:21 UTC (rev 13777)
@@ -57,6 +57,6 @@
@protocol SKNoteTypeSheetControllerDelegate <NSObject>
-- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController
*)controller;
-- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController
*)controller;
+- (void)noteTypeSheetControllerNoteTypesDidChange;
+- (NSWindow *)windowForNoteTypeSheetController;
@end
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKNoteTypeSheetController.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -147,7 +147,7 @@
- (void)toggleDisplayNoteType:(id)sender {
NSMenuItem *item = [noteTypeMenu itemWithTag:[sender tag]];
[item setState:NO == [item state]];
- [delegate noteTypeSheetControllerNoteTypesDidChange:self];
+ [delegate noteTypeSheetControllerNoteTypesDidChange];
}
- (void)displayAllNoteTypes:(id)sender {
@@ -154,7 +154,7 @@
NSInteger i;
for (i = 0; i < NOTETYPES_COUNT; i++)
[[noteTypeMenu itemAtIndex:i] setState:NSOnState];
- [delegate noteTypeSheetControllerNoteTypesDidChange:self];
+ [delegate noteTypeSheetControllerNoteTypesDidChange];
}
- (void)selectNoteTypes:(id)sender {
@@ -164,12 +164,12 @@
for (i = 0; i < NOTETYPES_COUNT; i++)
[[self switchForTag:i] setState:[[noteTypeMenu itemAtIndex:i] state]];
- [self beginSheetModalForWindow:[delegate
windowForNoteTypeSheetController:self] completionHandler:^(NSInteger result) {
+ [self beginSheetModalForWindow:[delegate windowForNoteTypeSheetController]
completionHandler:^(NSInteger result) {
if (result == NSModalResponseOK) {
NSInteger idx;
for (idx = 0; idx < NOTETYPES_COUNT; idx++)
[[noteTypeMenu itemAtIndex:idx] setState:[[self
switchForTag:idx] state]];
- [delegate noteTypeSheetControllerNoteTypesDidChange:self];
+ [delegate noteTypeSheetControllerNoteTypesDidChange];
}
}];
}
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKNoteWindowController.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -381,7 +381,7 @@
#pragma mark SKDragImageView delegate protocol
-- (id<NSPasteboardWriting>)draggedObjectForDragImageView:(SKDragImageView
*)view {
+- (id<NSPasteboardWriting>)draggedObjectForDragImageView {
NSImage *image = [note image];
if (image)
return [[[NSFilePromiseProvider alloc] initWithFileType:(NSString
*)kUTTypeTIFF delegate:self] autorelease];
@@ -389,7 +389,7 @@
return nil;
}
-- (void)showImageForDragImageView:(SKDragImageView *)view {
+- (void)showImageForDragImageView {
NSURL *fileURL = [self writeImageToDestination:[[self class]
temporaryDirectoryURL]];
if (fileURL)
[[NSWorkspace sharedWorkspace] openURL:fileURL];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKNotesDocument.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -878,11 +878,11 @@
#pragma mark SKNoteTypeSheetController delegate protocol
-- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController
*)controller {
+- (void)noteTypeSheetControllerNoteTypesDidChange {
[self updateNoteFilterPredicate];
}
-- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController
*)controller {
+- (NSWindow *)windowForNoteTypeSheetController {
return [outlineView window];
}
Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKPDFSynchronizer.h 2023-11-19 16:53:21 UTC (rev 13777)
@@ -86,7 +86,7 @@
@protocol SKPDFSynchronizerDelegate <NSObject>
-- (void)synchronizer:(SKPDFSynchronizer *)synchronizer
foundLine:(NSInteger)line inFile:(NSString *)file;
-- (void)synchronizer:(SKPDFSynchronizer *)synchronizer
foundLocation:(NSPoint)point atPageIndex:(NSUInteger)pageIndex
options:(SKPDFSynchronizerOption)options;
+- (void)synchronizerFoundLine:(NSInteger)line inFile:(NSString *)file;
+- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOption)options;
@end
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKPDFSynchronizer.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -593,7 +593,7 @@
if (success && [self shouldKeepRunning]) {
dispatch_async(dispatch_get_main_queue(), ^{
- [delegate synchronizer:self foundLine:foundLine
inFile:foundFile];
+ [delegate synchronizerFoundLine:foundLine
inFile:foundFile];
});
}
}
@@ -622,7 +622,7 @@
else
foundOptions |= SKPDFSynchronizerFlippedMask;
dispatch_async(dispatch_get_main_queue(), ^{
- [delegate synchronizer:self foundLocation:foundPoint
atPageIndex:foundPageIndex options:foundOptions];
+ [delegate synchronizerFoundLocation:foundPoint
atPageIndex:foundPageIndex options:foundOptions];
});
}
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKPDFView.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -1063,7 +1063,7 @@
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewReadingBarDidChangeNotification object:self
userInfo:userInfo];
}
-- (void)readingBar:(SKReadingBar *)aReadingBar
didChangeBounds:(NSRect)oldBounds onPage:(PDFPage *)oldPage
toBounds:(NSRect)newBounds onPage:(PDFPage *)newPage scroll:(BOOL)shouldScroll {
+- (void)readingBarDidChangeBounds:(NSRect)oldBounds onPage:(PDFPage *)oldPage
toBounds:(NSRect)newBounds onPage:(PDFPage *)newPage scroll:(BOOL)shouldScroll {
[syncDot setShouldHideReadingBar:NO];
if (shouldScroll) {
Modified: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKReadingBar.h 2023-11-19 16:53:21 UTC (rev 13777)
@@ -85,6 +85,6 @@
@protocol SKReadingBarDelegate <NSObject>
-- (void)readingBar:(SKReadingBar *)readingBar
didChangeBounds:(NSRect)oldBounds onPage:(PDFPage *)oldPage
toBounds:(NSRect)newBounds onPage:(PDFPage *)newPage scroll:(BOOL)shouldScroll;
+- (void)readingBarDidChangeBounds:(NSRect)oldBounds onPage:(PDFPage *)oldPage
toBounds:(NSRect)newBounds onPage:(PDFPage *)newPage scroll:(BOOL)shouldScroll;
@end
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2023-11-19 15:52:22 UTC (rev 13776)
+++ trunk/SKReadingBar.m 2023-11-19 16:53:21 UTC (rev 13777)
@@ -143,7 +143,7 @@
[self setCurrentBounds:[self currentBoundsFromLineRects:nil]];
[[NSUserDefaults standardUserDefaults] setInteger:numberOfLines
forKey:SKReadingBarNumberOfLinesKey];
if (delegate && NSEqualRects(oldBounds, currentBounds) == NO)
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:NO];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:NO];
}
}
@@ -205,7 +205,7 @@
didMove = YES;
}
if (didMove && delegate)
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
return didMove;
}
@@ -223,7 +223,7 @@
didMove = YES;
}
if (didMove && delegate)
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
return didMove;
}
@@ -232,7 +232,7 @@
NSRect oldBounds = currentBounds;
BOOL didMove = [self goToNextPageAtTop:YES];
if (didMove && delegate)
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
return didMove;
}
@@ -241,7 +241,7 @@
NSRect oldBounds = currentBounds;
BOOL didMove = [self goToPreviousPageAtTop:YES];
if (didMove && delegate)
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:YES];
return didMove;
}
@@ -260,7 +260,7 @@
[self goToNextPageAtTop:YES] || [self goToPreviousPageAtTop:NO];
}
if (delegate && (page != oldPage || NSEqualRects(oldBounds, currentBounds)
== NO))
- [delegate readingBar:self didChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:shouldScroll];
+ [delegate readingBarDidChangeBounds:oldBounds onPage:oldPage
toBounds:currentBounds onPage:page scroll:shouldScroll];
}
- (void)goToLine:(NSInteger)line onPage:(PDFPage *)aPage {
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
