From ad474fce8edd727dae0e26163b442f5b7430d34e Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Mon, 23 Feb 2015 14:17:31 -0800 Subject: [PATCH] Make project imports consistent --- AsyncDisplayKit.xcodeproj/project.pbxproj | 56 +++++++++---------- AsyncDisplayKit/ASCellNode.h | 1 + AsyncDisplayKit/ASCollectionView.h | 1 + AsyncDisplayKit/ASControlNode.h | 1 + AsyncDisplayKit/ASDisplayNode.h | 7 ++- AsyncDisplayKit/ASEditableTextNode.h | 1 + AsyncDisplayKit/ASImageNode.h | 1 + AsyncDisplayKit/ASMultiplexImageNode.h | 1 + AsyncDisplayKit/ASNetworkImageNode.h | 1 + AsyncDisplayKit/ASScrollNode.h | 3 +- AsyncDisplayKit/ASTableView.h | 1 + AsyncDisplayKit/ASTextNode.h | 1 + .../Details/ASBasicImageDownloader.h | 1 + AsyncDisplayKit/Details/ASDataController.h | 1 + .../Details/ASDealloc2MainObject.h | 1 + .../Details/ASFlowLayoutController.h | 1 + .../Details/ASHighlightOverlayLayer.h | 1 + AsyncDisplayKit/Details/ASImageProtocols.h | 1 + AsyncDisplayKit/Details/ASLayoutController.h | 1 + .../Details/ASMultidimensionalArrayUtils.h | 3 +- .../ASMutableAttributedStringBuilder.h | 1 + AsyncDisplayKit/Details/ASRangeController.h | 1 + .../Details/ASTextNodeCoreTextAdditions.h | 1 + AsyncDisplayKit/Details/ASTextNodeRenderer.h | 1 + AsyncDisplayKit/Details/ASTextNodeShadower.h | 1 + .../Details/ASTextNodeTextKitHelpers.h | 1 + .../Details/ASTextNodeWordKerner.h | 1 + AsyncDisplayKit/Details/ASThread.h | 3 +- ...MutableAttributedString+TextKitAdditions.h | 1 + .../Transactions/_ASAsyncTransaction.h | 1 + .../_ASAsyncTransactionContainer+Private.h | 3 +- .../_ASAsyncTransactionContainer.h | 3 +- .../Transactions/_ASAsyncTransactionGroup.h | 1 + .../Details/UIView+ASConvenience.h | 1 + AsyncDisplayKit/Details/_ASDisplayLayer.h | 1 + AsyncDisplayKit/Details/_ASDisplayView.h | 1 + 36 files changed, 70 insertions(+), 37 deletions(-) diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 4ec32bbb72..05a9ebf937 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -186,7 +186,6 @@ 051943141A1575670030A7D0 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; }; 052EE0651A159FEF002C6279 /* ASMultiplexImageNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASMultiplexImageNodeTests.m; sourceTree = ""; }; 052EE06A1A15A0D8002C6279 /* TestResources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = TestResources; sourceTree = ""; }; - 053011A719B9882B00A9F2D0 /* ASRangeControllerInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASRangeControllerInternal.h; sourceTree = ""; }; 054963471A1EA066000F8E56 /* ASBasicImageDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBasicImageDownloader.h; sourceTree = ""; }; 054963481A1EA066000F8E56 /* ASBasicImageDownloader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBasicImageDownloader.mm; sourceTree = ""; }; 055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASNetworkImageNode.h; sourceTree = ""; }; @@ -368,17 +367,19 @@ 058D09B1195D04C000B7D73C /* AsyncDisplayKit */ = { isa = PBXGroup; children = ( - 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */, + 055F1A3A19ABD43F004DAFF1 /* ASCellNode.h */, + 055F1A3B19ABD43F004DAFF1 /* ASCellNode.m */, + AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */, + AC3C4A501A1139C100143C57 /* ASCollectionView.mm */, + AC3C4A531A113EEC00143C57 /* ASCollectionViewProtocols.h */, + 058D09D5195D050800B7D73C /* ASControlNode.h */, + 058D09D6195D050800B7D73C /* ASControlNode.m */, + 058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */, 058D09D8195D050800B7D73C /* ASDisplayNode.h */, 058D09D9195D050800B7D73C /* ASDisplayNode.mm */, 058D09DA195D050800B7D73C /* ASDisplayNode+Subclasses.h */, 058D09DB195D050800B7D73C /* ASDisplayNodeExtras.h */, 058D09DC195D050800B7D73C /* ASDisplayNodeExtras.mm */, - 058D09D5195D050800B7D73C /* ASControlNode.h */, - 058D09D6195D050800B7D73C /* ASControlNode.m */, - 058D09D7195D050800B7D73C /* ASControlNode+Subclasses.h */, - 058D09DF195D050800B7D73C /* ASTextNode.h */, - 058D09E0195D050800B7D73C /* ASTextNode.mm */, 0587F9BB1A7309ED00AFF0BA /* ASEditableTextNode.h */, 0587F9BC1A7309ED00AFF0BA /* ASEditableTextNode.mm */, 058D09DD195D050800B7D73C /* ASImageNode.h */, @@ -387,16 +388,14 @@ 0516FA3F1A1563D200B4EBED /* ASMultiplexImageNode.mm */, 055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */, 055B9FA71A1C154B00035D6D /* ASNetworkImageNode.mm */, - 055F1A3219ABD3E3004DAFF1 /* ASTableView.h */, - 0574D5E119C110610097DC25 /* ASTableViewProtocols.h */, - 055F1A3319ABD3E3004DAFF1 /* ASTableView.mm */, - AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */, - AC3C4A531A113EEC00143C57 /* ASCollectionViewProtocols.h */, - AC3C4A501A1139C100143C57 /* ASCollectionView.mm */, - 055F1A3A19ABD43F004DAFF1 /* ASCellNode.h */, - 055F1A3B19ABD43F004DAFF1 /* ASCellNode.m */, D785F6601A74327E00291744 /* ASScrollNode.h */, D785F6611A74327E00291744 /* ASScrollNode.m */, + 055F1A3219ABD3E3004DAFF1 /* ASTableView.h */, + 055F1A3319ABD3E3004DAFF1 /* ASTableView.mm */, + 0574D5E119C110610097DC25 /* ASTableViewProtocols.h */, + 058D09DF195D050800B7D73C /* ASTextNode.h */, + 058D09E0195D050800B7D73C /* ASTextNode.mm */, + 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */, 058D09E1195D050800B7D73C /* Details */, 058D0A01195D050800B7D73C /* Private */, 058D09B2195D04C000B7D73C /* Supporting Files */, @@ -448,24 +447,28 @@ 058D09E1195D050800B7D73C /* Details */ = { isa = PBXGroup; children = ( - 464052191A3F83C40061C0BA /* ASDataController.h */, - 4640521A1A3F83C40061C0BA /* ASDataController.mm */, - 4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */, - 4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */, - 4640521D1A3F83C40061C0BA /* ASLayoutController.h */, - 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */, - 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */, - 05F20AA31A15733C00DCA68A /* ASImageProtocols.h */, 058D09E2195D050800B7D73C /* _ASDisplayLayer.h */, 058D09E3195D050800B7D73C /* _ASDisplayLayer.mm */, 058D09E4195D050800B7D73C /* _ASDisplayView.h */, 058D09E5195D050800B7D73C /* _ASDisplayView.mm */, 054963471A1EA066000F8E56 /* ASBasicImageDownloader.h */, 054963481A1EA066000F8E56 /* ASBasicImageDownloader.mm */, + 464052191A3F83C40061C0BA /* ASDataController.h */, + 4640521A1A3F83C40061C0BA /* ASDataController.mm */, + 05A6D05819D0EB64002DD95E /* ASDealloc2MainObject.h */, + 05A6D05919D0EB64002DD95E /* ASDealloc2MainObject.m */, + 4640521B1A3F83C40061C0BA /* ASFlowLayoutController.h */, + 4640521C1A3F83C40061C0BA /* ASFlowLayoutController.mm */, 058D09E6195D050800B7D73C /* ASHighlightOverlayLayer.h */, 058D09E7195D050800B7D73C /* ASHighlightOverlayLayer.mm */, + 05F20AA31A15733C00DCA68A /* ASImageProtocols.h */, + 4640521D1A3F83C40061C0BA /* ASLayoutController.h */, + 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */, + 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */, 058D09E8195D050800B7D73C /* ASMutableAttributedStringBuilder.h */, 058D09E9195D050800B7D73C /* ASMutableAttributedStringBuilder.m */, + 055F1A3619ABD413004DAFF1 /* ASRangeController.h */, + 055F1A3719ABD413004DAFF1 /* ASRangeController.mm */, 058D09EA195D050800B7D73C /* ASTextNodeCoreTextAdditions.h */, 058D09EB195D050800B7D73C /* ASTextNodeCoreTextAdditions.m */, 058D09EC195D050800B7D73C /* ASTextNodeRenderer.h */, @@ -476,17 +479,13 @@ 058D09F1195D050800B7D73C /* ASTextNodeTextKitHelpers.mm */, 058D09F2195D050800B7D73C /* ASTextNodeTypes.h */, 058D09F3195D050800B7D73C /* ASTextNodeWordKerner.h */, - 058D0A12195D050800B7D73C /* ASThread.h */, 058D09F4195D050800B7D73C /* ASTextNodeWordKerner.m */, + 058D0A12195D050800B7D73C /* ASThread.h */, 058D09F5195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.h */, 058D09F6195D050800B7D73C /* NSMutableAttributedString+TextKitAdditions.m */, - 055F1A3619ABD413004DAFF1 /* ASRangeController.h */, - 055F1A3719ABD413004DAFF1 /* ASRangeController.mm */, 058D09F7195D050800B7D73C /* Transactions */, 058D09FF195D050800B7D73C /* UIView+ASConvenience.h */, 058D0A00195D050800B7D73C /* UIView+ASConvenience.m */, - 05A6D05819D0EB64002DD95E /* ASDealloc2MainObject.h */, - 05A6D05919D0EB64002DD95E /* ASDealloc2MainObject.m */, ); path = Details; sourceTree = ""; @@ -521,7 +520,6 @@ 058D0A0C195D050800B7D73C /* ASDisplayNodeInternal.h */, 058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */, 058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.m */, - 053011A719B9882B00A9F2D0 /* ASRangeControllerInternal.h */, 058D0A10195D050800B7D73C /* ASSentinel.h */, 058D0A11195D050800B7D73C /* ASSentinel.m */, ); diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 41a4dfcbc7..1893f92a30 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -8,6 +8,7 @@ #import + /** * Generic cell node. Subclass ASCellNode instead of to use . */ diff --git a/AsyncDisplayKit/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h index 9f83a3046c..6598dc9b2b 100644 --- a/AsyncDisplayKit/ASCollectionView.h +++ b/AsyncDisplayKit/ASCollectionView.h @@ -11,6 +11,7 @@ #import #import + @class ASCellNode; @protocol ASCollectionViewDataSource; @protocol ASCollectionViewDelegate; diff --git a/AsyncDisplayKit/ASControlNode.h b/AsyncDisplayKit/ASControlNode.h index c31d73f08a..b94bb77227 100644 --- a/AsyncDisplayKit/ASControlNode.h +++ b/AsyncDisplayKit/ASControlNode.h @@ -8,6 +8,7 @@ #import + /** @abstract Kinds of events possible for control nodes. @discussion These events are identical to their UIControl counterparts. diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 2681bf2682..2770ae75e3 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -8,9 +8,10 @@ #import -#import "_ASAsyncTransactionContainer.h" -#import "ASBaseDefines.h" -#import "ASDealloc2MainObject.h" +#import +#import +#import + typedef UIView *(^ASDisplayNodeViewBlock)(); typedef CALayer *(^ASDisplayNodeLayerBlock)(); diff --git a/AsyncDisplayKit/ASEditableTextNode.h b/AsyncDisplayKit/ASEditableTextNode.h index 129bfc4679..11cfaf8405 100644 --- a/AsyncDisplayKit/ASEditableTextNode.h +++ b/AsyncDisplayKit/ASEditableTextNode.h @@ -8,6 +8,7 @@ #import + @protocol ASEditableTextNodeDelegate; //! @abstract ASEditableTextNode implements a node that supports text editing. diff --git a/AsyncDisplayKit/ASImageNode.h b/AsyncDisplayKit/ASImageNode.h index b04712bdb9..f9bf3d45ba 100644 --- a/AsyncDisplayKit/ASImageNode.h +++ b/AsyncDisplayKit/ASImageNode.h @@ -8,6 +8,7 @@ #import + /** * Image tints. */ diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h index 308eedd144..c62f7c3153 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.h +++ b/AsyncDisplayKit/ASMultiplexImageNode.h @@ -9,6 +9,7 @@ #import #import + @protocol ASMultiplexImageNodeDelegate; @protocol ASMultiplexImageNodeDataSource; diff --git a/AsyncDisplayKit/ASNetworkImageNode.h b/AsyncDisplayKit/ASNetworkImageNode.h index e6ed744184..7039004c95 100644 --- a/AsyncDisplayKit/ASNetworkImageNode.h +++ b/AsyncDisplayKit/ASNetworkImageNode.h @@ -9,6 +9,7 @@ #import #import + @protocol ASNetworkImageNodeDelegate; diff --git a/AsyncDisplayKit/ASScrollNode.h b/AsyncDisplayKit/ASScrollNode.h index bd5e4d8f05..a53090bd8f 100644 --- a/AsyncDisplayKit/ASScrollNode.h +++ b/AsyncDisplayKit/ASScrollNode.h @@ -6,9 +6,10 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +#import + #import -#import /** * Simple node that wraps UIScrollView. diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h index faf1b29cc4..30f974b80f 100644 --- a/AsyncDisplayKit/ASTableView.h +++ b/AsyncDisplayKit/ASTableView.h @@ -11,6 +11,7 @@ #import #import + @class ASCellNode; @protocol ASTableViewDataSource; @protocol ASTableViewDelegate; diff --git a/AsyncDisplayKit/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h index 4e00abe8f4..b0b80f9d13 100644 --- a/AsyncDisplayKit/ASTextNode.h +++ b/AsyncDisplayKit/ASTextNode.h @@ -8,6 +8,7 @@ #import + @protocol ASTextNodeDelegate; /** diff --git a/AsyncDisplayKit/Details/ASBasicImageDownloader.h b/AsyncDisplayKit/Details/ASBasicImageDownloader.h index 12e9ed9b76..2d96296280 100644 --- a/AsyncDisplayKit/Details/ASBasicImageDownloader.h +++ b/AsyncDisplayKit/Details/ASBasicImageDownloader.h @@ -8,6 +8,7 @@ #import + /** * @abstract Simple NSURLSession-based image downloader. */ diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h index f271066d44..3d8d85fd9f 100644 --- a/AsyncDisplayKit/Details/ASDataController.h +++ b/AsyncDisplayKit/Details/ASDataController.h @@ -3,6 +3,7 @@ #import #import + @class ASCellNode; @class ASDataController; diff --git a/AsyncDisplayKit/Details/ASDealloc2MainObject.h b/AsyncDisplayKit/Details/ASDealloc2MainObject.h index 0bedeaa9d6..06c298a541 100644 --- a/AsyncDisplayKit/Details/ASDealloc2MainObject.h +++ b/AsyncDisplayKit/Details/ASDealloc2MainObject.h @@ -8,6 +8,7 @@ #import + /** * _OBJC_SUPPORTED_INLINE_REFCNT_WITH_DEALLOC2MAIN permits classes to implement their own reference counting and enforce * deallocation on the main thread, but requires manual reference counting. This superclass exposes such functionality diff --git a/AsyncDisplayKit/Details/ASFlowLayoutController.h b/AsyncDisplayKit/Details/ASFlowLayoutController.h index 45fefaa6ad..6593761632 100644 --- a/AsyncDisplayKit/Details/ASFlowLayoutController.h +++ b/AsyncDisplayKit/Details/ASFlowLayoutController.h @@ -2,6 +2,7 @@ #import + typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) { ASFlowLayoutDirectionVertical, ASFlowLayoutDirectionHorizontal, diff --git a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h index af84bfd5d6..6b7c236f34 100644 --- a/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h +++ b/AsyncDisplayKit/Details/ASHighlightOverlayLayer.h @@ -8,6 +8,7 @@ #import + @interface ASHighlightOverlayLayer : CALayer /** diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h index efab16ffb0..e1f843e996 100644 --- a/AsyncDisplayKit/Details/ASImageProtocols.h +++ b/AsyncDisplayKit/Details/ASImageProtocols.h @@ -9,6 +9,7 @@ #import #import + @protocol ASImageCacheProtocol @required diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index d6998bb1b8..f55e36edf7 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -2,6 +2,7 @@ #import + typedef struct { CGFloat leadingBufferScreenfuls; CGFloat trailingBufferScreenfuls; diff --git a/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h b/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h index 3b7f2ada6a..1a3c2ed2f2 100644 --- a/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h +++ b/AsyncDisplayKit/Details/ASMultidimensionalArrayUtils.h @@ -2,7 +2,8 @@ #import -#import "ASBaseDefines.h" +#import + /** * Helper class for operation on multidimensional array, where the object of array may be an object or an array. diff --git a/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h b/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h index f801e28961..99d7c9adb3 100644 --- a/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h +++ b/AsyncDisplayKit/Details/ASMutableAttributedStringBuilder.h @@ -8,6 +8,7 @@ #import + /* * Use this class to compose new attributed strings. You may use the normal * attributed string calls on this the same way you would on a normal mutable diff --git a/AsyncDisplayKit/Details/ASRangeController.h b/AsyncDisplayKit/Details/ASRangeController.h index 0684d92ca6..1675b56c80 100644 --- a/AsyncDisplayKit/Details/ASRangeController.h +++ b/AsyncDisplayKit/Details/ASRangeController.h @@ -13,6 +13,7 @@ #import #import + @protocol ASRangeControllerDelegate; diff --git a/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h b/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h index 5e9afde6b4..ce74957e22 100644 --- a/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h +++ b/AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.h @@ -11,6 +11,7 @@ #import + ASDISPLAYNODE_EXTERN_C_BEGIN /** @abstract Returns whether a given attribute is an unsupported Core Text attribute. diff --git a/AsyncDisplayKit/Details/ASTextNodeRenderer.h b/AsyncDisplayKit/Details/ASTextNodeRenderer.h index 1e2d78a56c..dd57a99421 100644 --- a/AsyncDisplayKit/Details/ASTextNodeRenderer.h +++ b/AsyncDisplayKit/Details/ASTextNodeRenderer.h @@ -8,6 +8,7 @@ #import + typedef void (^as_renderer_index_block_t)(NSUInteger characterIndex, CGRect glyphBoundingRect, BOOL *stop); diff --git a/AsyncDisplayKit/Details/ASTextNodeShadower.h b/AsyncDisplayKit/Details/ASTextNodeShadower.h index 1cd180fcd5..59744897cc 100644 --- a/AsyncDisplayKit/Details/ASTextNodeShadower.h +++ b/AsyncDisplayKit/Details/ASTextNodeShadower.h @@ -9,6 +9,7 @@ #import #import + /** * @abstract Negates/inverts a UIEdgeInsets. * @discussion Useful for undoing the application of shadow padding to a frame/bounds CGRect. diff --git a/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h b/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h index 771c8ef775..22fc9efb08 100644 --- a/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h +++ b/AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h @@ -11,6 +11,7 @@ #import #import + @interface ASTextKitComponents : NSObject /** diff --git a/AsyncDisplayKit/Details/ASTextNodeWordKerner.h b/AsyncDisplayKit/Details/ASTextNodeWordKerner.h index 41c5b7a29f..1be6390c31 100644 --- a/AsyncDisplayKit/Details/ASTextNodeWordKerner.h +++ b/AsyncDisplayKit/Details/ASTextNodeWordKerner.h @@ -9,6 +9,7 @@ #import #import + /** @abstract This class acts as the NSLayoutManagerDelegate for ASTextNode. @discussion Its current job is word kerning, i.e. adjusting the width of spaces to match the set diff --git a/AsyncDisplayKit/Details/ASThread.h b/AsyncDisplayKit/Details/ASThread.h index 8025d3fd50..121756bca9 100644 --- a/AsyncDisplayKit/Details/ASThread.h +++ b/AsyncDisplayKit/Details/ASThread.h @@ -13,10 +13,11 @@ #import #import +#import + #import #import -#import static inline BOOL ASDisplayNodeThreadIsMain() { diff --git a/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h b/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h index 5754011c08..8810ba3524 100644 --- a/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h +++ b/AsyncDisplayKit/Details/NSMutableAttributedString+TextKitAdditions.h @@ -8,6 +8,7 @@ #import + @interface NSMutableAttributedString (TextKitAdditions) - (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight; diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h index 2bab65bb4a..1558766c40 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransaction.h @@ -8,6 +8,7 @@ #import + @class _ASAsyncTransaction; typedef void(^asyncdisplaykit_async_transaction_completion_block_t)(_ASAsyncTransaction *completedTransaction, BOOL canceled); diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer+Private.h b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer+Private.h index adec5431c4..32421c2543 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer+Private.h +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer+Private.h @@ -6,7 +6,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "_ASAsyncTransactionContainer.h" +#import + @interface CALayer (ASAsyncTransactionContainerTransactions) @property (nonatomic, retain, setter=asyncdisplaykit_setAsyncLayerTransactions:) NSHashTable *asyncdisplaykit_asyncLayerTransactions; diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer.h b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer.h index 74e0d055d6..628d461a39 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer.h +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionContainer.h @@ -6,9 +6,10 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import #import + @class _ASAsyncTransaction; typedef NS_ENUM(NSUInteger, ASAsyncTransactionContainerState) { diff --git a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.h b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.h index 414465f0da..235e98a1cf 100644 --- a/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.h +++ b/AsyncDisplayKit/Details/Transactions/_ASAsyncTransactionGroup.h @@ -8,6 +8,7 @@ #import + @class _ASAsyncTransaction; /// A group of transaction container layers, for which the current transactions are committed together at the end of the next runloop tick. diff --git a/AsyncDisplayKit/Details/UIView+ASConvenience.h b/AsyncDisplayKit/Details/UIView+ASConvenience.h index 5c4da6c2b5..2b7df0c476 100644 --- a/AsyncDisplayKit/Details/UIView+ASConvenience.h +++ b/AsyncDisplayKit/Details/UIView+ASConvenience.h @@ -8,6 +8,7 @@ #import + /** These are the properties we support from CALayer (implemented in the pending state) */ diff --git a/AsyncDisplayKit/Details/_ASDisplayLayer.h b/AsyncDisplayKit/Details/_ASDisplayLayer.h index 1fd3c4a730..6927348842 100644 --- a/AsyncDisplayKit/Details/_ASDisplayLayer.h +++ b/AsyncDisplayKit/Details/_ASDisplayLayer.h @@ -8,6 +8,7 @@ #import + @class ASSentinel; @protocol _ASDisplayLayerDelegate; diff --git a/AsyncDisplayKit/Details/_ASDisplayView.h b/AsyncDisplayKit/Details/_ASDisplayView.h index b6adce64c8..940ddd6630 100644 --- a/AsyncDisplayKit/Details/_ASDisplayView.h +++ b/AsyncDisplayKit/Details/_ASDisplayView.h @@ -8,6 +8,7 @@ #import + // This class is only for use by ASDisplayNode and should never be subclassed or used directly. // Note that the "node" property is added to UIView directly via a category in ASDisplayNode.