diff --git a/AlbumArt/AmazonAlbumArtSheet.h b/AlbumArt/AmazonAlbumArtSheet.h index 24639117..3532580b 100644 --- a/AlbumArt/AmazonAlbumArtSheet.h +++ b/AlbumArt/AmazonAlbumArtSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ enum { NSNumber *_searchInProgress; } -- (id) initWithSource:(id )source; +- (instancetype) initWithSource:(id )source; - (void) showAlbumArtMatches; diff --git a/CompactDisc/CompactDisc.h b/CompactDisc/CompactDisc.h index fa712a4f..292e406b 100644 --- a/CompactDisc/CompactDisc.h +++ b/CompactDisc/CompactDisc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ NSUInteger _length; } -- (id) initWithDeviceName:(NSString *)deviceName; +- (instancetype) initWithDeviceName:(NSString *)deviceName; - (NSString *) deviceName; diff --git a/CompactDisc/CompactDiscDocument.h b/CompactDisc/CompactDiscDocument.h index 4479545e..589f2242 100644 --- a/CompactDisc/CompactDiscDocument.h +++ b/CompactDisc/CompactDiscDocument.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -184,10 +184,10 @@ enum { @end @interface CompactDiscDocument (ScriptingAdditions) -- (id) handleEncodeScriptCommand:(NSScriptCommand *)command; -- (id) handleEjectDiscScriptCommand:(NSScriptCommand *)command; -- (id) handleQueryMusicBrainzScriptCommand:(NSScriptCommand *)command; -- (id) handleToggleTrackInformationScriptCommand:(NSScriptCommand *)command; -- (id) handleToggleAlbumArtScriptCommand:(NSScriptCommand *)command; -- (id) handleFetchAlbumArtScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleEncodeScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleEjectDiscScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleQueryMusicBrainzScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleToggleTrackInformationScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleToggleAlbumArtScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleFetchAlbumArtScriptCommand:(NSScriptCommand *)command; @end diff --git a/Controllers/ApplicationController.h b/Controllers/ApplicationController.h index 6efa9f61..0c43e6f5 100644 --- a/Controllers/ApplicationController.h +++ b/Controllers/ApplicationController.h @@ -19,7 +19,7 @@ #import @interface NSApplication (ScriptingAdditions) -- (id) handleConvertScriptCommand:(NSScriptCommand *)command; +- (instancetype) handleConvertScriptCommand:(NSScriptCommand *)command; @end @interface ApplicationController : NSObject diff --git a/Decoders/CircularBuffer.h b/Decoders/CircularBuffer.h index f291b601..bc853ce4 100644 --- a/Decoders/CircularBuffer.h +++ b/Decoders/CircularBuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ uint8_t *_writePtr; } -- (id) initWithSize:(NSUInteger)size; +- (instancetype) initWithSize:(NSUInteger)size; - (void) reset; diff --git a/Drive/Drive.h b/Drive/Drive.h index a9e205e8..0a008b77 100644 --- a/Drive/Drive.h +++ b/Drive/Drive.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ enum { } // Set up to read the drive corresponding to deviceName (will open the device and read the CDTOC) -- (id) initWithDeviceName:(NSString *)deviceName; +- (instancetype) initWithDeviceName:(NSString *)deviceName; // Device management - (BOOL) deviceOpen; diff --git a/Preferences/EncoderSettingsSheets/CoreAudioSettingsSheet.h b/Preferences/EncoderSettingsSheets/CoreAudioSettingsSheet.h index 0a15ef05..8f1a3725 100644 --- a/Preferences/EncoderSettingsSheets/CoreAudioSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/CoreAudioSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ NSString *_formatName; } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; - (NSString *) formatName; - (void) setFormatName:(NSString *)formatName; diff --git a/Preferences/EncoderSettingsSheets/EncoderSettingsSheet.h b/Preferences/EncoderSettingsSheets/EncoderSettingsSheet.h index 9caa0fab..f8feb6fb 100644 --- a/Preferences/EncoderSettingsSheets/EncoderSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/EncoderSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ + (NSDictionary *) defaultSettings; -- (id) initWithNibName:(NSString *)nibName settings:(NSDictionary *)settings; +- (instancetype) initWithNibName:(NSString *)nibName settings:(NSDictionary *)settings; - (NSDictionary *) searchKey; - (void) setSearchKey:(NSDictionary *)searchKey; diff --git a/Preferences/EncoderSettingsSheets/FLACSettingsSheet.h b/Preferences/EncoderSettingsSheets/FLACSettingsSheet.h index 298d7faa..58c5c546 100644 --- a/Preferences/EncoderSettingsSheets/FLACSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/FLACSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ enum { { } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; - (IBAction) userSelectedCompressionLevel:(id)sender; diff --git a/Preferences/EncoderSettingsSheets/LibsndfileSettingsSheet.h b/Preferences/EncoderSettingsSheets/LibsndfileSettingsSheet.h index 01ec8e47..f6d5c376 100644 --- a/Preferences/EncoderSettingsSheets/LibsndfileSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/LibsndfileSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ NSString *_formatName; } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; - (NSString *) formatName; - (void) setFormatName:(NSString *)formatName; diff --git a/Preferences/EncoderSettingsSheets/MP3SettingsSheet.h b/Preferences/EncoderSettingsSheets/MP3SettingsSheet.h index 113ca768..698249f3 100644 --- a/Preferences/EncoderSettingsSheets/MP3SettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/MP3SettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ IBOutlet NSTextField *_presetDescription; } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; - (IBAction) userSelectedPreset:(id)sender; diff --git a/Preferences/EncoderSettingsSheets/MonkeysAudioSettingsSheet.h b/Preferences/EncoderSettingsSheets/MonkeysAudioSettingsSheet.h index 7f02b17c..0501fc51 100644 --- a/Preferences/EncoderSettingsSheets/MonkeysAudioSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/MonkeysAudioSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,6 @@ { } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; @end diff --git a/Preferences/EncoderSettingsSheets/OggSpeexSettingsSheet.h b/Preferences/EncoderSettingsSheets/OggSpeexSettingsSheet.h index 982ce43a..a729114a 100644 --- a/Preferences/EncoderSettingsSheets/OggSpeexSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/OggSpeexSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ { } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; - (IBAction) enableVBRButtonAction:(id)sender; diff --git a/Preferences/EncoderSettingsSheets/OggVorbisSettingsSheet.h b/Preferences/EncoderSettingsSheets/OggVorbisSettingsSheet.h index 2cda7e8f..4e792b63 100644 --- a/Preferences/EncoderSettingsSheets/OggVorbisSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/OggVorbisSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,6 @@ { } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; @end diff --git a/Preferences/EncoderSettingsSheets/WavPackSettingsSheet.h b/Preferences/EncoderSettingsSheets/WavPackSettingsSheet.h index 9e0b91e3..3a15d030 100644 --- a/Preferences/EncoderSettingsSheets/WavPackSettingsSheet.h +++ b/Preferences/EncoderSettingsSheets/WavPackSettingsSheet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,6 @@ { } -- (id) initWithSettings:(NSDictionary *)settings; +- (instancetype) initWithSettings:(NSDictionary *)settings; @end diff --git a/Rippers/BasicRipper.h b/Rippers/BasicRipper.h index 795b0f09..badf0279 100644 --- a/Rippers/BasicRipper.h +++ b/Rippers/BasicRipper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +30,6 @@ NSDate *_startTime; } -- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; +- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; @end diff --git a/Rippers/ComparisonRipper.h b/Rippers/ComparisonRipper.h index d0d21ad5..3f2d17dd 100644 --- a/Rippers/ComparisonRipper.h +++ b/Rippers/ComparisonRipper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ NSDate *_startTime; } -- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; +- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; - (int) driveOffset; - (void) setDriveOffset:(int)driveOffset; diff --git a/Rippers/ParanoiaRipper.h b/Rippers/ParanoiaRipper.h index 0af6e040..2147c727 100644 --- a/Rippers/ParanoiaRipper.h +++ b/Rippers/ParanoiaRipper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,6 @@ NSDate *_startTime; } -- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; +- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; @end diff --git a/Rippers/Rip.h b/Rippers/Rip.h index 7d6dc896..0781722e 100644 --- a/Rippers/Rip.h +++ b/Rippers/Rip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +29,8 @@ unsigned char **_hashes; // The SHA-256 for each sector in the file } -- (id) initWithSectorRange:(SectorRange *)range; -- (id) initWithFirstSector:(NSUInteger)firstSector lastSector:(NSUInteger)lastSector; +- (instancetype) initWithSectorRange:(SectorRange *)range; +- (instancetype) initWithFirstSector:(NSUInteger)firstSector lastSector:(NSUInteger)lastSector; // Easy access to the SectorRange contained in this rip - (NSUInteger) firstSector; diff --git a/Rippers/Ripper.h b/Rippers/Ripper.h index 5dcdd91e..8d3b283d 100644 --- a/Rippers/Ripper.h +++ b/Rippers/Ripper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 - 2007 Stephen F. Booth + * Copyright (C) 2005 - 2020 Stephen F. Booth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ BOOL _logActivity; } -- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; +- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName; - (NSString *) deviceName; diff --git a/Tasks/RipperTasks/RipperTask.h b/Tasks/RipperTasks/RipperTask.h index 0cb059fb..4004441a 100644 --- a/Tasks/RipperTasks/RipperTask.h +++ b/Tasks/RipperTasks/RipperTask.h @@ -32,7 +32,7 @@ NSString *_deviceName; } -- (id) initWithTracks:(NSArray *)tracks; +- (instancetype) initWithTracks:(NSArray *)tracks; - (NSArray *) sectors; - (NSString *) deviceName;