Bug 1118605 - Mark virtual overridden functions as MOZ_OVERRIDE in xpfe/appshell; r=bsmedberg
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 06 Jan 2015 23:46:46 -0500
changeset 223396 4b301160418344a5e3ae5f38a174845bd79efb6b
parent 223395 6615268fcb5021c4a44ff8a2db176b0572a2d8a0
child 223397 e478d4d1d17ce94c8a74324b04f0b212fa51504a
push id53895
push usereakhgari@mozilla.com
push dateMon, 12 Jan 2015 21:32:16 +0000
treeherdermozilla-inbound@e381d48c2435 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1118605
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1118605 - Mark virtual overridden functions as MOZ_OVERRIDE in xpfe/appshell; r=bsmedberg
xpfe/appshell/nsAppShellWindowEnumerator.h
xpfe/appshell/nsWebShellWindow.cpp
xpfe/appshell/nsWebShellWindow.h
--- a/xpfe/appshell/nsAppShellWindowEnumerator.h
+++ b/xpfe/appshell/nsAppShellWindowEnumerator.h
@@ -45,18 +45,18 @@ struct nsWindowInfo
 
 class nsAppShellWindowEnumerator : public nsISimpleEnumerator {
 
 friend class nsWindowMediator;
 
 public:
   nsAppShellWindowEnumerator(const char16_t* aTypeString,
                              nsWindowMediator& inMediator);
-  NS_IMETHOD GetNext(nsISupports **retval) = 0;
-  NS_IMETHOD HasMoreElements(bool *retval);
+  NS_IMETHOD GetNext(nsISupports **retval) MOZ_OVERRIDE = 0;
+  NS_IMETHOD HasMoreElements(bool *retval) MOZ_OVERRIDE;
 
   NS_DECL_ISUPPORTS
 
 protected:
 
   virtual ~nsAppShellWindowEnumerator();
 
   void AdjustInitialPosition();
--- a/xpfe/appshell/nsWebShellWindow.cpp
+++ b/xpfe/appshell/nsWebShellWindow.cpp
@@ -445,17 +445,17 @@ class WebShellWindowTimerCallback MOZ_FI
 {
 public:
   explicit WebShellWindowTimerCallback(nsWebShellWindow* aWindow)
     : mWindow(aWindow)
   {}
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD Notify(nsITimer* aTimer)
+  NS_IMETHOD Notify(nsITimer* aTimer) MOZ_OVERRIDE
   {
     // Although this object participates in a refcount cycle (this -> mWindow
     // -> mSPTimer -> this), mSPTimer is a one-shot timer and releases this
     // after it fires.  So we don't need to release mWindow here.
 
     mWindow->FirePersistenceTimer();
     return NS_OK;
   }
--- a/xpfe/appshell/nsWebShellWindow.h
+++ b/xpfe/appshell/nsWebShellWindow.h
@@ -42,30 +42,30 @@ public:
                       nsWidgetInitData& widgetInitData);
 
   nsresult Toolbar();
 
   // nsIWebProgressListener
   NS_DECL_NSIWEBPROGRESSLISTENER
 
   // nsIBaseWindow
-  NS_IMETHOD Destroy();
+  NS_IMETHOD Destroy() MOZ_OVERRIDE;
 
   // nsIWidgetListener
-  virtual nsIXULWindow* GetXULWindow() { return this; }
-  virtual nsIPresShell* GetPresShell();
-  virtual bool WindowMoved(nsIWidget* aWidget, int32_t x, int32_t y);
-  virtual bool WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight);
-  virtual bool RequestWindowClose(nsIWidget* aWidget);
-  virtual void SizeModeChanged(nsSizeMode sizeMode);
-  virtual void OSToolbarButtonPressed();
+  virtual nsIXULWindow* GetXULWindow() MOZ_OVERRIDE { return this; }
+  virtual nsIPresShell* GetPresShell() MOZ_OVERRIDE;
+  virtual bool WindowMoved(nsIWidget* aWidget, int32_t x, int32_t y) MOZ_OVERRIDE;
+  virtual bool WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight) MOZ_OVERRIDE;
+  virtual bool RequestWindowClose(nsIWidget* aWidget) MOZ_OVERRIDE;
+  virtual void SizeModeChanged(nsSizeMode sizeMode) MOZ_OVERRIDE;
+  virtual void OSToolbarButtonPressed() MOZ_OVERRIDE;
   virtual bool ZLevelChanged(bool aImmediate, nsWindowZ *aPlacement,
-                             nsIWidget* aRequestBelow, nsIWidget** aActualBelow);
-  virtual void WindowActivated();
-  virtual void WindowDeactivated();
+                             nsIWidget* aRequestBelow, nsIWidget** aActualBelow) MOZ_OVERRIDE;
+  virtual void WindowActivated() MOZ_OVERRIDE;
+  virtual void WindowDeactivated() MOZ_OVERRIDE;
 
 protected:
   friend class mozilla::WebShellWindowTimerCallback;
   
   virtual ~nsWebShellWindow();
 
   void                     LoadContentAreas();
   bool                     ExecuteCloseHandler();