diff options
author | Moonchild <moonchild@palemoon.org> | 2023-11-05 00:59:31 +0100 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2023-11-08 13:49:51 +0100 |
commit | ccc8c3b988375858400e8cbb5cd3ed665ece7aa4 (patch) | |
tree | 0dfab44af42ba7db171eaff6893c6b543835fe5b /widget | |
parent | d53992cc127fb85a63a23c01cd92347901bf2371 (diff) | |
download | uxp-ccc8c3b988375858400e8cbb5cd3ed665ece7aa4.tar.gz |
Issue #2342: Use [[nodiscard]] in /uriloader /widget
Also a few misc low-volume places.
Diffstat (limited to 'widget')
-rw-r--r-- | widget/PluginWidgetProxy.h | 9 | ||||
-rw-r--r-- | widget/cocoa/nsChildView.h | 9 | ||||
-rw-r--r-- | widget/cocoa/nsCocoaWindow.h | 20 | ||||
-rw-r--r-- | widget/gtk/nsWindow.h | 8 | ||||
-rw-r--r-- | widget/nsBaseWidget.h | 2 | ||||
-rw-r--r-- | widget/nsIWidget.h | 6 | ||||
-rw-r--r-- | widget/uikit/nsWindow.h | 9 | ||||
-rw-r--r-- | widget/windows/nsWindow.h | 11 |
8 files changed, 34 insertions, 40 deletions
diff --git a/widget/PluginWidgetProxy.h b/widget/PluginWidgetProxy.h index 3fb86a5162..e16554967f 100644 --- a/widget/PluginWidgetProxy.h +++ b/widget/PluginWidgetProxy.h @@ -35,11 +35,10 @@ public: // nsIWidget using PuppetWidget::Create; // for Create signature not overridden here - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; virtual void Destroy() override; NS_IMETHOD SetFocus(bool aRaise = false) override; NS_IMETHOD SetParent(nsIWidget* aNewParent) override; diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h index 7b998a6c5c..3ec93f1875 100644 --- a/widget/cocoa/nsChildView.h +++ b/widget/cocoa/nsChildView.h @@ -303,11 +303,10 @@ public: nsChildView(); // nsIWidget interface - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; virtual void Destroy() override; diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index 1913696b8c..43f8668e84 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -223,17 +223,15 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSPIWIDGETCOCOA - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const DesktopIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; - - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const DesktopIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; + + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; virtual void Destroy() override; diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h index f76f72d71b..1772e11926 100644 --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -94,10 +94,10 @@ public: // nsIWidget using nsBaseWidget::Create; // for Create signature not overridden here - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData) override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData) override; virtual void Destroy() override; virtual nsIWidget *GetParent() override; virtual float GetDPI() override; diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h index ab29fcd0ff..cc38b14b86 100644 --- a/widget/nsBaseWidget.h +++ b/widget/nsBaseWidget.h @@ -239,7 +239,7 @@ public: virtual LayoutDeviceIntRect GetBounds() override; virtual LayoutDeviceIntRect GetClientBounds() override; virtual LayoutDeviceIntRect GetScreenBounds() override; - virtual MOZ_MUST_USE nsresult GetRestoredBounds(LayoutDeviceIntRect& aRect) override; + [[nodiscard]] virtual nsresult GetRestoredBounds(LayoutDeviceIntRect& aRect) override; NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override; virtual LayoutDeviceIntPoint GetClientOffset() override; virtual void EnableDragDrop(bool aEnable) override {}; diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h index fe21b67275..825db6f0cf 100644 --- a/widget/nsIWidget.h +++ b/widget/nsIWidget.h @@ -417,7 +417,7 @@ class nsIWidget : public nsISupports * @param aInitData data that is used for widget initialization * */ - virtual MOZ_MUST_USE nsresult + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, nsNativeWidget aNativeParent, const LayoutDeviceIntRect& aRect, @@ -431,7 +431,7 @@ class nsIWidget : public nsISupports * mapping is not straightforward or the native platform needs to use the * desktop pixel values directly. */ - virtual MOZ_MUST_USE nsresult + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, nsNativeWidget aNativeParent, const DesktopIntRect& aRect, @@ -890,7 +890,7 @@ class nsIWidget : public nsISupports * @param aRect On return it holds the x, y, width and height of * this widget. */ - virtual MOZ_MUST_USE nsresult + [[nodiscard]] virtual nsresult GetRestoredBounds(LayoutDeviceIntRect& aRect) = 0; /** diff --git a/widget/uikit/nsWindow.h b/widget/uikit/nsWindow.h index cb18c09069..9a69113312 100644 --- a/widget/uikit/nsWindow.h +++ b/widget/uikit/nsWindow.h @@ -29,11 +29,10 @@ public: // nsIWidget // - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; virtual void Destroy() override; NS_IMETHOD Show(bool aState) override; NS_IMETHOD Enable(bool aState) override { diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h index ec4a1f0192..4c6c7cb80d 100644 --- a/widget/windows/nsWindow.h +++ b/widget/windows/nsWindow.h @@ -98,11 +98,10 @@ public: // nsIWidget interface using nsWindowBase::Create; // for Create signature not overridden here - virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent, - nsNativeWidget aNativeParent, - const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr) - override; + [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, + nsNativeWidget aNativeParent, + const LayoutDeviceIntRect& aRect, + nsWidgetInitData* aInitData = nullptr) override; virtual void Destroy() override; NS_IMETHOD SetParent(nsIWidget *aNewParent) override; virtual nsIWidget* GetParent(void) override; @@ -136,7 +135,7 @@ public: NS_IMETHOD SetFocus(bool aRaise) override; virtual LayoutDeviceIntRect GetBounds() override; virtual LayoutDeviceIntRect GetScreenBounds() override; - virtual MOZ_MUST_USE nsresult GetRestoredBounds(LayoutDeviceIntRect& aRect) override; + [[nodiscard]] virtual nsresult GetRestoredBounds(LayoutDeviceIntRect& aRect) override; virtual LayoutDeviceIntRect GetClientBounds() override; virtual LayoutDeviceIntPoint GetClientOffset() override; void SetBackgroundColor(const nscolor& aColor) override; |