Skip to content

Fix block declaration warning for Xcode 9 #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skunkworks wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix block declaration warning for Xcode 9 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions SlideMenu/Source/SlideNavigationController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ extern NSString *const SlideNavigationControllerDidReveal;
@property (nonatomic, strong) id <SlideNavigationContorllerAnimator> menuRevealAnimator;

+ (SlideNavigationController *)sharedInstance;
- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion __deprecated;
- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)())completion;
- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion;
- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)())completion;
- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion;
- (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion;
- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion;
- (void)closeMenuWithCompletion:(void (^)())completion;
- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion __deprecated;
- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)(void))completion;
- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion;
- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withSlideOutAnimation:(BOOL)slideOutAnimation andCompletion:(void (^)(void))completion;
- (void)popAllAndSwitchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion;
- (void)bounceMenu:(Menu)menu withCompletion:(void (^)(void))completion;
- (void)openMenu:(Menu)menu withCompletion:(void (^)(void))completion;
- (void)closeMenuWithCompletion:(void (^)(void))completion;
- (void)toggleLeftMenu;
- (void)toggleRightMenu;
- (BOOL)isMenuOpen;
Expand Down
24 changes: 12 additions & 12 deletions SlideMenu/Source/SlideNavigationController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrie

#pragma mark - Public Methods -

- (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion
- (void)bounceMenu:(Menu)menu withCompletion:(void (^)(void))completion
{
[self prepareMenuForReveal:menu];
NSInteger movementDirection = (menu == MenuLeft) ? 1 : -1;
Expand Down Expand Up @@ -210,7 +210,7 @@ - (void)bounceMenu:(Menu)menu withCompletion:(void (^)())completion
- (void)switchToViewController:(UIViewController *)viewController
withSlideOutAnimation:(BOOL)slideOutAnimation
popType:(PopType)poptype
andCompletion:(void (^)())completion
andCompletion:(void (^)(void))completion
{
if (self.avoidSwitchingToSameClassViewController && [self.topViewController isKindOfClass:viewController.class])
{
Expand Down Expand Up @@ -267,43 +267,43 @@ - (void)switchToViewController:(UIViewController *)viewController
}
}

- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion
- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)(void))completion
{
[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
}

- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
withSlideOutAnimation:(BOOL)slideOutAnimation
andCompletion:(void (^)())completion
andCompletion:(void (^)(void))completion
{
[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeRoot andCompletion:completion];
}

- (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
withCompletion:(void (^)())completion
withCompletion:(void (^)(void))completion
{
[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
}

- (void)popAllAndSwitchToViewController:(UIViewController *)viewController
withSlideOutAnimation:(BOOL)slideOutAnimation
andCompletion:(void (^)())completion
andCompletion:(void (^)(void))completion
{
[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeAll andCompletion:completion];
}

- (void)popAllAndSwitchToViewController:(UIViewController *)viewController
withCompletion:(void (^)())completion
withCompletion:(void (^)(void))completion
{
[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeAll andCompletion:completion];
}

- (void)closeMenuWithCompletion:(void (^)())completion
- (void)closeMenuWithCompletion:(void (^)(void))completion
{
[self closeMenuWithDuration:self.menuRevealAnimationDuration andCompletion:completion];
}

- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion
- (void)openMenu:(Menu)menu withCompletion:(void (^)(void))completion
{
[self openMenu:menu withDuration:self.menuRevealAnimationDuration andCompletion:completion];
}
Expand Down Expand Up @@ -424,7 +424,7 @@ - (void)enableTapGestureToCloseMenu:(BOOL)enable
}
}

- (void)toggleMenu:(Menu)menu withCompletion:(void (^)())completion
- (void)toggleMenu:(Menu)menu withCompletion:(void (^)(void))completion
{
if ([self isMenuOpen])
[self closeMenuWithCompletion:completion];
Expand Down Expand Up @@ -473,7 +473,7 @@ - (BOOL)shouldDisplayMenu:(Menu)menu forViewController:(UIViewController *)vc
return NO;
}

- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)())completion
- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)(void))completion
{
[self enableTapGestureToCloseMenu:YES];

Expand All @@ -496,7 +496,7 @@ - (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)
}];
}

- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completion
- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)(void))completion
{
[self enableTapGestureToCloseMenu:NO];

Expand Down