Skip to content

Commit c6c466c

Browse files
committed
[NSObject] Rename replacementObjectFor... to match the Darwin version
1 parent bf45fe4 commit c6c466c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Foundation/NSKeyedArchiver.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,10 @@ open class NSKeyedArchiver : NSCoder {
483483
return objectToEncode
484484
}
485485

486-
// object replaced by NSObject.replacementObjectForKeyedArchiver
486+
// object replaced by NSObject.replacementObject(for:)
487487
// if it is replaced with nil, it cannot be further replaced
488488
if let ns = objectToEncode as? NSObject {
489-
objectToEncode = ns.replacementObjectForKeyedArchiver(self)
489+
objectToEncode = ns.replacementObject(for: self)
490490
if objectToEncode == nil {
491491
replaceObject(object!, withObject: nil)
492492
return nil
@@ -799,7 +799,7 @@ public protocol NSKeyedArchiverDelegate : class {
799799
// either returns this object or can return a different object to be encoded
800800
// instead. The delegate can also fiddle with the coder state. If the delegate
801801
// returns nil, nil is encoded. This method is called after the original object
802-
// may have replaced itself with replacementObjectForKeyedArchiver:.
802+
// may have replaced itself with replacementObject(for:).
803803
// This method is not called for an object once a replacement mapping has been
804804
// setup for that object (either explicitly, or because the object has previously
805805
// been encoded). This is also not called when nil is about to be encoded.

Foundation/NSObject.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ open class NSObject : NSObjectProtocol, Equatable, Hashable {
260260
///
261261
/// - Parameter aCoder: The coder encoding the instance.
262262
/// - Returns: The object encode instead of the instance (if different).
263-
open func replacementObjectForCoder(_ aCoder: NSCoder) -> Any? {
263+
open func replacementObject(for aCoder: NSCoder) -> Any? {
264264
return self
265265
}
266266

@@ -284,8 +284,8 @@ open class NSObject : NSObjectProtocol, Equatable, Hashable {
284284
///
285285
/// - Parameter archiver: A keyed archiver creating an archive.
286286
/// - Returns: The object encode instead of the instance (if different).
287-
open func replacementObjectForKeyedArchiver(_ archiver: NSKeyedArchiver) -> Any? {
288-
return self.replacementObjectForCoder(archiver)
287+
open func replacementObject(for archiver: NSKeyedArchiver) -> Any? {
288+
return self.replacementObject(for: archiver as NSCoder)
289289
}
290290

291291
/// Overridden to return the names of classes that can be used to decode

0 commit comments

Comments
 (0)