Skip to content

Commit e257c1e

Browse files
committed
Remove method definitions that are not necessary in modern Obj-C
1 parent f83739b commit e257c1e

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

SVWebViewController/SVWebViewController.m

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ @interface SVWebViewController () <UIWebViewDelegate>
2121
@property (nonatomic, strong) UIWebView *webView;
2222
@property (nonatomic, strong) NSURLRequest *request;
2323

24-
- (void)loadRequest:(NSURLRequest*)request;
25-
26-
- (void)updateToolbarItems;
27-
28-
- (void)goBackClicked:(UIBarButtonItem *)sender;
29-
- (void)goForwardClicked:(UIBarButtonItem *)sender;
30-
- (void)reloadClicked:(UIBarButtonItem *)sender;
31-
- (void)stopClicked:(UIBarButtonItem *)sender;
32-
- (void)actionButtonClicked:(UIBarButtonItem *)sender;
33-
3424
@end
3525

3626

@@ -135,7 +125,7 @@ - (UIBarButtonItem *)backBarButtonItem {
135125
_backBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"SVWebViewController.bundle/SVWebViewControllerBack"]
136126
style:UIBarButtonItemStylePlain
137127
target:self
138-
action:@selector(goBackClicked:)];
128+
action:@selector(goBackTapped:)];
139129
_backBarButtonItem.width = 18.0f;
140130
}
141131
return _backBarButtonItem;
@@ -146,29 +136,29 @@ - (UIBarButtonItem *)forwardBarButtonItem {
146136
_forwardBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"SVWebViewController.bundle/SVWebViewControllerNext"]
147137
style:UIBarButtonItemStylePlain
148138
target:self
149-
action:@selector(goForwardClicked:)];
139+
action:@selector(goForwardTapped:)];
150140
_forwardBarButtonItem.width = 18.0f;
151141
}
152142
return _forwardBarButtonItem;
153143
}
154144

155145
- (UIBarButtonItem *)refreshBarButtonItem {
156146
if (!_refreshBarButtonItem) {
157-
_refreshBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(reloadClicked:)];
147+
_refreshBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(reloadTapped:)];
158148
}
159149
return _refreshBarButtonItem;
160150
}
161151

162152
- (UIBarButtonItem *)stopBarButtonItem {
163153
if (!_stopBarButtonItem) {
164-
_stopBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(stopClicked:)];
154+
_stopBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(stopTapped:)];
165155
}
166156
return _stopBarButtonItem;
167157
}
168158

169159
- (UIBarButtonItem *)actionBarButtonItem {
170160
if (!_actionBarButtonItem) {
171-
_actionBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonClicked:)];
161+
_actionBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonTapped:)];
172162
}
173163
return _actionBarButtonItem;
174164
}
@@ -250,24 +240,24 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
250240

251241
#pragma mark - Target actions
252242

253-
- (void)goBackClicked:(UIBarButtonItem *)sender {
243+
- (void)goBackTapped:(UIBarButtonItem *)sender {
254244
[self.webView goBack];
255245
}
256246

257-
- (void)goForwardClicked:(UIBarButtonItem *)sender {
247+
- (void)goForwardTapped:(UIBarButtonItem *)sender {
258248
[self.webView goForward];
259249
}
260250

261-
- (void)reloadClicked:(UIBarButtonItem *)sender {
251+
- (void)reloadTapped:(UIBarButtonItem *)sender {
262252
[self.webView reload];
263253
}
264254

265-
- (void)stopClicked:(UIBarButtonItem *)sender {
255+
- (void)stopTapped:(UIBarButtonItem *)sender {
266256
[self.webView stopLoading];
267257
[self updateToolbarItems];
268258
}
269259

270-
- (void)actionButtonClicked:(id)sender {
260+
- (void)actionButtonTapped:(id)sender {
271261
NSURL *url = self.webView.request.URL ? self.webView.request.URL : self.request.URL;
272262
if (url != nil) {
273263
NSArray *activities = @[[SVWebViewControllerActivitySafari new], [SVWebViewControllerActivityChrome new]];
@@ -282,7 +272,7 @@ - (void)actionButtonClicked:(id)sender {
282272
}
283273
}
284274

285-
- (void)doneButtonTapped:(id)sender {
275+
- (void)doneButtonTapped:(id)sùender {
286276
[self dismissViewControllerAnimated:YES completion:NULL];
287277
}
288278

0 commit comments

Comments
 (0)