diff options
| author | Abhi Beckert <abhi@Twist-of-Lemon-2.local> | 2015-05-16 08:06:06 +1000 |
|---|---|---|
| committer | Abhi Beckert <abhi@Twist-of-Lemon-2.local> | 2015-05-16 08:06:06 +1000 |
| commit | 57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch) | |
| tree | dd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPSplitView.m | |
| parent | b5e972f4504043dfb9c358e272e93fb59ae2127f (diff) | |
| parent | 0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff) | |
| download | sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2 sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip | |
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPSplitView.m')
| -rw-r--r-- | Source/SPSplitView.m | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/SPSplitView.m b/Source/SPSplitView.m index 9d5b59d8..ed87f3c0 100644 --- a/Source/SPSplitView.m +++ b/Source/SPSplitView.m @@ -105,11 +105,11 @@ - (void)dealloc { - [viewMinimumSizes release]; - [viewMaximumSizes release]; + SPClear(viewMinimumSizes); + SPClear(viewMaximumSizes); - if (animationTimer) [animationTimer invalidate], [animationTimer release], animationTimer = nil; - if (animationRetainCycleBypassObject) [animationRetainCycleBypassObject release], animationRetainCycleBypassObject = nil; + if (animationTimer) [animationTimer invalidate], SPClear(animationTimer); + if (animationRetainCycleBypassObject) SPClear(animationRetainCycleBypassObject); [[NSNotificationCenter defaultCenter] removeObserver:self]; [super dealloc]; @@ -233,8 +233,8 @@ // Otherwise, start an animation. } else { - if (animationTimer) [animationTimer invalidate], [animationTimer release], animationTimer = nil; - if (animationRetainCycleBypassObject) [animationRetainCycleBypassObject release], animationRetainCycleBypassObject = nil; + if (animationTimer) [animationTimer invalidate], SPClear(animationTimer); + if (animationRetainCycleBypassObject) SPClear(animationRetainCycleBypassObject); animationStartTime = [NSDate monotonicTimeInterval]; // Determine the animation length, in seconds, starting with a quarter of a second @@ -853,8 +853,8 @@ // If the animation has reached the end, ensure completion tasks are run if (animationProgress == 1) { - if (animationTimer) [animationTimer invalidate], [animationTimer release], animationTimer = nil; - if (animationRetainCycleBypassObject) [animationRetainCycleBypassObject release], animationRetainCycleBypassObject = nil; + if (animationTimer) [animationTimer invalidate], SPClear(animationTimer); + if (animationRetainCycleBypassObject) SPClear(animationRetainCycleBypassObject); // If uncollapsing, restore the original view and remove the helper if (!collapsibleSubviewCollapsed) { @@ -1132,12 +1132,12 @@ [[wrappedView window] makeFirstResponder:firstResponderToRestore]; } - [wrappedView release], wrappedView = nil; + SPClear(wrappedView); } - (void)dealloc { - if (wrappedView) [wrappedView release], wrappedView = nil; + if (wrappedView) SPClear(wrappedView); [super dealloc]; } |