chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fix deprecations with replacemnt and reindent touched files.

Browse source
This commit is contained in:
Dzmitry Neviadomski 2021-01-27 05:30:19 +03:00
parent 70a22e9611
commit a0afe85130
5 changed files with 455 additions and 455 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Application/MediaKeysApplication.m
View file

@ -101,7 +101,7 @@
{ {
BOOL shouldHandleMediaKeyEventLocally = ![SPMediaKeyTap usesGlobalMediaKeyTap]; BOOL shouldHandleMediaKeyEventLocally = ![SPMediaKeyTap usesGlobalMediaKeyTap];
if(shouldHandleMediaKeyEventLocally && [event type] == NSSystemDefined && [event subtype] == 8 ) if(shouldHandleMediaKeyEventLocally && [event type] == NSEventTypeSystemDefined && [event subtype] == 8 )
{ {
[self mediaKeyTap:nil receivedMediaKeyEvent:event]; [self mediaKeyTap:nil receivedMediaKeyEvent:event];
} }
@ -111,7 +111,7 @@
-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event; -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
{ {
NSAssert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:"); NSAssert([event type] == NSEventTypeSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:");
int keyCode = (([event data1] & 0xFFFF0000) >> 16); int keyCode = (([event data1] & 0xFFFF0000) >> 16);
int keyFlags = ([event data1] & 0x0000FFFF); int keyFlags = ([event data1] & 0x0000FFFF);

2
FileTree/FileTreeOutlineView.m
View file

@ -21,7 +21,7 @@
- (void)keyDown:(NSEvent *)e - (void)keyDown:(NSEvent *)e
{ {
unsigned int modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask); unsigned int modifiers = [e modifierFlags] & (NSEventModifierFlagCommand | NSEventModifierFlagShift | NSEventModifierFlagControl | NSEventModifierFlagOption);
NSString *characters = [e characters]; NSString *characters = [e characters];
unichar c; unichar c;

6
Playlist/PlaylistView.m
View file

@ -26,7 +26,7 @@
[[self menu] setAutoenablesItems:NO]; [[self menu] setAutoenablesItems:NO];
// Configure bindings to scale font size and row height // Configure bindings to scale font size and row height
NSControlSize s = NSSmallControlSize; NSControlSize s = NSControlSizeSmall;
NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]]; NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]];
// NSFont *bf = [[NSFontManager sharedFontManager] convertFont:f toHaveTrait:NSBoldFontMask]; // NSFont *bf = [[NSFontManager sharedFontManager] convertFont:f toHaveTrait:NSBoldFontMask];
@ -130,7 +130,7 @@
{ {
[super mouseDown:e]; [super mouseDown:e];
if ([e type] == NSLeftMouseDown && [e clickCount] == 2 && [[self selectedRowIndexes] count] == 1) if ([e type] == NSEventTypeLeftMouseDown && [e clickCount] == 2 && [[self selectedRowIndexes] count] == 1)
{ {
[playbackController play:self]; [playbackController play:self];
} }
@ -174,7 +174,7 @@
- (void)keyDown:(NSEvent *)e - (void)keyDown:(NSEvent *)e
{ {
unsigned int modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask); unsigned int modifiers = [e modifierFlags] & (NSEventModifierFlagCommand | NSEventModifierFlagShift | NSEventModifierFlagControl | NSEventModifierFlagOption);
NSString *characters = [e characters]; NSString *characters = [e characters];
unichar c; unichar c;

2
ThirdParty/ImageTextCell/ImageTextCell.m vendored
View file

@ -61,7 +61,7 @@
imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2); imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
[image drawInRect:imageFrame fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:YES hints:nil]; [image drawInRect:imageFrame fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0 respectFlipped:YES hints:nil];
} }
[super drawWithFrame:cellFrame inView:controlView]; [super drawWithFrame:cellFrame inView:controlView];
} }

2
ThirdParty/OpenURLPanel/OpenURLPanel.m vendored
View file

@ -168,7 +168,7 @@ typedef id (*myIMP)(id, SEL, ...);
BOOL informDelegate = YES; BOOL informDelegate = YES;
myIMP callback; myIMP callback;
if ([sender tag] == NSOKButton) if ([sender tag] == NSModalResponseOK)
{ {
// validate the URL // validate the URL
url = [self url]; url = [self url];