Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj

This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final

Author: Ehsan Akhgari

accessible/atk/AccessibleWrap.h

@@ -52,11 +52,11 @@ class AccessibleWrap : public Accessible
   virtual ~AccessibleWrap();
   void ShutdownAtkObject();
 
-  virtual void Shutdown() MOZ_OVERRIDE;
+  virtual void Shutdown() override;
 
   // return the atk object for this AccessibleWrap
-  virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
-  virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE;
+  virtual void GetNativeInterface(void** aOutAccessible) override;
+  virtual nsresult HandleAccEvent(AccEvent* aEvent) override;
 
   AtkObject * GetAtkObject(void);
   static AtkObject* GetAtkObject(Accessible* aAccessible);

accessible/atk/ApplicationAccessibleWrap.h

@@ -19,14 +19,14 @@ class ApplicationAccessibleWrap: public ApplicationAccessible
   virtual ~ApplicationAccessibleWrap();
 
   // Accessible
-  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
-  virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
-  virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE;
+  virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override;
+  virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override;
+  virtual bool RemoveChild(Accessible* aChild) override;
 
   /**
    * Return the atk object for app root accessible.
    */
-  virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
+  virtual void GetNativeInterface(void** aOutAccessible) override;
 };
 
 } // namespace a11y

accessible/atk/AtkSocketAccessible.h

@@ -45,9 +45,9 @@ class AtkSocketAccessible : public AccessibleWrap
   AtkSocketAccessible(nsIContent* aContent, DocAccessible* aDoc,
                       const nsCString& aPlugId);
 
-  virtual void Shutdown() MOZ_OVERRIDE;
+  virtual void Shutdown() override;
 
-  virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
+  virtual void GetNativeInterface(void** aOutAccessible) override;
 };
 
 } // namespace a11y

accessible/atk/RootAccessibleWrap.h

@@ -20,7 +20,7 @@ typedef RootAccessible RootAccessibleWrap;
  * It is added into root when the toplevel window is created, and removed
  * from root when the toplevel window is destroyed.
  */
-class GtkWindowAccessible MOZ_FINAL : public DummyAccessible
+class GtkWindowAccessible final : public DummyAccessible
 {
 public:
   explicit GtkWindowAccessible(AtkObject* aAccessible);

accessible/base/AccCollector.h

@@ -71,20 +71,20 @@ class AccCollector
  * Collect embedded objects. Provide quick access to accessible by index and
  * vice versa.
  */
-class EmbeddedObjCollector MOZ_FINAL : public AccCollector
+class EmbeddedObjCollector final : public AccCollector
 {
 public:
   virtual ~EmbeddedObjCollector() { }
 
 public:
-  virtual int32_t GetIndexAt(Accessible* aAccessible) MOZ_OVERRIDE;
+  virtual int32_t GetIndexAt(Accessible* aAccessible) override;
 
 protected:
   // Make sure it's used by Accessible class only.
   explicit EmbeddedObjCollector(Accessible* aRoot) :
     AccCollector(aRoot, filters::GetEmbeddedObject) { }
 
-  virtual void AppendObject(Accessible* aAccessible) MOZ_OVERRIDE;
+  virtual void AppendObject(Accessible* aAccessible) override;
 
   friend class Accessible;
 };

accessible/base/AccEvent.h

@@ -154,7 +154,7 @@ class AccStateChangeEvent: public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eStateChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eStateChangeEvent);
   }
@@ -183,7 +183,7 @@ class AccTextChangeEvent: public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eTextChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eTextChangeEvent);
   }
@@ -223,7 +223,7 @@ class AccMutationEvent: public AccEvent
 
   // Event
   static const EventGroup kEventGroup = eMutationEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eMutationEvent);
   }
@@ -253,7 +253,7 @@ class AccHideEvent: public AccMutationEvent
 
   // Event
   static const EventGroup kEventGroup = eHideEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccMutationEvent::GetEventGroups() | (1U << eHideEvent);
   }
@@ -281,7 +281,7 @@ class AccShowEvent: public AccMutationEvent
 
   // Event
   static const EventGroup kEventGroup = eShowEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccMutationEvent::GetEventGroups() | (1U << eShowEvent);
   }
@@ -301,7 +301,7 @@ class AccReorderEvent : public AccEvent
 
   // Event
   static const EventGroup kEventGroup = eReorderEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eReorderEvent);
   }
@@ -354,7 +354,7 @@ class AccCaretMoveEvent: public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eCaretMoveEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eCaretMoveEvent);
   }
@@ -380,7 +380,7 @@ class AccTextSelChangeEvent : public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eTextSelChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eTextSelChangeEvent);
   }
@@ -419,7 +419,7 @@ class AccSelChangeEvent : public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eSelectionChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eSelectionChangeEvent);
   }
@@ -449,7 +449,7 @@ class AccTableChangeEvent : public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eTableChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eTableChangeEvent);
   }
@@ -479,7 +479,7 @@ class AccVCChangeEvent : public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eVirtualCursorChangeEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eVirtualCursorChangeEvent);
   }
@@ -509,7 +509,7 @@ class AccObjectAttrChangedEvent: public AccEvent
 
   // AccEvent
   static const EventGroup kEventGroup = eObjectAttrChangedEvent;
-  virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
+  virtual unsigned int GetEventGroups() const override
   {
     return AccEvent::GetEventGroups() | (1U << eObjectAttrChangedEvent);
   }

accessible/base/AccIterator.h

@@ -43,7 +43,7 @@ class AccIterator : public AccIterable
    * Return next accessible complying with filter function. Return the first
    * accessible for the first time.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   AccIterator();
@@ -89,7 +89,7 @@ class RelatedAccIterator : public AccIterable
   /**
    * Return next related accessible for the given dependent accessible.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   RelatedAccIterator();
@@ -123,7 +123,7 @@ class HTMLLabelIterator : public AccIterable
   /**
    * Return next label accessible associated with the given element.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   HTMLLabelIterator();
@@ -150,7 +150,7 @@ class HTMLOutputIterator : public AccIterable
   /**
    * Return next output accessible associated with the given element.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   HTMLOutputIterator();
@@ -173,7 +173,7 @@ class XULLabelIterator : public AccIterable
   /**
    * Return next label accessible associated with the given element.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   XULLabelIterator();
@@ -196,7 +196,7 @@ class XULDescriptionIterator : public AccIterable
   /**
    * Return next description accessible associated with the given element.
    */
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   XULDescriptionIterator();
@@ -234,7 +234,7 @@ class IDRefsIterator : public AccIterable
   nsIContent* GetElem(const nsDependentSubstring& aID);
 
   // AccIterable
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   IDRefsIterator();
@@ -251,13 +251,13 @@ class IDRefsIterator : public AccIterable
 /**
  * Iterates over related accessible referred by aria-owns.
  */
-class ARIAOwnedByIterator MOZ_FINAL : public RelatedAccIterator
+class ARIAOwnedByIterator final : public RelatedAccIterator
 {
 public:
   explicit ARIAOwnedByIterator(const Accessible* aDependent);
   virtual ~ARIAOwnedByIterator() { }
 
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   ARIAOwnedByIterator() = delete;
@@ -271,13 +271,13 @@ class ARIAOwnedByIterator MOZ_FINAL : public RelatedAccIterator
 /**
  * Iterates over related accessible referred by aria-owns.
  */
-class ARIAOwnsIterator MOZ_FINAL : public AccIterable
+class ARIAOwnsIterator final : public AccIterable
 {
 public:
   explicit ARIAOwnsIterator(const Accessible* aOwner);
   virtual ~ARIAOwnsIterator() { }
 
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   ARIAOwnsIterator() = delete;
@@ -299,7 +299,7 @@ class SingleAccIterator : public AccIterable
   explicit SingleAccIterator(Accessible* aTarget): mAcc(aTarget) { }
   virtual ~SingleAccIterator() { }
 
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   SingleAccIterator();
@@ -320,7 +320,7 @@ class ItemIterator : public AccIterable
     mContainer(aItemContainer), mAnchor(nullptr) { }
   virtual ~ItemIterator() { }
 
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   ItemIterator() = delete;
@@ -342,7 +342,7 @@ class XULTreeItemIterator : public AccIterable
                       int32_t aRowIdx);
   virtual ~XULTreeItemIterator() { }
 
-  virtual Accessible* Next() MOZ_OVERRIDE;
+  virtual Accessible* Next() override;
 
 private:
   XULTreeItemIterator() = delete;

accessible/base/NotificationController.h

@@ -64,7 +64,7 @@ class TNotification : public Notification
     mInstance(aInstance), mCallback(aCallback), mArg(aArg) { }
   virtual ~TNotification() { mInstance = nullptr; }
 
-  virtual void Process() MOZ_OVERRIDE
+  virtual void Process() override
   {
     (mInstance->*mCallback)(mArg);
 
@@ -85,14 +85,14 @@ class TNotification : public Notification
 /**
  * Used to process notifications from core for the document accessible.
  */
-class NotificationController MOZ_FINAL : public EventQueue,
+class NotificationController final : public EventQueue,
                                          public nsARefreshObserver
 {
 public:
   NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
 
-  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) MOZ_OVERRIDE;
-  NS_IMETHOD_(MozExternalRefCountType) Release(void) MOZ_OVERRIDE;
+  NS_IMETHOD_(MozExternalRefCountType) AddRef(void) override;
+  NS_IMETHOD_(MozExternalRefCountType) Release(void) override;
 
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(NotificationController)
 
@@ -203,7 +203,7 @@ class NotificationController MOZ_FINAL : public EventQueue,
   NotificationController& operator = (const NotificationController&);
 
   // nsARefreshObserver
-  virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE;
+  virtual void WillRefresh(mozilla::TimeStamp aTime) override;
 
 private:
   /**

accessible/base/SelectionManager.cpp

@@ -24,7 +24,7 @@ using namespace mozilla;
 using namespace mozilla::a11y;
 using mozilla::dom::Selection;
 
-struct mozilla::a11y::SelData MOZ_FINAL
+struct mozilla::a11y::SelData final
 {
   SelData(Selection* aSel, int32_t aReason) :
     mSel(aSel), mReason(aReason) {}