ios / yh_sdwebimage · Commits

Go to a project

Authored by Bogdan Poplauschi
Committed by GitHub
Commit 8ac72a2bdb16282feebb5b8143eccf140c15d2e1 2 parents dbb2dcd2 cf0ec1a0

Merge pull request #1797 from skyline75489/quick-fix-for-swift3 

Fix #1764 Swift naming collision
Inline Side-by-side
Showing 5 changed files with 23 additions and 23 deletions
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 * 31 *
32 * @param url The url for the image. 32 * @param url The url for the image.
33 */ 33 */
34 -- (void)sd_setImageWithURL:(nullable NSURL *)url; 34 +- (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
35 35
36 /** 36 /**
37 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images 37 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 * @param placeholder The image to be set initially, until the image request finishes. 42 * @param placeholder The image to be set initially, until the image request finishes.
43 */ 43 */
44 - (void)sd_setImageWithURL:(nullable NSURL *)url 44 - (void)sd_setImageWithURL:(nullable NSURL *)url
45 - placeholderImage:(nullable UIImage *)placeholder; 45 + placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
46 46
47 /** 47 /**
48 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images 48 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 */ 55 */
56 - (void)sd_setImageWithURL:(nullable NSURL *)url 56 - (void)sd_setImageWithURL:(nullable NSURL *)url
57 placeholderImage:(nullable UIImage *)placeholder 57 placeholderImage:(nullable UIImage *)placeholder
58 - options:(SDWebImageOptions)options; 58 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
59 59
60 /** 60 /**
61 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images 61 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 */ 86 */
87 - (void)sd_setImageWithURL:(nullable NSURL *)url 87 - (void)sd_setImageWithURL:(nullable NSURL *)url
88 placeholderImage:(nullable UIImage *)placeholder 88 placeholderImage:(nullable UIImage *)placeholder
89 - completed:(nullable SDExternalCompletionBlock)completedBlock; 89 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
90 90
91 /** 91 /**
92 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images 92 * Load the image at the given url (either from cache or download) and load it in this imageView. It works with both static and dynamic images
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 * 25 *
26 * @param url The url for the image. 26 * @param url The url for the image.
27 */ 27 */
28 -- (void)sd_setImageWithURL:(nullable NSURL *)url; 28 +- (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
29 29
30 /** 30 /**
31 * Set the imageView `image` with an `url` and a placeholder. 31 * Set the imageView `image` with an `url` and a placeholder.
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 * @see sd_setImageWithURL:placeholderImage:options: 37 * @see sd_setImageWithURL:placeholderImage:options:
38 */ 38 */
39 - (void)sd_setImageWithURL:(nullable NSURL *)url 39 - (void)sd_setImageWithURL:(nullable NSURL *)url
40 - placeholderImage:(nullable UIImage *)placeholder; 40 + placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
41 41
42 /** 42 /**
43 * Set the imageView `image` with an `url`, placeholder and custom options. 43 * Set the imageView `image` with an `url`, placeholder and custom options.
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 51
52 - (void)sd_setImageWithURL:(nullable NSURL *)url 52 - (void)sd_setImageWithURL:(nullable NSURL *)url
53 placeholderImage:(nullable UIImage *)placeholder 53 placeholderImage:(nullable UIImage *)placeholder
54 - options:(SDWebImageOptions)options; 54 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
55 55
56 /** 56 /**
57 * Set the imageView `image` with an `url`. 57 * Set the imageView `image` with an `url`.
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 */ 83 */
84 - (void)sd_setImageWithURL:(nullable NSURL *)url 84 - (void)sd_setImageWithURL:(nullable NSURL *)url
85 placeholderImage:(nullable UIImage *)placeholder 85 placeholderImage:(nullable UIImage *)placeholder
86 - completed:(nullable SDExternalCompletionBlock)completedBlock; 86 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
87 87
88 /** 88 /**
89 * Set the imageView `image` with an `url`, placeholder and custom options. 89 * Set the imageView `image` with an `url`, placeholder and custom options.
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 * @param state The state that uses the specified title. The values are described in UIControlState. 40 * @param state The state that uses the specified title. The values are described in UIControlState.
41 */ 41 */
42 - (void)sd_setImageWithURL:(nullable NSURL *)url 42 - (void)sd_setImageWithURL:(nullable NSURL *)url
43 - forState:(UIControlState)state; 43 + forState:(UIControlState)state NS_REFINED_FOR_SWIFT;
44 44
45 /** 45 /**
46 * Set the imageView `image` with an `url` and a placeholder. 46 * Set the imageView `image` with an `url` and a placeholder.
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 */ 54 */
55 - (void)sd_setImageWithURL:(nullable NSURL *)url 55 - (void)sd_setImageWithURL:(nullable NSURL *)url
56 forState:(UIControlState)state 56 forState:(UIControlState)state
57 - placeholderImage:(nullable UIImage *)placeholder; 57 + placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
58 58
59 /** 59 /**
60 * Set the imageView `image` with an `url`, placeholder and custom options. 60 * Set the imageView `image` with an `url`, placeholder and custom options.
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 - (void)sd_setImageWithURL:(nullable NSURL *)url 69 - (void)sd_setImageWithURL:(nullable NSURL *)url
70 forState:(UIControlState)state 70 forState:(UIControlState)state
71 placeholderImage:(nullable UIImage *)placeholder 71 placeholderImage:(nullable UIImage *)placeholder
72 - options:(SDWebImageOptions)options; 72 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
73 73
74 /** 74 /**
75 * Set the imageView `image` with an `url`. 75 * Set the imageView `image` with an `url`.
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 - (void)sd_setImageWithURL:(nullable NSURL *)url 105 - (void)sd_setImageWithURL:(nullable NSURL *)url
106 forState:(UIControlState)state 106 forState:(UIControlState)state
107 placeholderImage:(nullable UIImage *)placeholder 107 placeholderImage:(nullable UIImage *)placeholder
108 - completed:(nullable SDExternalCompletionBlock)completedBlock; 108 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
109 109
110 /** 110 /**
111 * Set the imageView `image` with an `url`, placeholder and custom options. 111 * Set the imageView `image` with an `url`, placeholder and custom options.
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 * @param state The state that uses the specified title. The values are described in UIControlState. 139 * @param state The state that uses the specified title. The values are described in UIControlState.
140 */ 140 */
141 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url 141 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
142 - forState:(UIControlState)state; 142 + forState:(UIControlState)state NS_REFINED_FOR_SWIFT;
143 143
144 /** 144 /**
145 * Set the backgroundImageView `image` with an `url` and a placeholder. 145 * Set the backgroundImageView `image` with an `url` and a placeholder.
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
153 */ 153 */
154 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url 154 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
155 forState:(UIControlState)state 155 forState:(UIControlState)state
156 - placeholderImage:(nullable UIImage *)placeholder; 156 + placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
157 157
158 /** 158 /**
159 * Set the backgroundImageView `image` with an `url`, placeholder and custom options. 159 * Set the backgroundImageView `image` with an `url`, placeholder and custom options.
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url 168 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
169 forState:(UIControlState)state 169 forState:(UIControlState)state
170 placeholderImage:(nullable UIImage *)placeholder 170 placeholderImage:(nullable UIImage *)placeholder
171 - options:(SDWebImageOptions)options; 171 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
172 172
173 /** 173 /**
174 * Set the backgroundImageView `image` with an `url`. 174 * Set the backgroundImageView `image` with an `url`.
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url 204 - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
205 forState:(UIControlState)state 205 forState:(UIControlState)state
206 placeholderImage:(nullable UIImage *)placeholder 206 placeholderImage:(nullable UIImage *)placeholder
207 - completed:(nullable SDExternalCompletionBlock)completedBlock; 207 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
208 208
209 /** 209 /**
210 * Set the backgroundImageView `image` with an `url`, placeholder and custom options. 210 * Set the backgroundImageView `image` with an `url`, placeholder and custom options.
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 * 24 *
25 * @param url The url for the image. 25 * @param url The url for the image.
26 */ 26 */
27 -- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url; 27 +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
28 28
29 /** 29 /**
30 * Set the imageView `highlightedImage` with an `url` and custom options. 30 * Set the imageView `highlightedImage` with an `url` and custom options.
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. 35 * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values.
36 */ 36 */
37 - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url 37 - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url
38 - options:(SDWebImageOptions)options; 38 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
39 39
40 /** 40 /**
41 * Set the imageView `highlightedImage` with an `url`. 41 * Set the imageView `highlightedImage` with an `url`.
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 * The fourth parameter is the original image url. 50 * The fourth parameter is the original image url.
51 */ 51 */
52 - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url 52 - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url
53 - completed:(nullable SDExternalCompletionBlock)completedBlock; 53 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
54 54
55 /** 55 /**
56 * Set the imageView `highlightedImage` with an `url` and custom options. 56 * Set the imageView `highlightedImage` with an `url` and custom options.
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 * 54 *
55 * @param url The url for the image. 55 * @param url The url for the image.
56 */ 56 */
57 -- (void)sd_setImageWithURL:(nullable NSURL *)url; 57 +- (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
58 58
59 /** 59 /**
60 * Set the imageView `image` with an `url` and a placeholder. 60 * Set the imageView `image` with an `url` and a placeholder.
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 * @see sd_setImageWithURL:placeholderImage:options: 66 * @see sd_setImageWithURL:placeholderImage:options:
67 */ 67 */
68 - (void)sd_setImageWithURL:(nullable NSURL *)url 68 - (void)sd_setImageWithURL:(nullable NSURL *)url
69 - placeholderImage:(nullable UIImage *)placeholder; 69 + placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
70 70
71 /** 71 /**
72 * Set the imageView `image` with an `url`, placeholder and custom options. 72 * Set the imageView `image` with an `url`, placeholder and custom options.
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 */ 79 */
80 - (void)sd_setImageWithURL:(nullable NSURL *)url 80 - (void)sd_setImageWithURL:(nullable NSURL *)url
81 placeholderImage:(nullable UIImage *)placeholder 81 placeholderImage:(nullable UIImage *)placeholder
82 - options:(SDWebImageOptions)options; 82 + options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
83 83
84 /** 84 /**
85 * Set the imageView `image` with an `url`. 85 * Set the imageView `image` with an `url`.
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 */ 111 */
112 - (void)sd_setImageWithURL:(nullable NSURL *)url 112 - (void)sd_setImageWithURL:(nullable NSURL *)url
113 placeholderImage:(nullable UIImage *)placeholder 113 placeholderImage:(nullable UIImage *)placeholder
114 - completed:(nullable SDExternalCompletionBlock)completedBlock; 114 + completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
115 115
116 /** 116 /**
117 * Set the imageView `image` with an `url`, placeholder and custom options. 117 * Set the imageView `image` with an `url`, placeholder and custom options.