diff --git a/Source/ASControlNode.h b/Source/ASControlNode.h index 862f8fc83..0918fdb0b 100644 --- a/Source/ASControlNode.h +++ b/Source/ASControlNode.h @@ -11,9 +11,6 @@ #pragma once -#pragma clang diagnostic push -#pragma clang diagnostic error "-Wobjc-missing-property-synthesis" - NS_ASSUME_NONNULL_BEGIN /** @@ -150,5 +147,3 @@ static UIControlState const ASControlStateSelected ASDISPLAYNODE_DEPRECATED_MSG( #endif NS_ASSUME_NONNULL_END - -#pragma clang diagnostic pop diff --git a/Source/ASControlNode.mm b/Source/ASControlNode.mm index 08d4536d9..1256d2d62 100644 --- a/Source/ASControlNode.mm +++ b/Source/ASControlNode.mm @@ -33,7 +33,6 @@ @interface ASControlNode () // Control Attributes BOOL _enabled; BOOL _highlighted; - BOOL _selected; // Tracking BOOL _tracking; @@ -122,68 +121,6 @@ - (void)__exitHierarchy } } -#pragma mark - ASDisplayNode Overrides - -- (BOOL)isEnabled -{ - ASLockScopeSelf(); - return _enabled; -} - -- (void)setEnabled:(BOOL)enabled -{ - ASLockScopeSelf(); - _enabled = enabled; -} - -- (BOOL)isHighlighted -{ - ASLockScopeSelf(); - return _highlighted; -} - -- (void)setHighlighted:(BOOL)highlighted -{ - ASLockScopeSelf(); - _highlighted = highlighted; -} - -- (void)setSelected:(BOOL)selected -{ - ASLockScopeSelf(); - _selected = selected; -} - -- (BOOL)isSelected -{ - ASLockScopeSelf(); - return _selected; -} - -- (void)setTracking:(BOOL)tracking -{ - ASLockScopeSelf(); - _tracking = tracking; -} - -- (BOOL)isTracking -{ - ASLockScopeSelf(); - return _tracking; -} - -- (void)setTouchInside:(BOOL)touchInside -{ - ASLockScopeSelf(); - _touchInside = touchInside; -} - -- (BOOL)isTouchInside -{ - ASLockScopeSelf(); - return _touchInside; -} - #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wobjc-missing-super-calls" diff --git a/Source/ASDisplayNode.h b/Source/ASDisplayNode.h index 87f45972a..57d9cf7fc 100644 --- a/Source/ASDisplayNode.h +++ b/Source/ASDisplayNode.h @@ -20,9 +20,6 @@ #import #import -#pragma clang diagnostic push -#pragma clang diagnostic error "-Wobjc-missing-property-synthesis" - NS_ASSUME_NONNULL_BEGIN #define ASDisplayNodeLoggingEnabled 0 @@ -990,5 +987,3 @@ typedef NS_ENUM(NSInteger, ASLayoutEngineType) { @end NS_ASSUME_NONNULL_END - -#pragma clang diagnostic pop diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm index 5c8e529a2..b9c7106f5 100644 --- a/Source/ASDisplayNode.mm +++ b/Source/ASDisplayNode.mm @@ -2634,42 +2634,6 @@ - (BOOL)placeholderShouldPersist return NO; } -- (BOOL)placeholderEnabled -{ - MutexLocker l(__instanceLock__); - return _flags.placeholderEnabled; -} - -- (void)setPlaceholderEnabled:(BOOL)placeholderEnabled -{ - MutexLocker l(__instanceLock__); - _flags.placeholderEnabled = placeholderEnabled; -} - -- (NSTimeInterval)placeholderFadeDuration -{ - MutexLocker l(__instanceLock__); - return _placeholderFadeDuration; -} - -- (void)setPlaceholderFadeDuration:(NSTimeInterval)placeholderFadeDuration -{ - MutexLocker l(__instanceLock__); - _placeholderFadeDuration = placeholderFadeDuration; -} - -- (NSInteger)drawingPriority -{ - MutexLocker l(__instanceLock__); - return _drawingPriority; -} - -- (void)setDrawingPriority:(NSInteger)drawingPriority -{ - MutexLocker l(__instanceLock__); - _drawingPriority = drawingPriority; -} - #pragma mark - Hierarchy State - (BOOL)isInHierarchy diff --git a/Source/Private/ASDisplayNodeInternal.h b/Source/Private/ASDisplayNodeInternal.h index 2ac51600d..4c9796103 100644 --- a/Source/Private/ASDisplayNodeInternal.h +++ b/Source/Private/ASDisplayNodeInternal.h @@ -222,9 +222,6 @@ static constexpr CACornerMask kASCACornerAllCorners = // Placeholder support UIImage *_placeholderImage; CALayer *_placeholderLayer; - NSTimeInterval _placeholderFadeDuration; - - NSInteger _drawingPriority; // keeps track of nodes/subnodes that have not finished display, used with placeholders ASWeakSet *_pendingDisplayNodes;