mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1764 Swift naming collision

This commit is contained in:
skyline75489 2017-02-10 20:46:32 +08:00
parent 74ee9c08ef
commit cf0ec1a05a
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.h
View File

@ -31,7 +31,7 @@
* *
* @param url The url for the image. * @param url The url for the image.
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url; - (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
/** /**
* 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 * 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 @@
* @param placeholder The image to be set initially, until the image request finishes. * @param placeholder The image to be set initially, until the image request finishes.
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder; placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
/** /**
* 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 * 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 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* 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 * 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 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* 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 * 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

8
SDWebImage/MKAnnotationView+WebCache.h
View File

@ -25,7 +25,7 @@
* *
* @param url The url for the image. * @param url The url for the image.
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url; - (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url` and a placeholder. * Set the imageView `image` with an `url` and a placeholder.
@ -37,7 +37,7 @@
* @see sd_setImageWithURL:placeholderImage:options: * @see sd_setImageWithURL:placeholderImage:options:
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder; placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.
@ -51,7 +51,7 @@
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`. * Set the imageView `image` with an `url`.
@ -83,7 +83,7 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.

16
SDWebImage/UIButton+WebCache.h
View File

@ -40,7 +40,7 @@
* @param state The state that uses the specified title. The values are described in UIControlState. * @param state The state that uses the specified title. The values are described in UIControlState.
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state; forState:(UIControlState)state NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url` and a placeholder. * Set the imageView `image` with an `url` and a placeholder.
@ -54,7 +54,7 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder; placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.
@ -69,7 +69,7 @@
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`. * Set the imageView `image` with an `url`.
@ -105,7 +105,7 @@
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.
@ -139,7 +139,7 @@
* @param state The state that uses the specified title. The values are described in UIControlState. * @param state The state that uses the specified title. The values are described in UIControlState.
*/ */
- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state; forState:(UIControlState)state NS_REFINED_FOR_SWIFT;
/** /**
* Set the backgroundImageView `image` with an `url` and a placeholder. * Set the backgroundImageView `image` with an `url` and a placeholder.
@ -153,7 +153,7 @@
*/ */
- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder; placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
/** /**
* Set the backgroundImageView `image` with an `url`, placeholder and custom options. * Set the backgroundImageView `image` with an `url`, placeholder and custom options.
@ -168,7 +168,7 @@
- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* Set the backgroundImageView `image` with an `url`. * Set the backgroundImageView `image` with an `url`.
@ -204,7 +204,7 @@
- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url - (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url
forState:(UIControlState)state forState:(UIControlState)state
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* Set the backgroundImageView `image` with an `url`, placeholder and custom options. * Set the backgroundImageView `image` with an `url`, placeholder and custom options.

6
SDWebImage/UIImageView+HighlightedWebCache.h
View File

@ -24,7 +24,7 @@
* *
* @param url The url for the image. * @param url The url for the image.
*/ */
- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url; - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `highlightedImage` with an `url` and custom options. * Set the imageView `highlightedImage` with an `url` and custom options.
@ -35,7 +35,7 @@
* @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values.
*/ */
- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `highlightedImage` with an `url`. * Set the imageView `highlightedImage` with an `url`.
@ -50,7 +50,7 @@
* The fourth parameter is the original image url. * The fourth parameter is the original image url.
*/ */
- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url - (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `highlightedImage` with an `url` and custom options. * Set the imageView `highlightedImage` with an `url` and custom options.

8
SDWebImage/UIImageView+WebCache.h
View File

@ -54,7 +54,7 @@
* *
* @param url The url for the image. * @param url The url for the image.
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url; - (void)sd_setImageWithURL:(nullable NSURL *)url NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url` and a placeholder. * Set the imageView `image` with an `url` and a placeholder.
@ -66,7 +66,7 @@
* @see sd_setImageWithURL:placeholderImage:options: * @see sd_setImageWithURL:placeholderImage:options:
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder; placeholderImage:(nullable UIImage *)placeholder NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.
@ -79,7 +79,7 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
options:(SDWebImageOptions)options; options:(SDWebImageOptions)options NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`. * Set the imageView `image` with an `url`.
@ -111,7 +111,7 @@
*/ */
- (void)sd_setImageWithURL:(nullable NSURL *)url - (void)sd_setImageWithURL:(nullable NSURL *)url
placeholderImage:(nullable UIImage *)placeholder placeholderImage:(nullable UIImage *)placeholder
completed:(nullable SDExternalCompletionBlock)completedBlock; completed:(nullable SDExternalCompletionBlock)completedBlock NS_REFINED_FOR_SWIFT;
/** /**
* Set the imageView `image` with an `url`, placeholder and custom options. * Set the imageView `image` with an `url`, placeholder and custom options.