Skip to content

Commit

Permalink
More changes of id to instancetype
Browse files Browse the repository at this point in the history
  • Loading branch information
sbooth committed Feb 23, 2020
1 parent cadd609 commit 59b7c56
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions AlbumArt/AmazonAlbumArtSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -42,7 +42,7 @@ enum {
NSNumber *_searchInProgress;
}

- (id) initWithSource:(id <AlbumArtMethods>)source;
- (instancetype) initWithSource:(id <AlbumArtMethods>)source;

- (void) showAlbumArtMatches;

Expand Down
4 changes: 2 additions & 2 deletions CompactDisc/CompactDisc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -34,7 +34,7 @@
NSUInteger _length;
}

- (id) initWithDeviceName:(NSString *)deviceName;
- (instancetype) initWithDeviceName:(NSString *)deviceName;

- (NSString *) deviceName;

Expand Down
14 changes: 7 additions & 7 deletions CompactDisc/CompactDiscDocument.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Controllers/ApplicationController.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#import <Cocoa/Cocoa.h>

@interface NSApplication (ScriptingAdditions)
- (id) handleConvertScriptCommand:(NSScriptCommand *)command;
- (instancetype) handleConvertScriptCommand:(NSScriptCommand *)command;
@end

@interface ApplicationController : NSObject
Expand Down
4 changes: 2 additions & 2 deletions Decoders/CircularBuffer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -28,7 +28,7 @@
uint8_t *_writePtr;
}

- (id) initWithSize:(NSUInteger)size;
- (instancetype) initWithSize:(NSUInteger)size;

- (void) reset;

Expand Down
4 changes: 2 additions & 2 deletions Drive/Drive.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/CoreAudioSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -29,7 +29,7 @@
NSString *_formatName;
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

- (NSString *) formatName;
- (void) setFormatName:(NSString *)formatName;
Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/EncoderSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/FLACSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -36,7 +36,7 @@ enum {
{
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

- (IBAction) userSelectedCompressionLevel:(id)sender;

Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/LibsndfileSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -27,7 +27,7 @@
NSString *_formatName;
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

- (NSString *) formatName;
- (void) setFormatName:(NSString *)formatName;
Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/MP3SettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand All @@ -24,7 +24,7 @@
IBOutlet NSTextField *_presetDescription;
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

- (IBAction) userSelectedPreset:(id)sender;

Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/MonkeysAudioSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand All @@ -23,6 +23,6 @@
{
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

@end
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/OggSpeexSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand All @@ -23,7 +23,7 @@
{
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

- (IBAction) enableVBRButtonAction:(id)sender;

Expand Down
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/OggVorbisSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand All @@ -23,6 +23,6 @@
{
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

@end
4 changes: 2 additions & 2 deletions Preferences/EncoderSettingsSheets/WavPackSettingsSheet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand All @@ -23,6 +23,6 @@
{
}

- (id) initWithSettings:(NSDictionary *)settings;
- (instancetype) initWithSettings:(NSDictionary *)settings;

@end
4 changes: 2 additions & 2 deletions Rippers/BasicRipper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -30,6 +30,6 @@
NSDate *_startTime;
}

- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;
- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;

@end
4 changes: 2 additions & 2 deletions Rippers/ComparisonRipper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Rippers/ParanoiaRipper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -36,6 +36,6 @@
NSDate *_startTime;
}

- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;
- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;

@end
6 changes: 3 additions & 3 deletions Rippers/Rip.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Rippers/Ripper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* 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
Expand Down Expand Up @@ -30,7 +30,7 @@
BOOL _logActivity;
}

- (id) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;
- (instancetype) initWithSectors:(NSArray *)sectors deviceName:(NSString *)deviceName;

- (NSString *) deviceName;

Expand Down
2 changes: 1 addition & 1 deletion Tasks/RipperTasks/RipperTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
NSString *_deviceName;
}

- (id) initWithTracks:(NSArray *)tracks;
- (instancetype) initWithTracks:(NSArray *)tracks;

- (NSArray *) sectors;
- (NSString *) deviceName;
Expand Down

0 comments on commit 59b7c56

Please sign in to comment.