summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2023-11-11 01:55:07 +0000
committerMoonchild <moonchild@palemoon.org>2023-11-11 01:55:07 +0000
commitc789882a294d29b3e5450a972ad67c4839c75e23 (patch)
tree4234880ff76df9da2caaf06983da144e42032a09 /image
parent93eee35e84c29e1e64cb1531a0830b8ab2a7c5fa (diff)
parentf9ad6258221d89d8ee8e543c2ff8b21a42dbd285 (diff)
downloaduxp-c789882a294d29b3e5450a972ad67c4839c75e23.tar.gz
Merge pull request 'Replace MOZ_MUST_USE with [[nodiscard]]' (#2375) from 2342-nodiscard-work into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2375
Diffstat (limited to 'image')
-rw-r--r--image/imgLoader.h32
-rw-r--r--image/imgRequest.h20
2 files changed, 26 insertions, 26 deletions
diff --git a/image/imgLoader.h b/image/imgLoader.h
index 8e818a2907..6ac383cdc6 100644
--- a/image/imgLoader.h
+++ b/image/imgLoader.h
@@ -287,22 +287,22 @@ public:
imgLoader();
nsresult Init();
- MOZ_MUST_USE nsresult LoadImage(nsIURI* aURI,
- nsIURI* aInitialDocumentURI,
- nsIURI* aReferrerURI,
- ReferrerPolicy aReferrerPolicy,
- nsIPrincipal* aLoadingPrincipal,
- nsILoadGroup* aLoadGroup,
- imgINotificationObserver* aObserver,
- nsINode* aContext,
- nsIDocument* aLoadingDocument,
- nsLoadFlags aLoadFlags,
- nsISupports* aCacheKey,
- nsContentPolicyType aContentPolicyType,
- const nsAString& initiatorType,
- imgRequestProxy** _retval);
-
- MOZ_MUST_USE nsresult
+ [[nodiscard]] nsresult LoadImage(nsIURI* aURI,
+ nsIURI* aInitialDocumentURI,
+ nsIURI* aReferrerURI,
+ ReferrerPolicy aReferrerPolicy,
+ nsIPrincipal* aLoadingPrincipal,
+ nsILoadGroup* aLoadGroup,
+ imgINotificationObserver* aObserver,
+ nsINode* aContext,
+ nsIDocument* aLoadingDocument,
+ nsLoadFlags aLoadFlags,
+ nsISupports* aCacheKey,
+ nsContentPolicyType aContentPolicyType,
+ const nsAString& initiatorType,
+ imgRequestProxy** _retval);
+
+ [[nodiscard]] nsresult
LoadImageWithChannel(nsIChannel* channel,
imgINotificationObserver* aObserver,
nsISupports* aCX,
diff --git a/image/imgRequest.h b/image/imgRequest.h
index c05e6a4a94..2ee00af4a9 100644
--- a/image/imgRequest.h
+++ b/image/imgRequest.h
@@ -65,16 +65,16 @@ public:
NS_DECL_NSIINTERFACEREQUESTOR
NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
- MOZ_MUST_USE nsresult Init(nsIURI* aURI,
- nsIURI* aCurrentURI,
- bool aHadInsecureRedirect,
- nsIRequest* aRequest,
- nsIChannel* aChannel,
- imgCacheEntry* aCacheEntry,
- nsISupports* aCX,
- nsIPrincipal* aLoadingPrincipal,
- int32_t aCORSMode,
- ReferrerPolicy aReferrerPolicy);
+ [[nodiscard]] nsresult Init(nsIURI* aURI,
+ nsIURI* aCurrentURI,
+ bool aHadInsecureRedirect,
+ nsIRequest* aRequest,
+ nsIChannel* aChannel,
+ imgCacheEntry* aCacheEntry,
+ nsISupports* aCX,
+ nsIPrincipal* aLoadingPrincipal,
+ int32_t aCORSMode,
+ ReferrerPolicy aReferrerPolicy);
void ClearLoader();