From 20ee9bca8d0bb11e206ae05de9571e7587de75a8 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Thu, 31 Mar 2016 20:42:22 -0700 Subject: [PATCH] Rename ASEnvironmentStateCreate to ASEnvironmentStateMakeDefault --- AsyncDisplayKit/ASDisplayNode.mm | 2 +- AsyncDisplayKit/Details/ASEnvironment.h | 2 +- AsyncDisplayKit/Details/ASEnvironment.m | 10 +++++----- AsyncDisplayKit/Layout/ASLayoutSpec.mm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 850d0a46aa..0d0b362b85 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -253,7 +253,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c) _displaySentinel = [[ASSentinel alloc] init]; _preferredFrameSize = CGSizeZero; - _environmentState = ASEnvironmentStateCreate(); + _environmentState = ASEnvironmentStateMakeDefault(); } - (id)init diff --git a/AsyncDisplayKit/Details/ASEnvironment.h b/AsyncDisplayKit/Details/ASEnvironment.h index 62e352fb52..20837d4aa4 100644 --- a/AsyncDisplayKit/Details/ASEnvironment.h +++ b/AsyncDisplayKit/Details/ASEnvironment.h @@ -66,7 +66,7 @@ typedef struct ASEnvironmentState { struct ASEnvironmentHierarchyState hierarchyState; struct ASEnvironmentLayoutOptionsState layoutOptionsState; } ASEnvironmentState; -extern ASEnvironmentState ASEnvironmentStateCreate(); +extern ASEnvironmentState ASEnvironmentStateMakeDefault(); ASDISPLAYNODE_EXTERN_C_END diff --git a/AsyncDisplayKit/Details/ASEnvironment.m b/AsyncDisplayKit/Details/ASEnvironment.m index 01006405d4..f3b2039f8f 100644 --- a/AsyncDisplayKit/Details/ASEnvironment.m +++ b/AsyncDisplayKit/Details/ASEnvironment.m @@ -10,24 +10,24 @@ #import "ASEnvironment.h" -ASEnvironmentLayoutOptionsState _ASEnvironmentLayoutOptionsStateCreate() +ASEnvironmentLayoutOptionsState _ASEnvironmentLayoutOptionsStateMakeDefault() { return (ASEnvironmentLayoutOptionsState) { // Default values can be defined in here }; } -ASEnvironmentHierarchyState _ASEnvironmentHierarchyStateCreate() +ASEnvironmentHierarchyState _ASEnvironmentHierarchyStateMakeDefault() { return (ASEnvironmentHierarchyState) { // Default values can be defined in here }; } -ASEnvironmentState ASEnvironmentStateCreate() +ASEnvironmentState ASEnvironmentStateMakeDefault() { return (ASEnvironmentState) { - .layoutOptionsState = _ASEnvironmentLayoutOptionsStateCreate(), - .hierarchyState = _ASEnvironmentHierarchyStateCreate() + .layoutOptionsState = _ASEnvironmentLayoutOptionsStateMakeDefault(), + .hierarchyState = _ASEnvironmentHierarchyStateMakeDefault() }; } \ No newline at end of file diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index 72904044ff..c61e7a966f 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -44,7 +44,7 @@ static NSString * const kDefaultChildrenKey = @"kDefaultChildrenKey"; return nil; } _isMutable = YES; - _environmentState = ASEnvironmentStateCreate(); + _environmentState = ASEnvironmentStateMakeDefault(); return self; }