Bug 1146094 - Replace MOZ_OVERRIDE and MOZ_FINAL with override and final, as a follow-up to bug 1145631
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 22 Mar 2015 14:54:47 -0400
changeset 22208 94adb5945ec3147c246b55b123676c324274fd25
parent 22207 a5b7321a3e26095b2c4849287423cf6adaf16881
child 22209 f1739bc5332cc9d2d16269b57729988a18e961f5
push id1385
push usermbanner@mozilla.com
push dateMon, 11 May 2015 19:50:21 +0000
treeherdercomm-beta@2b24a4d6cd0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1146094, 1145631
Bug 1146094 - Replace MOZ_OVERRIDE and MOZ_FINAL with override and final, as a follow-up to bug 1145631
calendar/base/backend/libical/calDuration.h
calendar/base/backend/libical/calPeriod.h
db/mork/build/nsMorkFactory.cpp
im/components/mintrayr/trayToolkit.h
ldap/xpcom/src/nsLDAPControl.h
mailnews/addrbook/src/nsAbBSDirectory.h
mailnews/addrbook/src/nsAbCardProperty.cpp
mailnews/addrbook/src/nsAbLDAPChangeLogData.h
mailnews/addrbook/src/nsAbLDAPChangeLogQuery.h
mailnews/addrbook/src/nsAbLDAPDirectory.h
mailnews/addrbook/src/nsAbLDAPListenerBase.h
mailnews/addrbook/src/nsAbLDAPReplicationData.h
mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
mailnews/addrbook/src/nsAbMDBCard.h
mailnews/addrbook/src/nsAbMDBDirectory.h
mailnews/addrbook/src/nsAbOSXCard.h
mailnews/addrbook/src/nsAbOSXDirFactory.h
mailnews/addrbook/src/nsAbOSXDirectory.h
mailnews/addrbook/src/nsAbOutlookDirectory.h
mailnews/addrbook/src/nsAddrDatabase.cpp
mailnews/addrbook/src/nsAddrDatabase.h
mailnews/addrbook/src/nsDirPrefs.cpp
mailnews/addrbook/src/nsMapiAddressBook.h
mailnews/addrbook/src/nsWabAddressBook.h
mailnews/base/search/public/nsMsgSearchAdapter.h
mailnews/base/search/src/nsMsgLocalSearch.h
mailnews/base/search/src/nsMsgSearchImap.h
mailnews/base/search/src/nsMsgSearchNews.h
mailnews/base/src/nsMailDirProvider.h
mailnews/base/src/nsMsgAccountManager.h
mailnews/base/src/nsMsgAccountManagerDS.h
mailnews/base/src/nsMsgDBView.h
mailnews/base/src/nsMsgFolderCompactor.h
mailnews/base/src/nsMsgFolderDataSource.h
mailnews/base/src/nsMsgGroupThread.h
mailnews/base/src/nsMsgGroupView.h
mailnews/base/src/nsMsgQuickSearchDBView.h
mailnews/base/src/nsMsgSearchDBView.h
mailnews/base/src/nsMsgSpecialViews.h
mailnews/base/src/nsMsgTagService.h
mailnews/base/src/nsMsgThreadedDBView.h
mailnews/base/src/nsMsgXFVirtualFolderDBView.h
mailnews/base/util/Services.cpp
mailnews/base/util/nsImapMoveCoalescer.h
mailnews/base/util/nsMsgCompressIStream.h
mailnews/base/util/nsMsgCompressOStream.h
mailnews/base/util/nsMsgDBFolder.h
mailnews/base/util/nsMsgFileStream.h
mailnews/base/util/nsMsgIdentity.h
mailnews/base/util/nsMsgProtocol.h
mailnews/base/util/nsMsgReadStateTxn.h
mailnews/base/util/nsMsgTxn.cpp
mailnews/base/util/nsMsgTxn.h
mailnews/compose/public/nsMsgAttachmentData.h
mailnews/compose/src/nsMsgComposeService.cpp
mailnews/compose/src/nsMsgCopy.h
mailnews/compose/src/nsSmtpProtocol.h
mailnews/db/msgdb/public/nsImapMailDatabase.h
mailnews/db/msgdb/public/nsMailDatabase.h
mailnews/db/msgdb/public/nsMsgDatabase.h
mailnews/db/msgdb/public/nsNewsDatabase.h
mailnews/db/msgdb/src/nsMsgDatabase.cpp
mailnews/imap/src/nsIMAPBodyShell.h
mailnews/imap/src/nsIMAPHostSessionList.h
mailnews/imap/src/nsImapIncomingServer.h
mailnews/imap/src/nsImapMailFolder.cpp
mailnews/imap/src/nsImapMailFolder.h
mailnews/imap/src/nsImapOfflineSync.h
mailnews/imap/src/nsImapProtocol.h
mailnews/imap/src/nsImapServerResponseParser.h
mailnews/imap/src/nsImapUndoTxn.h
mailnews/imap/src/nsImapUrl.h
mailnews/imap/src/nsSyncRunnableHelpers.h
mailnews/import/eudora/src/nsEudoraMac.h
mailnews/import/eudora/src/nsEudoraWin32.h
mailnews/import/oexpress/nsOEAddressIterator.h
mailnews/import/outlook/src/rtfMailDecoder.h
mailnews/import/src/nsImportABDescriptor.h
mailnews/import/src/nsImportEmbeddedImageData.h
mailnews/import/src/nsImportEncodeScan.h
mailnews/import/src/nsImportMailboxDescriptor.h
mailnews/import/src/nsImportMimeEncode.h
mailnews/import/src/nsImportScanFile.h
mailnews/import/src/nsImportTranslator.h
mailnews/import/text/src/nsTextImport.cpp
mailnews/local/src/nsLocalMailFolder.h
mailnews/local/src/nsLocalUndoTxn.h
mailnews/local/src/nsMailboxProtocol.h
mailnews/local/src/nsMailboxServer.h
mailnews/local/src/nsMailboxUrl.h
mailnews/local/src/nsMovemailIncomingServer.h
mailnews/local/src/nsMsgBrkMBoxStore.h
mailnews/local/src/nsMsgMaildirStore.h
mailnews/local/src/nsNoIncomingServer.h
mailnews/local/src/nsParseMailbox.h
mailnews/local/src/nsPop3IncomingServer.cpp
mailnews/local/src/nsPop3IncomingServer.h
mailnews/local/src/nsPop3Protocol.h
mailnews/local/src/nsRssIncomingServer.h
mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.h
mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
mailnews/mime/emitters/nsMimeHtmlEmitter.h
mailnews/mime/emitters/nsMimePlainEmitter.h
mailnews/mime/emitters/nsMimeRawEmitter.h
mailnews/mime/emitters/nsMimeXmlEmitter.h
mailnews/mime/src/mimeenc.cpp
mailnews/mime/src/nsCMS.cpp
mailnews/mime/src/nsMimeObjectClassAccess.h
mailnews/news/src/nsNewsFolder.h
suite/feeds/src/nsFeedSniffer.h
suite/profile/migration/src/nsThunderbirdProfileMigrator.h
suite/profile/nsSuiteDirectoryProvider.h
suite/shell/src/nsGNOMEShellService.h
suite/shell/src/nsMacShellService.h
suite/shell/src/nsWindowsShellService.h
--- a/calendar/base/backend/libical/calDuration.h
+++ b/calendar/base/backend/libical/calDuration.h
@@ -7,17 +7,17 @@
 #define CALDURATION_H_
 
 #include "calIDuration.h"
 
 extern "C" {
     #include "ical.h"
 }
 
-class calDuration MOZ_FINAL : public calIDurationLibical
+class calDuration final : public calIDurationLibical
 {
 public:
     calDuration ();
     calDuration (const calDuration& cdt);
     calDuration (const struct icaldurationtype * const aDurationPtr);
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
--- a/calendar/base/backend/libical/calPeriod.h
+++ b/calendar/base/backend/libical/calPeriod.h
@@ -11,17 +11,17 @@
 #include "calIPeriod.h"
 #include "calDateTime.h"
 #include "calIDuration.h"
 
 extern "C" {
     #include "ical.h"
 }
 
-class calPeriod MOZ_FINAL : public calIPeriodLibical
+class calPeriod final : public calIPeriodLibical
 {
 public:
     calPeriod ();
     explicit calPeriod (const calPeriod& cpt);
     explicit calPeriod (struct icalperiodtype const* aPeriodPtr);
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
--- a/db/mork/build/nsMorkFactory.cpp
+++ b/db/mork/build/nsMorkFactory.cpp
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ModuleUtils.h"
 #include "nsCOMPtr.h"
 #include "nsMorkCID.h"
 #include "nsIMdbFactoryFactory.h"
 #include "mdb.h"
 
-class nsMorkFactoryService MOZ_FINAL : public nsIMdbFactoryService
+class nsMorkFactoryService final : public nsIMdbFactoryService
 {
 public:
   nsMorkFactoryService() {};
   // nsISupports methods
   NS_DECL_ISUPPORTS 
 
   NS_IMETHOD GetMdbFactory(nsIMdbFactory **aFactory);
 
--- a/im/components/mintrayr/trayToolkit.h
+++ b/im/components/mintrayr/trayToolkit.h
@@ -50,17 +50,17 @@ NS_IMETHODIMP GetBaseWindow(nsIDOMWindow
  */
 NS_IMETHODIMP DispatchTrustedEvent(nsIDOMWindow *aWindow, const nsAString& aEventName);
 
 class TrayServiceImpl;
 
 /**
  * The implementation for trayITrayIcon
  */
-class TrayIconImpl MOZ_FINAL : public trayITrayIcon, nsIDOMEventListener {
+class TrayIconImpl final : public trayITrayIcon, nsIDOMEventListener {
   friend class platform::Icon;
 
 private:
   ~TrayIconImpl() {}
   bool mIsMinimized;
   nsCOMPtr<nsIDOMWindow> mWindow;
 
   bool mCloseOnRestore;
@@ -84,17 +84,17 @@ public:
   NS_IMETHOD Init(nsIDOMWindow *aWindow, bool aCloseOnRestore);
   NS_IMETHOD DispatchMouseEvent(const nsAString& aEventName, PRUint16 aButton, nsPoint& pt, bool aCtrlKey, bool aAltKey, bool aShiftKey);
   inline bool IsClosed() const { return mClosed; }
 };
 
 /**
  * The implementation for trayITrayService
  */
-class TrayServiceImpl MOZ_FINAL : public trayITrayService, nsIObserver {
+class TrayServiceImpl final : public trayITrayService, nsIObserver {
   friend class TrayIconImpl;
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
   NS_DECL_TRAYITRAYSERVICE
 
   TrayServiceImpl();
 
--- a/ldap/xpcom/src/nsLDAPControl.h
+++ b/ldap/xpcom/src/nsLDAPControl.h
@@ -10,17 +10,17 @@
 #include "nsStringGlue.h"
 #include "ldap.h"
 
 // {5B608BBE-C0EA-4f74-B209-9CDCD79EC401}
 #define NS_LDAPCONTROL_CID \
   { 0x5b608bbe, 0xc0ea, 0x4f74, \
       { 0xb2, 0x9, 0x9c, 0xdc, 0xd7, 0x9e, 0xc4, 0x1 } }
 
-class nsLDAPControl MOZ_FINAL : public nsILDAPControl
+class nsLDAPControl final : public nsILDAPControl
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSILDAPCONTROL
 
   nsLDAPControl();
 
   /**
--- a/mailnews/addrbook/src/nsAbBSDirectory.h
+++ b/mailnews/addrbook/src/nsAbBSDirectory.h
@@ -16,29 +16,29 @@
 class nsAbBSDirectory : public nsAbDirProperty
 {
 public:
 	NS_DECL_ISUPPORTS_INHERITED
 
 	nsAbBSDirectory();
 
 	// nsIAbDirectory methods
-  NS_IMETHOD Init(const char *aURI) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aURI) override;
+  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) override;
   NS_IMETHOD CreateNewDirectory(const nsAString &aDirName,
                                 const nsACString &aURI,
                                 uint32_t aType,
                                 const nsACString &aPrefName,
-                                nsACString &aResult) MOZ_OVERRIDE;
+                                nsACString &aResult) override;
   NS_IMETHOD CreateDirectoryByURI(const nsAString &aDisplayName,
-                                  const nsACString &aURI) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory) MOZ_OVERRIDE;
-  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir) MOZ_OVERRIDE;
-  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetURI(nsACString &aURI) MOZ_OVERRIDE;
+                                  const nsACString &aURI) override;
+  NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory) override;
+  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir) override;
+  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) override;
+  NS_IMETHOD GetURI(nsACString &aURI) override;
 
 protected:
   virtual ~nsAbBSDirectory();
   nsresult EnsureInitialized();
 	nsresult CreateDirectoriesFromFactory(const nsACString &aURI,
                                         DIR_Server* aServer, bool aNotify);
 
 protected:
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -195,17 +195,17 @@ NS_IMETHODIMP nsAbCardProperty::SetMailL
   else
     return NS_ERROR_NULL_POINTER;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Property bag portion of nsAbCardProperty
 ///////////////////////////////////////////////////////////////////////////////
 
-class nsAbSimpleProperty MOZ_FINAL : public nsIProperty {
+class nsAbSimpleProperty final : public nsIProperty {
 public:
     nsAbSimpleProperty(const nsACString& aName, nsIVariant* aValue)
         : mName(aName), mValue(aValue)
     {
     }
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPROPERTY
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.h
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.h
@@ -26,18 +26,18 @@ public :
   NS_IMETHOD Init(nsIAbLDAPReplicationQuery * query, nsIWebProgressListener *progressListener);
 
 protected :
   ~nsAbLDAPProcessChangeLogData();
 
   nsCOMPtr <nsIAbLDAPChangeLogQuery> mChangeLogQuery;
 
   nsresult OnLDAPBind(nsILDAPMessage *aMessage);
-  nsresult OnLDAPSearchEntry(nsILDAPMessage *aMessage) MOZ_OVERRIDE;
-  nsresult OnLDAPSearchResult(nsILDAPMessage *aMessage) MOZ_OVERRIDE;
+  nsresult OnLDAPSearchEntry(nsILDAPMessage *aMessage) override;
+  nsresult OnLDAPSearchResult(nsILDAPMessage *aMessage) override;
 
   nsresult ParseChangeLogEntries(nsILDAPMessage *aMessage);
   nsresult ParseRootDSEEntry(nsILDAPMessage *aMessage);
 
   nsresult  GetAuthData(); // displays username and password prompt
   nsCString mAuthUserID;   // user id of the user making the connection
 
   nsresult OnSearchAuthDNDone();
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.h
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.h
@@ -16,13 +16,13 @@ class nsAbLDAPChangeLogQuery : public ns
 {
 public :
   NS_DECL_ISUPPORTS
   NS_DECL_NSIABLDAPCHANGELOGQUERY
 
   nsAbLDAPChangeLogQuery();
   virtual ~nsAbLDAPChangeLogQuery();
 
-  NS_IMETHOD DoReplicationQuery() MOZ_OVERRIDE;
+  NS_IMETHOD DoReplicationQuery() override;
   NS_IMETHOD Init(const nsACString & aPrefName, nsIWebProgressListener *aProgressListener);
 };
 
 #endif // nsAbLDAPChangeLogQuery_h__
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.h
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.h
@@ -24,33 +24,33 @@ class nsAbLDAPDirectory :
   public nsIAbLDAPDirectory,
   public nsIAbDirSearchListener
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   nsAbLDAPDirectory();
 
-  NS_IMETHOD Init(const char *aUri) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aUri) override;
 
   // nsIAbDirectory methods
-  NS_IMETHOD GetPropertiesChromeURI(nsACString &aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetURI(nsACString &aURI) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsQuery(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard) MOZ_OVERRIDE;
-  NS_IMETHOD GetSupportsMailingLists(bool *aSupportsMailingsLists) MOZ_OVERRIDE;
-  NS_IMETHOD GetReadOnly(bool *aReadOnly) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsRemote(bool *aIsRemote) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsSecure(bool *aIsRemote) MOZ_OVERRIDE;
-  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD AddCard(nsIAbCard *aChildCard, nsIAbCard **aAddedCard) MOZ_OVERRIDE;
-  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteCards(nsIArray *aCards) MOZ_OVERRIDE;
+  NS_IMETHOD GetPropertiesChromeURI(nsACString &aResult) override;
+  NS_IMETHOD GetURI(nsACString &aURI) override;
+  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) override;
+  NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result) override;
+  NS_IMETHOD GetIsQuery(bool *aResult) override;
+  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard) override;
+  NS_IMETHOD GetSupportsMailingLists(bool *aSupportsMailingsLists) override;
+  NS_IMETHOD GetReadOnly(bool *aReadOnly) override;
+  NS_IMETHOD GetIsRemote(bool *aIsRemote) override;
+  NS_IMETHOD GetIsSecure(bool *aIsRemote) override;
+  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) override;
+  NS_IMETHOD AddCard(nsIAbCard *aChildCard, nsIAbCard **aAddedCard) override;
+  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) override;
+  NS_IMETHOD DeleteCards(nsIArray *aCards) override;
 
   // nsIAbDirectorySearch methods
   NS_DECL_NSIABDIRECTORYSEARCH
   NS_DECL_NSIABLDAPDIRECTORY
   NS_DECL_NSIABDIRSEARCHLISTENER
 
 protected:
   virtual ~nsAbLDAPDirectory();
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.h
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.h
@@ -21,17 +21,17 @@ public:
   // Note that the directoryUrl is the details of the ldap directory
   // without any search params or attributes specified.
   nsAbLDAPListenerBase(nsILDAPURL* directoryUrl = nullptr,
                        nsILDAPConnection* connection = nullptr,
                        const nsACString &login = EmptyCString(),
                        const int32_t timeOut = 0);
   virtual ~nsAbLDAPListenerBase();
 
-  NS_IMETHOD OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus) MOZ_OVERRIDE;
+  NS_IMETHOD OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus) override;
 
 protected:
   nsresult OnLDAPMessageBind(nsILDAPMessage *aMessage);
 
   nsresult Initiate();
 
   // Called if an LDAP initialization fails.
   virtual void InitFailed(bool aCancelled = false) = 0;
--- a/mailnews/addrbook/src/nsAbLDAPReplicationData.h
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationData.h
@@ -23,22 +23,22 @@ class nsAbLDAPProcessReplicationData : p
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIABLDAPPROCESSREPLICATIONDATA
 
   nsAbLDAPProcessReplicationData();
 
   // nsILDAPMessageListener
-  NS_IMETHOD OnLDAPMessage(nsILDAPMessage *aMessage) MOZ_OVERRIDE;
+  NS_IMETHOD OnLDAPMessage(nsILDAPMessage *aMessage) override;
 
 protected:
   virtual ~nsAbLDAPProcessReplicationData();
-  virtual nsresult DoTask() MOZ_OVERRIDE;
-  virtual void InitFailed(bool aCancelled = false) MOZ_OVERRIDE;
+  virtual nsresult DoTask() override;
+  virtual void InitFailed(bool aCancelled = false) override;
 
   // pointer to the interfaces used by this object
   nsCOMPtr<nsIWebProgressListener> mListener;
   // pointer to the query to call back to once we've finished
   nsCOMPtr<nsIAbLDAPReplicationQuery> mQuery;
 
   nsCOMPtr<nsIAddrDatabase> mReplicationDB;
   nsCOMPtr <nsIFile> mReplicationFile;
--- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
@@ -11,17 +11,17 @@
 #include "nsIAbLDAPReplicationData.h"
 #include "nsIAbLDAPDirectory.h"
 #include "nsILDAPConnection.h"
 #include "nsILDAPOperation.h"
 #include "nsILDAPURL.h"
 #include "nsDirPrefs.h"
 #include "nsStringGlue.h"
 
-class nsAbLDAPReplicationQuery MOZ_FINAL : public nsIAbLDAPReplicationQuery
+class nsAbLDAPReplicationQuery final : public nsIAbLDAPReplicationQuery
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIABLDAPREPLICATIONQUERY
 
   nsAbLDAPReplicationQuery();
 
   nsresult InitLDAPData();
--- a/mailnews/addrbook/src/nsAbMDBCard.h
+++ b/mailnews/addrbook/src/nsAbMDBCard.h
@@ -12,15 +12,15 @@
 
 class nsAbMDBCard: public nsAbCardProperty
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   nsAbMDBCard(void);
 
-  NS_IMETHOD Equals(nsIAbCard *card, bool *result) MOZ_OVERRIDE;
+  NS_IMETHOD Equals(nsIAbCard *card, bool *result) override;
 
 private:
   virtual ~nsAbMDBCard();
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbMDBDirectory.h
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.h
@@ -35,50 +35,50 @@ class nsAbMDBDirectory:
 {
 public: 
   nsAbMDBDirectory(void);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIADDRDBLISTENER
 
   // Override nsAbMDBDirProperty::Init
-  NS_IMETHOD Init(const char *aUri) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aUri) override;
 
   // nsIAbMDBDirectory methods
-  NS_IMETHOD GetURI(nsACString &aURI) MOZ_OVERRIDE;
-  NS_IMETHOD ClearDatabase() MOZ_OVERRIDE;
-  NS_IMETHOD NotifyDirItemAdded(nsISupports *item) MOZ_OVERRIDE { return NotifyItemAdded(item);}
-  NS_IMETHOD RemoveElementsFromAddressList() MOZ_OVERRIDE;
-  NS_IMETHOD RemoveEmailAddressAt(uint32_t aIndex) MOZ_OVERRIDE;
-  NS_IMETHOD AddDirectory(const char *uriName, nsIAbDirectory **childDir) MOZ_OVERRIDE;
-  NS_IMETHOD GetDatabaseFile(nsIFile **aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetDatabase(nsIAddrDatabase **aResult) MOZ_OVERRIDE;
+  NS_IMETHOD GetURI(nsACString &aURI) override;
+  NS_IMETHOD ClearDatabase() override;
+  NS_IMETHOD NotifyDirItemAdded(nsISupports *item) override { return NotifyItemAdded(item);}
+  NS_IMETHOD RemoveElementsFromAddressList() override;
+  NS_IMETHOD RemoveEmailAddressAt(uint32_t aIndex) override;
+  NS_IMETHOD AddDirectory(const char *uriName, nsIAbDirectory **childDir) override;
+  NS_IMETHOD GetDatabaseFile(nsIFile **aResult) override;
+  NS_IMETHOD GetDatabase(nsIAddrDatabase **aResult) override;
 
   // nsIAbDirectory methods:
-  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsQuery(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteCards(nsIArray *cards) MOZ_OVERRIDE;
-  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard) MOZ_OVERRIDE;
-  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir) MOZ_OVERRIDE;
-  NS_IMETHOD AddMailList(nsIAbDirectory *list, nsIAbDirectory **addedList) MOZ_OVERRIDE;
-  NS_IMETHOD AddCard(nsIAbCard *card, nsIAbCard **addedCard) MOZ_OVERRIDE;
-  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) MOZ_OVERRIDE;
-  NS_IMETHOD DropCard(nsIAbCard *card, bool needToCopyCard) MOZ_OVERRIDE;
-  NS_IMETHOD EditMailListToDatabase(nsIAbCard *listCard) MOZ_OVERRIDE;
+  NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) override;
+  NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result) override;
+  NS_IMETHOD GetIsQuery(bool *aResult) override;
+  NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory) override;
+  NS_IMETHOD DeleteCards(nsIArray *cards) override;
+  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard) override;
+  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir) override;
+  NS_IMETHOD AddMailList(nsIAbDirectory *list, nsIAbDirectory **addedList) override;
+  NS_IMETHOD AddCard(nsIAbCard *card, nsIAbCard **addedCard) override;
+  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) override;
+  NS_IMETHOD DropCard(nsIAbCard *card, bool needToCopyCard) override;
+  NS_IMETHOD EditMailListToDatabase(nsIAbCard *listCard) override;
   NS_IMETHOD CardForEmailAddress(const nsACString &aEmailAddress,
-                                 nsIAbCard ** aAbCard) MOZ_OVERRIDE;
+                                 nsIAbCard ** aAbCard) override;
   NS_IMETHOD GetCardFromProperty(const char *aProperty,
                                  const nsACString &aValue,
-                                 bool caseSensitive, nsIAbCard **result) MOZ_OVERRIDE;
+                                 bool caseSensitive, nsIAbCard **result) override;
   NS_IMETHOD GetCardsFromProperty(const char *aProperty,
                                   const nsACString &aValue,
                                   bool caseSensitive,
-                                  nsISimpleEnumerator **result) MOZ_OVERRIDE;
+                                  nsISimpleEnumerator **result) override;
 
   // nsIAbDirectorySearch methods
   NS_DECL_NSIABDIRECTORYSEARCH
 
   // nsIAbDirSearchListener methods
   NS_DECL_NSIABDIRSEARCHLISTENER
 
 protected:
--- a/mailnews/addrbook/src/nsAbOSXCard.h
+++ b/mailnews/addrbook/src/nsAbOSXCard.h
@@ -28,19 +28,19 @@ public:
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIAbOSXCard, NS_IABOSXCARD_IID)
 
 class nsAbOSXCard : public nsAbCardProperty,
                     public nsIAbOSXCard
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
     
-  nsresult Update(bool aNotify) MOZ_OVERRIDE;
-  nsresult GetURI(nsACString &aURI) MOZ_OVERRIDE;
-  nsresult Init(const char *aUri) MOZ_OVERRIDE;
+  nsresult Update(bool aNotify) override;
+  nsresult GetURI(nsACString &aURI) override;
+  nsresult Init(const char *aUri) override;
   // this is needed so nsAbOSXUtils.mm can get at nsAbCardProperty
   friend class nsAbOSXUtils;
 private:
   nsCString mURI;
 
   virtual ~nsAbOSXCard() {}
 };
 
--- a/mailnews/addrbook/src/nsAbOSXDirFactory.h
+++ b/mailnews/addrbook/src/nsAbOSXDirFactory.h
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsAbOSXDirFactory_h___
 #define nsAbOSXDirFactory_h___
 
 #include "nsIAbDirFactory.h"
 
-class nsAbOSXDirFactory MOZ_FINAL : public nsIAbDirFactory
+class nsAbOSXDirFactory final : public nsIAbDirFactory
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIABDIRFACTORY
 
 private:
     ~nsAbOSXDirFactory() {}
 };
--- a/mailnews/addrbook/src/nsAbOSXDirectory.h
+++ b/mailnews/addrbook/src/nsAbOSXDirectory.h
@@ -46,65 +46,65 @@ public:
   virtual nsresult DeleteUid(const nsACString &aUid) = 0;
   virtual nsresult GetURI(nsACString &aURI) = 0;
   virtual nsresult Init(const char *aUri) = 0;
   virtual nsresult GetCardByUri(const nsACString &aUri, nsIAbOSXCard **aResult) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIAbOSXDirectory, NS_IABOSXDIRECTORY_IID)
 
-class nsAbOSXDirectory MOZ_FINAL : public nsAbDirProperty,
+class nsAbOSXDirectory final : public nsAbDirProperty,
 public nsIAbDirSearchListener,
 public nsIAbOSXDirectory
 {
 public:
   nsAbOSXDirectory();
   
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIABDIRSEARCHLISTENER
     
   // nsIAbOSXDirectory method
-  NS_IMETHOD Init(const char *aUri) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aUri) override;
   
   // nsAbDirProperty methods
-  NS_IMETHOD GetReadOnly(bool *aReadOnly) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildCards(nsISimpleEnumerator **aCards) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildNodes(nsISimpleEnumerator **aNodes) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsQuery(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD HasCard(nsIAbCard *aCard, bool *aHasCard) MOZ_OVERRIDE;
-  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory) MOZ_OVERRIDE;
-  NS_IMETHOD GetURI(nsACString &aURI) MOZ_OVERRIDE;
+  NS_IMETHOD GetReadOnly(bool *aReadOnly) override;
+  NS_IMETHOD GetChildCards(nsISimpleEnumerator **aCards) override;
+  NS_IMETHOD GetChildNodes(nsISimpleEnumerator **aNodes) override;
+  NS_IMETHOD GetIsQuery(bool *aResult) override;
+  NS_IMETHOD HasCard(nsIAbCard *aCard, bool *aHasCard) override;
+  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory) override;
+  NS_IMETHOD GetURI(nsACString &aURI) override;
   NS_IMETHOD GetCardFromProperty(const char *aProperty,
                                  const nsACString &aValue,
                                  bool caseSensitive,
-                                 nsIAbCard **aResult) MOZ_OVERRIDE;
+                                 nsIAbCard **aResult) override;
   NS_IMETHOD GetCardsFromProperty(const char *aProperty,
                                   const nsACString &aValue,
                                   bool aCaseSensitive,
-                                  nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
+                                  nsISimpleEnumerator **aResult) override;
   NS_IMETHOD CardForEmailAddress(const nsACString &aEmailAddress,
-                                 nsIAbCard **aResult) MOZ_OVERRIDE;
+                                 nsIAbCard **aResult) override;
 
   // nsIAbOSXDirectory
-  nsresult AssertChildNodes() MOZ_OVERRIDE;
+  nsresult AssertChildNodes() override;
   nsresult AssertDirectory(nsIAbManager *aManager,
-                           nsIAbDirectory *aDirectory) MOZ_OVERRIDE;
+                           nsIAbDirectory *aDirectory) override;
   nsresult AssertCard(nsIAbManager *aManager,
-                      nsIAbCard *aCard) MOZ_OVERRIDE;
+                      nsIAbCard *aCard) override;
   nsresult UnassertCard(nsIAbManager *aManager,
                         nsIAbCard *aCard,
-                        nsIMutableArray *aCardList) MOZ_OVERRIDE;
+                        nsIMutableArray *aCardList) override;
   nsresult UnassertDirectory(nsIAbManager *aManager,
-                             nsIAbDirectory *aDirectory) MOZ_OVERRIDE;
+                             nsIAbDirectory *aDirectory) override;
   
-  nsresult Update() MOZ_OVERRIDE;
+  nsresult Update() override;
 
-  nsresult DeleteUid(const nsACString &aUid) MOZ_OVERRIDE;
+  nsresult DeleteUid(const nsACString &aUid) override;
 
-  nsresult GetCardByUri(const nsACString &aUri, nsIAbOSXCard **aResult) MOZ_OVERRIDE;
+  nsresult GetCardByUri(const nsACString &aUri, nsIAbOSXCard **aResult) override;
 
   nsresult GetRootOSXDirectory(nsIAbOSXDirectory **aResult);
 
 private:
   ~nsAbOSXDirectory();
   nsresult FallbackSearch(nsIAbBooleanExpression *aExpression,
                           nsISimpleEnumerator **aCards);
 
--- a/mailnews/addrbook/src/nsAbOutlookDirectory.h
+++ b/mailnews/addrbook/src/nsAbOutlookDirectory.h
@@ -27,34 +27,34 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIABDIRSEARCHLISTENER
   NS_DECL_NSIABDIRECTORYQUERYRESULTLISTENER
 
   nsAbOutlookDirectory(void);
   virtual ~nsAbOutlookDirectory(void);
 
   // nsAbDirProperty methods
-  NS_IMETHOD GetDirType(int32_t *aDirType) MOZ_OVERRIDE;
-  NS_IMETHOD GetURI(nsACString &aURI) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildCards(nsISimpleEnumerator **aCards) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildNodes(nsISimpleEnumerator **aNodes) MOZ_OVERRIDE;
-  NS_IMETHOD GetIsQuery(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD HasCard(nsIAbCard *aCard, bool *aHasCard) MOZ_OVERRIDE;
-  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteCards(nsIArray *aCardList) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteDirectory(nsIAbDirectory *aDirectory) MOZ_OVERRIDE;
-  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD AddCard(nsIAbCard *aData, nsIAbCard **addedCard) MOZ_OVERRIDE;
-  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) MOZ_OVERRIDE;
-  NS_IMETHOD DropCard(nsIAbCard *aData, bool needToCopyCard) MOZ_OVERRIDE;
-  NS_IMETHOD AddMailList(nsIAbDirectory *aMailList, nsIAbDirectory **addedList) MOZ_OVERRIDE;
-  NS_IMETHOD EditMailListToDatabase(nsIAbCard *listCard) MOZ_OVERRIDE;
+  NS_IMETHOD GetDirType(int32_t *aDirType) override;
+  NS_IMETHOD GetURI(nsACString &aURI) override;
+  NS_IMETHOD GetChildCards(nsISimpleEnumerator **aCards) override;
+  NS_IMETHOD GetChildNodes(nsISimpleEnumerator **aNodes) override;
+  NS_IMETHOD GetIsQuery(bool *aResult) override;
+  NS_IMETHOD HasCard(nsIAbCard *aCard, bool *aHasCard) override;
+  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory) override;
+  NS_IMETHOD DeleteCards(nsIArray *aCardList) override;
+  NS_IMETHOD DeleteDirectory(nsIAbDirectory *aDirectory) override;
+  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) override;
+  NS_IMETHOD AddCard(nsIAbCard *aData, nsIAbCard **addedCard) override;
+  NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard) override;
+  NS_IMETHOD DropCard(nsIAbCard *aData, bool needToCopyCard) override;
+  NS_IMETHOD AddMailList(nsIAbDirectory *aMailList, nsIAbDirectory **addedList) override;
+  NS_IMETHOD EditMailListToDatabase(nsIAbCard *listCard) override;
   
   // nsAbDirProperty method
-  NS_IMETHOD Init(const char *aUri) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aUri) override;
   // nsIAbDirectoryQuery methods
   NS_DECL_NSIABDIRECTORYQUERY
   // nsIAbDirectorySearch methods
   NS_DECL_NSIABDIRECTORYSEARCH
   // Perform a MAPI query (function executed in a separate thread)
   nsresult ExecuteQuery(SRestriction &aRestriction,
                         nsIAbDirSearchListener *aListener,
                         int32_t aResultLimit, int32_t aTimeout,
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -2658,17 +2658,17 @@ NS_IMETHODIMP nsAddrDBEnumerator::OnList
 
 /* void onAnnouncerGoingAway (); */
 NS_IMETHODIMP nsAddrDBEnumerator::OnAnnouncerGoingAway()
 {
   Clear();
   return NS_OK;
 }
 
-class nsListAddressEnumerator MOZ_FINAL : public nsISimpleEnumerator
+class nsListAddressEnumerator final : public nsISimpleEnumerator
 {
 public:
     NS_DECL_ISUPPORTS
 
     // nsISimpleEnumerator methods:
     NS_DECL_NSISIMPLEENUMERATOR
 
     // nsListAddressEnumerator methods:
--- a/mailnews/addrbook/src/nsAddrDatabase.h
+++ b/mailnews/addrbook/src/nsAddrDatabase.h
@@ -26,229 +26,229 @@ typedef enum
 class nsAddrDatabase : public nsIAddrDatabase
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIADDRDBANNOUNCER
   //////////////////////////////////////////////////////////////////////////////
   // nsIAddrDatabase methods:
 
-  NS_IMETHOD GetDbPath(nsIFile * *aDbPath) MOZ_OVERRIDE;
-  NS_IMETHOD SetDbPath(nsIFile * aDbPath) MOZ_OVERRIDE;
-  NS_IMETHOD Open(nsIFile *aMabFile, bool aCreate, bool upgrading, nsIAddrDatabase **pCardDB) MOZ_OVERRIDE;
-  NS_IMETHOD Close(bool forceCommit) MOZ_OVERRIDE;
-  NS_IMETHOD OpenMDB(nsIFile *dbName, bool create) MOZ_OVERRIDE;
-  NS_IMETHOD CloseMDB(bool commit) MOZ_OVERRIDE;
-  NS_IMETHOD Commit(uint32_t commitType) MOZ_OVERRIDE;
-  NS_IMETHOD ForceClosed() MOZ_OVERRIDE;
+  NS_IMETHOD GetDbPath(nsIFile * *aDbPath) override;
+  NS_IMETHOD SetDbPath(nsIFile * aDbPath) override;
+  NS_IMETHOD Open(nsIFile *aMabFile, bool aCreate, bool upgrading, nsIAddrDatabase **pCardDB) override;
+  NS_IMETHOD Close(bool forceCommit) override;
+  NS_IMETHOD OpenMDB(nsIFile *dbName, bool create) override;
+  NS_IMETHOD CloseMDB(bool commit) override;
+  NS_IMETHOD Commit(uint32_t commitType) override;
+  NS_IMETHOD ForceClosed() override;
 
-  NS_IMETHOD CreateNewCardAndAddToDB(nsIAbCard *newCard, bool notify, nsIAbDirectory *parent) MOZ_OVERRIDE;
-  NS_IMETHOD CreateNewListCardAndAddToDB(nsIAbDirectory *list, uint32_t listRowID, nsIAbCard *newCard, bool notify) MOZ_OVERRIDE;
-  NS_IMETHOD CreateMailListAndAddToDB(nsIAbDirectory *newList, bool notify, nsIAbDirectory *parent) MOZ_OVERRIDE;
-  NS_IMETHOD EnumerateCards(nsIAbDirectory *directory, nsISimpleEnumerator **result) MOZ_OVERRIDE;
-  NS_IMETHOD GetMailingListsFromDB(nsIAbDirectory *parentDir) MOZ_OVERRIDE;
-  NS_IMETHOD EnumerateListAddresses(nsIAbDirectory *directory, nsISimpleEnumerator **result) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteCard(nsIAbCard *newCard, bool notify, nsIAbDirectory *parent) MOZ_OVERRIDE;
-  NS_IMETHOD EditCard(nsIAbCard *card, bool notify, nsIAbDirectory *parent) MOZ_OVERRIDE;
-  NS_IMETHOD ContainsCard(nsIAbCard *card, bool *hasCard) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteMailList(nsIAbDirectory *aMailList, nsIAbDirectory *aParent) MOZ_OVERRIDE;
-  NS_IMETHOD EditMailList(nsIAbDirectory *mailList, nsIAbCard *listCard, bool notify) MOZ_OVERRIDE;
-  NS_IMETHOD ContainsMailList(nsIAbDirectory *mailList, bool *hasCard) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteCardFromMailList(nsIAbDirectory *mailList, nsIAbCard *card, bool aNotify) MOZ_OVERRIDE;
+  NS_IMETHOD CreateNewCardAndAddToDB(nsIAbCard *newCard, bool notify, nsIAbDirectory *parent) override;
+  NS_IMETHOD CreateNewListCardAndAddToDB(nsIAbDirectory *list, uint32_t listRowID, nsIAbCard *newCard, bool notify) override;
+  NS_IMETHOD CreateMailListAndAddToDB(nsIAbDirectory *newList, bool notify, nsIAbDirectory *parent) override;
+  NS_IMETHOD EnumerateCards(nsIAbDirectory *directory, nsISimpleEnumerator **result) override;
+  NS_IMETHOD GetMailingListsFromDB(nsIAbDirectory *parentDir) override;
+  NS_IMETHOD EnumerateListAddresses(nsIAbDirectory *directory, nsISimpleEnumerator **result) override;
+  NS_IMETHOD DeleteCard(nsIAbCard *newCard, bool notify, nsIAbDirectory *parent) override;
+  NS_IMETHOD EditCard(nsIAbCard *card, bool notify, nsIAbDirectory *parent) override;
+  NS_IMETHOD ContainsCard(nsIAbCard *card, bool *hasCard) override;
+  NS_IMETHOD DeleteMailList(nsIAbDirectory *aMailList, nsIAbDirectory *aParent) override;
+  NS_IMETHOD EditMailList(nsIAbDirectory *mailList, nsIAbCard *listCard, bool notify) override;
+  NS_IMETHOD ContainsMailList(nsIAbDirectory *mailList, bool *hasCard) override;
+  NS_IMETHOD DeleteCardFromMailList(nsIAbDirectory *mailList, nsIAbCard *card, bool aNotify) override;
   NS_IMETHOD GetCardFromAttribute(nsIAbDirectory *aDirectory, const char *aName,
                                   const nsACString &aValue,
-                                  bool aCaseInsensitive, nsIAbCard **card) MOZ_OVERRIDE;
+                                  bool aCaseInsensitive, nsIAbCard **card) override;
   NS_IMETHOD GetCardsFromAttribute(nsIAbDirectory *aDirectory,
                                    const char *aName,
                                    const nsACString & uUTF8Value,
                                    bool aCaseInsensitive,
-                                   nsISimpleEnumerator **cards) MOZ_OVERRIDE;
-  NS_IMETHOD GetNewRow(nsIMdbRow * *newRow) MOZ_OVERRIDE;
-  NS_IMETHOD GetNewListRow(nsIMdbRow * *newRow) MOZ_OVERRIDE;
-  NS_IMETHOD AddCardRowToDB(nsIMdbRow *newRow) MOZ_OVERRIDE;
-  NS_IMETHOD AddLdifListMember(nsIMdbRow* row, const char * value) MOZ_OVERRIDE;
+                                   nsISimpleEnumerator **cards) override;
+  NS_IMETHOD GetNewRow(nsIMdbRow * *newRow) override;
+  NS_IMETHOD GetNewListRow(nsIMdbRow * *newRow) override;
+  NS_IMETHOD AddCardRowToDB(nsIMdbRow *newRow) override;
+  NS_IMETHOD AddLdifListMember(nsIMdbRow* row, const char * value) override;
 
-  NS_IMETHOD GetDeletedCardList(nsIArray **aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetDeletedCardCount(uint32_t *aCount) MOZ_OVERRIDE;
+  NS_IMETHOD GetDeletedCardList(nsIArray **aResult) override;
+  NS_IMETHOD GetDeletedCardCount(uint32_t *aCount) override;
   NS_IMETHOD PurgeDeletedCardTable();
 
-  NS_IMETHOD AddFirstName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddFirstName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_FirstNameColumnToken, value); }
 
-  NS_IMETHOD AddLastName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddLastName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_LastNameColumnToken, value); }
 
-  NS_IMETHOD AddPhoneticFirstName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddPhoneticFirstName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_PhoneticFirstNameColumnToken, value); }
 
-  NS_IMETHOD AddPhoneticLastName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddPhoneticLastName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_PhoneticLastNameColumnToken, value); }
 
-  NS_IMETHOD AddDisplayName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddDisplayName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_DisplayNameColumnToken, value); }
 
-  NS_IMETHOD AddNickName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddNickName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_NickNameColumnToken, value); }
 
-  NS_IMETHOD AddPrimaryEmail(nsIMdbRow * row, const char * value) MOZ_OVERRIDE;
+  NS_IMETHOD AddPrimaryEmail(nsIMdbRow * row, const char * value) override;
 
-  NS_IMETHOD Add2ndEmail(nsIMdbRow * row, const char * value) MOZ_OVERRIDE;
+  NS_IMETHOD Add2ndEmail(nsIMdbRow * row, const char * value) override;
 
-  NS_IMETHOD AddPreferMailFormat(nsIMdbRow * row, uint32_t value) MOZ_OVERRIDE
+  NS_IMETHOD AddPreferMailFormat(nsIMdbRow * row, uint32_t value) override
   { return AddIntColumn(row, m_MailFormatColumnToken, value); }
 
-  NS_IMETHOD AddPopularityIndex(nsIMdbRow * row, uint32_t value) MOZ_OVERRIDE
+  NS_IMETHOD AddPopularityIndex(nsIMdbRow * row, uint32_t value) override
   { return AddIntColumn(row, m_PopularityIndexColumnToken, value); }
 
-  NS_IMETHOD AddWorkPhone(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkPhone(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkPhoneColumnToken, value); }
 
-  NS_IMETHOD AddHomePhone(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomePhone(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomePhoneColumnToken, value); }
 
-  NS_IMETHOD AddFaxNumber(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddFaxNumber(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_FaxColumnToken, value); }
 
-  NS_IMETHOD AddPagerNumber(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddPagerNumber(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_PagerColumnToken, value); }
 
-  NS_IMETHOD AddCellularNumber(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCellularNumber(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_CellularColumnToken, value); }
 
-  NS_IMETHOD AddWorkPhoneType(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkPhoneType(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkPhoneTypeColumnToken, value); }
 
-  NS_IMETHOD AddHomePhoneType(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomePhoneType(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomePhoneTypeColumnToken, value); }
 
-  NS_IMETHOD AddFaxNumberType(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddFaxNumberType(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_FaxTypeColumnToken, value); }
 
-  NS_IMETHOD AddPagerNumberType(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddPagerNumberType(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_PagerTypeColumnToken, value); }
 
-  NS_IMETHOD AddCellularNumberType(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCellularNumberType(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_CellularTypeColumnToken, value); }
 
-  NS_IMETHOD AddHomeAddress(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeAddress(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeAddressColumnToken, value); }
 
-  NS_IMETHOD AddHomeAddress2(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeAddress2(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeAddress2ColumnToken, value); }
 
-  NS_IMETHOD AddHomeCity(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeCity(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeCityColumnToken, value); }
 
-  NS_IMETHOD AddHomeState(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeState(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeStateColumnToken, value); }
 
-  NS_IMETHOD AddHomeZipCode(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeZipCode(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeZipCodeColumnToken, value); }
 
-  NS_IMETHOD AddHomeCountry(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddHomeCountry(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_HomeCountryColumnToken, value); }
 
-  NS_IMETHOD AddWorkAddress(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkAddress(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkAddressColumnToken, value); }
 
-  NS_IMETHOD AddWorkAddress2(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkAddress2(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkAddress2ColumnToken, value); }
 
-  NS_IMETHOD AddWorkCity(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkCity(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkCityColumnToken, value); }
 
-  NS_IMETHOD AddWorkState(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkState(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkStateColumnToken, value); }
 
-  NS_IMETHOD AddWorkZipCode(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkZipCode(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkZipCodeColumnToken, value); }
 
-  NS_IMETHOD AddWorkCountry(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWorkCountry(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WorkCountryColumnToken, value); }
 
-  NS_IMETHOD AddJobTitle(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddJobTitle(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_JobTitleColumnToken, value); }
 
-  NS_IMETHOD AddDepartment(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddDepartment(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_DepartmentColumnToken, value); }
 
-  NS_IMETHOD AddCompany(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCompany(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_CompanyColumnToken, value); }
 
-  NS_IMETHOD AddAimScreenName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddAimScreenName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_AimScreenNameColumnToken, value); }
 
-  NS_IMETHOD AddAnniversaryYear(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddAnniversaryYear(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_AnniversaryYearColumnToken, value); }
 
-  NS_IMETHOD AddAnniversaryMonth(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddAnniversaryMonth(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_AnniversaryMonthColumnToken, value); }
 
-  NS_IMETHOD AddAnniversaryDay(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddAnniversaryDay(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_AnniversaryDayColumnToken, value); }
 
-  NS_IMETHOD AddSpouseName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddSpouseName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_SpouseNameColumnToken, value); }
 
-  NS_IMETHOD AddFamilyName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddFamilyName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_FamilyNameColumnToken, value); }
 
-  NS_IMETHOD AddDefaultAddress(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddDefaultAddress(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_DefaultAddressColumnToken, value); }
 
-  NS_IMETHOD AddCategory(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCategory(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_CategoryColumnToken, value); }
 
-  NS_IMETHOD AddWebPage1(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWebPage1(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WebPage1ColumnToken, value); }
 
-  NS_IMETHOD AddWebPage2(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddWebPage2(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_WebPage2ColumnToken, value); }
 
-  NS_IMETHOD AddBirthYear(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddBirthYear(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_BirthYearColumnToken, value); }
 
-  NS_IMETHOD AddBirthMonth(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddBirthMonth(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_BirthMonthColumnToken, value); }
 
-  NS_IMETHOD AddBirthDay(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddBirthDay(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_BirthDayColumnToken, value); }
 
-  NS_IMETHOD AddCustom1(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCustom1(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_Custom1ColumnToken, value); }
 
-  NS_IMETHOD AddCustom2(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCustom2(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_Custom2ColumnToken, value); }
 
-  NS_IMETHOD AddCustom3(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCustom3(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_Custom3ColumnToken, value); }
 
-  NS_IMETHOD AddCustom4(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddCustom4(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_Custom4ColumnToken, value); }
 
-  NS_IMETHOD AddNotes(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddNotes(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_NotesColumnToken, value); }
 
-  NS_IMETHOD AddListName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE;
+  NS_IMETHOD AddListName(nsIMdbRow * row, const char * value) override;
 
-  NS_IMETHOD AddListNickName(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddListNickName(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_ListNickNameColumnToken, value); }
 
-  NS_IMETHOD AddListDescription(nsIMdbRow * row, const char * value) MOZ_OVERRIDE
+  NS_IMETHOD AddListDescription(nsIMdbRow * row, const char * value) override
   { return AddCharStringColumn(row, m_ListDescriptionColumnToken, value); }
 
 
-  NS_IMETHOD AddListDirNode(nsIMdbRow * listRow) MOZ_OVERRIDE;
+  NS_IMETHOD AddListDirNode(nsIMdbRow * listRow) override;
 
-  NS_IMETHOD FindMailListbyUnicodeName(const char16_t *listName, bool *exist) MOZ_OVERRIDE;
+  NS_IMETHOD FindMailListbyUnicodeName(const char16_t *listName, bool *exist) override;
 
-  NS_IMETHOD GetCardCount(uint32_t *count) MOZ_OVERRIDE;
+  NS_IMETHOD GetCardCount(uint32_t *count) override;
 
-  NS_IMETHOD SetCardValue(nsIAbCard *card, const char *name, const char16_t *value, bool notify) MOZ_OVERRIDE;
-  NS_IMETHOD GetCardValue(nsIAbCard *card, const char *name, char16_t **value) MOZ_OVERRIDE;
+  NS_IMETHOD SetCardValue(nsIAbCard *card, const char *name, const char16_t *value, bool notify) override;
+  NS_IMETHOD GetCardValue(nsIAbCard *card, const char *name, char16_t **value) override;
   // nsAddrDatabase methods:
 
   nsAddrDatabase();
 
   void GetMDBFactory(nsIMdbFactory ** aMdbFactory);
   nsIMdbEnv    *GetEnv() {return m_mdbEnv;}
   uint32_t    GetCurVersion();
   nsIMdbTableRowCursor *GetTableRowCursor();
@@ -266,20 +266,20 @@ public:
   bool IsCardRowScopeToken(mdb_scope scope) { return (scope == m_CardRowScopeToken) ? true: false;  }
   bool IsDataRowScopeToken(mdb_scope scope) { return (scope == m_DataRowScopeToken) ? true: false; }
   nsresult GetCardRowByRowID(mdb_id rowID, nsIMdbRow **dbRow);
   nsresult GetListRowByRowID(mdb_id rowID, nsIMdbRow **dbRow);
 
   uint32_t GetListAddressTotal(nsIMdbRow* listRow);
   nsresult GetAddressRowByPos(nsIMdbRow* listRow, uint16_t pos, nsIMdbRow** cardRow);
 
-    NS_IMETHOD AddListCardColumnsToRow(nsIAbCard *aPCard, nsIMdbRow *aPListRow, uint32_t aPos, nsIAbCard** aPNewCard, bool aInMailingList, nsIAbDirectory *aParent, nsIAbDirectory *aRoot) MOZ_OVERRIDE;
-    NS_IMETHOD InitCardFromRow(nsIAbCard *aNewCard, nsIMdbRow* aCardRow) MOZ_OVERRIDE;
-    NS_IMETHOD SetListAddressTotal(nsIMdbRow* aListRow, uint32_t aTotal) MOZ_OVERRIDE;
-    NS_IMETHOD FindRowByCard(nsIAbCard * card,nsIMdbRow **aRow) MOZ_OVERRIDE;
+    NS_IMETHOD AddListCardColumnsToRow(nsIAbCard *aPCard, nsIMdbRow *aPListRow, uint32_t aPos, nsIAbCard** aPNewCard, bool aInMailingList, nsIAbDirectory *aParent, nsIAbDirectory *aRoot) override;
+    NS_IMETHOD InitCardFromRow(nsIAbCard *aNewCard, nsIMdbRow* aCardRow) override;
+    NS_IMETHOD SetListAddressTotal(nsIMdbRow* aListRow, uint32_t aTotal) override;
+    NS_IMETHOD FindRowByCard(nsIAbCard * card,nsIMdbRow **aRow) override;
 
 protected:
   virtual ~nsAddrDatabase();
 
   static void RemoveFromCache(nsAddrDatabase* pAddrDB);
   bool MatchDbName(nsIFile *dbName); // returns TRUE if they match
 
   void YarnToUInt32(struct mdbYarn *yarn, uint32_t *pResult);
--- a/mailnews/addrbook/src/nsDirPrefs.cpp
+++ b/mailnews/addrbook/src/nsDirPrefs.cpp
@@ -68,17 +68,17 @@ static nsresult DIR_GetServerPreferences
 static void DIR_SaveServerPreferences(nsVoidArray *wholeList);
 
 static int32_t dir_UserId = 0;
 nsVoidArray *dir_ServerList = nullptr;
 
 /*****************************************************************************
  * Functions for creating the new back end managed DIR_Server list.
  */
-class DirPrefObserver MOZ_FINAL : public nsSupportsWeakReference,
+class DirPrefObserver final : public nsSupportsWeakReference,
                                   public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
 private:
   ~DirPrefObserver() {}
--- a/mailnews/addrbook/src/nsMapiAddressBook.h
+++ b/mailnews/addrbook/src/nsMapiAddressBook.h
@@ -35,19 +35,19 @@ protected :
     static BOOL mInitialized ;
     static BOOL mLogonDone ;
     static LPMAPISESSION mRootSession ;
     static LPADRBOOK mRootBook ;
 
     // Load the MAPI environment
     BOOL Initialize(void) ;
     // Allocation of a buffer for transmission to interfaces
-    virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) MOZ_OVERRIDE;
+    virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) override;
     // Destruction of a buffer provided by the interfaces
-    virtual void FreeBuffer(LPVOID aBuffer) MOZ_OVERRIDE;
+    virtual void FreeBuffer(LPVOID aBuffer) override;
     // Library management 
     static BOOL LoadMapiLibrary(void) ;
     static void FreeMapiLibrary(void) ;
 
 private :
 } ;
 
 #endif // nsMapiAddressBook_h___
--- a/mailnews/addrbook/src/nsWabAddressBook.h
+++ b/mailnews/addrbook/src/nsWabAddressBook.h
@@ -23,19 +23,19 @@ protected :
     // Class members to handle library loading/entry points
     static int32_t mLibUsage ;
     static HMODULE mLibrary ;
     static LPWABOPEN mWABOpen ;
 
     // Load the WAB environment
     BOOL Initialize(void) ;
     // Allocation of a buffer for transmission to interfaces
-    virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) MOZ_OVERRIDE;
+    virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) override;
     // Destruction of a buffer provided by the interfaces
-    virtual void FreeBuffer(LPVOID aBuffer) MOZ_OVERRIDE;
+    virtual void FreeBuffer(LPVOID aBuffer) override;
     // Manage the library
     static BOOL LoadWabLibrary(void) ;
     static void FreeWabLibrary(void) ;
 
 private :
 } ;
 
 // Additional definitions for WAB stuff. These properties are
--- a/mailnews/base/search/public/nsMsgSearchAdapter.h
+++ b/mailnews/base/search/public/nsMsgSearchAdapter.h
@@ -103,17 +103,17 @@ protected:
 //   1. when the FE brings up the dialog box and needs to know how to build
 //      the menus and enable their items
 //   2. when the FE fires off a search, we need to check their lists for
 //      correctness
 //   3. for on-the-fly capability negotion e.g. with XSEARCH-capable news
 //      servers
 //-----------------------------------------------------------------------------
 
-class nsMsgSearchValidityTable MOZ_FINAL : public nsIMsgSearchValidityTable
+class nsMsgSearchValidityTable final : public nsIMsgSearchValidityTable
 {
 public:
   nsMsgSearchValidityTable ();
   NS_DECL_NSIMSGSEARCHVALIDITYTABLE
   NS_DECL_ISUPPORTS
 
 protected:
   int m_numAvailAttribs;        // number of rows with at least one available operator
--- a/mailnews/base/search/src/nsMsgLocalSearch.h
+++ b/mailnews/base/search/src/nsMsgLocalSearch.h
@@ -25,20 +25,20 @@ class nsMsgSearchOfflineMail : public ns
 {
 public:
   nsMsgSearchOfflineMail (nsIMsgSearchScopeTerm*, nsISupportsArray *);
 
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_DECL_NSIURLLISTENER
 
-  NS_IMETHOD ValidateTerms () MOZ_OVERRIDE;
-  NS_IMETHOD Search (bool *aDone) MOZ_OVERRIDE;
-  NS_IMETHOD Abort () MOZ_OVERRIDE;
-  NS_IMETHOD AddResultElement (nsIMsgDBHdr *) MOZ_OVERRIDE;
+  NS_IMETHOD ValidateTerms () override;
+  NS_IMETHOD Search (bool *aDone) override;
+  NS_IMETHOD Abort () override;
+  NS_IMETHOD AddResultElement (nsIMsgDBHdr *) override;
 
   static nsresult  MatchTermsForFilter(nsIMsgDBHdr * msgToMatch,
                                          nsISupportsArray *termList,
                                          const char *defaultCharset,
                                          nsIMsgSearchScopeTerm *scope,
                                          nsIMsgDatabase * db,
                                          const char * headers,
                                          uint32_t headerSize,
@@ -88,17 +88,17 @@ protected:
 };
 
 
 class nsMsgSearchOfflineNews : public nsMsgSearchOfflineMail
 {
 public:
   nsMsgSearchOfflineNews (nsIMsgSearchScopeTerm*, nsISupportsArray *);
   virtual ~nsMsgSearchOfflineNews ();
-  NS_IMETHOD ValidateTerms () MOZ_OVERRIDE;
+  NS_IMETHOD ValidateTerms () override;
 
-  virtual nsresult OpenSummaryFile () MOZ_OVERRIDE;
+  virtual nsresult OpenSummaryFile () override;
 };
 
 
 
 #endif
 
--- a/mailnews/base/search/src/nsMsgSearchImap.h
+++ b/mailnews/base/search/src/nsMsgSearchImap.h
@@ -12,20 +12,20 @@
 //-----------------------------------------------------------------------------
 
 class nsMsgSearchOnlineMail : public nsMsgSearchAdapter
 {
 public:
   nsMsgSearchOnlineMail (nsMsgSearchScopeTerm *scope, nsISupportsArray *termList);
   virtual ~nsMsgSearchOnlineMail ();
 
-  NS_IMETHOD ValidateTerms () MOZ_OVERRIDE;
-  NS_IMETHOD Search (bool *aDone) MOZ_OVERRIDE;
-  NS_IMETHOD GetEncoding (char **result) MOZ_OVERRIDE;
-  NS_IMETHOD AddResultElement (nsIMsgDBHdr *) MOZ_OVERRIDE;
+  NS_IMETHOD ValidateTerms () override;
+  NS_IMETHOD Search (bool *aDone) override;
+  NS_IMETHOD GetEncoding (char **result) override;
+  NS_IMETHOD AddResultElement (nsIMsgDBHdr *) override;
 
   static nsresult Encode (nsCString& ppEncoding,
                             nsISupportsArray *searchTerms,
                             const char16_t *destCharset);
 
 
 protected:
   nsCString m_encoding;
--- a/mailnews/base/search/src/nsMsgSearchNews.h
+++ b/mailnews/base/search/src/nsMsgSearchNews.h
@@ -13,21 +13,21 @@
 //-----------------------------------------------------------------------------
 
 class nsMsgSearchNews : public nsMsgSearchAdapter
 {
 public:
   nsMsgSearchNews (nsMsgSearchScopeTerm *scope, nsISupportsArray *termList);
   virtual ~nsMsgSearchNews ();
 
-  NS_IMETHOD ValidateTerms () MOZ_OVERRIDE;
-  NS_IMETHOD Search (bool *aDone) MOZ_OVERRIDE;
-  NS_IMETHOD GetEncoding (char **result) MOZ_OVERRIDE;
-  NS_IMETHOD AddHit(nsMsgKey key) MOZ_OVERRIDE;
-  NS_IMETHOD CurrentUrlDone(nsresult exitCode) MOZ_OVERRIDE;
+  NS_IMETHOD ValidateTerms () override;
+  NS_IMETHOD Search (bool *aDone) override;
+  NS_IMETHOD GetEncoding (char **result) override;
+  NS_IMETHOD AddHit(nsMsgKey key) override;
+  NS_IMETHOD CurrentUrlDone(nsresult exitCode) override;
 
   virtual nsresult Encode (nsCString *outEncoding);
   virtual char *EncodeTerm (nsIMsgSearchTerm *);
   char16_t *EncodeToWildmat (const char16_t *);
 
   void ReportHits ();
     void CollateHits ();
     void ReportHit (nsIMsgDBHdr *pHeaders, nsIMsgFolder *folder);
--- a/mailnews/base/src/nsMailDirProvider.h
+++ b/mailnews/base/src/nsMailDirProvider.h
@@ -6,29 +6,29 @@
 #ifndef nsMailDirProvider_h__
 #define nsMailDirProvider_h__
 
 #include "nsIDirectoryService.h"
 #include "nsISimpleEnumerator.h"
 #include "nsStringGlue.h"
 #include "nsCOMPtr.h"
 
-class nsMailDirProvider MOZ_FINAL : public nsIDirectoryServiceProvider2
+class nsMailDirProvider final : public nsIDirectoryServiceProvider2
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
 
 private:
   ~nsMailDirProvider() {}
 
   nsresult EnsureDirectory(nsIFile *aDirectory);
 
-  class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator
+  class AppendingEnumerator final : public nsISimpleEnumerator
   {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISIMPLEENUMERATOR
 
     AppendingEnumerator(nsISimpleEnumerator* aBase);
 
   private:
--- a/mailnews/base/src/nsMsgAccountManager.h
+++ b/mailnews/base/src/nsMsgAccountManager.h
@@ -26,17 +26,17 @@
 #include "nsInterfaceHashtable.h"
 #include "nsIMsgDatabase.h"
 #include "nsIDBChangeListener.h"
 #include "nsAutoPtr.h"
 #include "nsTObserverArray.h"
 
 class nsIRDFService;
 
-class VirtualFolderChangeListener MOZ_FINAL : public nsIDBChangeListener
+class VirtualFolderChangeListener final : public nsIDBChangeListener
 {
 public:
   VirtualFolderChangeListener();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDBCHANGELISTENER
 
   nsresult Init();
--- a/mailnews/base/src/nsMsgAccountManagerDS.h
+++ b/mailnews/base/src/nsMsgAccountManagerDS.h
@@ -29,42 +29,42 @@
 class nsMsgAccountManagerDataSource : public nsMsgRDFDataSource,
                                       public nsIFolderListener,
                                       public nsIIncomingServerListener
 {
 
 public:
     
   nsMsgAccountManagerDataSource();
-  virtual nsresult Init() MOZ_OVERRIDE;
+  virtual nsresult Init() override;
 
-  virtual void Cleanup() MOZ_OVERRIDE;
+  virtual void Cleanup() override;
   // service manager shutdown method
   
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIFOLDERLISTENER
   NS_DECL_NSIINCOMINGSERVERLISTENER
   NS_DECL_NSIOBSERVER
   // RDF datasource methods
   NS_IMETHOD GetTarget(nsIRDFResource *source,
                        nsIRDFResource *property,
                        bool aTruthValue,
                        nsIRDFNode **_retval);
   NS_IMETHOD GetTargets(nsIRDFResource *source,
                         nsIRDFResource *property,
                         bool aTruthValue,
-                        nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
+                        nsISimpleEnumerator **_retval) override;
   NS_IMETHOD ArcLabelsOut(nsIRDFResource *source,
-                          nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
+                          nsISimpleEnumerator **_retval) override;
 
   NS_IMETHOD HasAssertion(nsIRDFResource *aSource, nsIRDFResource *aProperty,
                           nsIRDFNode *aTarget, bool aTruthValue,
-                          bool *_retval) MOZ_OVERRIDE;
+                          bool *_retval) override;
   NS_IMETHOD HasArcOut(nsIRDFResource *source, nsIRDFResource *aArc,
-                       bool *result) MOZ_OVERRIDE;
+                       bool *result) override;
     
 protected:
   virtual ~nsMsgAccountManagerDataSource();
 
   nsresult HasAssertionServer(nsIMsgIncomingServer *aServer,
                               nsIRDFResource *aProperty,
                               nsIRDFNode *aTarget,
                               bool aTruthValue, bool *_retval);
--- a/mailnews/base/src/nsMsgDBView.h
+++ b/mailnews/base/src/nsMsgDBView.h
@@ -467,17 +467,17 @@ private:
 
   nsresult PerformActionsOnJunkMsgs(bool msgsAreJunk);
   nsresult DetermineActionsForJunkChange(bool msgsAreJunk,
                                          nsIMsgFolder *srcFolder,
                                          bool &moveMessages,
                                          bool &changeReadState,
                                          nsIMsgFolder** targetFolder);
 
-  class nsMsgViewHdrEnumerator MOZ_FINAL : public nsISimpleEnumerator
+  class nsMsgViewHdrEnumerator final : public nsISimpleEnumerator
   {
   public:
     NS_DECL_ISUPPORTS
 
     // nsISimpleEnumerator methods:
     NS_DECL_NSISIMPLEENUMERATOR
 
     // nsMsgThreadEnumerator methods:
--- a/mailnews/base/src/nsMsgFolderCompactor.h
+++ b/mailnews/base/src/nsMsgFolderCompactor.h
@@ -93,23 +93,23 @@ protected:
 
 class nsOfflineStoreCompactState : public nsFolderCompactState
 {
 public:
 
   nsOfflineStoreCompactState(void);
   virtual ~nsOfflineStoreCompactState(void);
   NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt,
-                                    nsresult status) MOZ_OVERRIDE;
+                                    nsresult status) override;
   NS_IMETHODIMP OnDataAvailable(nsIRequest *request, nsISupports *ctxt,
                                 nsIInputStream *inStr,
                                 uint64_t sourceOffset, uint32_t count);
 
 protected:
     nsresult         CopyNextMessage(bool &done);
-    virtual nsresult InitDB(nsIMsgDatabase *db) MOZ_OVERRIDE;
-    virtual nsresult StartCompacting() MOZ_OVERRIDE;
-    virtual nsresult FinishCompact() MOZ_OVERRIDE;
+    virtual nsresult InitDB(nsIMsgDatabase *db) override;
+    virtual nsresult StartCompacting() override;
+    virtual nsresult FinishCompact() override;
 
     uint32_t m_offlineMsgSize;
 };
 
 #endif
--- a/mailnews/base/src/nsMsgFolderDataSource.h
+++ b/mailnews/base/src/nsMsgFolderDataSource.h
@@ -20,80 +20,80 @@ class nsMsgFolderDataSource : public nsM
                               public nsIFolderListener
 {
 public:
   
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIFOLDERLISTENER
 
   nsMsgFolderDataSource(void);
-  virtual nsresult Init() MOZ_OVERRIDE;
-  virtual void Cleanup() MOZ_OVERRIDE;
+  virtual nsresult Init() override;
+  virtual void Cleanup() override;
 
   // nsIRDFDataSource methods
-  NS_IMETHOD GetURI(char* *uri) MOZ_OVERRIDE;
+  NS_IMETHOD GetURI(char* *uri) override;
 
   NS_IMETHOD GetSource(nsIRDFResource* property,
                        nsIRDFNode* target,
                        bool tv,
-                       nsIRDFResource** source /* out */) MOZ_OVERRIDE;
+                       nsIRDFResource** source /* out */) override;
 
   NS_IMETHOD GetTarget(nsIRDFResource* source,
                        nsIRDFResource* property,
                        bool tv,
-                       nsIRDFNode** target) MOZ_OVERRIDE;
+                       nsIRDFNode** target) override;
 
   NS_IMETHOD GetSources(nsIRDFResource* property,
                         nsIRDFNode* target,
                         bool tv,
-                        nsISimpleEnumerator** sources) MOZ_OVERRIDE;
+                        nsISimpleEnumerator** sources) override;
 
   NS_IMETHOD GetTargets(nsIRDFResource* source,
                         nsIRDFResource* property,    
                         bool tv,
-                        nsISimpleEnumerator** targets) MOZ_OVERRIDE;
+                        nsISimpleEnumerator** targets) override;
 
   NS_IMETHOD Assert(nsIRDFResource* source,
                     nsIRDFResource* property, 
                     nsIRDFNode* target,
-                    bool tv) MOZ_OVERRIDE;
+                    bool tv) override;
 
   NS_IMETHOD Unassert(nsIRDFResource* source,
                       nsIRDFResource* property,
-                      nsIRDFNode* target) MOZ_OVERRIDE;
+                      nsIRDFNode* target) override;
 
   NS_IMETHOD HasAssertion(nsIRDFResource* source,
                           nsIRDFResource* property,
                           nsIRDFNode* target,
                           bool tv,
-                          bool* hasAssertion) MOZ_OVERRIDE;
+                          bool* hasAssertion) override;
 
   NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc,
-                       bool *result) MOZ_OVERRIDE;
+                       bool *result) override;
 
   NS_IMETHOD ArcLabelsIn(nsIRDFNode* node,
-                         nsISimpleEnumerator** labels) MOZ_OVERRIDE;
+                         nsISimpleEnumerator** labels) override;
 
   NS_IMETHOD ArcLabelsOut(nsIRDFResource* source,
-                          nsISimpleEnumerator** labels) MOZ_OVERRIDE; 
+                          nsISimpleEnumerator** labels) override; 
 
-  NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) MOZ_OVERRIDE;
+  NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) override;
 
   NS_IMETHOD GetAllCmds(nsIRDFResource* source,
                             nsISimpleEnumerator/*<nsIRDFResource>*/** commands
-                        ) MOZ_OVERRIDE;
+                        ) override;
 
   NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
                               nsIRDFResource*   aCommand,
                               nsISupportsArray/*<nsIRDFResource>*/* aArguments,
-                              bool* aResult) MOZ_OVERRIDE;
+                              bool* aResult) override;
 
   NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
                        nsIRDFResource*   aCommand,
-                       nsISupportsArray/*<nsIRDFResource>*/* aArguments) MOZ_OVERRIDE;
+                       nsISupportsArray/*<nsIRDFResource>*/* aArguments) override;
 protected:
   virtual ~nsMsgFolderDataSource();
 
   nsresult GetSenderName(nsAutoString& sender, nsAutoString *senderUserName);
 
   nsresult createFolderNode(nsIMsgFolder *folder, nsIRDFResource* property,
                             nsIRDFNode **target);
   nsresult createFolderNameNode(nsIMsgFolder *folder, nsIRDFNode **target, bool sort);
@@ -270,79 +270,79 @@ protected:
 
 
 class nsMsgFlatFolderDataSource : public nsMsgFolderDataSource
 {
 public:
   // constructor could take a filter to filter out folders.
   nsMsgFlatFolderDataSource();
   virtual ~nsMsgFlatFolderDataSource();
-  virtual nsresult Init() MOZ_OVERRIDE;
-  virtual void Cleanup() MOZ_OVERRIDE;
+  virtual nsresult Init() override;
+  virtual void Cleanup() override;
 
-  NS_IMETHOD GetURI(char* *uri) MOZ_OVERRIDE;
+  NS_IMETHOD GetURI(char* *uri) override;
   NS_IMETHOD GetTargets(nsIRDFResource* source,
                         nsIRDFResource* property,    
                         bool tv,
-                        nsISimpleEnumerator** targets) MOZ_OVERRIDE;
+                        nsISimpleEnumerator** targets) override;
   NS_IMETHOD GetTarget(nsIRDFResource* source,
                        nsIRDFResource* property,
                        bool tv,
-                       nsIRDFNode** target) MOZ_OVERRIDE;
+                       nsIRDFNode** target) override;
 
   NS_IMETHOD HasAssertion(nsIRDFResource* source,
                             nsIRDFResource* property,
                             nsIRDFNode* target,
                             bool tv,
-                            bool* hasAssertion) MOZ_OVERRIDE;
+                            bool* hasAssertion) override;
 protected:
   virtual nsresult GetFolderDisplayName(nsIMsgFolder *folder,
-                                        nsString& folderName) MOZ_OVERRIDE;
+                                        nsString& folderName) override;
   virtual void EnsureFolders();
   virtual bool WantsThisFolder(nsIMsgFolder *folder);
           bool ResourceIsOurRoot(nsIRDFResource *resource);
   virtual nsresult OnItemAddedOrRemoved(nsIMsgFolder *parentItem, nsISupports *item,
-                                        bool added) MOZ_OVERRIDE;
+                                        bool added) override;
 
   nsCOMArray <nsIMsgFolder> m_folders;
   nsCOMPtr<nsIRDFResource>  m_rootResource; // the resource for our root
   nsCString m_dsName;
   bool m_builtFolders;
 };
 
 
 class nsMsgUnreadFoldersDataSource : public nsMsgFlatFolderDataSource
 {
 public:
   nsMsgUnreadFoldersDataSource() {m_dsName = "mailnewsunreadfolders";}
   virtual ~nsMsgUnreadFoldersDataSource() {}
   virtual nsresult NotifyPropertyChanged(nsIRDFResource *resource, 
                     nsIRDFResource *propertyResource, nsIRDFNode *newNode, 
-                    nsIRDFNode *oldNode = nullptr) MOZ_OVERRIDE;
+                    nsIRDFNode *oldNode = nullptr) override;
 protected:
-  virtual bool WantsThisFolder(nsIMsgFolder *folder) MOZ_OVERRIDE;
+  virtual bool WantsThisFolder(nsIMsgFolder *folder) override;
 };
 
 class nsMsgFavoriteFoldersDataSource : public nsMsgFlatFolderDataSource
 {
 public:
   nsMsgFavoriteFoldersDataSource() {m_dsName = "mailnewsfavefolders";}
   virtual ~nsMsgFavoriteFoldersDataSource() {}
 protected:
-  virtual bool WantsThisFolder(nsIMsgFolder *folder) MOZ_OVERRIDE;
+  virtual bool WantsThisFolder(nsIMsgFolder *folder) override;
 };
 
 class nsMsgRecentFoldersDataSource : public nsMsgFlatFolderDataSource
 {
 public:
   nsMsgRecentFoldersDataSource() {m_dsName = "mailnewsrecentfolders";
                                   m_cutOffDate = 0; m_maxNumFolders = 15;}
   virtual ~nsMsgRecentFoldersDataSource() {}
   virtual nsresult NotifyPropertyChanged(nsIRDFResource *resource, 
                     nsIRDFResource *property, nsIRDFNode *newNode, 
-                    nsIRDFNode *oldNode) MOZ_OVERRIDE;
-  NS_IMETHOD OnItemAdded(nsIMsgFolder *parentItem, nsISupports *item) MOZ_OVERRIDE;
-  virtual void Cleanup() MOZ_OVERRIDE;
+                    nsIRDFNode *oldNode) override;
+  NS_IMETHOD OnItemAdded(nsIMsgFolder *parentItem, nsISupports *item) override;
+  virtual void Cleanup() override;
 protected:
-  virtual void EnsureFolders() MOZ_OVERRIDE;
+  virtual void EnsureFolders() override;
   uint32_t m_cutOffDate;
   uint32_t m_maxNumFolders;
 };
--- a/mailnews/base/src/nsMsgGroupThread.h
+++ b/mailnews/base/src/nsMsgGroupThread.h
@@ -59,29 +59,29 @@ protected:
   nsCOMPtr <nsIMsgDatabase> m_db; // should we make a weak ref or just a ptr?
 };
 
 class nsMsgXFGroupThread : public nsMsgGroupThread
 {
 public:
   nsMsgXFGroupThread();
 
-  NS_IMETHOD GetNumChildren(uint32_t *aNumChildren) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildKeyAt(uint32_t aIndex, nsMsgKey *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetChildHdrAt(uint32_t aIndex, nsIMsgDBHdr **aResult) MOZ_OVERRIDE;
-  NS_IMETHOD RemoveChildAt(uint32_t aIndex) MOZ_OVERRIDE;
+  NS_IMETHOD GetNumChildren(uint32_t *aNumChildren) override;
+  NS_IMETHOD GetChildKeyAt(uint32_t aIndex, nsMsgKey *aResult) override;
+  NS_IMETHOD GetChildHdrAt(uint32_t aIndex, nsIMsgDBHdr **aResult) override;
+  NS_IMETHOD RemoveChildAt(uint32_t aIndex) override;
 protected:
   virtual ~nsMsgXFGroupThread();
 
   virtual void InsertMsgHdrAt(nsMsgViewIndex index,
-                              nsIMsgDBHdr *hdr) MOZ_OVERRIDE;
-  virtual void SetMsgHdrAt(nsMsgViewIndex index, nsIMsgDBHdr *hdr) MOZ_OVERRIDE;
-  virtual nsMsgViewIndex FindMsgHdr(nsIMsgDBHdr *hdr) MOZ_OVERRIDE;
+                              nsIMsgDBHdr *hdr) override;
+  virtual void SetMsgHdrAt(nsMsgViewIndex index, nsIMsgDBHdr *hdr) override;
+  virtual nsMsgViewIndex FindMsgHdr(nsIMsgDBHdr *hdr) override;
   virtual nsMsgViewIndex AddMsgHdrInDateOrder(nsIMsgDBHdr *child, 
-                                              nsMsgDBView *view) MOZ_OVERRIDE;
+                                              nsMsgDBView *view) override;
   virtual nsMsgViewIndex GetInsertIndexFromView(nsMsgDBView *view, 
                                           nsIMsgDBHdr *child, 
                                           nsMsgViewSortOrderValue threadSortOrder
-                                                ) MOZ_OVERRIDE;
+                                                ) override;
 
   nsCOMArray<nsIMsgFolder> m_folders;
 };
 
--- a/mailnews/base/src/nsMsgGroupView.h
+++ b/mailnews/base/src/nsMsgGroupView.h
@@ -26,38 +26,38 @@ public:
   NS_IMETHOD OpenWithHdrs(nsISimpleEnumerator *aHeaders, nsMsgViewSortTypeValue aSortType, 
                                         nsMsgViewSortOrderValue aSortOrder, nsMsgViewFlagsTypeValue aViewFlags, 
                                         int32_t *aCount);
   NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType);
   NS_IMETHOD CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger *aMessengerInstance,
                         nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCmdUpdater);
   NS_IMETHOD Close();
   NS_IMETHOD OnHdrDeleted(nsIMsgDBHdr *aHdrDeleted, nsMsgKey aParentKey, int32_t aFlags, 
-                            nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                            nsIDBChangeListener *aInstigator) override;
   NS_IMETHOD OnHdrFlagsChanged(nsIMsgDBHdr *aHdrChanged, uint32_t aOldFlags, 
-                                      uint32_t aNewFlags, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                                      uint32_t aNewFlags, nsIDBChangeListener *aInstigator) override;
 
   NS_IMETHOD LoadMessageByViewIndex(nsMsgViewIndex aViewIndex);
-  NS_IMETHOD GetCellProperties(int32_t aRow, nsITreeColumn *aCol, nsAString& aProperties) MOZ_OVERRIDE;
-  NS_IMETHOD GetRowProperties(int32_t aRow, nsAString& aProperties) MOZ_OVERRIDE;
+  NS_IMETHOD GetCellProperties(int32_t aRow, nsITreeColumn *aCol, nsAString& aProperties) override;
+  NS_IMETHOD GetRowProperties(int32_t aRow, nsAString& aProperties) override;
   NS_IMETHOD CellTextForColumn(int32_t aRow, const char16_t *aColumnName,
                                nsAString &aValue);
   NS_IMETHOD GetThreadContainingMsgHdr(nsIMsgDBHdr *msgHdr, nsIMsgThread **pThread);
 
 protected:
   virtual void InternalClose();
   nsMsgGroupThread *AddHdrToThread(nsIMsgDBHdr *msgHdr, bool *pNewThread);
   virtual nsresult HashHdr(nsIMsgDBHdr *msgHdr, nsString& aHashKey);
   nsresult GetAgeBucketValue(nsIMsgDBHdr *aMsgHdr, uint32_t * aAgeBucket, bool rcvDate = false); // helper function to get the age bucket for a hdr, useful when grouped by date
-  nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool /*ensureListed*/) MOZ_OVERRIDE;
-  virtual int32_t FindLevelInThread(nsIMsgDBHdr *msgHdr, nsMsgViewIndex startOfThread, nsMsgViewIndex viewIndex) MOZ_OVERRIDE;
+  nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool /*ensureListed*/) override;
+  virtual int32_t FindLevelInThread(nsIMsgDBHdr *msgHdr, nsMsgViewIndex startOfThread, nsMsgViewIndex viewIndex) override;
   nsMsgViewIndex ThreadIndexOfMsg(nsMsgKey msgKey, 
                                             nsMsgViewIndex msgIndex = nsMsgViewIndex_None,
                                             int32_t *pThreadCount = NULL,
-                                            uint32_t *pFlags = NULL) MOZ_OVERRIDE;
+                                            uint32_t *pFlags = NULL) override;
 
   bool GroupViewUsesDummyRow(); // returns true if we are grouped by a sort attribute that uses a dummy row
   virtual nsresult RebuildView(nsMsgViewFlagsTypeValue newFlags);
   virtual nsMsgGroupThread *CreateGroupThread(nsIMsgDatabase *db);
   PR_STATIC_CALLBACK(PLDHashOperator) GroupTableCloner(const nsAString &aKey,
                                                        nsIMsgThread* aGroupThread,
                                                        void* aArg);
 
--- a/mailnews/base/src/nsMsgQuickSearchDBView.h
+++ b/mailnews/base/src/nsMsgQuickSearchDBView.h
@@ -17,71 +17,71 @@
 class nsMsgQuickSearchDBView : public nsMsgThreadedDBView, public nsIMsgSearchNotify
 {
 public:
   nsMsgQuickSearchDBView();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMSGSEARCHNOTIFY
 
-  virtual const char * GetViewName(void) MOZ_OVERRIDE {return "QuickSearchView"; }
+  virtual const char * GetViewName(void) override {return "QuickSearchView"; }
   NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, 
                   nsMsgViewSortOrderValue sortOrder, 
-                  nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) MOZ_OVERRIDE;
+                  nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) override;
   NS_IMETHOD OpenWithHdrs(nsISimpleEnumerator *aHeaders, 
                           nsMsgViewSortTypeValue aSortType, 
                           nsMsgViewSortOrderValue aSortOrder, 
                           nsMsgViewFlagsTypeValue aViewFlags, 
-                          int32_t *aCount) MOZ_OVERRIDE;
+                          int32_t *aCount) override;
   NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance,
                          nsIMsgWindow *aMsgWindow,
                          nsIMsgDBViewCommandUpdater *aCommandUpdater,
-                         nsIMsgDBView **_retval) MOZ_OVERRIDE;
+                         nsIMsgDBView **_retval) override;
   NS_IMETHOD CopyDBView(nsMsgDBView *aNewMsgDBView,
                         nsIMessenger *aMessengerInstance,
                         nsIMsgWindow *aMsgWindow,
-                        nsIMsgDBViewCommandUpdater *aCmdUpdater) MOZ_OVERRIDE;
+                        nsIMsgDBViewCommandUpdater *aCmdUpdater) override;
   NS_IMETHOD DoCommand(nsMsgViewCommandTypeValue aCommand);
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
   NS_IMETHOD SetViewFlags(nsMsgViewFlagsTypeValue aViewFlags);
   NS_IMETHOD SetSearchSession(nsIMsgSearchSession *aSearchSession);
   NS_IMETHOD GetSearchSession(nsIMsgSearchSession* *aSearchSession);
   NS_IMETHOD OnHdrFlagsChanged(nsIMsgDBHdr *aHdrChanged, uint32_t aOldFlags, 
-                         uint32_t aNewFlags, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                         uint32_t aNewFlags, nsIDBChangeListener *aInstigator) override;
   NS_IMETHOD OnHdrPropertyChanged(nsIMsgDBHdr *aHdrToChange, bool aPreChange, uint32_t *aStatus, 
-                                 nsIDBChangeListener * aInstigator) MOZ_OVERRIDE;
+                                 nsIDBChangeListener * aInstigator) override;
   NS_IMETHOD OnHdrDeleted(nsIMsgDBHdr *aHdrDeleted, nsMsgKey aParentKey,
-                          int32_t aFlags, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                          int32_t aFlags, nsIDBChangeListener *aInstigator) override;
   NS_IMETHOD GetNumMsgsInView(int32_t *aNumMsgs);
 
 protected:
   virtual ~nsMsgQuickSearchDBView();
   nsWeakPtr m_searchSession;
   nsTArray<nsMsgKey> m_origKeys;
   bool      m_usingCachedHits;
   bool      m_cacheEmpty;
   nsCOMArray <nsIMsgDBHdr> m_hdrHits;
-  virtual nsresult AddHdr(nsIMsgDBHdr *msgHdr, nsMsgViewIndex *resultIndex = nullptr) MOZ_OVERRIDE;
-  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool ensureListed) MOZ_OVERRIDE;
-  virtual nsresult DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool deleteStorage) MOZ_OVERRIDE;
-  virtual nsresult SortThreads(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder) MOZ_OVERRIDE;
-  virtual nsresult GetFirstMessageHdrToDisplayInThread(nsIMsgThread *threadHdr, nsIMsgDBHdr **result) MOZ_OVERRIDE;
-  virtual nsresult ExpansionDelta(nsMsgViewIndex index, int32_t *expansionDelta) MOZ_OVERRIDE;
+  virtual nsresult AddHdr(nsIMsgDBHdr *msgHdr, nsMsgViewIndex *resultIndex = nullptr) override;
+  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool ensureListed) override;
+  virtual nsresult DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool deleteStorage) override;
+  virtual nsresult SortThreads(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder) override;
+  virtual nsresult GetFirstMessageHdrToDisplayInThread(nsIMsgThread *threadHdr, nsIMsgDBHdr **result) override;
+  virtual nsresult ExpansionDelta(nsMsgViewIndex index, int32_t *expansionDelta) override;
   virtual nsresult ListCollapsedChildren(nsMsgViewIndex viewIndex,
-                                         nsIMutableArray *messageArray) MOZ_OVERRIDE;
-  virtual nsresult ListIdsInThread(nsIMsgThread *threadHdr, nsMsgViewIndex startOfThreadViewIndex, uint32_t *pNumListed) MOZ_OVERRIDE;
+                                         nsIMutableArray *messageArray) override;
+  virtual nsresult ListIdsInThread(nsIMsgThread *threadHdr, nsMsgViewIndex startOfThreadViewIndex, uint32_t *pNumListed) override;
   virtual nsresult ListIdsInThreadOrder(nsIMsgThread *threadHdr,
                                         nsMsgKey parentKey, uint32_t level,
                                         nsMsgViewIndex *viewIndex,
-                                        uint32_t *pNumListed) MOZ_OVERRIDE;
+                                        uint32_t *pNumListed) override;
   virtual nsresult ListIdsInThreadOrder(nsIMsgThread *threadHdr,
                                         nsMsgKey parentKey, uint32_t level,
                                         uint32_t callLevel,
                                         nsMsgKey keyToSkip,
                                         nsMsgViewIndex *viewIndex,
                                         uint32_t *pNumListed);
-  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) MOZ_OVERRIDE;
+  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) override;
   void      SavePreSearchInfo();
   void      ClearPreSearchInfo();
 
 };
 
 #endif
--- a/mailnews/base/src/nsMsgSearchDBView.h
+++ b/mailnews/base/src/nsMsgSearchDBView.h
@@ -24,85 +24,85 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMSGSEARCHNOTIFY
   NS_DECL_NSIMSGCOPYSERVICELISTENER
 
   NS_IMETHOD SetSearchSession(nsIMsgSearchSession *aSearchSession);
 
   virtual const char * GetViewName(void) {return "SearchView"; }
   NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, 
-        nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) MOZ_OVERRIDE;
+        nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) override;
   NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow,
                          nsIMsgDBViewCommandUpdater *aCmdUpdater, nsIMsgDBView **_retval);
   NS_IMETHOD CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger *aMessengerInstance, 
-                        nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCmdUpdater) MOZ_OVERRIDE;
-  NS_IMETHOD Close() MOZ_OVERRIDE;
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
+                        nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCmdUpdater) override;
+  NS_IMETHOD Close() override;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
   NS_IMETHOD Sort(nsMsgViewSortTypeValue sortType, 
                   nsMsgViewSortOrderValue sortOrder);
   NS_IMETHOD GetCommandStatus(nsMsgViewCommandTypeValue command,
                               bool *selectable_p, 
                               nsMsgViewCommandCheckStateValue *selected_p);
   NS_IMETHOD DoCommand(nsMsgViewCommandTypeValue command);
   NS_IMETHOD DoCommandWithFolder(nsMsgViewCommandTypeValue command, nsIMsgFolder *destFolder);
   NS_IMETHOD GetHdrForFirstSelectedMessage(nsIMsgDBHdr **hdr);
   NS_IMETHOD OpenWithHdrs(nsISimpleEnumerator *aHeaders, 
                           nsMsgViewSortTypeValue aSortType,
                           nsMsgViewSortOrderValue aSortOrder, 
                           nsMsgViewFlagsTypeValue aViewFlags,
-                          int32_t *aCount) MOZ_OVERRIDE;
+                          int32_t *aCount) override;
   NS_IMETHOD OnHdrDeleted(nsIMsgDBHdr *aHdrDeleted, nsMsgKey aParentKey, 
-                          int32_t aFlags, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                          int32_t aFlags, nsIDBChangeListener *aInstigator) override;
   NS_IMETHOD OnHdrFlagsChanged(nsIMsgDBHdr *aHdrChanged, uint32_t aOldFlags,
-                               uint32_t aNewFlags, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+                               uint32_t aNewFlags, nsIDBChangeListener *aInstigator) override;
   NS_IMETHOD GetNumMsgsInView(int32_t *aNumMsgs);
   // override to get location
-  NS_IMETHOD GetCellText(int32_t aRow, nsITreeColumn* aCol, nsAString& aValue) MOZ_OVERRIDE;
-  virtual nsresult GetMsgHdrForViewIndex(nsMsgViewIndex index, nsIMsgDBHdr **msgHdr) MOZ_OVERRIDE;
-  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey parentKey, bool ensureListed) MOZ_OVERRIDE;
+  NS_IMETHOD GetCellText(int32_t aRow, nsITreeColumn* aCol, nsAString& aValue) override;
+  virtual nsresult GetMsgHdrForViewIndex(nsMsgViewIndex index, nsIMsgDBHdr **msgHdr) override;
+  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey parentKey, bool ensureListed) override;
   NS_IMETHOD GetFolderForViewIndex(nsMsgViewIndex index, nsIMsgFolder **folder);
 
-  NS_IMETHOD OnAnnouncerGoingAway(nsIDBChangeAnnouncer *instigator) MOZ_OVERRIDE;
+  NS_IMETHOD OnAnnouncerGoingAway(nsIDBChangeAnnouncer *instigator) override;
 
-  virtual nsCOMArray<nsIMsgFolder>* GetFolders() MOZ_OVERRIDE;
-  virtual nsresult GetFolderFromMsgURI(const char *aMsgURI, nsIMsgFolder **aFolder) MOZ_OVERRIDE;
+  virtual nsCOMArray<nsIMsgFolder>* GetFolders() override;
+  virtual nsresult GetFolderFromMsgURI(const char *aMsgURI, nsIMsgFolder **aFolder) override;
 
   NS_IMETHOD SetCurCustomColumn(const nsAString& aColID);
   NS_IMETHOD GetCurCustomColumn(nsAString &result);
-  NS_IMETHOD GetThreadContainingMsgHdr(nsIMsgDBHdr *msgHdr, nsIMsgThread **pThread) MOZ_OVERRIDE;
+  NS_IMETHOD GetThreadContainingMsgHdr(nsIMsgDBHdr *msgHdr, nsIMsgThread **pThread) override;
 
 protected:
   virtual ~nsMsgSearchDBView();
-  virtual void InternalClose() MOZ_OVERRIDE;
-  virtual nsresult HashHdr(nsIMsgDBHdr *msgHdr, nsString& aHashKey) MOZ_OVERRIDE;
+  virtual void InternalClose() override;
+  virtual nsresult HashHdr(nsIMsgDBHdr *msgHdr, nsString& aHashKey) override;
   virtual nsresult ListIdsInThread(nsIMsgThread *threadHdr, 
                                    nsMsgViewIndex startOfThreadViewIndex, 
-                                   uint32_t *pNumListed) MOZ_OVERRIDE;
+                                   uint32_t *pNumListed) override;
   nsresult FetchLocation(int32_t aRow, nsAString& aLocationString);
   virtual nsresult AddHdrFromFolder(nsIMsgDBHdr *msgHdr, nsIMsgFolder *folder);
-  virtual nsresult GetDBForViewIndex(nsMsgViewIndex index, nsIMsgDatabase **db) MOZ_OVERRIDE;
-  virtual nsresult RemoveByIndex(nsMsgViewIndex index) MOZ_OVERRIDE;
-  virtual nsresult CopyMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool isMove, nsIMsgFolder *destFolder) MOZ_OVERRIDE;
-  virtual nsresult DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool deleteStorage) MOZ_OVERRIDE;
+  virtual nsresult GetDBForViewIndex(nsMsgViewIndex index, nsIMsgDatabase **db) override;
+  virtual nsresult RemoveByIndex(nsMsgViewIndex index) override;
+  virtual nsresult CopyMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool isMove, nsIMsgFolder *destFolder) override;
+  virtual nsresult DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, int32_t numIndices, bool deleteStorage) override;
   virtual void InsertMsgHdrAt(nsMsgViewIndex index, nsIMsgDBHdr *hdr,
-                              nsMsgKey msgKey, uint32_t flags, uint32_t level) MOZ_OVERRIDE;
+                              nsMsgKey msgKey, uint32_t flags, uint32_t level) override;
   virtual void SetMsgHdrAt(nsIMsgDBHdr *hdr, nsMsgViewIndex index,
-                              nsMsgKey msgKey, uint32_t flags, uint32_t level) MOZ_OVERRIDE;
-  virtual bool InsertEmptyRows(nsMsgViewIndex viewIndex, int32_t numRows) MOZ_OVERRIDE;
-  virtual void RemoveRows(nsMsgViewIndex viewIndex, int32_t numRows) MOZ_OVERRIDE;
+                              nsMsgKey msgKey, uint32_t flags, uint32_t level) override;
+  virtual bool InsertEmptyRows(nsMsgViewIndex viewIndex, int32_t numRows) override;
+  virtual void RemoveRows(nsMsgViewIndex viewIndex, int32_t numRows) override;
   virtual nsMsgViewIndex FindHdr(nsIMsgDBHdr *msgHdr, nsMsgViewIndex startIndex = 0,
-                                 bool allowDummy=false) MOZ_OVERRIDE;
+                                 bool allowDummy=false) override;
   nsresult GetFoldersAndHdrsForSelection(nsMsgViewIndex *indices, int32_t numIndices);
   nsresult GroupSearchResultsByFolder();
   nsresult PartitionSelectionByFolder(nsMsgViewIndex *indices, int32_t numIndices, nsTArray<uint32_t> **indexArrays, int32_t *numArrays);
   virtual nsresult ApplyCommandToIndicesWithFolder(nsMsgViewCommandTypeValue command, nsMsgViewIndex* indices,
-                    int32_t numIndices, nsIMsgFolder *destFolder) MOZ_OVERRIDE;
+                    int32_t numIndices, nsIMsgFolder *destFolder) override;
   void MoveThreadAt(nsMsgViewIndex threadIndex);
   
-  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) MOZ_OVERRIDE;
+  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) override;
   virtual nsresult InsertHdrFromFolder(nsIMsgDBHdr *msgHdr, nsIMsgFolder *folder);
 
   nsCOMArray<nsIMsgFolder> m_folders;
   nsCOMArray<nsIMutableArray> m_hdrsForEachFolder;
   nsCOMArray<nsIMsgFolder> m_uniqueFoldersSelected;
   uint32_t mCurIndex;
 
   nsMsgViewIndex* mIndicesForChainedDeleteAndFile;
@@ -130,17 +130,17 @@ protected:
   uint32_t m_totalMessagesInView;
 
   PR_STATIC_CALLBACK(PLDHashOperator) ThreadTableCloner(const nsACString &aKey, 
                                                         nsIMsgThread* aThread, 
                                                         void* aArg);
   PR_STATIC_CALLBACK(PLDHashOperator) MsgHdrTableCloner(const nsACString &aKey, 
                                                         nsIMsgDBHdr* aMsgHdr, 
                                                         void* aArg);
-  virtual nsMsgGroupThread *CreateGroupThread(nsIMsgDatabase *db) MOZ_OVERRIDE;
+  virtual nsMsgGroupThread *CreateGroupThread(nsIMsgDatabase *db) override;
   nsresult GetXFThreadFromMsgHdr(nsIMsgDBHdr *msgHdr, nsIMsgThread **pThread,
                                  bool *foundByMessageId = nullptr);
   bool     GetThreadFromHash(nsCString &reference, nsIMsgThread **thread);
   bool     GetMsgHdrFromHash(nsCString &reference, nsIMsgDBHdr **hdr);
   nsresult AddRefToHash(nsCString &reference, nsIMsgThread *thread);
   nsresult AddMsgToHashTables(nsIMsgDBHdr *msgHdr, nsIMsgThread *thread);
   nsresult RemoveRefFromHash(nsCString &reference);
   nsresult RemoveMsgFromHashTables(nsIMsgDBHdr *msgHdr);
--- a/mailnews/base/src/nsMsgSpecialViews.h
+++ b/mailnews/base/src/nsMsgSpecialViews.h
@@ -9,38 +9,38 @@
 #include "mozilla/Attributes.h"
 #include "nsMsgThreadedDBView.h"
 
 class nsMsgThreadsWithUnreadDBView : public nsMsgThreadedDBView
 {
 public:
   nsMsgThreadsWithUnreadDBView();
   virtual ~nsMsgThreadsWithUnreadDBView();
-  virtual const char * GetViewName(void) MOZ_OVERRIDE {return "ThreadsWithUnreadView"; }
-  NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval) MOZ_OVERRIDE;
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
+  virtual const char * GetViewName(void) override {return "ThreadsWithUnreadView"; }
+  NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval) override;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
   NS_IMETHOD GetNumMsgsInView(int32_t *aNumMsgs);
 
-virtual bool WantsThisThread(nsIMsgThread *threadHdr) MOZ_OVERRIDE;
+virtual bool WantsThisThread(nsIMsgThread *threadHdr) override;
 protected:
-  virtual nsresult AddMsgToThreadNotInView(nsIMsgThread *threadHdr, nsIMsgDBHdr *msgHdr, bool ensureListed) MOZ_OVERRIDE;
+  virtual nsresult AddMsgToThreadNotInView(nsIMsgThread *threadHdr, nsIMsgDBHdr *msgHdr, bool ensureListed) override;
   uint32_t m_totalUnwantedMessagesInView;
 };
 
 class nsMsgWatchedThreadsWithUnreadDBView : public nsMsgThreadedDBView
 {
 public:
   nsMsgWatchedThreadsWithUnreadDBView ();
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
-  NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval) MOZ_OVERRIDE;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
+  NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval) override;
   NS_IMETHOD GetNumMsgsInView(int32_t *aNumMsgs);
-  virtual const char * GetViewName(void) MOZ_OVERRIDE {return "WatchedThreadsWithUnreadView"; }
-  virtual bool WantsThisThread(nsIMsgThread *threadHdr) MOZ_OVERRIDE;
+  virtual const char * GetViewName(void) override {return "WatchedThreadsWithUnreadView"; }
+  virtual bool WantsThisThread(nsIMsgThread *threadHdr) override;
 protected:
-  virtual nsresult AddMsgToThreadNotInView(nsIMsgThread *threadHdr, nsIMsgDBHdr *msgHdr, bool ensureListed) MOZ_OVERRIDE;
+  virtual nsresult AddMsgToThreadNotInView(nsIMsgThread *threadHdr, nsIMsgDBHdr *msgHdr, bool ensureListed) override;
   uint32_t m_totalUnwantedMessagesInView;
 
 };
 #ifdef DOING_CACHELESS_VIEW
 // This view will initially be used for cacheless IMAP.
 class nsMsgCachelessView : public nsMsgDBView
 {
 public:
--- a/mailnews/base/src/nsMsgTagService.h
+++ b/mailnews/base/src/nsMsgTagService.h
@@ -7,17 +7,17 @@
 #define nsMsgTagService_h__
 
 #include "nsIMsgTagService.h"
 #include "nsIPrefBranch.h"
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 
-class nsMsgTag MOZ_FINAL : public nsIMsgTag
+class nsMsgTag final : public nsIMsgTag
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGTAG
 
   nsMsgTag(const nsACString &aKey,
            const nsAString  &aTag,
            const nsACString &aColor,
@@ -26,17 +26,17 @@ public:
 protected:
   ~nsMsgTag();
 
   nsString  mTag;
   nsCString mKey, mColor, mOrdinal;
 };
 
 
-class nsMsgTagService MOZ_FINAL : public nsIMsgTagService
+class nsMsgTagService final : public nsIMsgTagService
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGTAGSERVICE
 
   nsMsgTagService();
 
 private:
--- a/mailnews/base/src/nsMsgThreadedDBView.h
+++ b/mailnews/base/src/nsMsgThreadedDBView.h
@@ -10,37 +10,37 @@
 #include "nsMsgGroupView.h"
 
 class nsMsgThreadedDBView : public nsMsgGroupView
 {
 public:
   nsMsgThreadedDBView();
   virtual ~nsMsgThreadedDBView();
 
-  NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) MOZ_OVERRIDE;
+  NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) override;
   NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval);
-  NS_IMETHOD Close() MOZ_OVERRIDE;
+  NS_IMETHOD Close() override;
   int32_t AddKeys(nsMsgKey *pKeys, int32_t *pFlags, const char *pLevels, nsMsgViewSortTypeValue sortType, int32_t numKeysToAdd);
   NS_IMETHOD Sort(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder);
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
-  NS_IMETHOD OnParentChanged (nsMsgKey aKeyChanged, nsMsgKey oldParent, nsMsgKey newParent, nsIDBChangeListener *aInstigator) MOZ_OVERRIDE;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
+  NS_IMETHOD OnParentChanged (nsMsgKey aKeyChanged, nsMsgKey oldParent, nsMsgKey newParent, nsIDBChangeListener *aInstigator) override;
 
 protected:
   virtual const char * GetViewName(void) {return "ThreadedDBView"; }
   nsresult InitThreadedView(int32_t *pCount);
-  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool ensureListed) MOZ_OVERRIDE;
+  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey aParentKey, bool ensureListed) override;
   virtual nsresult AddMsgToThreadNotInView(nsIMsgThread *threadHdr, nsIMsgDBHdr *msgHdr, bool ensureListed);
   nsresult ListThreadIds(nsMsgKey *startMsg, bool unreadOnly, nsMsgKey *pOutput, int32_t *pFlags, char *pLevels, 
                         int32_t numToList, int32_t *pNumListed, int32_t *pTotalHeaders);
   nsresult InitSort(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder);
   virtual nsresult SortThreads(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder);
-  virtual void  OnExtraFlagChanged(nsMsgViewIndex index, uint32_t extraFlag) MOZ_OVERRIDE;
-  virtual void OnHeaderAddedOrDeleted() MOZ_OVERRIDE;
+  virtual void  OnExtraFlagChanged(nsMsgViewIndex index, uint32_t extraFlag) override;
+  virtual void OnHeaderAddedOrDeleted() override;
   void    ClearPrevIdArray();
-  virtual nsresult RemoveByIndex(nsMsgViewIndex index) MOZ_OVERRIDE;
+  virtual nsresult RemoveByIndex(nsMsgViewIndex index) override;
   nsMsgViewIndex GetInsertInfoForNewHdr(nsIMsgDBHdr *newHdr, nsMsgViewIndex threadIndex, int32_t targetLevel);
   void MoveThreadAt(nsMsgViewIndex threadIndex);
 
   // these are used to save off the previous view so that bopping back and forth
   // between two views is quick (e.g., threaded and flat sorted by date).
   bool            m_havePrevView;
   nsTArray<nsMsgKey> m_prevKeys;   //this is used for caching non-threaded view.
   nsTArray<uint32_t> m_prevFlags;
--- a/mailnews/base/src/nsMsgXFVirtualFolderDBView.h
+++ b/mailnews/base/src/nsMsgXFVirtualFolderDBView.h
@@ -18,39 +18,39 @@ class nsMsgXFVirtualFolderDBView : publi
 {
 public:
   nsMsgXFVirtualFolderDBView();
   virtual ~nsMsgXFVirtualFolderDBView();
 
   // we override all the methods, currently. Might change...
   NS_DECL_NSIMSGSEARCHNOTIFY
 
-  virtual const char * GetViewName(void) MOZ_OVERRIDE {return "XFVirtualFolderView"; }
+  virtual const char * GetViewName(void) override {return "XFVirtualFolderView"; }
   NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, 
-        nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) MOZ_OVERRIDE;
+        nsMsgViewFlagsTypeValue viewFlags, int32_t *pCount) override;
   NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, 
-                         nsIMsgDBViewCommandUpdater *aCmdUpdater, nsIMsgDBView **_retval) MOZ_OVERRIDE;
+                         nsIMsgDBViewCommandUpdater *aCmdUpdater, nsIMsgDBView **_retval) override;
   NS_IMETHOD CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger *aMessengerInstance, 
-                        nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCmdUpdater) MOZ_OVERRIDE;
-  NS_IMETHOD Close() MOZ_OVERRIDE;
-  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) MOZ_OVERRIDE;
-  NS_IMETHOD DoCommand(nsMsgViewCommandTypeValue command) MOZ_OVERRIDE;
+                        nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCmdUpdater) override;
+  NS_IMETHOD Close() override;
+  NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType) override;
+  NS_IMETHOD DoCommand(nsMsgViewCommandTypeValue command) override;
   NS_IMETHOD SetViewFlags(nsMsgViewFlagsTypeValue aViewFlags);
   NS_IMETHOD OnHdrPropertyChanged(nsIMsgDBHdr *aHdrToChange, bool aPreChange, uint32_t *aStatus, 
-                                 nsIDBChangeListener * aInstigator) MOZ_OVERRIDE;
+                                 nsIDBChangeListener * aInstigator) override;
   NS_IMETHOD GetMsgFolder(nsIMsgFolder **aMsgFolder);
 
-  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey parentKey, bool ensureListed) MOZ_OVERRIDE;
+  virtual nsresult OnNewHeader(nsIMsgDBHdr *newHdr, nsMsgKey parentKey, bool ensureListed) override;
   void UpdateCacheAndViewForPrevSearchedFolders(nsIMsgFolder *curSearchFolder);
   void UpdateCacheAndViewForFolder(nsIMsgFolder *folder, nsMsgKey *newHits, uint32_t numNewHits);
   void RemovePendingDBListeners();
 
 protected:
 
-  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) MOZ_OVERRIDE;
+  virtual nsresult GetMessageEnumerator(nsISimpleEnumerator **enumerator) override;
 
   uint32_t m_cachedFolderArrayIndex; // array index of next folder with cached hits to deal with.
   nsCOMArray<nsIMsgFolder> m_foldersSearchingOver;
   nsCOMArray<nsIMsgDBHdr> m_hdrHits;
   nsCOMPtr <nsIMsgFolder> m_curFolderGettingHits;
   uint32_t m_curFolderStartKeyIndex; // keeps track of the index of the first hit from the cur folder
   bool m_curFolderHasCachedHits;
   bool m_doingSearch;
--- a/mailnews/base/util/Services.cpp
+++ b/mailnews/base/util/Services.cpp
@@ -27,17 +27,17 @@
 #include "nsINntpService.h"
 #include "nsIPop3Service.h"
 #include "nsISmtpService.h"
 
 namespace mozilla {
 namespace services {
 
 namespace {
-class ShutdownObserver MOZ_FINAL : public nsIObserver
+class ShutdownObserver final : public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
   static void EnsureInitialized();
 private:
   ~ShutdownObserver() {}
--- a/mailnews/base/util/nsImapMoveCoalescer.h
+++ b/mailnews/base/util/nsImapMoveCoalescer.h
@@ -46,17 +46,17 @@ protected:
   nsCOMPtr <nsIMsgWindow> m_msgWindow;
   nsCOMPtr <nsIMsgFolder> m_sourceFolder;
   bool m_doNewMailNotification;
   bool m_hasPendingMoves;
   nsTArray<nsMsgKey> m_keyBuckets[2];
   int32_t m_outstandingMoves;
 };
 
-class nsMoveCoalescerCopyListener MOZ_FINAL : public nsIMsgCopyServiceListener
+class nsMoveCoalescerCopyListener final : public nsIMsgCopyServiceListener
 {
 public:
     nsMoveCoalescerCopyListener(nsImapMoveCoalescer * coalescer, nsIMsgFolder *destFolder);
     NS_DECL_ISUPPORTS
     NS_DECL_NSIMSGCOPYSERVICELISTENER
 
     nsCOMPtr <nsIMsgFolder> m_destFolder;
 
--- a/mailnews/base/util/nsMsgCompressIStream.h
+++ b/mailnews/base/util/nsMsgCompressIStream.h
@@ -4,17 +4,17 @@
 
 #include "msgCore.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIInputStream.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "zlib.h"
 
-class NS_MSG_BASE nsMsgCompressIStream MOZ_FINAL : public nsIAsyncInputStream
+class NS_MSG_BASE nsMsgCompressIStream final : public nsIAsyncInputStream
 {
 public:
   nsMsgCompressIStream();
 
   NS_DECL_THREADSAFE_ISUPPORTS
     
   NS_DECL_NSIINPUTSTREAM
   NS_DECL_NSIASYNCINPUTSTREAM
--- a/mailnews/base/util/nsMsgCompressOStream.h
+++ b/mailnews/base/util/nsMsgCompressOStream.h
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "msgCore.h"
 #include "nsIOutputStream.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "zlib.h"
 
-class NS_MSG_BASE nsMsgCompressOStream MOZ_FINAL : public nsIOutputStream
+class NS_MSG_BASE nsMsgCompressOStream final : public nsIOutputStream
 {
 public:
   nsMsgCompressOStream();
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
   NS_DECL_NSIOUTPUTSTREAM
 
--- a/mailnews/base/util/nsMsgDBFolder.h
+++ b/mailnews/base/util/nsMsgDBFolder.h
@@ -59,17 +59,17 @@ public:
   NS_DECL_NSIURLLISTENER
   NS_DECL_NSIJUNKMAILCLASSIFICATIONLISTENER
   NS_DECL_NSIMSGTRAITCLASSIFICATIONLISTENER
   
   NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element);
   NS_IMETHOD ReadFromFolderCacheElem(nsIMsgFolderCacheElement *element);
 
   // nsRDFResource overrides
-  NS_IMETHOD Init(const char* aURI) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char* aURI) override;
 
   // These functions are used for tricking the front end into thinking that we have more 
   // messages than are really in the DB.  This is usually after and IMAP message copy where
   // we don't want to do an expensive select until the user actually opens that folder
   // These functions are called when MSG_Master::GetFolderLineById is populating a MSG_FolderLine
   // struct used by the FE
   int32_t GetNumPendingUnread();
   int32_t GetNumPendingTotalMessages();
--- a/mailnews/base/util/nsMsgFileStream.h
+++ b/mailnews/base/util/nsMsgFileStream.h
@@ -4,28 +4,28 @@
 
 #include "mozilla/Attributes.h"
 #include "msgCore.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsISeekableStream.h"
 #include "prio.h"
 
-class nsMsgFileStream MOZ_FINAL : public nsIInputStream,
+class nsMsgFileStream final : public nsIInputStream,
                                   public nsIOutputStream,
                                   public nsISeekableStream
 {
 public:
   nsMsgFileStream();
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD Available(uint64_t *_retval) MOZ_OVERRIDE; 
-  NS_IMETHOD Read(char * aBuf, uint32_t aCount, uint32_t *_retval) MOZ_OVERRIDE; 
-  NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void * aClosure, uint32_t aCount, uint32_t *_retval) MOZ_OVERRIDE;
+  NS_IMETHOD Available(uint64_t *_retval) override; 
+  NS_IMETHOD Read(char * aBuf, uint32_t aCount, uint32_t *_retval) override; 
+  NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void * aClosure, uint32_t aCount, uint32_t *_retval) override;
   NS_DECL_NSIOUTPUTSTREAM
   NS_DECL_NSISEEKABLESTREAM
 
   nsresult InitWithFile(nsIFile *localFile);
 protected:
   ~nsMsgFileStream();
 
   PRFileDesc *mFileDesc;
--- a/mailnews/base/util/nsMsgIdentity.h
+++ b/mailnews/base/util/nsMsgIdentity.h
@@ -7,17 +7,17 @@
 #define nsMsgIdentity_h___
 
 #include "nsIMsgIdentity.h"
 #include "nsIPrefBranch.h"
 #include "msgCore.h"
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
 
-class NS_MSG_BASE nsMsgIdentity MOZ_FINAL : public nsIMsgIdentity
+class NS_MSG_BASE nsMsgIdentity final : public nsIMsgIdentity
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIMSGIDENTITY
   
 private:
   ~nsMsgIdentity() {}
   nsCString mKey;
--- a/mailnews/base/util/nsMsgProtocol.h
+++ b/mailnews/base/util/nsMsgProtocol.h
@@ -174,26 +174,26 @@ protected:
 // and news want to leverage aysnc write. We don't want everyone who inherits from nsMsgProtocol to have to
 // pick up the extra overhead.
 class NS_MSG_BASE nsMsgAsyncWriteProtocol : public nsMsgProtocol
                                           , public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_IMETHOD Cancel(nsresult status) MOZ_OVERRIDE;
+  NS_IMETHOD Cancel(nsresult status) override;
 
   nsMsgAsyncWriteProtocol(nsIURI * aURL);
   
   // temporary over ride...
-  virtual nsresult PostMessage(nsIURI* url, nsIFile *postFile) MOZ_OVERRIDE;
+  virtual nsresult PostMessage(nsIURI* url, nsIFile *postFile) override;
   
   // over ride the following methods from the base class
-  virtual nsresult SetupTransportState() MOZ_OVERRIDE;
-  virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) MOZ_OVERRIDE;
+  virtual nsresult SetupTransportState() override;
+  virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) override;
   nsCString mAsyncBuffer;
 
   // if we suspended the asynch write while waiting for more data to write then this will be TRUE
   bool mSuspendedWrite;
   nsCOMPtr<nsIRequest>     m_WriteRequest;
   nsCOMPtr<nsIAsyncOutputStream>    mAsyncOutStream;
   nsCOMPtr<nsIOutputStreamCallback> mProvider;
   nsCOMPtr<nsIThread>               mProviderThread;
@@ -229,15 +229,15 @@ protected:
   uint32_t                  mSuspendedReadBytes;   // remaining # of bytes we need to read before   
                                                    // the input stream becomes unblocked
   uint32_t                  mSuspendedReadBytesPostPeriod; // # of bytes which need processed after we insert a '.' before 
                                                            // the input stream becomes unblocked.
   int64_t  mFilePostSize; // used for determining progress on posting files.
   uint32_t  mNumBytesPosted; // used for deterimining progress on posting files 
   bool      mGenerateProgressNotifications; // set during a post operation after we've started sending the post data...
 
-  virtual nsresult CloseSocket() MOZ_OVERRIDE; 
+  virtual nsresult CloseSocket() override; 
 };
 
 #undef  IMETHOD_VISIBILITY
 #define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
 
 #endif /* nsMsgProtocol_h__ */
--- a/mailnews/base/util/nsMsgReadStateTxn.h
+++ b/mailnews/base/util/nsMsgReadStateTxn.h
@@ -28,18 +28,18 @@ class NS_MSG_BASE nsMsgReadStateTxn : pu
 {
 public:
   nsMsgReadStateTxn();
   virtual ~nsMsgReadStateTxn();
 
   nsresult Init(nsIMsgFolder *aParentFolder,
                 uint32_t aNumKeys,
                 nsMsgKey *aMsgKeyArray);
-  NS_IMETHOD UndoTransaction() MOZ_OVERRIDE;
-  NS_IMETHOD RedoTransaction() MOZ_OVERRIDE;
+  NS_IMETHOD UndoTransaction() override;
+  NS_IMETHOD RedoTransaction() override;
 
 protected:
   NS_IMETHOD MarkMessages(bool aAsRead);
 
 private:
   nsCOMPtr<nsIMsgFolder> mParentFolder;
   nsTArray<nsMsgKey>     mMarkedMessages;
   bool                   mWasMarkedRead;
--- a/mailnews/base/util/nsMsgTxn.cpp
+++ b/mailnews/base/util/nsMsgTxn.cpp
@@ -72,17 +72,17 @@ NS_IMETHODIMP nsMsgTxn::DeleteProperty(c
   return mPropertyHash.Get(name, nullptr) ? NS_ERROR_FAILURE : NS_OK;
 }
 
 //
 // nsMailSimpleProperty class and impl; used for GetEnumerator
 // This is same as nsSimpleProperty but for external API use.
 //
 
-class nsMailSimpleProperty MOZ_FINAL : public nsIProperty 
+class nsMailSimpleProperty final : public nsIProperty 
 {
 public:
   nsMailSimpleProperty(const nsAString& aName, nsIVariant* aValue)
       : mName(aName), mValue(aValue)
   {
   }
 
   NS_DECL_ISUPPORTS
--- a/mailnews/base/util/nsMsgTxn.h
+++ b/mailnews/base/util/nsMsgTxn.h
@@ -32,25 +32,25 @@ class NS_MSG_BASE nsMsgTxn : public nsIT
                              public nsIWritablePropertyBag,
                              public nsIWritablePropertyBag2
 {
 public:
     nsMsgTxn();
 
     nsresult Init();
 
-    NS_IMETHOD DoTransaction(void) MOZ_OVERRIDE;
+    NS_IMETHOD DoTransaction(void) override;
 
-    NS_IMETHOD UndoTransaction(void) MOZ_OVERRIDE = 0;
+    NS_IMETHOD UndoTransaction(void) override = 0;
 
-    NS_IMETHOD RedoTransaction(void) MOZ_OVERRIDE = 0;
+    NS_IMETHOD RedoTransaction(void) override = 0;
     
-    NS_IMETHOD GetIsTransient(bool *aIsTransient) MOZ_OVERRIDE;
+    NS_IMETHOD GetIsTransient(bool *aIsTransient) override;
 
-    NS_IMETHOD Merge(nsITransaction *aTransaction, bool *aDidMerge) MOZ_OVERRIDE;
+    NS_IMETHOD Merge(nsITransaction *aTransaction, bool *aDidMerge) override;
 
     nsresult GetMsgWindow(nsIMsgWindow **msgWindow);
     nsresult SetMsgWindow(nsIMsgWindow *msgWindow);
     nsresult SetTransactionType(uint32_t txnType);
  
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIPROPERTYBAG
     NS_DECL_NSIPROPERTYBAG2
--- a/mailnews/compose/public/nsMsgAttachmentData.h
+++ b/mailnews/compose/public/nsMsgAttachmentData.h
@@ -6,17 +6,17 @@
 #ifndef __MSGATTACHMENTDATA_H__
 #define __MSGATTACHMENTDATA_H__
 
 #include "nsIURL.h"
 #include "nsStringGlue.h"
 #include "nsIMsgSend.h"
 
 // Attachment file/URL structures - we're letting libmime use this directly
-class nsMsgAttachmentData MOZ_FINAL : public nsIMsgAttachmentData
+class nsMsgAttachmentData final : public nsIMsgAttachmentData
 {
 public:
   NS_DECL_NSIMSGATTACHMENTDATA
   NS_DECL_ISUPPORTS
 
   nsMsgAttachmentData();
   virtual ~nsMsgAttachmentData();
 
@@ -54,17 +54,17 @@ public:
 
   int32_t m_size;                  // The size of the attachment. May be 0.
   bool    m_isExternalAttachment;  // Flag for determining if the attachment is external
   bool    m_isDownloaded;          // Flag for determining if the attachment has already been downloaded
   bool    m_hasFilename;           // Tells whether the name is provided by us or if it's a Part 1.2-like attachment
   bool    m_displayableInline;     // Tells whether the attachment could be displayed inline
 };
 
-class nsMsgAttachedFile MOZ_FINAL : public nsIMsgAttachedFile
+class nsMsgAttachedFile final : public nsIMsgAttachedFile
 {
 public:
   NS_DECL_NSIMSGATTACHEDFILE
   NS_DECL_ISUPPORTS
 
   nsMsgAttachedFile();
   virtual ~nsMsgAttachedFile();
 
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -867,17 +867,17 @@ nsMsgComposeService::CacheWindow(nsIDOMW
       mCachedWindows[oppositeTypeId].Initialize(aWindow, xulWindow, aListener, aComposeHTML);
 
     return rv;
   }
 
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-class nsMsgTemplateReplyHelper MOZ_FINAL: public nsIStreamListener,
+class nsMsgTemplateReplyHelper final: public nsIStreamListener,
                                           public nsIUrlListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIURLLISTENER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIREQUESTOBSERVER
 
--- a/mailnews/compose/src/nsMsgCopy.h
+++ b/mailnews/compose/src/nsMsgCopy.h
@@ -30,25 +30,25 @@ class   nsMsgCopy;
 class CopyListener : public nsIMsgCopyServiceListener
 {
 public:
   CopyListener(void);
 
   // nsISupports interface
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD OnStartCopy() MOZ_OVERRIDE;
+  NS_IMETHOD OnStartCopy() override;
   
-  NS_IMETHOD OnProgress(uint32_t aProgress, uint32_t aProgressMax) MOZ_OVERRIDE;
+  NS_IMETHOD OnProgress(uint32_t aProgress, uint32_t aProgressMax) override;
 
-  NS_IMETHOD SetMessageKey(nsMsgKey aMessageKey) MOZ_OVERRIDE;
+  NS_IMETHOD SetMessageKey(nsMsgKey aMessageKey) override;
 
-  NS_IMETHOD GetMessageId(nsACString& aMessageId) MOZ_OVERRIDE;
+  NS_IMETHOD GetMessageId(nsACString& aMessageId) override;
   
-  NS_IMETHOD OnStopCopy(nsresult aStatus) MOZ_OVERRIDE;
+  NS_IMETHOD OnStopCopy(nsresult aStatus) override;
 
   NS_IMETHOD SetMsgComposeAndSendObject(nsIMsgSend *obj);
   
   bool                            mCopyInProgress;
 
 private:
   virtual ~CopyListener();
   nsCOMPtr<nsIMsgSend>       mComposeAndSend;
--- a/mailnews/compose/src/nsSmtpProtocol.h
+++ b/mailnews/compose/src/nsSmtpProtocol.h
@@ -77,25 +77,25 @@ SMTP_SEND_AUTH_GSSAPI_STEP              
 class nsSmtpProtocol : public nsMsgAsyncWriteProtocol
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
 
     // Creating a protocol instance requires the URL which needs to be run.
     nsSmtpProtocol(nsIURI * aURL);
 
-    virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nullptr) MOZ_OVERRIDE;
-    virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) MOZ_OVERRIDE;
+    virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nullptr) override;
+    virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) override;
 
     ////////////////////////////////////////////////////////////////////////////////////////
     // we suppport the nsIStreamListener interface 
     ////////////////////////////////////////////////////////////////////////////////////////
 
     // stop binding is a "notification" informing us that the stream associated with aURL is going away. 
-    NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) MOZ_OVERRIDE;
+    NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) override;
 
 private:
     virtual ~nsSmtpProtocol();
     // if we are asked to load a url while we are blocked waiting for redirection information,
     // then we'll store the url consumer in mPendingConsumer until we can actually load
     // the url.
     nsCOMPtr<nsISupports> mPendingConsumer;
 
@@ -138,17 +138,17 @@ private:
     char *m_dataBuf;
     uint32_t m_dataBufSize;
 
     int32_t   m_originalContentLength; /* the content length at the time of calling graph progress */
 
     // initialization function given a new url and transport layer
     void Initialize(nsIURI * aURL);
     virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream, 
-                                          uint64_t sourceOffset, uint32_t length) MOZ_OVERRIDE;
+                                          uint64_t sourceOffset, uint32_t length) override;
 
     ////////////////////////////////////////////////////////////////////////////////////////
     // Communication methods --> Reading and writing protocol
     ////////////////////////////////////////////////////////////////////////////////////////
 
     void UpdateStatus(const char16_t* aStatusName);
     void UpdateStatusWithString(const char16_t * aStatusString);
 
@@ -194,16 +194,16 @@ private:
                                const char16_t **formatStrings, 
                                nsACString &aPassword);
 
     void    InitPrefAuthMethods(int32_t authMethodPrefValue);
     nsresult ChooseAuthMethod();
     void    MarkAuthMethodAsFailed(int32_t failedAuthMethod);
     void    ResetAuthMethods();
 
-    virtual const char* GetType() MOZ_OVERRIDE {return "smtp";}
+    virtual const char* GetType() override {return "smtp";}
 
     int32_t m_prefAuthMethods; // set of capability flags for auth methods
     int32_t m_failedAuthMethods; // ditto
     int32_t m_currentAuthMethod; // exactly one capability flag, or 0
 };
 
 #endif  // nsSmtpProtocol_h___
--- a/mailnews/db/msgdb/public/nsImapMailDatabase.h
+++ b/mailnews/db/msgdb/public/nsImapMailDatabase.h
@@ -12,34 +12,34 @@ class nsImapMailDatabase : public nsMail
 {
 public:
   // OK, it's dumb that this should require a fileSpec, since there is no file
   // for the folder. This is mainly because we're deriving from nsMailDatabase;
   // Perhaps we shouldn't...
   nsImapMailDatabase();
   virtual ~nsImapMailDatabase();
   
-  NS_IMETHOD    StartBatch() MOZ_OVERRIDE;
-  NS_IMETHOD    EndBatch() MOZ_OVERRIDE;
-  NS_IMETHOD    GetSummaryValid(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD    SetSummaryValid(bool valid = true) MOZ_OVERRIDE;
-  virtual nsresult AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr) MOZ_OVERRIDE;
+  NS_IMETHOD    StartBatch() override;
+  NS_IMETHOD    EndBatch() override;
+  NS_IMETHOD    GetSummaryValid(bool *aResult) override;
+  NS_IMETHOD    SetSummaryValid(bool valid = true) override;
+  virtual nsresult AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr) override;
 
-  NS_IMETHOD    ForceClosed() MOZ_OVERRIDE;
-  NS_IMETHOD    AddNewHdrToDB(nsIMsgDBHdr *newHdr, bool notify) MOZ_OVERRIDE;
+  NS_IMETHOD    ForceClosed() override;
+  NS_IMETHOD    AddNewHdrToDB(nsIMsgDBHdr *newHdr, bool notify) override;
   NS_IMETHOD    SetAttributeOnPendingHdr(nsIMsgDBHdr *pendingHdr, const char *property,
-                                  const char *propertyVal) MOZ_OVERRIDE;
+                                  const char *propertyVal) override;
   NS_IMETHOD    SetUint32AttributeOnPendingHdr(nsIMsgDBHdr *pendingHdr, const char *property,
-                                  uint32_t propertyVal) MOZ_OVERRIDE;
+                                  uint32_t propertyVal) override;
   NS_IMETHOD    SetUint64AttributeOnPendingHdr(nsIMsgDBHdr *aPendingHdr,
                                                const char *aProperty,
-                                               uint64_t aPropertyVal) MOZ_OVERRIDE;
+                                               uint64_t aPropertyVal) override;
   NS_IMETHOD    DeleteMessages(uint32_t aNumKeys, nsMsgKey* nsMsgKeys,
-                               nsIDBChangeListener *instigator) MOZ_OVERRIDE;
-  NS_IMETHOD    UpdatePendingAttributes(nsIMsgDBHdr* aNewHdr) MOZ_OVERRIDE;
+                               nsIDBChangeListener *instigator) override;
+  NS_IMETHOD    UpdatePendingAttributes(nsIMsgDBHdr* aNewHdr) override;
 
 protected:
   // IMAP does not set local file flags, override does nothing
   virtual void UpdateFolderFlag(nsIMsgDBHdr *msgHdr, bool bSet,
                                 nsMsgMessageFlagType flag, nsIOutputStream **ppFileStream);
 
   nsresult      GetRowForPendingHdr(nsIMsgDBHdr *pendingHdr, nsIMdbRow **row);
   nsresult     GetAllPendingHdrsTable();
--- a/mailnews/db/msgdb/public/nsMailDatabase.h
+++ b/mailnews/db/msgdb/public/nsMailDatabase.h
@@ -17,38 +17,38 @@ class nsIOFileStream;
 class nsIFile;
 class nsOfflineImapOperation;
 
 class nsMailDatabase : public nsMsgDatabase
 {
 public:
   nsMailDatabase();
   virtual ~nsMailDatabase();
-  NS_IMETHOD  ForceClosed() MOZ_OVERRIDE;
+  NS_IMETHOD  ForceClosed() override;
   NS_IMETHOD DeleteMessages(uint32_t aNumKeys, nsMsgKey* nsMsgKeys,
-                            nsIDBChangeListener *instigator) MOZ_OVERRIDE;
+                            nsIDBChangeListener *instigator) override;
 
-  NS_IMETHOD StartBatch() MOZ_OVERRIDE;
-  NS_IMETHOD EndBatch() MOZ_OVERRIDE;
+  NS_IMETHOD StartBatch() override;
+  NS_IMETHOD EndBatch() override;
 
-  nsresult  Open(nsMsgDBService* aDBService, nsIFile *aSummaryFile, bool create, bool upgrading) MOZ_OVERRIDE;
+  nsresult  Open(nsMsgDBService* aDBService, nsIFile *aSummaryFile, bool create, bool upgrading) override;
   virtual nsMailDatabase  *GetMailDB() {return this;}
 
-  virtual uint32_t  GetCurVersion() MOZ_OVERRIDE {return kMsgDBVersion;}
+  virtual uint32_t  GetCurVersion() override {return kMsgDBVersion;}
   
   NS_IMETHOD  GetOfflineOpForKey(nsMsgKey opKey, bool create,
-                                 nsIMsgOfflineImapOperation **op) MOZ_OVERRIDE;
-  NS_IMETHOD  RemoveOfflineOp(nsIMsgOfflineImapOperation *op) MOZ_OVERRIDE;
+                                 nsIMsgOfflineImapOperation **op) override;
+  NS_IMETHOD  RemoveOfflineOp(nsIMsgOfflineImapOperation *op) override;
 
-  NS_IMETHOD  SetSummaryValid(bool valid) MOZ_OVERRIDE;
-  NS_IMETHOD  GetSummaryValid(bool *valid) MOZ_OVERRIDE;
+  NS_IMETHOD  SetSummaryValid(bool valid) override;
+  NS_IMETHOD  GetSummaryValid(bool *valid) override;
 	
-  NS_IMETHOD    EnumerateOfflineOps(nsISimpleEnumerator **enumerator) MOZ_OVERRIDE;
-  NS_IMETHOD    ListAllOfflineOpIds(nsTArray<nsMsgKey> *offlineOpIds) MOZ_OVERRIDE;
-  NS_IMETHOD    ListAllOfflineDeletes(nsTArray<nsMsgKey> *offlineDeletes) MOZ_OVERRIDE;
+  NS_IMETHOD    EnumerateOfflineOps(nsISimpleEnumerator **enumerator) override;
+  NS_IMETHOD    ListAllOfflineOpIds(nsTArray<nsMsgKey> *offlineOpIds) override;
+  NS_IMETHOD    ListAllOfflineDeletes(nsTArray<nsMsgKey> *offlineDeletes) override;
 
   friend class nsMsgOfflineOpEnumerator;
 protected:
 
   nsresult        GetAllOfflineOpsTable(); // get this on demand
 
   // get the time and date of the mailbox file
   void            GetMailboxModProperties(int64_t *aSize, uint32_t *aDate); 
--- a/mailnews/db/msgdb/public/nsMsgDatabase.h
+++ b/mailnews/db/msgdb/public/nsMsgDatabase.h
@@ -35,17 +35,17 @@ class nsIDBFolderInfo;
 
 const int32_t kMsgDBVersion = 1;
 
 // Hopefully we're not opening up lots of databases at the same time, however
 // this will give us a buffer before we need to start reallocating the cache
 // array.
 const uint32_t kInitialMsgDBCacheSize = 20;
 
-class nsMsgDBService MOZ_FINAL : public nsIMsgDBService
+class nsMsgDBService final : public nsIMsgDBService
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGDBSERVICE
 
   nsMsgDBService();
 
   void AddToCache(nsMsgDatabase* pMessageDB);
@@ -110,17 +110,17 @@ class nsMsgFilteredDBEnumerator : public
 {
 public:
   nsMsgFilteredDBEnumerator(nsMsgDatabase* db, nsIMdbTable *table,
                             bool reverse, nsIArray *searchTerms);
   virtual ~nsMsgFilteredDBEnumerator();
   nsresult InitSearchSession(nsIArray *searchTerms, nsIMsgFolder *folder);
 
 protected:
-  virtual nsresult               PrefetchNext() MOZ_OVERRIDE;
+  virtual nsresult               PrefetchNext() override;
 
   nsCOMPtr <nsIMsgSearchSession> m_searchSession;
 
 };
 
 namespace mozilla {
 namespace mailnews {
 class MsgDBReporter;
--- a/mailnews/db/msgdb/public/nsNewsDatabase.h
+++ b/mailnews/db/msgdb/public/nsNewsDatabase.h
@@ -18,40 +18,40 @@ class MSG_PurgeInfo;
 class nsNewsDatabase : public nsMsgDatabase , public nsINewsDatabase
 {
 public:
   nsNewsDatabase();
 
   NS_DECL_ISUPPORTS_INHERITED 
   NS_DECL_NSINEWSDATABASE
 
-  NS_IMETHOD Close(bool forceCommit) MOZ_OVERRIDE;
-  NS_IMETHOD ForceClosed() MOZ_OVERRIDE;
-  NS_IMETHOD Commit(nsMsgDBCommit commitType) MOZ_OVERRIDE;
-  virtual uint32_t GetCurVersion() MOZ_OVERRIDE;
+  NS_IMETHOD Close(bool forceCommit) override;
+  NS_IMETHOD ForceClosed() override;
+  NS_IMETHOD Commit(nsMsgDBCommit commitType) override;
+  virtual uint32_t GetCurVersion() override;
 
   // methods to get and set docsets for ids.
-  NS_IMETHOD  IsRead(nsMsgKey key, bool *pRead) MOZ_OVERRIDE;
-  virtual nsresult  IsHeaderRead(nsIMsgDBHdr *msgHdr, bool *pRead) MOZ_OVERRIDE;
+  NS_IMETHOD  IsRead(nsMsgKey key, bool *pRead) override;
+  virtual nsresult  IsHeaderRead(nsIMsgDBHdr *msgHdr, bool *pRead) override;
 
-  NS_IMETHOD         GetHighWaterArticleNum(nsMsgKey *key) MOZ_OVERRIDE;
-  NS_IMETHOD         GetLowWaterArticleNum(nsMsgKey *key) MOZ_OVERRIDE;
-  NS_IMETHOD         MarkAllRead(uint32_t *aNumMarked, nsMsgKey **thoseMarked) MOZ_OVERRIDE;
+  NS_IMETHOD         GetHighWaterArticleNum(nsMsgKey *key) override;
+  NS_IMETHOD         GetLowWaterArticleNum(nsMsgKey *key) override;
+  NS_IMETHOD         MarkAllRead(uint32_t *aNumMarked, nsMsgKey **thoseMarked) override;
 
   virtual nsresult    ExpireUpTo(nsMsgKey expireKey);
   virtual nsresult    ExpireRange(nsMsgKey startRange, nsMsgKey endRange);
  
-  virtual bool        SetHdrReadFlag(nsIMsgDBHdr *msgHdr, bool bRead) MOZ_OVERRIDE;
+  virtual bool        SetHdrReadFlag(nsIMsgDBHdr *msgHdr, bool bRead) override;
  
-  virtual nsresult  AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr) MOZ_OVERRIDE;
+  virtual nsresult  AdjustExpungedBytesOnDelete(nsIMsgDBHdr *msgHdr) override;
   nsresult          SyncWithReadSet();
   
-  NS_IMETHOD GetDefaultViewFlags(nsMsgViewFlagsTypeValue *aDefaultViewFlags) MOZ_OVERRIDE;
-  NS_IMETHOD GetDefaultSortType(nsMsgViewSortTypeValue *aDefaultSortType) MOZ_OVERRIDE;
-  NS_IMETHOD GetDefaultSortOrder(nsMsgViewSortOrderValue *aDefaultSortOrder) MOZ_OVERRIDE;
+  NS_IMETHOD GetDefaultViewFlags(nsMsgViewFlagsTypeValue *aDefaultViewFlags) override;
+  NS_IMETHOD GetDefaultSortType(nsMsgViewSortTypeValue *aDefaultSortType) override;
+  NS_IMETHOD GetDefaultSortOrder(nsMsgViewSortOrderValue *aDefaultSortOrder) override;
 
 protected:
   virtual ~nsNewsDatabase();
   // this is owned by the nsNewsFolder, which lives longer than the db.
   nsMsgKeySet           *m_readSet;
 };
 
 #endif
--- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -1028,17 +1028,17 @@ size_t nsMsgDatabase::SizeOfExcludingThi
   return totalSize;
 }
 
 namespace mozilla {
 namespace mailnews {
 
 MOZ_DEFINE_MALLOC_SIZE_OF(GetMallocSize)
 
-class MsgDBReporter MOZ_FINAL : public nsIMemoryReporter
+class MsgDBReporter final : public nsIMemoryReporter
 {
   nsMsgDatabase *mDatabase;
 public:
   MsgDBReporter(nsMsgDatabase *db) : mDatabase(db) {}
 
   NS_DECL_ISUPPORTS
   NS_IMETHOD GetName(nsACString &aName)
   {
--- a/mailnews/imap/src/nsIMAPBodyShell.h
+++ b/mailnews/imap/src/nsIMAPBodyShell.h
@@ -110,40 +110,40 @@ protected:
 // Message headers
 // A special type of nsIMAPBodypart
 // These may be headers for the top-level message,
 // or any body part of type message/rfc822.
 class nsIMAPMessageHeaders : public nsIMAPBodypart
 {
 public:
     nsIMAPMessageHeaders(char *partNum, nsIMAPBodypart *parentPart);
-	virtual nsIMAPBodypartType	GetType() MOZ_OVERRIDE;
+	virtual nsIMAPBodypartType	GetType() override;
     // Generates an HTML representation of this part.  Returns content length generated, -1 if failed.
     virtual int32_t Generate(nsIMAPBodyShell *aShell, bool stream,
-                             bool prefetch) MOZ_OVERRIDE;
-    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
+                             bool prefetch) override;
+    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) override;
     virtual void QueuePrefetchMessageHeaders(nsIMAPBodyShell *aShell);
 };
 
 
 class nsIMAPBodypartMultipart : public nsIMAPBodypart
 {
 public:
     nsIMAPBodypartMultipart(char *partNum, nsIMAPBodypart *parentPart);
-	virtual nsIMAPBodypartType	GetType() MOZ_OVERRIDE;
+	virtual nsIMAPBodypartType	GetType() override;
 	virtual ~nsIMAPBodypartMultipart();
-    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
-    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
+    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) override;
+    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) override;
     // Generates an HTML representation of this part.  Returns content length generated, -1 if failed.
     virtual int32_t Generate(nsIMAPBodyShell *aShell, bool stream,
-                             bool prefetch) MOZ_OVERRIDE;
+                             bool prefetch) override;
     // Returns the part object with the given number
 	virtual nsIMAPBodypart	*FindPartWithNumber(const char *partNum
-                                                ) MOZ_OVERRIDE;
-    virtual bool IsLastTextPart(const char *partNumberString) MOZ_OVERRIDE;
+                                                ) override;
+    virtual bool IsLastTextPart(const char *partNumberString) override;
     void AppendPart(nsIMAPBodypart *part)  { m_partList->AppendElement(part); }
     void SetBodySubType(char *bodySubType);
 
 protected:
 	nsVoidArray			*m_partList;			// An ordered list of top-level body parts for this shell
 };
 
 
@@ -151,49 +151,49 @@ protected:
 // a leaf, even though it can contain other parts within it.
 class nsIMAPBodypartLeaf : public nsIMAPBodypart
 {
 public:
   nsIMAPBodypartLeaf(char *partNum, nsIMAPBodypart *parentPart, char *bodyType,
                      char *bodySubType, char *bodyID, char *bodyDescription,
                      char *bodyEncoding, int32_t partLength,
                      bool preferPlainText);
-	virtual nsIMAPBodypartType	GetType() MOZ_OVERRIDE;
+	virtual nsIMAPBodypartType	GetType() override;
     // Generates an HTML representation of this part.  Returns content length generated, -1 if failed.
-    virtual int32_t Generate(nsIMAPBodyShell *aShell, bool stream, bool prefetch) MOZ_OVERRIDE;
+    virtual int32_t Generate(nsIMAPBodyShell *aShell, bool stream, bool prefetch) override;
     // returns true if this part should be fetched inline for generation.
-    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
-    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
+    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) override;
+    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) override;
 private:
   bool mPreferPlainText;
 };
 
 
 class nsIMAPBodypartMessage : public nsIMAPBodypartLeaf
 {
 public:
   nsIMAPBodypartMessage(char *partNum, nsIMAPBodypart *parentPart,
                         bool topLevelMessage, char *bodyType,
                         char *bodySubType, char *bodyID,
                         char *bodyDescription, char *bodyEncoding,
                         int32_t partLength, bool preferPlainText);
     void SetBody(nsIMAPBodypart *body);
-	virtual nsIMAPBodypartType	GetType() MOZ_OVERRIDE;
+	virtual nsIMAPBodypartType	GetType() override;
 	virtual ~nsIMAPBodypartMessage();
     virtual int32_t Generate(nsIMAPBodyShell *aShell, bool stream,
-                             bool prefetch) MOZ_OVERRIDE;
-    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
-    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) MOZ_OVERRIDE;
+                             bool prefetch) override;
+    virtual bool ShouldFetchInline(nsIMAPBodyShell *aShell) override;
+    virtual bool PreflightCheckAllInline(nsIMAPBodyShell *aShell) override;
 	// Returns the part object with the given number
 	virtual nsIMAPBodypart	*FindPartWithNumber(const char *partNum
-                                                ) MOZ_OVERRIDE;
+                                                ) override;
 	void	AdoptMessageHeaders(char *headers);			// Fills in buffer (and adopts storage) for header object
 														// partNum specifies the message part number to which the
 														// headers correspond.  NULL indicates the top-level message
-	virtual nsIMAPBodypartMessage	*GetnsIMAPBodypartMessage() MOZ_OVERRIDE { return this; }
+	virtual nsIMAPBodypartMessage	*GetnsIMAPBodypartMessage() override { return this; }
 	virtual	bool		GetIsTopLevelMessage() { return m_topLevelMessage; }
 
 protected:
 	nsIMAPMessageHeaders		*m_headers;				// Every body shell should have headers
 	nsIMAPBodypart			*m_body;	
 	bool					m_topLevelMessage;		// Whether or not this is the top-level message
 
 };
--- a/mailnews/imap/src/nsIMAPHostSessionList.h
+++ b/mailnews/imap/src/nsIMAPHostSessionList.h
@@ -51,83 +51,83 @@ class nsIMAPHostSessionList : public nsI
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIOBSERVER  
 
   nsIMAPHostSessionList();
   nsresult Init();
   // Host List
   NS_IMETHOD AddHostToList(const char *serverKey, 
-                            nsIImapIncomingServer *server) MOZ_OVERRIDE;
-  NS_IMETHOD ResetAll() MOZ_OVERRIDE;
+                            nsIImapIncomingServer *server) override;
+  NS_IMETHOD ResetAll() override;
 
   // Capabilities
-  NS_IMETHOD GetHostHasAdminURL(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetHostHasAdminURL(const char *serverKey, bool hasAdminUrl) MOZ_OVERRIDE;
+  NS_IMETHOD GetHostHasAdminURL(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetHostHasAdminURL(const char *serverKey, bool hasAdminUrl) override;
   // Subscription
-  NS_IMETHOD GetHostIsUsingSubscription(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetHostIsUsingSubscription(const char *serverKey, bool usingSubscription) MOZ_OVERRIDE;
+  NS_IMETHOD GetHostIsUsingSubscription(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetHostIsUsingSubscription(const char *serverKey, bool usingSubscription) override;
 
   // Passwords
-  NS_IMETHOD GetPasswordForHost(const char *serverKey, nsString &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetPasswordForHost(const char *serverKey, const char *password) MOZ_OVERRIDE;
-  NS_IMETHOD GetPasswordVerifiedOnline(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetPasswordVerifiedOnline(const char *serverKey) MOZ_OVERRIDE;
+  NS_IMETHOD GetPasswordForHost(const char *serverKey, nsString &result) override;
+  NS_IMETHOD SetPasswordForHost(const char *serverKey, const char *password) override;
+  NS_IMETHOD GetPasswordVerifiedOnline(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetPasswordVerifiedOnline(const char *serverKey) override;
 
   // OnlineDir
   NS_IMETHOD GetOnlineDirForHost(const char *serverKey,
-                                 nsString &result) MOZ_OVERRIDE;
+                                 nsString &result) override;
   NS_IMETHOD SetOnlineDirForHost(const char *serverKey,
-                                 const char *onlineDir) MOZ_OVERRIDE;
+                                 const char *onlineDir) override;
 
   // Delete is move to trash folder
-  NS_IMETHOD GetDeleteIsMoveToTrashForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetDeleteIsMoveToTrashForHost(const char *serverKey, bool isMoveToTrash) MOZ_OVERRIDE;
+  NS_IMETHOD GetDeleteIsMoveToTrashForHost(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetDeleteIsMoveToTrashForHost(const char *serverKey, bool isMoveToTrash) override;
   // imap delete model (or not)
-  NS_IMETHOD GetShowDeletedMessagesForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetShowDeletedMessagesForHost(const char *serverKey, bool showDeletedMessages) MOZ_OVERRIDE;
+  NS_IMETHOD GetShowDeletedMessagesForHost(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetShowDeletedMessagesForHost(const char *serverKey, bool showDeletedMessages) override;
 
   // Get namespaces
-  NS_IMETHOD GetGotNamespacesForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetGotNamespacesForHost(const char *serverKey, bool gotNamespaces) MOZ_OVERRIDE;
+  NS_IMETHOD GetGotNamespacesForHost(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetGotNamespacesForHost(const char *serverKey, bool gotNamespaces) override;
   // Folders
-  NS_IMETHOD SetHaveWeEverDiscoveredFoldersForHost(const char *serverKey, bool discovered) MOZ_OVERRIDE;
-  NS_IMETHOD GetHaveWeEverDiscoveredFoldersForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
+  NS_IMETHOD SetHaveWeEverDiscoveredFoldersForHost(const char *serverKey, bool discovered) override;
+  NS_IMETHOD GetHaveWeEverDiscoveredFoldersForHost(const char *serverKey, bool &result) override;
 
   // Trash Folder
-  NS_IMETHOD SetOnlineTrashFolderExistsForHost(const char *serverKey, bool exists) MOZ_OVERRIDE;
-  NS_IMETHOD GetOnlineTrashFolderExistsForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
+  NS_IMETHOD SetOnlineTrashFolderExistsForHost(const char *serverKey, bool exists) override;
+  NS_IMETHOD GetOnlineTrashFolderExistsForHost(const char *serverKey, bool &result) override;
 
   // INBOX
-  NS_IMETHOD GetOnlineInboxPathForHost(const char *serverKey, nsString &result) MOZ_OVERRIDE;
-  NS_IMETHOD GetShouldAlwaysListInboxForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD SetShouldAlwaysListInboxForHost(const char *serverKey, bool shouldList) MOZ_OVERRIDE;
+  NS_IMETHOD GetOnlineInboxPathForHost(const char *serverKey, nsString &result) override;
+  NS_IMETHOD GetShouldAlwaysListInboxForHost(const char *serverKey, bool &result) override;
+  NS_IMETHOD SetShouldAlwaysListInboxForHost(const char *serverKey, bool shouldList) override;
 
   // Namespaces
-  NS_IMETHOD GetNamespaceForMailboxForHost(const char *serverKey, const char *mailbox_name, nsIMAPNamespace *&result) MOZ_OVERRIDE;
-  NS_IMETHOD SetNamespaceFromPrefForHost(const char *serverKey, const char *namespacePref, EIMAPNamespaceType type) MOZ_OVERRIDE;
-  NS_IMETHOD AddNewNamespaceForHost(const char *serverKey, nsIMAPNamespace *ns) MOZ_OVERRIDE;
-  NS_IMETHOD ClearServerAdvertisedNamespacesForHost(const char *serverKey) MOZ_OVERRIDE;
-  NS_IMETHOD ClearPrefsNamespacesForHost(const char *serverKey) MOZ_OVERRIDE;
-  NS_IMETHOD GetDefaultNamespaceOfTypeForHost(const char *serverKey, EIMAPNamespaceType type, nsIMAPNamespace *&result) MOZ_OVERRIDE;
-  NS_IMETHOD SetNamespacesOverridableForHost(const char *serverKey, bool overridable) MOZ_OVERRIDE;
-  NS_IMETHOD GetNamespacesOverridableForHost(const char *serverKey,bool &result) MOZ_OVERRIDE;
-  NS_IMETHOD GetNumberOfNamespacesForHost(const char *serverKey, uint32_t &result) MOZ_OVERRIDE;
-  NS_IMETHOD GetNamespaceNumberForHost(const char *serverKey, int32_t n, nsIMAPNamespace * &result) MOZ_OVERRIDE;
+  NS_IMETHOD GetNamespaceForMailboxForHost(const char *serverKey, const char *mailbox_name, nsIMAPNamespace *&result) override;
+  NS_IMETHOD SetNamespaceFromPrefForHost(const char *serverKey, const char *namespacePref, EIMAPNamespaceType type) override;
+  NS_IMETHOD AddNewNamespaceForHost(const char *serverKey, nsIMAPNamespace *ns) override;
+  NS_IMETHOD ClearServerAdvertisedNamespacesForHost(const char *serverKey) override;
+  NS_IMETHOD ClearPrefsNamespacesForHost(const char *serverKey) override;
+  NS_IMETHOD GetDefaultNamespaceOfTypeForHost(const char *serverKey, EIMAPNamespaceType type, nsIMAPNamespace *&result) override;
+  NS_IMETHOD SetNamespacesOverridableForHost(const char *serverKey, bool overridable) override;
+  NS_IMETHOD GetNamespacesOverridableForHost(const char *serverKey,bool &result) override;
+  NS_IMETHOD GetNumberOfNamespacesForHost(const char *serverKey, uint32_t &result) override;
+  NS_IMETHOD GetNamespaceNumberForHost(const char *serverKey, int32_t n, nsIMAPNamespace * &result) override;
   // ### dmb hoo boy, how are we going to do this?
-  NS_IMETHOD CommitNamespacesForHost(nsIImapIncomingServer *host) MOZ_OVERRIDE;
-  NS_IMETHOD FlushUncommittedNamespacesForHost(const char *serverKey, bool &result) MOZ_OVERRIDE;
+  NS_IMETHOD CommitNamespacesForHost(nsIImapIncomingServer *host) override;
+  NS_IMETHOD FlushUncommittedNamespacesForHost(const char *serverKey, bool &result) override;
 
   // Hierarchy Delimiters
-  NS_IMETHOD SetNamespaceHierarchyDelimiterFromMailboxForHost(const char *serverKey, const char *boxName, char delimiter) MOZ_OVERRIDE;
+  NS_IMETHOD SetNamespaceHierarchyDelimiterFromMailboxForHost(const char *serverKey, const char *boxName, char delimiter) override;
 
   // Message Body Shells
-  NS_IMETHOD AddShellToCacheForHost(const char *serverKey, nsIMAPBodyShell *shell) MOZ_OVERRIDE;
-  NS_IMETHOD FindShellInCacheForHost(const char *serverKey, const char *mailboxName, const char *UID, IMAP_ContentModifiedType modType, nsIMAPBodyShell	**result) MOZ_OVERRIDE;
-  NS_IMETHOD ClearShellCacheForHost(const char *serverKey) MOZ_OVERRIDE;
+  NS_IMETHOD AddShellToCacheForHost(const char *serverKey, nsIMAPBodyShell *shell) override;
+  NS_IMETHOD FindShellInCacheForHost(const char *serverKey, const char *mailboxName, const char *UID, IMAP_ContentModifiedType modType, nsIMAPBodyShell	**result) override;
+  NS_IMETHOD ClearShellCacheForHost(const char *serverKey) override;
   PRMonitor *gCachedHostInfoMonitor;
   nsIMAPHostInfo *fHostInfoList;
 protected:
   virtual ~nsIMAPHostSessionList();
   nsresult SetNamespacesPrefForHost(nsIImapIncomingServer *aHost,
                                     EIMAPNamespaceType type,
                                     const char *pref);
   nsIMAPHostInfo *FindHost(const char *serverKey);
--- a/mailnews/imap/src/nsImapIncomingServer.h
+++ b/mailnews/imap/src/nsImapIncomingServer.h
@@ -29,62 +29,62 @@ class nsImapIncomingServer : public nsMs
                              public nsIUrlListener
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
 
     nsImapIncomingServer();
 
     // overriding nsMsgIncomingServer methods
-  NS_IMETHOD SetKey(const nsACString& aKey) MOZ_OVERRIDE;  // override nsMsgIncomingServer's implementation...
-  NS_IMETHOD GetLocalStoreType(nsACString& type) MOZ_OVERRIDE;
+  NS_IMETHOD SetKey(const nsACString& aKey) override;  // override nsMsgIncomingServer's implementation...
+  NS_IMETHOD GetLocalStoreType(nsACString& type) override;
 
   NS_DECL_NSIIMAPINCOMINGSERVER
   NS_DECL_NSIIMAPSERVERSINK
   NS_DECL_NSISUBSCRIBABLESERVER
   NS_DECL_NSIURLLISTENER
 
-  NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD PerformExpand(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD CloseCachedConnections() MOZ_OVERRIDE;
-  NS_IMETHOD GetConstructedPrettyName(nsAString& retval) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) MOZ_OVERRIDE;
+  NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD PerformExpand(nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD CloseCachedConnections() override;
+  NS_IMETHOD GetConstructedPrettyName(nsAString& retval) override;
+  NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) override;
   NS_IMETHOD GetCanCompactFoldersOnServer(bool *canCompactFoldersOnServer
-                                          ) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanUndoDeleteOnServer(bool *canUndoDeleteOnServer) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanEmptyTrashOnExit(bool *canEmptyTrashOnExit) MOZ_OVERRIDE;
-  NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) MOZ_OVERRIDE;
-  NS_IMETHOD GeneratePrettyNameForMigration(nsAString& aPrettyName) MOZ_OVERRIDE;
-  NS_IMETHOD GetSupportsDiskSpace(bool *aSupportsDiskSpace) MOZ_OVERRIDE;
+                                          ) override;
+  NS_IMETHOD GetCanUndoDeleteOnServer(bool *canUndoDeleteOnServer) override;
+  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) override;
+  NS_IMETHOD GetCanEmptyTrashOnExit(bool *canEmptyTrashOnExit) override;
+  NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) override;
+  NS_IMETHOD GeneratePrettyNameForMigration(nsAString& aPrettyName) override;
+  NS_IMETHOD GetSupportsDiskSpace(bool *aSupportsDiskSpace) override;
   NS_IMETHOD GetCanCreateFoldersOnServer(bool *aCanCreateFoldersOnServer
-                                         ) MOZ_OVERRIDE;
+                                         ) override;
   NS_IMETHOD GetCanFileMessagesOnServer(bool *aCanFileMessagesOnServer
-                                        ) MOZ_OVERRIDE;
-  NS_IMETHOD GetFilterScope(nsMsgSearchScopeValue *filterScope) MOZ_OVERRIDE;
-  NS_IMETHOD GetSearchScope(nsMsgSearchScopeValue *searchScope) MOZ_OVERRIDE;
+                                        ) override;
+  NS_IMETHOD GetFilterScope(nsMsgSearchScopeValue *filterScope) override;
+  NS_IMETHOD GetSearchScope(nsMsgSearchScopeValue *searchScope) override;
   NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff
-                                              ) MOZ_OVERRIDE;
+                                              ) override;
   NS_IMETHOD OnUserOrHostNameChanged(const nsACString& oldName,
                                      const nsACString& newName,
-                                     bool hostnameChanged) MOZ_OVERRIDE;
+                                     bool hostnameChanged) override;
   NS_IMETHOD GetNumIdleConnections(int32_t *aNumIdleConnections);
-  NS_IMETHOD ForgetSessionPassword() MOZ_OVERRIDE;
+  NS_IMETHOD ForgetSessionPassword() override;
   NS_IMETHOD GetMsgFolderFromURI(nsIMsgFolder *aFolderResource,
                                  const nsACString& aURI,
-                                 nsIMsgFolder **aFolder) MOZ_OVERRIDE;
+                                 nsIMsgFolder **aFolder) override;
   NS_IMETHOD SetSocketType(int32_t aSocketType);
   NS_IMETHOD VerifyLogon(nsIUrlListener *aUrlListener, nsIMsgWindow *aMsgWindow,
-                         nsIURI **aURL) MOZ_OVERRIDE;
+                         nsIURI **aURL) override;
 
 protected:
   virtual ~nsImapIncomingServer();
   nsresult GetFolder(const nsACString& name, nsIMsgFolder** pFolder);
   virtual nsresult CreateRootFolderFromUri(const nsCString &serverUri,
-                                           nsIMsgFolder **rootFolder) MOZ_OVERRIDE;
+                                           nsIMsgFolder **rootFolder) override;
   nsresult ResetFoldersToUnverified(nsIMsgFolder *parentFolder);
   void GetUnverifiedSubFolders(nsIMsgFolder *parentFolder,
                                nsCOMArray<nsIMsgImapMailFolder> &aFoldersArray);
   void GetUnverifiedFolders(nsCOMArray<nsIMsgImapMailFolder> &aFolderArray);
   nsresult DeleteNonVerifiedFolders(nsIMsgFolder *parentFolder);
   bool NoDescendentsAreVerified(nsIMsgFolder *parentFolder);
   bool AllDescendentsAreNoSelect(nsIMsgFolder *parentFolder);
 
--- a/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mailnews/imap/src/nsImapMailFolder.cpp
@@ -6341,17 +6341,17 @@ static PLDHashOperator fillArrayWithKeys
 }
 
 NS_IMETHODIMP nsImapMailFolder::GetOtherUsersWithAccess(
         nsIUTF8StringEnumerator** aResult)
 {
   return GetFolderACL()->GetOtherUsers(aResult);
 }
 
-class AdoptUTF8StringEnumerator MOZ_FINAL : public nsIUTF8StringEnumerator
+class AdoptUTF8StringEnumerator final : public nsIUTF8StringEnumerator
 {
 public:
   AdoptUTF8StringEnumerator(nsTArray<nsCString>* array) :
     mStrings(array), mIndex(0)
   {}
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIUTF8STRINGENUMERATOR
@@ -7720,17 +7720,17 @@ done:
     {
       srcFolder->EnableNotifications(allMessageCountNotifications, true, true/* dbBatching*/);  //enable message count notification
       NotifyFolderEvent(mDeleteOrMoveMsgFailedAtom);
     }
   }
   return rv;
 }
 
-class nsImapFolderCopyState MOZ_FINAL : public nsIUrlListener, public nsIMsgCopyServiceListener
+class nsImapFolderCopyState final : public nsIUrlListener, public nsIMsgCopyServiceListener
 {
 public:
   nsImapFolderCopyState(nsIMsgFolder *destParent, nsIMsgFolder *srcFolder,
                     bool isMoveFolder, nsIMsgWindow *msgWindow, nsIMsgCopyServiceListener *listener);
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIURLLISTENER
   NS_DECL_NSIMSGCOPYSERVICELISTENER
--- a/mailnews/imap/src/nsImapMailFolder.h
+++ b/mailnews/imap/src/nsImapMailFolder.h
@@ -198,134 +198,134 @@ class nsImapMailFolder :  public nsMsgDB
 {
  static const uint32_t PLAYBACK_TIMER_INTERVAL_IN_MS = 500; 
 public:
   nsImapMailFolder();
 
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIMsgFolder methods:
-  NS_IMETHOD GetSubFolders(nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
+  NS_IMETHOD GetSubFolders(nsISimpleEnumerator **aResult) override;
 
-  NS_IMETHOD GetMessages(nsISimpleEnumerator* *result) MOZ_OVERRIDE;
-  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) MOZ_OVERRIDE;
+  NS_IMETHOD GetMessages(nsISimpleEnumerator* *result) override;
+  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) override;
 
-  NS_IMETHOD CreateSubfolder(const nsAString& folderName,nsIMsgWindow *msgWindow ) MOZ_OVERRIDE;
-  NS_IMETHOD AddSubfolder(const nsAString& aName, nsIMsgFolder** aChild) MOZ_OVERRIDE;
+  NS_IMETHOD CreateSubfolder(const nsAString& folderName,nsIMsgWindow *msgWindow ) override;
+  NS_IMETHOD AddSubfolder(const nsAString& aName, nsIMsgFolder** aChild) override;
   NS_IMETHODIMP CreateStorageIfMissing(nsIUrlListener* urlListener);
 
-  NS_IMETHOD Compact(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
+  NS_IMETHOD Compact(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow) override;
   NS_IMETHOD CompactAll(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow,
-                        bool aCompactOfflineAlso) MOZ_OVERRIDE;
-  NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener) MOZ_OVERRIDE;
+                        bool aCompactOfflineAlso) override;
+  NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener) override;
   NS_IMETHOD CopyDataToOutputStreamForAppend(nsIInputStream *aIStream,
-                     int32_t aLength, nsIOutputStream *outputStream) MOZ_OVERRIDE;
-  NS_IMETHOD CopyDataDone() MOZ_OVERRIDE;
-  NS_IMETHOD Delete () MOZ_OVERRIDE;
-  NS_IMETHOD Rename (const nsAString& newName, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD RenameSubFolders(nsIMsgWindow *msgWindow, nsIMsgFolder *oldFolder) MOZ_OVERRIDE;
-  NS_IMETHOD GetNoSelect(bool *aResult) MOZ_OVERRIDE;
+                     int32_t aLength, nsIOutputStream *outputStream) override;
+  NS_IMETHOD CopyDataDone() override;
+  NS_IMETHOD Delete () override;
+  NS_IMETHOD Rename (const nsAString& newName, nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD RenameSubFolders(nsIMsgWindow *msgWindow, nsIMsgFolder *oldFolder) override;
+  NS_IMETHOD GetNoSelect(bool *aResult) override;
 
-  NS_IMETHOD GetPrettyName(nsAString& prettyName) MOZ_OVERRIDE; // Override of the base, for top-level mail folder
+  NS_IMETHOD GetPrettyName(nsAString& prettyName) override; // Override of the base, for top-level mail folder
 
-  NS_IMETHOD GetFolderURL(nsACString& url) MOZ_OVERRIDE;
+  NS_IMETHOD GetFolderURL(nsACString& url) override;
 
-  NS_IMETHOD UpdateSummaryTotals(bool force) MOZ_OVERRIDE;
+  NS_IMETHOD UpdateSummaryTotals(bool force) override;
 
-  NS_IMETHOD GetDeletable (bool *deletable) MOZ_OVERRIDE;
+  NS_IMETHOD GetDeletable (bool *deletable) override;
 
-  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) override;
 
-  NS_IMETHOD GetCanCreateSubfolders(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanSubscribe(bool *aResult) MOZ_OVERRIDE;
+  NS_IMETHOD GetCanCreateSubfolders(bool *aResult) override;
+  NS_IMETHOD GetCanSubscribe(bool *aResult) override;
 
-  NS_IMETHOD ApplyRetentionSettings() MOZ_OVERRIDE;
+  NS_IMETHOD ApplyRetentionSettings() override;
 
-  NS_IMETHOD AddMessageDispositionState(nsIMsgDBHdr *aMessage, nsMsgDispositionState aDispositionFlag) MOZ_OVERRIDE;
-  NS_IMETHOD MarkMessagesRead(nsIArray *messages, bool markRead) MOZ_OVERRIDE;
-  NS_IMETHOD MarkAllMessagesRead(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD MarkMessagesFlagged(nsIArray *messages, bool markFlagged) MOZ_OVERRIDE;
-  NS_IMETHOD MarkThreadRead(nsIMsgThread *thread) MOZ_OVERRIDE;
-  NS_IMETHOD SetLabelForMessages(nsIArray *aMessages, nsMsgLabelValue aLabel) MOZ_OVERRIDE;
-  NS_IMETHOD SetJunkScoreForMessages(nsIArray *aMessages, const nsACString& aJunkScore) MOZ_OVERRIDE;
-  NS_IMETHOD DeleteSubFolders(nsIArray *folders, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD ReadFromFolderCacheElem(nsIMsgFolderCacheElement *element) MOZ_OVERRIDE;
-  NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element) MOZ_OVERRIDE;
+  NS_IMETHOD AddMessageDispositionState(nsIMsgDBHdr *aMessage, nsMsgDispositionState aDispositionFlag) override;
+  NS_IMETHOD MarkMessagesRead(nsIArray *messages, bool markRead) override;
+  NS_IMETHOD MarkAllMessagesRead(nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD MarkMessagesFlagged(nsIArray *messages, bool markFlagged) override;
+  NS_IMETHOD MarkThreadRead(nsIMsgThread *thread) override;
+  NS_IMETHOD SetLabelForMessages(nsIArray *aMessages, nsMsgLabelValue aLabel) override;
+  NS_IMETHOD SetJunkScoreForMessages(nsIArray *aMessages, const nsACString& aJunkScore) override;
+  NS_IMETHOD DeleteSubFolders(nsIArray *folders, nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD ReadFromFolderCacheElem(nsIMsgFolderCacheElement *element) override;
+  NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element) override;
 
   NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,
-                                  nsIMsgDatabase **db) MOZ_OVERRIDE;
+                                  nsIMsgDatabase **db) override;
   NS_IMETHOD DeleteMessages(nsIArray *messages,
                             nsIMsgWindow *msgWindow, bool
                             deleteStorage, bool isMove,
-                            nsIMsgCopyServiceListener* listener, bool allowUndo) MOZ_OVERRIDE;
+                            nsIMsgCopyServiceListener* listener, bool allowUndo) override;
   NS_IMETHOD CopyMessages(nsIMsgFolder *srcFolder,
                           nsIArray* messages,
                           bool isMove, nsIMsgWindow *msgWindow,
                           nsIMsgCopyServiceListener* listener, bool isFolder,
-                          bool allowUndo) MOZ_OVERRIDE;
+                          bool allowUndo) override;
   NS_IMETHOD CopyFolder(nsIMsgFolder *srcFolder, bool isMove, nsIMsgWindow *msgWindow,
-                        nsIMsgCopyServiceListener* listener) MOZ_OVERRIDE;
+                        nsIMsgCopyServiceListener* listener) override;
   NS_IMETHOD CopyFileMessage(nsIFile* file,
                               nsIMsgDBHdr* msgToReplace,
                               bool isDraftOrTemplate,
                               uint32_t aNewMsgFlags,
                               const nsACString &aNewMsgKeywords,
                               nsIMsgWindow *msgWindow,
-                              nsIMsgCopyServiceListener* listener) MOZ_OVERRIDE;
-  NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow, nsIUrlListener *aListener) MOZ_OVERRIDE;
+                              nsIMsgCopyServiceListener* listener) override;
+  NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow, nsIUrlListener *aListener) override;
 
-  NS_IMETHOD GetFilePath(nsIFile** aPathName) MOZ_OVERRIDE;
-  NS_IMETHOD SetFilePath(nsIFile * aPath) MOZ_OVERRIDE;
+  NS_IMETHOD GetFilePath(nsIFile** aPathName) override;
+  NS_IMETHOD SetFilePath(nsIFile * aPath) override;
 
-  NS_IMETHOD Shutdown(bool shutdownChildren) MOZ_OVERRIDE;
+  NS_IMETHOD Shutdown(bool shutdownChildren) override;
 
-  NS_IMETHOD DownloadMessagesForOffline(nsIArray *messages, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+  NS_IMETHOD DownloadMessagesForOffline(nsIArray *messages, nsIMsgWindow *msgWindow) override;
 
-  NS_IMETHOD DownloadAllForOffline(nsIUrlListener *listener, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanFileMessages(bool *aCanFileMessages) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanDeleteMessages(bool *aCanDeleteMessages) MOZ_OVERRIDE;
+  NS_IMETHOD DownloadAllForOffline(nsIUrlListener *listener, nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD GetCanFileMessages(bool *aCanFileMessages) override;
+  NS_IMETHOD GetCanDeleteMessages(bool *aCanDeleteMessages) override;
   NS_IMETHOD FetchMsgPreviewText(nsMsgKey *aKeysToFetch, uint32_t aNumKeys,
                                                  bool aLocalOnly, nsIUrlListener *aUrlListener,
-                                                 bool *aAsyncResults) MOZ_OVERRIDE;
+                                                 bool *aAsyncResults) override;
 
-  NS_IMETHOD AddKeywordsToMessages(nsIArray *aMessages, const nsACString& aKeywords) MOZ_OVERRIDE;
-  NS_IMETHOD RemoveKeywordsFromMessages(nsIArray *aMessages, const nsACString& aKeywords) MOZ_OVERRIDE;
+  NS_IMETHOD AddKeywordsToMessages(nsIArray *aMessages, const nsACString& aKeywords) override;
+  NS_IMETHOD RemoveKeywordsFromMessages(nsIArray *aMessages, const nsACString& aKeywords) override;
 
-  NS_IMETHOD NotifyCompactCompleted() MOZ_OVERRIDE;
+  NS_IMETHOD NotifyCompactCompleted() override;
 
   // overrides nsMsgDBFolder::HasMsgOffline()
-  NS_IMETHOD HasMsgOffline(nsMsgKey msgKey, bool *_retval) MOZ_OVERRIDE;
+  NS_IMETHOD HasMsgOffline(nsMsgKey msgKey, bool *_retval) override;
   // overrides nsMsgDBFolder::GetOfflineFileStream()
-  NS_IMETHOD GetOfflineFileStream(nsMsgKey msgKey, int64_t *offset, uint32_t *size, nsIInputStream **aFileStream) MOZ_OVERRIDE;
+  NS_IMETHOD GetOfflineFileStream(nsMsgKey msgKey, int64_t *offset, uint32_t *size, nsIInputStream **aFileStream) override;
 
   NS_DECL_NSIMSGIMAPMAILFOLDER
   NS_DECL_NSIIMAPMAILFOLDERSINK
   NS_DECL_NSIIMAPMESSAGESINK
   NS_DECL_NSICOPYMESSAGELISTENER
 
   // nsIUrlListener methods
-  NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl) MOZ_OVERRIDE;
-  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) MOZ_OVERRIDE;
+  NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl) override;
+  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) override;
 
   NS_DECL_NSIMSGFILTERHITNOTIFY
   NS_DECL_NSIJUNKMAILCLASSIFICATIONLISTENER
 
-  NS_IMETHOD IsCommandEnabled(const nsACString& command, bool *result) MOZ_OVERRIDE;
-  NS_IMETHOD SetFilterList(nsIMsgFilterList *aMsgFilterList) MOZ_OVERRIDE;
-  NS_IMETHOD GetCustomIdentity(nsIMsgIdentity **aIdentity) MOZ_OVERRIDE;
+  NS_IMETHOD IsCommandEnabled(const nsACString& command, bool *result) override;
+  NS_IMETHOD SetFilterList(nsIMsgFilterList *aMsgFilterList) override;
+  NS_IMETHOD GetCustomIdentity(nsIMsgIdentity **aIdentity) override;
 
  /**
   * This method is used to locate a folder where a msg could be present, not just
   * the folder where the message first arrives, this method searches for the existence
   * of msg in all the folders/labels that we retrieve from X-GM-LABELS also.
   * overrides nsMsgDBFolder::GetOfflineMsgFolder()
   *  @param msgKey key  of the msg for which we are trying to get the folder;
   *  @param aMsgFolder  required folder;
   */
-  NS_IMETHOD GetOfflineMsgFolder(nsMsgKey msgKey, nsIMsgFolder **aMsgFolder) MOZ_OVERRIDE;
+  NS_IMETHOD GetOfflineMsgFolder(nsMsgKey msgKey, nsIMsgFolder **aMsgFolder) override;
 
   nsresult AddSubfolderWithPath(nsAString& name, nsIFile *dbPath, nsIMsgFolder **child, bool brandNew = false);
   nsresult MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
                                   nsIMsgDatabase *sourceDB,
                                   const nsACString& destFolder,
                                   nsIMsgFilter *filter,
                                   nsIMsgWindow *msgWindow);
 
@@ -341,17 +341,17 @@ public:
 
   // Find the start of a range of msgKeys that can hold srcCount headers.
   nsresult FindOpenRange(nsMsgKey &fakeBase, uint32_t srcCount);
 
 protected:
   virtual ~nsImapMailFolder();
   // Helper methods
 
-  virtual nsresult CreateChildFromURI(const nsCString &uri, nsIMsgFolder **folder) MOZ_OVERRIDE;
+  virtual nsresult CreateChildFromURI(const nsCString &uri, nsIMsgFolder **folder) override;
   void FindKeysToAdd(const nsTArray<nsMsgKey> &existingKeys, nsTArray<nsMsgKey>
     &keysToFetch, uint32_t &numNewUnread, nsIImapFlagAndUidState *flagState);
   void FindKeysToDelete(const nsTArray<nsMsgKey> &existingKeys, nsTArray<nsMsgKey>
     &keysToFetch, nsIImapFlagAndUidState *flagState, uint32_t boxFlags);
   void PrepareToAddHeadersToMailDB(nsIImapProtocol* aProtocol);
   void TweakHeaderFlags(nsIImapProtocol* aProtocol, nsIMsgDBHdr *tweakMe);
 
   nsresult SyncFlags(nsIImapFlagAndUidState *flagState);
@@ -389,18 +389,18 @@ protected:
   bool TrashOrDescendentOfTrash(nsIMsgFolder* folder);
   static bool ShouldCheckAllFolders(nsIImapIncomingServer *imapServer);
   nsresult GetServerKey(nsACString& serverKey);
   nsresult DisplayStatusMsg(nsIImapUrl *aImapUrl, const nsAString& msg);
 
   //nsresult RenameLocal(const char *newName);
   nsresult AddDirectorySeparator(nsIFile *path);
   nsresult CreateSubFolders(nsIFile *path);
-  nsresult GetDatabase() MOZ_OVERRIDE;
-  virtual void GetIncomingServerType(nsCString& serverType) MOZ_OVERRIDE { serverType.AssignLiteral("imap");}
+  nsresult GetDatabase() override;
+  virtual void GetIncomingServerType(nsCString& serverType) override { serverType.AssignLiteral("imap");}
 
   nsresult        GetFolderOwnerUserName(nsACString& userName);
   nsIMAPNamespace *GetNamespaceForFolder();
   void            SetNamespaceForFolder(nsIMAPNamespace *ns);
 
   nsMsgIMAPFolderACL * GetFolderACL();
   nsresult CreateACLRightsStringForFolder(nsAString& rightsString);
   nsresult GetBodysToDownload(nsTArray<nsMsgKey> *keysOfMessagesToDownload);
@@ -420,17 +420,17 @@ protected:
                           bool acrossServers,
                           uint32_t newMsgFlags,
                           const nsACString &newMsgKeywords,
                           nsIMsgCopyServiceListener* listener,
                           nsIMsgWindow *msgWindow,
                           bool allowUndo);
   nsresult GetMoveCoalescer();
   nsresult PlaybackCoalescedOperations();
-  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) MOZ_OVERRIDE;
+  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) override;
   // offline-ish methods
   nsresult GetClearedOriginalOp(nsIMsgOfflineImapOperation *op, nsIMsgOfflineImapOperation **originalOp, nsIMsgDatabase **originalDB);
   nsresult GetOriginalOp(nsIMsgOfflineImapOperation *op, nsIMsgOfflineImapOperation **originalOp, nsIMsgDatabase **originalDB);
   nsresult CopyMessagesOffline(nsIMsgFolder* srcFolder,
                                 nsIArray* messages,
                                 bool isMove,
                                 nsIMsgWindow *msgWindow,
                                 nsIMsgCopyServiceListener* listener);
--- a/mailnews/imap/src/nsImapOfflineSync.h
+++ b/mailnews/imap/src/nsImapOfflineSync.h
@@ -81,12 +81,12 @@ protected:
   
 };
 
 class nsImapOfflineDownloader : public nsImapOfflineSync
 {
 public:
   nsImapOfflineDownloader(nsIMsgWindow *window, nsIUrlListener *listener);
   virtual ~nsImapOfflineDownloader();
-  virtual nsresult  ProcessNextOperation() MOZ_OVERRIDE; // this kicks off download
+  virtual nsresult  ProcessNextOperation() override; // this kicks off download
 };
 
 #endif
--- a/mailnews/imap/src/nsImapProtocol.h
+++ b/mailnews/imap/src/nsImapProtocol.h
@@ -134,20 +134,20 @@ class nsImapProtocol : public nsIImapPro
 {
 public:
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIINPUTSTREAMCALLBACK
   nsImapProtocol();
 
   virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream,
-                                        uint64_t sourceOffset, uint32_t length) MOZ_OVERRIDE;
+                                        uint64_t sourceOffset, uint32_t length) override;
 
   // nsIRunnable method
-  NS_IMETHOD Run() MOZ_OVERRIDE;
+  NS_IMETHOD Run() override;
 
   //////////////////////////////////////////////////////////////////////////////////
   // we support the nsIImapProtocol interface
   //////////////////////////////////////////////////////////////////////////////////
   NS_DECL_NSIIMAPPROTOCOL
 
   //////////////////////////////////////////////////////////////////////////////////
   // we support the nsIImapProtocolSink interface
@@ -429,17 +429,17 @@ private:
   // Communication methods --> Reading and writing protocol
   ////////////////////////////////////////////////////////////////////////////////////////
 
   // SendData not only writes the NULL terminated data in dataBuffer to our output stream
   // but it also informs the consumer that the data has been written to the stream.
   // aSuppressLogging --> set to true if you wish to suppress logging for this particular command.
   // this is useful for making sure we don't log authenication information like the user's password (which was
   // encoded anyway), but still we shouldn't add that information to the log.
-  nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) MOZ_OVERRIDE;
+  nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) override;
 
   // state ported over from 4.5
   bool m_pseudoInterrupted;
   bool m_active;
   bool m_folderNeedsSubscribing;
   bool m_folderNeedsACLRefreshed;
 
   bool m_threadShouldDie;
--- a/mailnews/imap/src/nsImapServerResponseParser.h
+++ b/mailnews/imap/src/nsImapServerResponseParser.h
@@ -27,18 +27,18 @@ class nsCString;
 
 class nsImapServerResponseParser : public nsIMAPGenericParser
 {
 public:
   nsImapServerResponseParser(nsImapProtocol &imapConnection);
   virtual ~nsImapServerResponseParser();
 
   // Overridden from the base parser class
-  virtual bool       LastCommandSuccessful() MOZ_OVERRIDE;
-  virtual void HandleMemoryFailure() MOZ_OVERRIDE;
+  virtual bool       LastCommandSuccessful() override;
+  virtual void HandleMemoryFailure() override;
 
   // aignoreBadAndNOResponses --> don't throw a error dialog if this command results in a NO or Bad response
   // from the server..in other words the command is "exploratory" and we don't really care if it succeeds or fails.
   // This value is typically FALSE for almost all cases.
   virtual void ParseIMAPServerResponse(const char *aCurrentCommand,
                                        bool aIgnoreBadAndNOResponses,
                                        char *aGreetingWithCapability = NULL);
   virtual void InitializeState();
@@ -177,19 +177,19 @@ protected:
   virtual void    ProcessOkCommand(const char *commandToken);
   virtual void    ProcessBadCommand(const char *commandToken);
   virtual void    PreProcessCommandToken(const char *commandToken,
                                              const char *currentCommand);
   virtual void    PostProcessEndOfLine();
 
   // Overridden from the nsIMAPGenericParser, to retrieve the next line
   // from the open socket.
-  virtual bool    GetNextLineForParser(char **nextLine) MOZ_OVERRIDE;
+  virtual bool    GetNextLineForParser(char **nextLine) override;
   // overriden to do logging
-  virtual void    SetSyntaxError(bool error, const char *msg = nullptr) MOZ_OVERRIDE;
+  virtual void    SetSyntaxError(bool error, const char *msg = nullptr) override;
 
 private:
   bool            fCurrentCommandFailed;
   bool            fReportingErrors;
 
 
   bool            fCurrentFolderReadOnly;
   bool            fCurrentLineContainedFlagInfo;
--- a/mailnews/imap/src/nsImapUndoTxn.h
+++ b/mailnews/imap/src/nsImapUndoTxn.h
@@ -27,18 +27,18 @@ public:
   nsImapMoveCopyMsgTxn();
   nsImapMoveCopyMsgTxn(nsIMsgFolder* srcFolder, nsTArray<nsMsgKey>* srcKeyArray,
                        const char* srcMsgIdString, nsIMsgFolder* dstFolder,
                        bool isMove);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIURLLISTENER
 
-  NS_IMETHOD UndoTransaction(void) MOZ_OVERRIDE;
-  NS_IMETHOD RedoTransaction(void) MOZ_OVERRIDE;
+  NS_IMETHOD UndoTransaction(void) override;
+  NS_IMETHOD RedoTransaction(void) override;
 
   // helper
   nsresult SetCopyResponseUid(const char *msgIdString);
   nsresult GetSrcKeyArray(nsTArray<nsMsgKey>& srcKeyArray);
   void GetSrcMsgIds(nsCString &srcMsgIds) {srcMsgIds = m_srcMsgIdString;}
   nsresult AddDstKey(nsMsgKey aKey);
   nsresult UndoMailboxDelete();
   nsresult RedoMailboxDelete();
@@ -73,18 +73,18 @@ class nsImapOfflineTxn : public nsImapMo
 public:
   nsImapOfflineTxn(nsIMsgFolder* srcFolder, nsTArray<nsMsgKey>* srcKeyArray,
                    const char* srcMsgIdString,
                    nsIMsgFolder* dstFolder,
                    bool isMove,
                    nsOfflineImapOperationType opType,
                    nsCOMArray<nsIMsgDBHdr> &srcHdrs);
 
-  NS_IMETHOD UndoTransaction(void) MOZ_OVERRIDE;
-  NS_IMETHOD RedoTransaction(void) MOZ_OVERRIDE;
+  NS_IMETHOD UndoTransaction(void) override;
+  NS_IMETHOD RedoTransaction(void) override;
   void SetAddFlags(bool addFlags) {m_addFlags = addFlags;}
   void SetFlags(uint32_t flags) {m_flags = flags;}
 protected:
   virtual ~nsImapOfflineTxn();
   nsOfflineImapOperationType m_opType;
   // these two are used to undo flag changes, which we don't currently do.
   bool m_addFlags;
   uint32_t m_flags;
--- a/mailnews/imap/src/nsImapUrl.h
+++ b/mailnews/imap/src/nsImapUrl.h
@@ -22,29 +22,29 @@
 
 class nsImapUrl : public nsIImapUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl, public nsIMsgI18NUrl
 {
 public:
 
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIURI override
-  NS_IMETHOD SetSpec(const nsACString &aSpec) MOZ_OVERRIDE;
-  NS_IMETHOD SetQuery(const nsACString &aQuery) MOZ_OVERRIDE;
-  NS_IMETHOD Clone(nsIURI **_retval) MOZ_OVERRIDE;
+  NS_IMETHOD SetSpec(const nsACString &aSpec) override;
+  NS_IMETHOD SetQuery(const nsACString &aQuery) override;
+  NS_IMETHOD Clone(nsIURI **_retval) override;
 
   //////////////////////////////////////////////////////////////////////////////
   // we support the nsIImapUrl interface
   //////////////////////////////////////////////////////////////////////////////
   NS_DECL_NSIIMAPURL
 
   // nsIMsgMailNewsUrl overrides
-  NS_IMETHOD IsUrlType(uint32_t type, bool *isType) MOZ_OVERRIDE;
-  NS_IMETHOD GetFolder(nsIMsgFolder **aFolder) MOZ_OVERRIDE;
-  NS_IMETHOD SetFolder(nsIMsgFolder *aFolder) MOZ_OVERRIDE;
+  NS_IMETHOD IsUrlType(uint32_t type, bool *isType) override;
+  NS_IMETHOD GetFolder(nsIMsgFolder **aFolder) override;
+  NS_IMETHOD SetFolder(nsIMsgFolder *aFolder) override;
   // nsIMsgMessageUrl
   NS_DECL_NSIMSGMESSAGEURL
   NS_DECL_NSIMSGI18NURL
 
   // nsImapUrl
   nsImapUrl();
 
   static nsresult ConvertToCanonicalFormat(const char *folderName, char onlineDelimiter, char **resultingCanonicalPath);
--- a/mailnews/imap/src/nsSyncRunnableHelpers.h
+++ b/mailnews/imap/src/nsSyncRunnableHelpers.h
@@ -14,17 +14,17 @@
 #include "nsIImapServerSink.h"
 #include "nsIImapProtocolSink.h"
 #include "nsIImapMessageSink.h"
 
 // The classes in this file proxy method calls to the main thread
 // synchronously. The main thread must not block on this thread, or a
 // deadlock condition can occur.
 
-class StreamListenerProxy MOZ_FINAL : public nsIStreamListener
+class StreamListenerProxy final : public nsIStreamListener
 {
 public:
   StreamListenerProxy(nsIStreamListener* receiver)
     : mReceiver(receiver)
   { }
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIREQUESTOBSERVER
@@ -33,17 +33,17 @@ public:
 private:
   ~StreamListenerProxy() {
     nsCOMPtr<nsIThread> thread = do_GetMainThread();
     NS_ProxyRelease(thread, mReceiver);
   }
   nsCOMPtr<nsIStreamListener> mReceiver;
 };
 
-class ImapMailFolderSinkProxy MOZ_FINAL : public nsIImapMailFolderSink
+class ImapMailFolderSinkProxy final : public nsIImapMailFolderSink
 {
 public:
   ImapMailFolderSinkProxy(nsIImapMailFolderSink* receiver)
     : mReceiver(receiver)
   {
     NS_ASSERTION(receiver, "Don't allow receiver is nullptr");
   }
 
@@ -53,17 +53,17 @@ public:
 private:
   ~ImapMailFolderSinkProxy() {
     nsCOMPtr<nsIThread> thread = do_GetMainThread();
     NS_ProxyRelease(thread, mReceiver);
   }
   nsCOMPtr<nsIImapMailFolderSink> mReceiver;
 };
 
-class ImapServerSinkProxy MOZ_FINAL : public nsIImapServerSink
+class ImapServerSinkProxy final : public nsIImapServerSink
 {
 public:
   ImapServerSinkProxy(nsIImapServerSink* receiver)
     : mReceiver(receiver)
   { }
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIIMAPSERVERSINK
@@ -72,17 +72,17 @@ private:
   ~ImapServerSinkProxy() {
     nsCOMPtr<nsIThread> thread = do_GetMainThread();
     NS_ProxyRelease(thread, mReceiver);
   }
   nsCOMPtr<nsIImapServerSink> mReceiver;
 };
 
 
-class ImapMessageSinkProxy MOZ_FINAL : public nsIImapMessageSink
+class ImapMessageSinkProxy final : public nsIImapMessageSink
 {
 public:
   ImapMessageSinkProxy(nsIImapMessageSink* receiver)
     : mReceiver(receiver)
   { }
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIIMAPMESSAGESINK
@@ -90,17 +90,17 @@ public:
 private:
   ~ImapMessageSinkProxy() {
     nsCOMPtr<nsIThread> thread = do_GetMainThread();
     NS_ProxyRelease(thread, mReceiver);
   }
   nsCOMPtr<nsIImapMessageSink> mReceiver;
 };
 
-class ImapProtocolSinkProxy MOZ_FINAL : public nsIImapProtocolSink
+class ImapProtocolSinkProxy final : public nsIImapProtocolSink
 {
 public:
   ImapProtocolSinkProxy(nsIImapProtocolSink* receiver)
     : mReceiver(receiver)
   { }
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIIMAPPROTOCOLSINK
--- a/mailnews/import/eudora/src/nsEudoraMac.h
+++ b/mailnews/import/eudora/src/nsEudoraMac.h
@@ -23,35 +23,35 @@ class nsIMutableArray;
 
 
 class nsEudoraMac : public nsEudoraMailbox, public nsEudoraAddress {
 public:
   nsEudoraMac();
   ~nsEudoraMac();
 
     // retrieve the mail folder
-  virtual bool      FindMailFolder(nsIFile **pFolder) MOZ_OVERRIDE;
+  virtual bool      FindMailFolder(nsIFile **pFolder) override;
     // get the list of mailboxes
   virtual nsresult  FindMailboxes(nsIFile *pRoot,
-                                  nsIMutableArray *pArray) MOZ_OVERRIDE;
+                                  nsIMutableArray *pArray) override;
     // get a TOC file from a mailbox file
   virtual nsresult  FindTOCFile(nsIFile *pMailFile,
                                 nsIFile **pTOCFile,
-                                bool *pDeleteToc) MOZ_OVERRIDE;
+                                bool *pDeleteToc) override;
 
   virtual nsresult  GetAttachmentInfo(const char *pFileName,
                                       nsIFile *pFile,
                                       nsCString& mimeType,
-                                      nsCString& aAttachment) MOZ_OVERRIDE;
+                                      nsCString& aAttachment) override;
 
     // Address book stuff
-  virtual bool      FindAddressFolder(nsIFile **pFolder) MOZ_OVERRIDE;
+  virtual bool      FindAddressFolder(nsIFile **pFolder) override;
     // get the list of mailboxes
   virtual nsresult  FindAddressBooks(nsIFile *pRoot,
-                                     nsIMutableArray *pArray) MOZ_OVERRIDE;
+                                     nsIMutableArray *pArray) override;
 
     // import settings
   static bool    ImportSettings(nsIFile *pIniFile,
                                 nsIMsgAccount **localMailAccount);
   static bool    FindSettingsFile(nsIFile **pIniFile) { return FindEudoraLocation(pIniFile, true);}
 
   static bool    FindFiltersFile(nsIFile **pFiltersFile);
 
--- a/mailnews/import/eudora/src/nsEudoraWin32.h
+++ b/mailnews/import/eudora/src/nsEudoraWin32.h
@@ -23,29 +23,29 @@ class nsIMutableArray;
 
 
 class nsEudoraWin32 : public nsEudoraMailbox, public nsEudoraAddress {
 public:
   nsEudoraWin32();
   ~nsEudoraWin32();
 
     // retrieve the mail folder
-  virtual bool      FindMailFolder(nsIFile **pFolder) MOZ_OVERRIDE;
+  virtual bool      FindMailFolder(nsIFile **pFolder) override;
     // get the list of mailboxes
-  virtual nsresult  FindMailboxes(nsIFile *pRoot, nsIMutableArray *pArray) MOZ_OVERRIDE;
+  virtual nsresult  FindMailboxes(nsIFile *pRoot, nsIMutableArray *pArray) override;
     // get a TOC file from a mailbox file
-  virtual nsresult  FindTOCFile(nsIFile *pMailFile, nsIFile **pTOCFile, bool *pDeleteToc) MOZ_OVERRIDE;
+  virtual nsresult  FindTOCFile(nsIFile *pMailFile, nsIFile **pTOCFile, bool *pDeleteToc) override;
 
-  virtual nsresult  GetAttachmentInfo(const char *pFileName, nsIFile *pFile, nsCString& mimeType, nsCString& aAttachment) MOZ_OVERRIDE;
+  virtual nsresult  GetAttachmentInfo(const char *pFileName, nsIFile *pFile, nsCString& mimeType, nsCString& aAttachment) override;
 
   // Things that must be overridden because they are platform specific.
     // retrieve the address book folder
-  virtual bool      FindAddressFolder(nsIFile **pFolder) MOZ_OVERRIDE;
+  virtual bool      FindAddressFolder(nsIFile **pFolder) override;
     // get the list of address books
-  virtual nsresult  FindAddressBooks(nsIFile *pRoot, nsIMutableArray *pArray) MOZ_OVERRIDE;
+  virtual nsresult  FindAddressBooks(nsIFile *pRoot, nsIMutableArray *pArray) override;
 
     // import settings from Win32 ini file
   static bool    ImportSettings(nsIFile *pIniFile, nsIMsgAccount **localMailAccount);
   static bool    FindSettingsFile(nsIFile **pIniFile) { return FindEudoraLocation(pIniFile, true);}
 
   static bool    FindFiltersFile(nsIFile **pFiltersFile);
 
   static bool    GetMailboxNameHierarchy(const nsACString& pEudoraLocation, const char* pEudoraFilePath, nsCString& nameHierarchy);
--- a/mailnews/import/oexpress/nsOEAddressIterator.h
+++ b/mailnews/import/oexpress/nsOEAddressIterator.h
@@ -13,18 +13,18 @@
 #include "nsStringGlue.h"
 #include "nsInterfaceHashtable.h"
 
 class nsOEAddressIterator : public CWabIterator {
 public:
   nsOEAddressIterator(CWAB *pWab, nsIAddrDatabase *database);
   ~nsOEAddressIterator();
   
-  virtual nsresult  EnumUser(const char16_t * pName, LPENTRYID pEid, ULONG cbEid) MOZ_OVERRIDE;
-  virtual nsresult  EnumList(const char16_t * pName, LPENTRYID pEid, ULONG cbEid, LPMAPITABLE table) MOZ_OVERRIDE;
+  virtual nsresult  EnumUser(const char16_t * pName, LPENTRYID pEid, ULONG cbEid) override;
+  virtual nsresult  EnumList(const char16_t * pName, LPENTRYID pEid, ULONG cbEid, LPMAPITABLE table) override;
         void FindListRow(nsString &eMail, nsIMdbRow **cardRow);
 
 private:
   bool      BuildCard(const char16_t * pName, nsIMdbRow *card, LPMAILUSER pUser);
   void    SanitizeValue(nsString& val);
   void    SplitString(nsString& val1, nsString& val2);
   void    SetBirthDay(nsIMdbRow *card, PRTime& birthDay);
 
--- a/mailnews/import/outlook/src/rtfMailDecoder.h
+++ b/mailnews/import/outlook/src/rtfMailDecoder.h
@@ -5,21 +5,21 @@
 #include "mozilla/Attributes.h"
 #include <string>
 #include "rtfDecoder.h"
 
 class CRTFMailDecoder: public CRTFDecoder {
 public:
   enum Mode {mNone, mText, mHTML};
   CRTFMailDecoder() : m_mode(mNone), m_state(sNormal), m_skipLevel(0) {}
-  void BeginGroup() MOZ_OVERRIDE;
-  void EndGroup() MOZ_OVERRIDE;
-  void Keyword(const char* name, const int* Val) MOZ_OVERRIDE;
-  void PCDATA(const wchar_t* data, size_t cch) MOZ_OVERRIDE;
-  void BDATA(const char* data, size_t sz) MOZ_OVERRIDE;
+  void BeginGroup() override;
+  void EndGroup() override;
+  void Keyword(const char* name, const int* Val) override;
+  void PCDATA(const wchar_t* data, size_t cch) override;
+  void BDATA(const char* data, size_t sz) override;
   const wchar_t* text() { return m_text.c_str(); }
   std::wstring::size_type textSize() { return m_text.size(); }
   Mode mode() { return m_mode; }
 private:
   enum State {sNormal = 0x0000,
               sBeginGroup = 0x0001,
               sAsterisk = 0x0002,
               sHtmlRtf = 0x0004};
--- a/mailnews/import/src/nsImportABDescriptor.h
+++ b/mailnews/import/src/nsImportABDescriptor.h
@@ -15,77 +15,77 @@
 
 ////////////////////////////////////////////////////////////////////////
 
 class nsImportABDescriptor : public nsIImportABDescriptor
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD GetIdentifier(uint32_t *pIdentifier) MOZ_OVERRIDE {
+  NS_IMETHOD GetIdentifier(uint32_t *pIdentifier) override {
     *pIdentifier = mId;
     return NS_OK;
   }
-  NS_IMETHOD SetIdentifier(uint32_t ident) MOZ_OVERRIDE {
+  NS_IMETHOD SetIdentifier(uint32_t ident) override {
     mId = ident;
     return NS_OK;
   }
 
-  NS_IMETHOD GetRef(uint32_t *pRef) MOZ_OVERRIDE {
+  NS_IMETHOD GetRef(uint32_t *pRef) override {
     *pRef = mRef;
     return NS_OK;
   }
-  NS_IMETHOD SetRef(uint32_t ref) MOZ_OVERRIDE {
+  NS_IMETHOD SetRef(uint32_t ref) override {
     mRef = ref;
     return NS_OK;
   }
 
   /* attribute unsigned long size; */
-  NS_IMETHOD GetSize(uint32_t *pSize) MOZ_OVERRIDE {
+  NS_IMETHOD GetSize(uint32_t *pSize) override {
     *pSize = mSize;
     return NS_OK;
   }
-  NS_IMETHOD SetSize(uint32_t theSize) MOZ_OVERRIDE {
+  NS_IMETHOD SetSize(uint32_t theSize) override {
     mSize = theSize;
     return NS_OK;
   }
 
   /* attribute AString displayName; */
-  NS_IMETHOD GetPreferredName(nsAString &aName) MOZ_OVERRIDE {
+  NS_IMETHOD GetPreferredName(nsAString &aName) override {
     aName = mDisplayName;
     return NS_OK;
   }
-  NS_IMETHOD SetPreferredName(const nsAString &aName) MOZ_OVERRIDE {
+  NS_IMETHOD SetPreferredName(const nsAString &aName) override {
     mDisplayName = aName;
     return NS_OK;
   }
 
   /* readonly attribute nsIFile fileSpec; */
-  NS_IMETHOD GetAbFile(nsIFile **aFile) MOZ_OVERRIDE {
+  NS_IMETHOD GetAbFile(nsIFile **aFile) override {
     if (!mFile)
       return NS_ERROR_NULL_POINTER;
 
     return mFile->Clone(aFile);
   }
 
-  NS_IMETHOD SetAbFile(nsIFile *aFile) MOZ_OVERRIDE {
+  NS_IMETHOD SetAbFile(nsIFile *aFile) override {
     if (!aFile) {
       mFile = nullptr;
       return NS_OK;
     }
 
     return aFile->Clone(getter_AddRefs(mFile));
   }
 
   /* attribute boolean import; */
-  NS_IMETHOD GetImport(bool *pImport) MOZ_OVERRIDE {
+  NS_IMETHOD GetImport(bool *pImport) override {
     *pImport = mImport;
     return NS_OK;
   }
-  NS_IMETHOD SetImport(bool doImport) MOZ_OVERRIDE {
+  NS_IMETHOD SetImport(bool doImport) override {
     mImport = doImport;
     return NS_OK;
   }
 
   nsImportABDescriptor();
 
   static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
--- a/mailnews/import/src/nsImportEmbeddedImageData.h
+++ b/mailnews/import/src/nsImportEmbeddedImageData.h
@@ -6,17 +6,17 @@
 #ifndef __IMPORTEMBEDDEDIMAGETDATA_H__
 #define __IMPORTEMBEDDEDIMAGETDATA_H__
 
 #include "nsIMsgSend.h"
 #include "nsStringGlue.h"
 #include "nsCOMPtr.h"
 #include "nsIURI.h"
 
-class nsImportEmbeddedImageData MOZ_FINAL : public nsIMsgEmbeddedImageData
+class nsImportEmbeddedImageData final : public nsIMsgEmbeddedImageData
 {
 public:
   nsImportEmbeddedImageData(nsIURI *aUri, const nsACString &aCID);
   nsImportEmbeddedImageData(nsIURI *aUri, const nsACString &aCID, const nsACString &aName);
   nsImportEmbeddedImageData();
   NS_DECL_NSIMSGEMBEDDEDIMAGEDATA
   NS_DECL_ISUPPORTS
 
--- a/mailnews/import/src/nsImportEncodeScan.h
+++ b/mailnews/import/src/nsImportEncodeScan.h
@@ -14,17 +14,17 @@
 class nsImportEncodeScan : public nsImportScanFile {
 public:
   nsImportEncodeScan();
   ~nsImportEncodeScan();
 
   bool    InitEncodeScan(bool appleSingleEncode, nsIFile *pFile, const char *pName, uint8_t * pBuf, uint32_t sz);
   void  CleanUpEncodeScan(void);
 
-  virtual bool    Scan(bool *pDone) MOZ_OVERRIDE;
+  virtual bool    Scan(bool *pDone) override;
 
 protected:
   void   FillInEntries(int numEntries);
   bool     AddEntries(void);
 
 protected:
   bool        m_isAppleSingle;
   nsCOMPtr<nsIFile>   m_pInputFile;
--- a/mailnews/import/src/nsImportMailboxDescriptor.h
+++ b/mailnews/import/src/nsImportMailboxDescriptor.h
@@ -16,37 +16,37 @@
 ////////////////////////////////////////////////////////////////////////
 
 
 class nsImportMailboxDescriptor : public nsIImportMailboxDescriptor
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  NS_IMETHOD  GetIdentifier(uint32_t *pIdentifier) MOZ_OVERRIDE { *pIdentifier = m_id; return NS_OK;}
-  NS_IMETHOD  SetIdentifier(uint32_t ident) MOZ_OVERRIDE { m_id = ident; return NS_OK;}
+  NS_IMETHOD  GetIdentifier(uint32_t *pIdentifier) override { *pIdentifier = m_id; return NS_OK;}
+  NS_IMETHOD  SetIdentifier(uint32_t ident) override { m_id = ident; return NS_OK;}
 
   /* attribute unsigned long depth; */
-  NS_IMETHOD  GetDepth(uint32_t *pDepth) MOZ_OVERRIDE { *pDepth = m_depth; return NS_OK;}
-  NS_IMETHOD  SetDepth(uint32_t theDepth) MOZ_OVERRIDE { m_depth = theDepth; return NS_OK;}
+  NS_IMETHOD  GetDepth(uint32_t *pDepth) override { *pDepth = m_depth; return NS_OK;}
+  NS_IMETHOD  SetDepth(uint32_t theDepth) override { m_depth = theDepth; return NS_OK;}
 
   /* attribute unsigned long size; */
-  NS_IMETHOD  GetSize(uint32_t *pSize) MOZ_OVERRIDE { *pSize = m_size; return NS_OK;}
-  NS_IMETHOD  SetSize(uint32_t theSize) MOZ_OVERRIDE { m_size = theSize; return NS_OK;}
+  NS_IMETHOD  GetSize(uint32_t *pSize) override { *pSize = m_size; return NS_OK;}
+  NS_IMETHOD  SetSize(uint32_t theSize) override { m_size = theSize; return NS_OK;}
 
   /* attribute wstring displayName; */
-  NS_IMETHOD  GetDisplayName(char16_t **pName) MOZ_OVERRIDE { *pName = ToNewUnicode(m_displayName); return NS_OK;}
-  NS_IMETHOD  SetDisplayName(const char16_t * pName) MOZ_OVERRIDE { m_displayName = pName; return NS_OK;}
+  NS_IMETHOD  GetDisplayName(char16_t **pName) override { *pName = ToNewUnicode(m_displayName); return NS_OK;}
+  NS_IMETHOD  SetDisplayName(const char16_t * pName) override { m_displayName = pName; return NS_OK;}
 
   /* attribute boolean import; */
-  NS_IMETHOD  GetImport(bool *pImport) MOZ_OVERRIDE { *pImport = m_import; return NS_OK;}
-  NS_IMETHOD  SetImport(bool doImport) MOZ_OVERRIDE { m_import = doImport; return NS_OK;}
+  NS_IMETHOD  GetImport(bool *pImport) override { *pImport = m_import; return NS_OK;}
+  NS_IMETHOD  SetImport(bool doImport) override { m_import = doImport; return NS_OK;}
 
   /* readonly attribute nsIFile file; */
-  NS_IMETHOD GetFile(nsIFile * *aFile) MOZ_OVERRIDE { if (m_pFile) { NS_ADDREF(*aFile = m_pFile); return NS_OK;} else return NS_ERROR_FAILURE; }
+  NS_IMETHOD GetFile(nsIFile * *aFile) override { if (m_pFile) { NS_ADDREF(*aFile = m_pFile); return NS_OK;} else return NS_ERROR_FAILURE; }
 
 
 
   nsImportMailboxDescriptor();
 
    static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
 private:
--- a/mailnews/import/src/nsImportMimeEncode.h
+++ b/mailnews/import/src/nsImportMimeEncode.h
@@ -30,17 +30,17 @@ public:
 
 protected:
 	void	CleanUp(void);
 	bool	SetUpEncode(void);
 	bool	WriteFileName(nsCString& fName, bool wasTrans, const char *pTag);
 	bool	TranslateFileName(nsCString& inFile, nsCString& outFile);
 
 
-	virtual bool	ScanBuffer(bool *pDone) MOZ_OVERRIDE;
+	virtual bool	ScanBuffer(bool *pDone) override;
 
 
 protected:
 	nsCString             m_fileName;
 	nsCOMPtr <nsIFile>    m_pMimeFile;
 	ImportOutFile *		m_pOut;
 	nsCString			m_mimeType;
 
--- a/mailnews/import/src/nsImportScanFile.h
+++ b/mailnews/import/src/nsImportScanFile.h
@@ -39,16 +39,16 @@ class nsImportScanFileLines : public nsI
 public:
   nsImportScanFileLines() {m_needEol = false;}
 
   void  ResetLineScan(void) { m_needEol = false;}
 
   virtual bool ProcessLine(uint8_t * /* pLine */, uint32_t /* len */, bool * /* pDone */) {return true;}
 
 protected:
-  virtual bool    ScanBuffer(bool *pDone) MOZ_OVERRIDE;
+  virtual bool    ScanBuffer(bool *pDone) override;
 
   bool    m_needEol;
 
 };
 
 
 #endif /* nsImportScanFile_h__ */
--- a/mailnews/import/src/nsImportTranslator.h
+++ b/mailnews/import/src/nsImportTranslator.h
@@ -33,32 +33,32 @@ public:
   virtual void  GetLanguage(nsCString& lang) { lang = "en";}
   virtual void  GetEncoding(nsCString& encoding) { encoding.Truncate();}
 };
 
 // Specialized encoder, not a vaild language translator, used for Mime headers.
 // rfc2231
 class CMHTranslator : public nsImportTranslator {
 public:
-  virtual uint32_t  GetMaxBufferSize(uint32_t inLen) MOZ_OVERRIDE { return (inLen * 3) + 1;}
-  virtual void    ConvertBuffer(const uint8_t * pIn, uint32_t inLen, uint8_t * pOut) MOZ_OVERRIDE;
-  virtual bool      ConvertToFile(const uint8_t * pIn, uint32_t inLen, ImportOutFile *pOutFile, uint32_t *pProcessed = nullptr) MOZ_OVERRIDE;
+  virtual uint32_t  GetMaxBufferSize(uint32_t inLen) override { return (inLen * 3) + 1;}
+  virtual void    ConvertBuffer(const uint8_t * pIn, uint32_t inLen, uint8_t * pOut) override;
+  virtual bool      ConvertToFile(const uint8_t * pIn, uint32_t inLen, ImportOutFile *pOutFile, uint32_t *pProcessed = nullptr) override;
 };
 
 // Specialized encoder, not a vaild language translator, used for mail headers
 // rfc2047
 class C2047Translator : public nsImportTranslator {
 public:
   virtual ~C2047Translator() {}
 
   C2047Translator(const char *pCharset, uint32_t headerLen) { m_charset = pCharset; m_startLen = headerLen; m_useQuotedPrintable = false;}
 
   void  SetUseQuotedPrintable(void) { m_useQuotedPrintable = true;}
 
-  virtual bool    ConvertToFile(const uint8_t * pIn, uint32_t inLen, ImportOutFile *pOutFile, uint32_t *pProcessed = nullptr) MOZ_OVERRIDE;
+  virtual bool    ConvertToFile(const uint8_t * pIn, uint32_t inLen, ImportOutFile *pOutFile, uint32_t *pProcessed = nullptr) override;
   bool    ConvertToFileQ(const uint8_t * pIn, uint32_t inLen, ImportOutFile *pOutFile, uint32_t *pProcessed);
 
 protected:
   bool        m_useQuotedPrintable;
   nsCString    m_charset;
   uint32_t    m_startLen;
 };
 
--- a/mailnews/import/text/src/nsTextImport.cpp
+++ b/mailnews/import/text/src/nsTextImport.cpp
@@ -43,17 +43,17 @@
 #define TEXTIMPORT_ADDRESS_SUCCESS       2003
 #define TEXTIMPORT_ADDRESS_BADPARAM      2004
 #define TEXTIMPORT_ADDRESS_BADSOURCEFILE 2005
 #define TEXTIMPORT_ADDRESS_CONVERTERROR  2006
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 PRLogModuleInfo* TEXTIMPORTLOGMODULE;
 
-class ImportAddressImpl MOZ_FINAL : public nsIImportAddressBooks
+class ImportAddressImpl final : public nsIImportAddressBooks
 {
 public:
   ImportAddressImpl(nsIStringBundle* aStringBundle);
 
   static nsresult Create(nsIImportAddressBooks** aImport,
                          nsIStringBundle *aStringBundle);
 
     // nsISupports interface
--- a/mailnews/local/src/nsLocalMailFolder.h
+++ b/mailnews/local/src/nsLocalMailFolder.h
@@ -96,111 +96,111 @@ class nsMsgLocalMailFolder : public nsMs
 {
 public:
   nsMsgLocalMailFolder(void);
   NS_DECL_NSICOPYMESSAGELISTENER
   NS_DECL_NSIMSGLOCALMAILFOLDER
   NS_DECL_NSIJUNKMAILCLASSIFICATIONLISTENER
   NS_DECL_ISUPPORTS_INHERITED
   // nsIRDFResource methods:
-  NS_IMETHOD Init(const char *aURI) MOZ_OVERRIDE;
+  NS_IMETHOD Init(const char *aURI) override;
 
   // nsIUrlListener methods
-  NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl) MOZ_OVERRIDE;
-  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) MOZ_OVERRIDE;
+  NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl) override;
+  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) override;
 
   // nsIMsgFolder methods:
-  NS_IMETHOD GetSubFolders(nsISimpleEnumerator* *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase **aMsgDatabase) MOZ_OVERRIDE;
+  NS_IMETHOD GetSubFolders(nsISimpleEnumerator* *aResult) override;
+  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase **aMsgDatabase) override;
 
-  NS_IMETHOD OnAnnouncerGoingAway(nsIDBChangeAnnouncer *instigator) MOZ_OVERRIDE;
-  NS_IMETHOD GetMessages(nsISimpleEnumerator **result) MOZ_OVERRIDE;
-  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) MOZ_OVERRIDE;
+  NS_IMETHOD OnAnnouncerGoingAway(nsIDBChangeAnnouncer *instigator) override;
+  NS_IMETHOD GetMessages(nsISimpleEnumerator **result) override;
+  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) override;
 
-  NS_IMETHOD CreateSubfolder(const nsAString& folderName ,nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+  NS_IMETHOD CreateSubfolder(const nsAString& folderName ,nsIMsgWindow *msgWindow) override;
 
-  NS_IMETHOD Compact(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD CompactAll(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow, bool aCompactOfflineAlso) MOZ_OVERRIDE;
-  NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener) MOZ_OVERRIDE;
-  NS_IMETHOD Delete () MOZ_OVERRIDE;
-  NS_IMETHOD DeleteSubFolders(nsIArray *folders, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD CreateStorageIfMissing(nsIUrlListener* urlListener) MOZ_OVERRIDE;
-  NS_IMETHOD Rename (const nsAString& aNewName, nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD RenameSubFolders (nsIMsgWindow *msgWindow, nsIMsgFolder *oldFolder) MOZ_OVERRIDE;
+  NS_IMETHOD Compact(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD CompactAll(nsIUrlListener *aListener, nsIMsgWindow *aMsgWindow, bool aCompactOfflineAlso) override;
+  NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener) override;
+  NS_IMETHOD Delete () override;
+  NS_IMETHOD DeleteSubFolders(nsIArray *folders, nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD CreateStorageIfMissing(nsIUrlListener* urlListener) override;
+  NS_IMETHOD Rename (const nsAString& aNewName, nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD RenameSubFolders (nsIMsgWindow *msgWindow, nsIMsgFolder *oldFolder) override;
 
-  NS_IMETHOD GetPrettyName(nsAString& prettyName) MOZ_OVERRIDE; // Override of the base, for top-level mail folder
-  NS_IMETHOD SetPrettyName(const nsAString& aName) MOZ_OVERRIDE;
+  NS_IMETHOD GetPrettyName(nsAString& prettyName) override; // Override of the base, for top-level mail folder
+  NS_IMETHOD SetPrettyName(const nsAString& aName) override;
 
-  NS_IMETHOD GetFolderURL(nsACString& url) MOZ_OVERRIDE;
+  NS_IMETHOD GetFolderURL(nsACString& url) override;
 
-  NS_IMETHOD GetManyHeadersToDownload(bool *retval) MOZ_OVERRIDE;
+  NS_IMETHOD GetManyHeadersToDownload(bool *retval) override;
 
-  NS_IMETHOD GetDeletable (bool *deletable) MOZ_OVERRIDE;
-  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
+  NS_IMETHOD GetDeletable (bool *deletable) override;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) override;
 
-  NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) MOZ_OVERRIDE;
+  NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) override;
 
   NS_IMETHOD DeleteMessages(nsIArray *messages, 
                       nsIMsgWindow *msgWindow, bool
                       deleteStorage, bool isMove,
-                      nsIMsgCopyServiceListener* listener, bool allowUndo) MOZ_OVERRIDE;
+                      nsIMsgCopyServiceListener* listener, bool allowUndo) override;
   NS_IMETHOD CopyMessages(nsIMsgFolder *srcFolder, nsIArray* messages,
                           bool isMove, nsIMsgWindow *msgWindow,
-                          nsIMsgCopyServiceListener* listener, bool isFolder, bool allowUndo) MOZ_OVERRIDE;
+                          nsIMsgCopyServiceListener* listener, bool isFolder, bool allowUndo) override;
   NS_IMETHOD CopyFolder(nsIMsgFolder *srcFolder, bool isMoveFolder, nsIMsgWindow *msgWindow,
-                          nsIMsgCopyServiceListener* listener) MOZ_OVERRIDE;
+                          nsIMsgCopyServiceListener* listener) override;
   NS_IMETHOD CopyFileMessage(nsIFile* aFile, nsIMsgDBHdr* msgToReplace,
                              bool isDraftOrTemplate, 
                              uint32_t newMsgFlags,
                              const nsACString &aNewMsgKeywords,
                              nsIMsgWindow *msgWindow,
-                             nsIMsgCopyServiceListener* listener) MOZ_OVERRIDE;
+                             nsIMsgCopyServiceListener* listener) override;
 
-  NS_IMETHOD AddMessageDispositionState(nsIMsgDBHdr *aMessage, nsMsgDispositionState aDispositionFlag) MOZ_OVERRIDE;
-  NS_IMETHOD MarkMessagesRead(nsIArray *aMessages, bool aMarkRead) MOZ_OVERRIDE;
-  NS_IMETHOD MarkMessagesFlagged(nsIArray *aMessages, bool aMarkFlagged) MOZ_OVERRIDE;
-  NS_IMETHOD MarkAllMessagesRead(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD MarkThreadRead(nsIMsgThread *thread) MOZ_OVERRIDE;
-  NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow, nsIUrlListener *aListener) MOZ_OVERRIDE;
-  NS_IMETHOD NotifyCompactCompleted() MOZ_OVERRIDE;
-  NS_IMETHOD Shutdown(bool shutdownChildren) MOZ_OVERRIDE;
+  NS_IMETHOD AddMessageDispositionState(nsIMsgDBHdr *aMessage, nsMsgDispositionState aDispositionFlag) override;
+  NS_IMETHOD MarkMessagesRead(nsIArray *aMessages, bool aMarkRead) override;
+  NS_IMETHOD MarkMessagesFlagged(nsIArray *aMessages, bool aMarkFlagged) override;
+  NS_IMETHOD MarkAllMessagesRead(nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD MarkThreadRead(nsIMsgThread *thread) override;
+  NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow, nsIUrlListener *aListener) override;
+  NS_IMETHOD NotifyCompactCompleted() override;
+  NS_IMETHOD Shutdown(bool shutdownChildren) override;
 
-  NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element) MOZ_OVERRIDE;
-  NS_IMETHOD ReadFromFolderCacheElem(nsIMsgFolderCacheElement *element) MOZ_OVERRIDE;
+  NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element) override;
+  NS_IMETHOD ReadFromFolderCacheElem(nsIMsgFolderCacheElement *element) override;
 
-  NS_IMETHOD GetName(nsAString& aName) MOZ_OVERRIDE;
+  NS_IMETHOD GetName(nsAString& aName) override;
 
   // Used when headers_only is TRUE
-  NS_IMETHOD DownloadMessagesForOffline(nsIArray *aMessages, nsIMsgWindow *aWindow) MOZ_OVERRIDE;
+  NS_IMETHOD DownloadMessagesForOffline(nsIArray *aMessages, nsIMsgWindow *aWindow) override;
   NS_IMETHOD FetchMsgPreviewText(nsMsgKey *aKeysToFetch, uint32_t aNumKeys,
                                                  bool aLocalOnly, nsIUrlListener *aUrlListener, 
-                                                 bool *aAsyncResults) MOZ_OVERRIDE;
-  NS_IMETHOD AddKeywordsToMessages(nsIArray *aMessages, const nsACString& aKeywords) MOZ_OVERRIDE;
-  NS_IMETHOD RemoveKeywordsFromMessages(nsIArray *aMessages, const nsACString& aKeywords) MOZ_OVERRIDE;
+                                                 bool *aAsyncResults) override;
+  NS_IMETHOD AddKeywordsToMessages(nsIArray *aMessages, const nsACString& aKeywords) override;
+  NS_IMETHOD RemoveKeywordsFromMessages(nsIArray *aMessages, const nsACString& aKeywords) override;
 
 protected:
   virtual ~nsMsgLocalMailFolder();
-  nsresult CreateChildFromURI(const nsCString &uri, nsIMsgFolder **folder) MOZ_OVERRIDE;
+  nsresult CreateChildFromURI(const nsCString &uri, nsIMsgFolder **folder) override;
   nsresult CopyFolderAcrossServer(nsIMsgFolder *srcFolder, nsIMsgWindow *msgWindow,nsIMsgCopyServiceListener* listener);
 
   nsresult CreateSubFolders(nsIFile *path);
   nsresult GetTrashFolder(nsIMsgFolder** trashFolder);
   nsresult WriteStartOfNewMessage();
 
   // CreateSubfolder, but without the nsIMsgFolderListener notification
   nsresult CreateSubfolderInternal(const nsAString& folderName, nsIMsgWindow *msgWindow,
                                    nsIMsgFolder **aNewFolder);
 
   nsresult IsChildOfTrash(bool *result);
   nsresult RecursiveSetDeleteIsMoveTrash(bool bVal);
   nsresult ConfirmFolderDeletion(nsIMsgWindow *aMsgWindow, nsIMsgFolder *aFolder, bool *aResult);
 
   nsresult DeleteMessage(nsISupports *message, nsIMsgWindow *msgWindow,
                    bool deleteStorage, bool commit);
-  nsresult GetDatabase() MOZ_OVERRIDE;
+  nsresult GetDatabase() override;
   // this will set mDatabase, if successful. It will also create a .msf file
   // for an empty local mail folder. It will leave invalid DBs in place, and
   // return an error.
   nsresult OpenDatabase();
 
   // copy message helper
   nsresult DisplayMoveCopyStatusMsg();
 
@@ -217,23 +217,23 @@ protected:
                              bool isMove,
                              int64_t totalMsgSize);
 
   // copy multiple messages at a time from this folder
   nsresult CopyMessagesTo(nsIArray *messages, nsTArray<nsMsgKey> &keyArray,
                                        nsIMsgWindow *aMsgWindow,
                                        nsIMsgFolder *dstFolder,
                                        bool isMove);
-  virtual void GetIncomingServerType(nsCString& serverType) MOZ_OVERRIDE;
+  virtual void GetIncomingServerType(nsCString& serverType) override;
   nsresult InitCopyState(nsISupports* aSupport, nsIArray* messages,
                          bool isMove, nsIMsgCopyServiceListener* listener, nsIMsgWindow *msgWindow, bool isMoveFolder, bool allowUndo);
   nsresult InitCopyMsgHdrAndFileStream();
   // preserve message metadata when moving or copying messages
   void CopyPropertiesToMsgHdr(nsIMsgDBHdr *destHdr, nsIMsgDBHdr *srcHdr, bool isMove);
-  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) MOZ_OVERRIDE;
+  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) override;
   nsresult ChangeKeywordForMessages(nsIArray *aMessages, const nsACString& aKeyword, bool add);
   bool GetDeleteFromServerOnMove();
   void CopyHdrPropertiesWithSkipList(nsIMsgDBHdr *destHdr,
                                      nsIMsgDBHdr *srcHdr,
                                      const nsCString &skipList);
 
 protected:
   nsLocalMailCopyState *mCopyState; //We only allow one of these at a time
--- a/mailnews/local/src/nsLocalUndoTxn.h
+++ b/mailnews/local/src/nsLocalUndoTxn.h
@@ -23,18 +23,18 @@ class nsLocalUndoFolderListener;
 class nsLocalMoveCopyMsgTxn : public nsIFolderListener, public nsMsgTxn
 {
 public:
     nsLocalMoveCopyMsgTxn();
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSIFOLDERLISTENER
 
     // overloading nsITransaction methods
-    NS_IMETHOD UndoTransaction(void) MOZ_OVERRIDE;
-    NS_IMETHOD RedoTransaction(void) MOZ_OVERRIDE;
+    NS_IMETHOD UndoTransaction(void) override;
+    NS_IMETHOD RedoTransaction(void) override;
 
     // helper
     nsresult AddSrcKey(nsMsgKey aKey);
     nsresult AddSrcStatusOffset(uint32_t statusOffset);
     nsresult AddDstKey(nsMsgKey aKey);
     nsresult AddDstMsgSize(uint32_t msgSize);
     nsresult SetSrcFolder(nsIMsgFolder* srcFolder);
     nsresult GetSrcIsImap(bool *isImap);
--- a/mailnews/local/src/nsMailboxProtocol.h
+++ b/mailnews/local/src/nsMailboxProtocol.h
@@ -51,24 +51,24 @@ public:
   // a transport layer.
   nsMailboxProtocol(nsIURI * aURL);
   virtual ~nsMailboxProtocol();
 
   // initialization function given a new url and transport layer
   nsresult Initialize(nsIURI * aURL);
 
   // the consumer of the url might be something like an nsIDocShell....
-  virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer) MOZ_OVERRIDE;
+  virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer) override;
 
   ////////////////////////////////////////////////////////////////////////////////////////
   // we suppport the nsIStreamListener interface
   ////////////////////////////////////////////////////////////////////////////////////////
 
-  NS_IMETHOD OnStartRequest(nsIRequest *request, nsISupports *ctxt) MOZ_OVERRIDE;
-  NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) MOZ_OVERRIDE;
+  NS_IMETHOD OnStartRequest(nsIRequest *request, nsISupports *ctxt) override;
+  NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult aStatus) override;
 
 private:
   nsCOMPtr<nsIMailboxUrl>  m_runningUrl; // the nsIMailboxURL that is currently running
   nsMailboxAction m_mailboxAction; // current mailbox action associated with this connnection...
   uint64_t m_msgOffset;
   // Event sink handles
   nsCOMPtr<nsIStreamListener> m_mailboxParser;
 
@@ -86,18 +86,18 @@ private:
   nsCOMPtr<nsIFile> m_tempMessageFile;
         nsCOMPtr<nsIOutputStream> m_msgFileOutputStream;
 
   // this is used to hold the source mailbox file open when move/copying
   // multiple messages.
   nsCOMPtr<nsIInputStream> m_multipleMsgMoveCopyStream;
 
   virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream,
-                                        uint64_t sourceOffset, uint32_t length) MOZ_OVERRIDE;
-  virtual nsresult CloseSocket() MOZ_OVERRIDE;
+                                        uint64_t sourceOffset, uint32_t length) override;
+  virtual nsresult CloseSocket() override;
 
   nsresult SetupMessageExtraction();
   nsresult OpenMultipleMsgTransport(uint64_t offset, int32_t size);
   nsresult OpenFileSocketForReuse(nsIURI * aURL, uint64_t aStartPosition, int32_t aReadCount);
   bool RunningMultipleMsgUrl();
 
   ////////////////////////////////////////////////////////////////////////////////////////
   // Protocol Methods --> This protocol is state driven so each protocol method is
--- a/mailnews/local/src/nsMailboxServer.h
+++ b/mailnews/local/src/nsMailboxServer.h
@@ -7,15 +7,15 @@
 #define nsMailboxServer_h__
 
 #include "mozilla/Attributes.h"
 #include "nsMsgIncomingServer.h"
 
 class nsMailboxServer : public nsMsgIncomingServer
 {
 public:
-  NS_IMETHOD GetLocalStoreType(nsACString& type) MOZ_OVERRIDE;
+  NS_IMETHOD GetLocalStoreType(nsACString& type) override;
 protected:
   virtual nsresult CreateRootFolderFromUri(const nsCString &serverUri,
-                                           nsIMsgFolder **rootFolder) MOZ_OVERRIDE;
+                                           nsIMsgFolder **rootFolder) override;
 };
 
 #endif
--- a/mailnews/local/src/nsMailboxUrl.h
+++ b/mailnews/local/src/nsMailboxUrl.h
@@ -13,59 +13,59 @@
 #include "nsCOMPtr.h"
 #include "MailNewsTypes.h"
 #include "nsTArray.h"
 
 class nsMailboxUrl : public nsIMailboxUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl, public nsIMsgI18NUrl
 {
 public:
   // nsIURI over-ride...
-  NS_IMETHOD SetSpec(const nsACString &aSpec) MOZ_OVERRIDE;
-  NS_IMETHOD SetQuery(const nsACString &aQuery) MOZ_OVERRIDE;
+  NS_IMETHOD SetSpec(const nsACString &aSpec) override;
+  NS_IMETHOD SetQuery(const nsACString &aQuery) override;
 
   // from nsIMailboxUrl:
-  NS_IMETHOD SetMailboxParser(nsIStreamListener * aConsumer) MOZ_OVERRIDE;
-  NS_IMETHOD GetMailboxParser(nsIStreamListener ** aConsumer) MOZ_OVERRIDE;
-  NS_IMETHOD SetMailboxCopyHandler(nsIStreamListener *  aConsumer) MOZ_OVERRIDE;
-  NS_IMETHOD GetMailboxCopyHandler(nsIStreamListener ** aConsumer) MOZ_OVERRIDE;
+  NS_IMETHOD SetMailboxParser(nsIStreamListener * aConsumer) override;
+  NS_IMETHOD GetMailboxParser(nsIStreamListener ** aConsumer) override;
+  NS_IMETHOD SetMailboxCopyHandler(nsIStreamListener *  aConsumer) override;
+  NS_IMETHOD GetMailboxCopyHandler(nsIStreamListener ** aConsumer) override;
 
-  NS_IMETHOD GetMessageKey(nsMsgKey* aMessageKey) MOZ_OVERRIDE;
-  NS_IMETHOD GetMessageSize(uint32_t *aMessageSize) MOZ_OVERRIDE;
-  NS_IMETHOD SetMessageSize(uint32_t aMessageSize) MOZ_OVERRIDE;
-  NS_IMETHOD GetMailboxAction(nsMailboxAction *result) MOZ_OVERRIDE
+  NS_IMETHOD GetMessageKey(nsMsgKey* aMessageKey) override;
+  NS_IMETHOD GetMessageSize(uint32_t *aMessageSize) override;
+  NS_IMETHOD SetMessageSize(uint32_t aMessageSize) override;
+  NS_IMETHOD GetMailboxAction(nsMailboxAction *result) override
   {
     NS_ENSURE_ARG_POINTER(result);
     *result = m_mailboxAction;
     return NS_OK;
   }
-  NS_IMETHOD SetMailboxAction(nsMailboxAction aAction) MOZ_OVERRIDE
+  NS_IMETHOD SetMailboxAction(nsMailboxAction aAction) override
   {
     m_mailboxAction = aAction;
     return NS_OK;
   }
   NS_IMETHOD IsUrlType(uint32_t type, bool *isType);
-  NS_IMETHOD SetMoveCopyMsgKeys(nsMsgKey *keysToFlag, int32_t numKeys) MOZ_OVERRIDE;
-  NS_IMETHOD GetMoveCopyMsgHdrForIndex(uint32_t msgIndex, nsIMsgDBHdr **msgHdr) MOZ_OVERRIDE;
-  NS_IMETHOD GetNumMoveCopyMsgs(uint32_t *numMsgs) MOZ_OVERRIDE;
-  NS_IMETHOD GetCurMoveCopyMsgIndex(uint32_t *result) MOZ_OVERRIDE
+  NS_IMETHOD SetMoveCopyMsgKeys(nsMsgKey *keysToFlag, int32_t numKeys) override;
+  NS_IMETHOD GetMoveCopyMsgHdrForIndex(uint32_t msgIndex, nsIMsgDBHdr **msgHdr) override;
+  NS_IMETHOD GetNumMoveCopyMsgs(uint32_t *numMsgs) override;
+  NS_IMETHOD GetCurMoveCopyMsgIndex(uint32_t *result) override
   {
     NS_ENSURE_ARG_POINTER(result);
     *result = m_curMsgIndex;
     return NS_OK;
   }
-  NS_IMETHOD SetCurMoveCopyMsgIndex(uint32_t aIndex) MOZ_OVERRIDE
+  NS_IMETHOD SetCurMoveCopyMsgIndex(uint32_t aIndex) override
   {
     m_curMsgIndex = aIndex;
     return NS_OK;
   }
 
   NS_IMETHOD GetFolder(nsIMsgFolder **msgFolder);
 
   // nsIMsgMailNewsUrl override
-  NS_IMETHOD Clone(nsIURI **_retval) MOZ_OVERRIDE;
+  NS_IMETHOD Clone(nsIURI **_retval) override;
 
   // nsMailboxUrl
   nsMailboxUrl();
   NS_DECL_NSIMSGMESSAGEURL
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMSGI18NURL
 
 protected:
--- a/mailnews/local/src/nsMovemailIncomingServer.h
+++ b/mailnews/local/src/nsMovemailIncomingServer.h
@@ -20,21 +20,21 @@ class nsMovemailIncomingServer : public 
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSIMOVEMAILINCOMINGSERVER
     NS_DECL_NSILOCALMAILINCOMINGSERVER
 
     nsMovemailIncomingServer();
 
-    NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-    NS_IMETHOD GetDownloadMessagesAtStartup(bool *getMessages) MOZ_OVERRIDE;
-    NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) MOZ_OVERRIDE;
-    NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) MOZ_OVERRIDE;
-    NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) MOZ_OVERRIDE;
-    NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) MOZ_OVERRIDE;
+    NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) override;
+    NS_IMETHOD GetDownloadMessagesAtStartup(bool *getMessages) override;
+    NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) override;
+    NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) override;
+    NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) override;
+    NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) override;
 
 private:
     virtual ~nsMovemailIncomingServer();
 };
 
 
 #endif
--- a/mailnews/local/src/nsMsgBrkMBoxStore.h
+++ b/mailnews/local/src/nsMsgBrkMBoxStore.h
@@ -10,17 +10,17 @@
 #ifndef nsMsgBrkMboxStore_h__
 #define nsMsgBrkMboxStore_h__
 
 #include "nsMsgLocalStoreUtils.h"
 #include "nsIFile.h"
 #include "nsInterfaceHashtable.h"
 #include "nsISeekableStream.h"
 
-class nsMsgBrkMBoxStore MOZ_FINAL : public nsMsgLocalStoreUtils, nsIMsgPluggableStore
+class nsMsgBrkMBoxStore final : public nsMsgLocalStoreUtils, nsIMsgPluggableStore
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGPLUGGABLESTORE
 
   nsMsgBrkMBoxStore();
 
 private:
--- a/mailnews/local/src/nsMsgMaildirStore.h
+++ b/mailnews/local/src/nsMsgMaildirStore.h
@@ -9,17 +9,17 @@
 
 #ifndef nsMsgMaildirStore_h__
 #define nsMsgMaildirStore_h__
 
 #include "nsMsgLocalStoreUtils.h"
 #include "nsIFile.h"
 #include "nsMsgMessageFlags.h"
 
-class nsMsgMaildirStore MOZ_FINAL : public nsMsgLocalStoreUtils, nsIMsgPluggableStore
+class nsMsgMaildirStore final : public nsMsgLocalStoreUtils, nsIMsgPluggableStore
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMSGPLUGGABLESTORE
 
   nsMsgMaildirStore();
 
 private:
--- a/mailnews/local/src/nsNoIncomingServer.h
+++ b/mailnews/local/src/nsNoIncomingServer.h
@@ -21,20 +21,20 @@ class nsNoIncomingServer : public nsMail
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSINOINCOMINGSERVER
   NS_DECL_NSILOCALMAILINCOMINGSERVER
 
   nsNoIncomingServer();
 
-  NS_IMETHOD GetLocalStoreType(nsACString& type) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) MOZ_OVERRIDE;
-  NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) MOZ_OVERRIDE;
-  NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetSortOrder(int32_t* aSortOrder) MOZ_OVERRIDE;
+  NS_IMETHOD GetLocalStoreType(nsACString& type) override;
+  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) override;
+  NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) override;
+  NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) override;
+  NS_IMETHOD GetSortOrder(int32_t* aSortOrder) override;
 
 private:
   virtual ~nsNoIncomingServer();
 };
 
 
 #endif
--- a/mailnews/local/src/nsParseMailbox.h
+++ b/mailnews/local/src/nsParseMailbox.h
@@ -191,40 +191,40 @@ private:
 
 class nsParseNewMailState : public nsMsgMailboxParser
 , public nsIMsgFilterHitNotify
 {
 public:
   nsParseNewMailState();
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_IMETHOD FinishHeader() MOZ_OVERRIDE;
+  NS_IMETHOD FinishHeader() override;
 
   nsresult Init(nsIMsgFolder *rootFolder, nsIMsgFolder *downloadFolder,
                 nsIMsgWindow *aMsgWindow, nsIMsgDBHdr *aHdr,
                 nsIOutputStream *aOutputStream);
 
-  virtual void  DoneParsingFolder(nsresult status) MOZ_OVERRIDE;
+  virtual void  DoneParsingFolder(nsresult status) override;
 
   void DisableFilters() {m_disableFilters = true;}
 
   NS_DECL_NSIMSGFILTERHITNOTIFY
 
   nsOutputFileStream *GetLogFile();
-  virtual int32_t PublishMsgHeader(nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+  virtual int32_t PublishMsgHeader(nsIMsgWindow *msgWindow) override;
   void            GetMsgWindow(nsIMsgWindow **aMsgWindow);
   nsresult EndMsgDownload();
 
   nsresult AppendMsgFromStream(nsIInputStream *fileStream, nsIMsgDBHdr *aHdr,
                                uint32_t length, nsIMsgFolder *destFolder);
 
   virtual void ApplyFilters(bool *pMoved, nsIMsgWindow *msgWindow,
                              uint32_t msgOffset);
   nsresult    ApplyForwardAndReplyFilter(nsIMsgWindow *msgWindow);
-  virtual void OnNewMessage(nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+  virtual void OnNewMessage(nsIMsgWindow *msgWindow) override;
 
   // this keeps track of how many messages we downloaded that
   // aren't new - e.g., marked read, or moved to an other server.
   int32_t     m_numNotNewMessages;
 protected:
   virtual ~nsParseNewMailState();
   virtual nsresult GetTrashFolder(nsIMsgFolder **pTrashFolder);
   virtual nsresult MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
--- a/mailnews/local/src/nsPop3IncomingServer.cpp
+++ b/mailnews/local/src/nsPop3IncomingServer.cpp
@@ -24,17 +24,17 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIMutableArray.h"
 #include "nsMsgUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "mozilla/Likely.h"
 
 static NS_DEFINE_CID(kCPop3ServiceCID, NS_POP3SERVICE_CID);
 
-class nsPop3GetMailChainer MOZ_FINAL : public nsIUrlListener
+class nsPop3GetMailChainer final : public nsIUrlListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIURLLISTENER
 
   nsPop3GetMailChainer();
   nsresult GetNewMailForServers(nsIPop3IncomingServer** servers, uint32_t count,
                                 nsIMsgWindow *msgWindow,
--- a/mailnews/local/src/nsPop3IncomingServer.h
+++ b/mailnews/local/src/nsPop3IncomingServer.h
@@ -23,29 +23,29 @@ class nsPop3IncomingServer : public nsMa
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPOP3INCOMINGSERVER
   NS_DECL_NSILOCALMAILINCOMINGSERVER
 
   nsPop3IncomingServer();
 
-  NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD GetDownloadMessagesAtStartup(bool *getMessages) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) MOZ_OVERRIDE;
-  NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) MOZ_OVERRIDE;
-  NS_IMETHOD CloseCachedConnections() MOZ_OVERRIDE;
-  NS_IMETHOD GetRootMsgFolder(nsIMsgFolder **aRootMsgFolder) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanFileMessagesOnServer(bool *aCanFileMessagesOnServer) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanCreateFoldersOnServer(bool *aCanCreateFoldersOnServer) MOZ_OVERRIDE;
+  NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) override;
+  NS_IMETHOD GetDownloadMessagesAtStartup(bool *getMessages) override;
+  NS_IMETHOD GetCanBeDefaultServer(bool *canBeDefaultServer) override;
+  NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) override;
+  NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) override;
+  NS_IMETHOD CloseCachedConnections() override;
+  NS_IMETHOD GetRootMsgFolder(nsIMsgFolder **aRootMsgFolder) override;
+  NS_IMETHOD GetCanFileMessagesOnServer(bool *aCanFileMessagesOnServer) override;
+  NS_IMETHOD GetCanCreateFoldersOnServer(bool *aCanCreateFoldersOnServer) override;
   NS_IMETHOD VerifyLogon(nsIUrlListener *aUrlListener, nsIMsgWindow *aMsgWindow,
-                         nsIURI **aURL) MOZ_OVERRIDE;
+                         nsIURI **aURL) override;
   NS_IMETHOD GetNewMessages(nsIMsgFolder *aFolder, nsIMsgWindow *aMsgWindow,
-                            nsIUrlListener *aUrlListener) MOZ_OVERRIDE;
+                            nsIUrlListener *aUrlListener) override;
 
 protected:
   virtual ~nsPop3IncomingServer();
   nsresult GetInbox(nsIMsgWindow *msgWindow, nsIMsgFolder **inbox);
 
 private:
   uint32_t m_capabilityFlags;
   bool m_authenticated;
--- a/mailnews/local/src/nsPop3Protocol.h
+++ b/mailnews/local/src/nsPop3Protocol.h
@@ -256,27 +256,27 @@ class nsPop3Protocol : public nsMsgProto
 public:
   nsPop3Protocol(nsIURI* aURL);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPOP3PROTOCOL
   NS_DECL_NSIMSGASYNCPROMPTLISTENER
 
   nsresult Initialize(nsIURI * aURL);
-  virtual nsresult LoadUrl(nsIURI *aURL, nsISupports * aConsumer = nullptr) MOZ_OVERRIDE;
+  virtual nsresult LoadUrl(nsIURI *aURL, nsISupports * aConsumer = nullptr) override;
   void Cleanup();
 
   const char* GetUsername() { return m_username.get(); }
   void SetUsername(const char* name);
 
   nsresult StartGetAsyncPassword(Pop3StatesEnum aNextState);
 
-  NS_IMETHOD OnTransportStatus(nsITransport *transport, nsresult status, int64_t progress, int64_t progressMax) MOZ_OVERRIDE;
-  NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus) MOZ_OVERRIDE;
-  NS_IMETHOD Cancel(nsresult status) MOZ_OVERRIDE;
+  NS_IMETHOD OnTransportStatus(nsITransport *transport, nsresult status, int64_t progress, int64_t progressMax) override;
+  NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports * aContext, nsresult aStatus) override;
+  NS_IMETHOD Cancel(nsresult status) override;
 
   static void MarkMsgInHashTable(PLHashTable *hashTable, const Pop3UidlEntry *uidl,
                                   bool *changed);
 
   static nsresult MarkMsgForHost(const char *hostName, const char *userName,
                                       nsIFile *mailDirectory,
                                       nsVoidArray  &UIDLArray);
 private:
@@ -304,20 +304,20 @@ private:
   int32_t  m_bytesInMsgReceived;
   int32_t  m_totalFolderSize;
   int32_t  m_totalDownloadSize; /* Number of bytes we're going to
                                     download.  Might be much less
                                     than the total_folder_size. */
   int32_t m_totalBytesReceived; // total # bytes received for the connection
 
   virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream,
-                                        uint64_t sourceOffset, uint32_t length) MOZ_OVERRIDE;
+                                        uint64_t sourceOffset, uint32_t length) override;
   virtual int32_t Pop3SendData(const char * dataBuffer, bool aSuppressLogging = false);
 
-  virtual const char* GetType() MOZ_OVERRIDE {return "pop3";}
+  virtual const char* GetType() override {return "pop3";}
 
   nsCOMPtr<nsIURI> m_url;
   nsCOMPtr<nsIPop3Sink> m_nsIPop3Sink;
   nsCOMPtr<nsIPop3IncomingServer> m_pop3Server;
 
   nsMsgLineStreamBuffer   * m_lineStreamBuffer; // used to efficiently extract lines from the incoming data stream
   Pop3ConData* m_pop3ConData;
   void FreeMsgInfo();
--- a/mailnews/local/src/nsRssIncomingServer.h
+++ b/mailnews/local/src/nsRssIncomingServer.h
@@ -19,23 +19,23 @@ class nsRssIncomingServer : public nsMai
 
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSIRSSINCOMINGSERVER
     NS_DECL_NSILOCALMAILINCOMINGSERVER
     NS_DECL_NSIMSGFOLDERLISTENER
 
-    NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) MOZ_OVERRIDE;
-    NS_IMETHOD GetSupportsDiskSpace(bool *aSupportsDiskSpace) MOZ_OVERRIDE;
-    NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) MOZ_OVERRIDE;
-    NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
-    NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) MOZ_OVERRIDE;
-    NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) MOZ_OVERRIDE;
-    NS_IMETHOD GetSortOrder(int32_t* aSortOrder) MOZ_OVERRIDE;
+    NS_IMETHOD GetOfflineSupportLevel(int32_t *aSupportLevel) override;
+    NS_IMETHOD GetSupportsDiskSpace(bool *aSupportsDiskSpace) override;
+    NS_IMETHOD GetAccountManagerChrome(nsAString& aResult) override;
+    NS_IMETHOD PerformBiff(nsIMsgWindow *aMsgWindow) override;
+    NS_IMETHOD GetServerRequiresPasswordForBiff(bool *aServerRequiresPasswordForBiff) override;
+    NS_IMETHOD GetCanSearchMessages(bool *canSearchMessages) override;
+    NS_IMETHOD GetSortOrder(int32_t* aSortOrder) override;
 
     nsRssIncomingServer();
 protected:
     virtual ~nsRssIncomingServer();
     nsresult FolderChanged(nsIMsgFolder *aFolder, nsIMsgFolder *aOrigFolder, const char *aAction);
     nsresult FillInDataSourcePath(const nsAString& aDataSourceName, nsIFile ** aLocation);
     static nsrefcnt gInstanceCount;
 };
--- a/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.h
+++ b/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.h
@@ -28,20 +28,20 @@ typedef MimeObjectClass  *
 class nsMimeContentTypeHandler : public nsIMimeContentTypeHandler {
 public: 
     nsMimeContentTypeHandler (const char *aMimeType, 
                               MCTHCreateCTHClass callback);
 
     /* this macro defines QueryInterface, AddRef and Release for this class */
     NS_DECL_ISUPPORTS 
 
-    NS_IMETHOD    GetContentType(char **contentType) MOZ_OVERRIDE;
+    NS_IMETHOD    GetContentType(char **contentType) override;
 
     NS_IMETHOD    CreateContentTypeHandlerClass(const char *content_type, 
                                                 contentTypeHandlerInitStruct *initStruct, 
-                                                MimeObjectClass **objClass) MOZ_OVERRIDE;
+                                                MimeObjectClass **objClass) override;
  private:
     virtual ~nsMimeContentTypeHandler();
     char *mimeType;
     MCTHCreateCTHClass realCreateContentTypeHandlerClass;
 }; 
 
 #endif /* nsMimeContentTypeHandler_h_ */
--- a/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
+++ b/mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
@@ -32,17 +32,17 @@
 #include "mozilla/Services.h"
 
 #define VIEW_ALL_HEADERS 2
 
 /**
  * A helper class to implement nsIUTF8StringEnumerator
  */
 
-class nsMimeStringEnumerator MOZ_FINAL : public nsIUTF8StringEnumerator {
+class nsMimeStringEnumerator final : public nsIUTF8StringEnumerator {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIUTF8STRINGENUMERATOR
 
   nsMimeStringEnumerator() : mCurrentIndex(0) {}
 
   template<class T>
   nsCString* Append(T value) { return mValues.AppendElement(value); }
--- a/mailnews/mime/emitters/nsMimeHtmlEmitter.h
+++ b/mailnews/mime/emitters/nsMimeHtmlEmitter.h
@@ -20,36 +20,36 @@
 class nsMimeHtmlDisplayEmitter : public nsMimeBaseEmitter {
 public:
     nsMimeHtmlDisplayEmitter ();
     nsresult Init();
 
     virtual       ~nsMimeHtmlDisplayEmitter (void);
 
     // Header handling routines.
-    NS_IMETHOD    EndHeader(const nsACString &name) MOZ_OVERRIDE;
+    NS_IMETHOD    EndHeader(const nsACString &name) override;
 
     // Attachment handling routines
     NS_IMETHOD    StartAttachment(const nsACString &name,
                                   const char *contentType, const char *url,
-                                  bool aIsExternalAttachment) MOZ_OVERRIDE;
-    NS_IMETHOD    AddAttachmentField(const char *field, const char *value) MOZ_OVERRIDE;
-    NS_IMETHOD    EndAttachment() MOZ_OVERRIDE;
-    NS_IMETHOD    EndAllAttachments() MOZ_OVERRIDE;
+                                  bool aIsExternalAttachment) override;
+    NS_IMETHOD    AddAttachmentField(const char *field, const char *value) override;
+    NS_IMETHOD    EndAttachment() override;
+    NS_IMETHOD    EndAllAttachments() override;
 
     // Body handling routines
-    NS_IMETHOD    WriteBody(const nsACString &buf, uint32_t *amountWritten) MOZ_OVERRIDE;
-    NS_IMETHOD    EndBody() MOZ_OVERRIDE;
-    NS_IMETHOD    WriteHTMLHeaders(const nsACString &name) MOZ_OVERRIDE;
+    NS_IMETHOD    WriteBody(const nsACString &buf, uint32_t *amountWritten) override;
+    NS_IMETHOD    EndBody() override;
+    NS_IMETHOD    WriteHTMLHeaders(const nsACString &name) override;
 
     virtual nsresult    WriteHeaderFieldHTMLPrefix(const nsACString &name
-                                                   ) MOZ_OVERRIDE;
+                                                   ) override;
     virtual nsresult    WriteHeaderFieldHTML(const char *field,
-                                             const char *value) MOZ_OVERRIDE;
-    virtual nsresult    WriteHeaderFieldHTMLPostfix() MOZ_OVERRIDE;
+                                             const char *value) override;
+    virtual nsresult    WriteHeaderFieldHTMLPostfix() override;
 
 protected:
     bool          mFirst;  // Attachment flag...
     bool          mSkipAttachment;  // attachments we shouldn't show...
 
     nsCOMPtr<nsIMsgHeaderSink> mHeaderSink;
 
     nsresult GetHeaderSink(nsIMsgHeaderSink ** aHeaderSink);
--- a/mailnews/mime/emitters/nsMimePlainEmitter.h
+++ b/mailnews/mime/emitters/nsMimePlainEmitter.h
@@ -16,16 +16,16 @@
 
 class nsMimePlainEmitter : public nsMimeBaseEmitter {
 public: 
     nsMimePlainEmitter ();
     virtual       ~nsMimePlainEmitter (void);
 
     // Header handling routines.
     NS_IMETHOD    StartHeader(bool rootMailHeader, bool headerOnly, const char *msgID,
-                              const char *outCharset) MOZ_OVERRIDE;
-    NS_IMETHOD    AddHeaderField(const char *field, const char *value) MOZ_OVERRIDE;
-    NS_IMETHOD    EndHeader(const nsACString &buf) MOZ_OVERRIDE;
+                              const char *outCharset) override;
+    NS_IMETHOD    AddHeaderField(const char *field, const char *value) override;
+    NS_IMETHOD    EndHeader(const nsACString &buf) override;
 
-    NS_IMETHOD    WriteBody(const nsACString &buf, uint32_t *amountWritten) MOZ_OVERRIDE;
+    NS_IMETHOD    WriteBody(const nsACString &buf, uint32_t *amountWritten) override;
 };
 
 #endif /* _nsMimePlainEmitter_h_ */
--- a/mailnews/mime/emitters/nsMimeRawEmitter.h
+++ b/mailnews/mime/emitters/nsMimeRawEmitter.h
@@ -15,15 +15,15 @@
 #include "nsIChannel.h"
 
 class nsMimeRawEmitter : public nsMimeBaseEmitter {
 public: 
     nsMimeRawEmitter ();
     virtual       ~nsMimeRawEmitter (void);
 
     NS_IMETHOD    WriteBody(const nsACString &buf,
-                            uint32_t *amountWritten) MOZ_OVERRIDE;
+                            uint32_t *amountWritten) override;
 
 protected:
 };
 
 
 #endif /* _nsMimeRawEmitter_h_ */
--- a/mailnews/mime/emitters/nsMimeXmlEmitter.h
+++ b/mailnews/mime/emitters/nsMimeXmlEmitter.h
@@ -14,30 +14,30 @@
 #include "nsIURI.h"
 #include "nsIChannel.h"
 
 class nsMimeXmlEmitter : public nsMimeBaseEmitter {
 public: 
     nsMimeXmlEmitter ();
     virtual       ~nsMimeXmlEmitter (void);
 
-    NS_IMETHOD    Complete() MOZ_OVERRIDE;
+    NS_IMETHOD    Complete() override;
 
     // Header handling routines.
     NS_IMETHOD    StartHeader(bool rootMailHeader, bool headerOnly, const char *msgID,
-                              const char *outCharset) MOZ_OVERRIDE;
-    NS_IMETHOD    AddHeaderField(const char *field, const char *value) MOZ_OVERRIDE;
-    NS_IMETHOD    EndHeader(const nsACString &buf) MOZ_OVERRIDE;
+                              const char *outCharset) override;
+    NS_IMETHOD    AddHeaderField(const char *field, const char *value) override;
+    NS_IMETHOD    EndHeader(const nsACString &buf) override;
 
     // Attachment handling routines
     NS_IMETHOD    StartAttachment(const nsACString &name,
                                   const char *contentType, const char *url,
-                                  bool aIsExternalAttachment) MOZ_OVERRIDE;
-    NS_IMETHOD    AddAttachmentField(const char *field, const char *value) MOZ_OVERRIDE;
-    NS_IMETHOD    EndAttachment() MOZ_OVERRIDE;
+                                  bool aIsExternalAttachment) override;
+    NS_IMETHOD    AddAttachmentField(const char *field, const char *value) override;
+    NS_IMETHOD    EndAttachment() override;
 
     NS_IMETHOD    WriteXMLHeader(const char *msgID);
     NS_IMETHOD    WriteXMLTag(const char *tagName, const char *value);
 
 protected:
 
     // For header determination...
     bool                mXMLHeaderStarted; 
--- a/mailnews/mime/src/mimeenc.cpp
+++ b/mailnews/mime/src/mimeenc.cpp
@@ -844,18 +844,18 @@ class Base64Encoder : public MimeEncoder
   int32_t in_buffer_count;
 
 public:
   Base64Encoder(OutputCallback callback, void *closure)
     : MimeEncoder(callback, closure),
       in_buffer_count(0) {}
   virtual ~Base64Encoder() {}
 
-  virtual nsresult Write(const char *buffer, int32_t size) MOZ_OVERRIDE;
-  virtual nsresult Flush() MOZ_OVERRIDE;
+  virtual nsresult Write(const char *buffer, int32_t size) override;
+  virtual nsresult Flush() override;
 
 private:
   static void Base64EncodeBits(RangedPtr<char> &out, uint32_t bits);
 };
 
 nsresult Base64Encoder::Write(const char *buffer, int32_t size)
 {
   if (size == 0)
@@ -978,17 +978,17 @@ void Base64Encoder::Base64EncodeBits(Ran
 }
 
 class QPEncoder : public MimeEncoder {
 public:
   QPEncoder(OutputCallback callback, void *closure)
     : MimeEncoder(callback, closure) {}
   virtual ~QPEncoder() {}
 
-  virtual nsresult Write(const char *buffer, int32_t size) MOZ_OVERRIDE;
+  virtual nsresult Write(const char *buffer, int32_t size) override;
 };
 
 nsresult QPEncoder::Write(const char *buffer, int32_t size)
 {
   nsresult rv = NS_OK;
   static const char *hexdigits = "0123456789ABCDEF";
   char out_buffer[80];
   RangedPtr<char> out(out_buffer);
--- a/mailnews/mime/src/nsCMS.cpp
+++ b/mailnews/mime/src/nsCMS.cpp
@@ -364,47 +364,47 @@ NS_IMETHODIMP nsCMSMessage::AsyncVerifyD
                               unsigned char* aDigestData, uint32_t aDigestDataLen)
 {
   if (!aDigestData || !aDigestDataLen)
     return NS_ERROR_FAILURE;
 
   return CommonAsyncVerifySignature(aListener, aDigestData, aDigestDataLen);
 }
 
-class SMimeVerificationTask MOZ_FINAL : public CryptoTask
+class SMimeVerificationTask final : public CryptoTask
 {
 public:
   SMimeVerificationTask(nsICMSMessage *aMessage,
                         nsISMimeVerificationListener *aListener,
                         unsigned char *aDigestData, uint32_t aDigestDataLen)
   {
     MOZ_ASSERT(NS_IsMainThread());
     mMessage = aMessage;
     mListener = aListener;
     mDigestData.Assign(reinterpret_cast<char *>(aDigestData), aDigestDataLen);
   }
 
 private:
-  virtual void ReleaseNSSResources() MOZ_OVERRIDE {}
-  virtual nsresult CalculateResult() MOZ_OVERRIDE
+  virtual void ReleaseNSSResources() override {}
+  virtual nsresult CalculateResult() override
   {
     MOZ_ASSERT(!NS_IsMainThread());
 
     nsresult rv;
     if (!mDigestData.IsEmpty()) {
       rv = mMessage->VerifyDetachedSignature(
         reinterpret_cast<uint8_t*>(const_cast<char *>(mDigestData.get())),
         mDigestData.Length());
     } else {
       rv = mMessage->VerifySignature();
     }
 
     return rv;
   }
-  virtual void CallCallback(nsresult rv) MOZ_OVERRIDE
+  virtual void CallCallback(nsresult rv) override
   {
     MOZ_ASSERT(NS_IsMainThread());
 
     nsCOMPtr<nsICMSMessage2> m2 = do_QueryInterface(mMessage);
     mListener->Notify(m2, rv);
   }
 
   nsCOMPtr<nsICMSMessage> mMessage;
--- a/mailnews/mime/src/nsMimeObjectClassAccess.h
+++ b/mailnews/mime/src/nsMimeObjectClassAccess.h
@@ -25,28 +25,28 @@ public:
 
   // These methods are all implemented by libmime to be used by
   // content type handler plugins for processing stream data.
 
   // This is the write call for outputting processed stream data.
   NS_IMETHOD    MimeObjectWrite(void *mimeObject,
                                 char *data,
                                 int32_t length,
-                                bool user_visible_p) MOZ_OVERRIDE;
+                                bool user_visible_p) override;
 
   // The following group of calls expose the pointers for the object
   // system within libmime.
-  NS_IMETHOD    GetmimeInlineTextClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeLeafClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeObjectClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeContainerClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeMultipartClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeMultipartSignedClass(void **ptr) MOZ_OVERRIDE;
-  NS_IMETHOD    GetmimeEncryptedClass(void **ptr) MOZ_OVERRIDE;
+  NS_IMETHOD    GetmimeInlineTextClass(void **ptr) override;
+  NS_IMETHOD    GetmimeLeafClass(void **ptr) override;
+  NS_IMETHOD    GetmimeObjectClass(void **ptr) override;
+  NS_IMETHOD    GetmimeContainerClass(void **ptr) override;
+  NS_IMETHOD    GetmimeMultipartClass(void **ptr) override;
+  NS_IMETHOD    GetmimeMultipartSignedClass(void **ptr) override;
+  NS_IMETHOD    GetmimeEncryptedClass(void **ptr) override;
 
   NS_IMETHOD    MimeCreate(char *content_type, void * hdrs,
-                           void * opts, void**ptr) MOZ_OVERRIDE;
+                           void * opts, void**ptr) override;
 
 private:
   virtual ~nsMimeObjectClassAccess();
 };
 
 #endif /* nsMimeObjectClassAccess_h_ */
--- a/mailnews/news/src/nsNewsFolder.h
+++ b/mailnews/news/src/nsNewsFolder.h
@@ -25,100 +25,100 @@ class nsMsgNewsFolder : public nsMsgDBFo
 {
 public:
   nsMsgNewsFolder(void);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMSGNEWSFOLDER
 
   // nsIUrlListener method
-  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) MOZ_OVERRIDE;
+  NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) override;
   // nsIMsgFolder methods:
-  NS_IMETHOD GetSubFolders(nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
+  NS_IMETHOD GetSubFolders(nsISimpleEnumerator **aResult) override;
 
-  NS_IMETHOD GetMessages(nsISimpleEnumerator **result) MOZ_OVERRIDE;
-  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) MOZ_OVERRIDE;
+  NS_IMETHOD GetMessages(nsISimpleEnumerator **result) override;
+  NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow) override;
 
   NS_IMETHOD CreateSubfolder(const nsAString& folderName,
-                             nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+                             nsIMsgWindow *msgWindow) override;
 
-  NS_IMETHOD Delete() MOZ_OVERRIDE;
+  NS_IMETHOD Delete() override;
   NS_IMETHOD Rename(const nsAString& newName,
-                     nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
+                     nsIMsgWindow *msgWindow) override;
 
-  NS_IMETHOD GetAbbreviatedName(nsAString& aAbbreviatedName) MOZ_OVERRIDE;
+  NS_IMETHOD GetAbbreviatedName(nsAString& aAbbreviatedName) override;
 
-  NS_IMETHOD GetFolderURL(nsACString& url) MOZ_OVERRIDE;
+  NS_IMETHOD GetFolderURL(nsACString& url) override;
 
   NS_IMETHOD GetExpungedBytesCount(int64_t *count);
-  NS_IMETHOD GetDeletable(bool *deletable) MOZ_OVERRIDE;
+  NS_IMETHOD GetDeletable(bool *deletable) override;
 
   NS_IMETHOD RefreshSizeOnDisk();
 
-  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) override;
 
   NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,
-                                  nsIMsgDatabase **db) MOZ_OVERRIDE;
+                                  nsIMsgDatabase **db) override;
 
   NS_IMETHOD DeleteMessages(nsIArray *messages,
                             nsIMsgWindow *msgWindow, bool deleteStorage,
                             bool isMove, nsIMsgCopyServiceListener* listener, 
-                            bool allowUndo) MOZ_OVERRIDE;
+                            bool allowUndo) override;
   NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow,
-                            nsIUrlListener *aListener) MOZ_OVERRIDE;
+                            nsIUrlListener *aListener) override;
 
-  NS_IMETHOD GetCanSubscribe(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanFileMessages(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanCreateSubfolders(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanRename(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD GetCanCompact(bool *aResult) MOZ_OVERRIDE;
-  NS_IMETHOD OnReadChanged(nsIDBChangeListener * aInstigator) MOZ_OVERRIDE;
+  NS_IMETHOD GetCanSubscribe(bool *aResult) override;
+  NS_IMETHOD GetCanFileMessages(bool *aResult) override;
+  NS_IMETHOD GetCanCreateSubfolders(bool *aResult) override;
+  NS_IMETHOD GetCanRename(bool *aResult) override;
+  NS_IMETHOD GetCanCompact(bool *aResult) override;
+  NS_IMETHOD OnReadChanged(nsIDBChangeListener * aInstigator) override;
 
   NS_IMETHOD DownloadMessagesForOffline(nsIArray *messages,
-                                        nsIMsgWindow *window) MOZ_OVERRIDE;
+                                        nsIMsgWindow *window) override;
   NS_IMETHOD Compact(nsIUrlListener *aListener,
-                     nsIMsgWindow *aMsgWindow) MOZ_OVERRIDE;
+                     nsIMsgWindow *aMsgWindow) override;
   NS_IMETHOD DownloadAllForOffline(nsIUrlListener *listener,
-                                   nsIMsgWindow *msgWindow) MOZ_OVERRIDE;
-  NS_IMETHOD GetSortOrder(int32_t *order) MOZ_OVERRIDE;
-  NS_IMETHOD SetSortOrder(int32_t order) MOZ_OVERRIDE;
+                                   nsIMsgWindow *msgWindow) override;
+  NS_IMETHOD GetSortOrder(int32_t *order) override;
+  NS_IMETHOD SetSortOrder(int32_t order) override;
 
-  NS_IMETHOD Shutdown(bool shutdownChildren) MOZ_OVERRIDE;
+  NS_IMETHOD Shutdown(bool shutdownChildren) override;
 
   NS_IMETHOD GetFilterList(nsIMsgWindow *aMsgWindow,
-                           nsIMsgFilterList **aFilterList) MOZ_OVERRIDE;
+                           nsIMsgFilterList **aFilterList) override;
   NS_IMETHOD GetEditableFilterList(nsIMsgWindow *aMsgWindow,
-                                   nsIMsgFilterList **aFilterList) MOZ_OVERRIDE;
-  NS_IMETHOD SetFilterList(nsIMsgFilterList *aFilterList) MOZ_OVERRIDE;
-  NS_IMETHOD SetEditableFilterList(nsIMsgFilterList *aFilterList) MOZ_OVERRIDE;
-  NS_IMETHOD ApplyRetentionSettings() MOZ_OVERRIDE;
+                                   nsIMsgFilterList **aFilterList) override;
+  NS_IMETHOD SetFilterList(nsIMsgFilterList *aFilterList) override;
+  NS_IMETHOD SetEditableFilterList(nsIMsgFilterList *aFilterList) override;
+  NS_IMETHOD ApplyRetentionSettings() override;
 
 protected:
   virtual ~nsMsgNewsFolder();
   // helper routine to parse the URI and update member variables
   nsresult AbbreviatePrettyName(nsAString& prettyName, int32_t fullwords);
   nsresult ParseFolder(nsIFile *path);
   nsresult CreateSubFolders(nsIFile *path);
   nsresult AddDirectorySeparator(nsIFile *path);
-  nsresult GetDatabase() MOZ_OVERRIDE;
+  nsresult GetDatabase() override;
   virtual nsresult CreateChildFromURI(const nsCString &uri,
-                                      nsIMsgFolder **folder) MOZ_OVERRIDE;
+                                      nsIMsgFolder **folder) override;
 
   nsresult LoadNewsrcFileAndCreateNewsgroups();
   int32_t RememberLine(const nsACString& line);
   nsresult RememberUnsubscribedGroup(const nsACString& newsgroup, const nsACString& setStr);
   nsresult ForgetLine(void);
   nsresult GetNewsMessages(nsIMsgWindow *aMsgWindow, bool getOld, nsIUrlListener *aListener);
 
   int32_t HandleNewsrcLine(const char * line, uint32_t line_size);
-  virtual void GetIncomingServerType(nsCString& serverType) MOZ_OVERRIDE
+  virtual void GetIncomingServerType(nsCString& serverType) override
   {
     serverType.AssignLiteral("nntp");
   }
-  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) MOZ_OVERRIDE;
+  virtual nsresult CreateBaseMessageURI(const nsACString& aURI) override;
 
 protected:
   int64_t mExpungedBytes;
   bool mGettingNews;
   bool mInitialized;
   bool m_downloadMessageForOfflineUse;
   bool m_downloadingMultipleMessages;
 
--- a/suite/feeds/src/nsFeedSniffer.h
+++ b/suite/feeds/src/nsFeedSniffer.h
@@ -11,17 +11,17 @@
 #define NS_FEEDSNIFFER_CONTRACTID \
   "@mozilla.org/browser/feeds/sniffer;1"
 
 // {E5EEEF51-05CE-4885-9434-7287616D9547}
 #define NS_FEEDSNIFFER_CID \
   { 0xe5eeef51, 0x5ce, 0x4885, { 0x94, 0x34, 0x72, 0x87, 0x61, 0x6d, 0x95, 0x47 } }
 
 
-class nsFeedSniffer MOZ_FINAL : public nsIContentSniffer, nsIStreamListener
+class nsFeedSniffer final : public nsIContentSniffer, nsIStreamListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICONTENTSNIFFER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
   static NS_METHOD AppendSegmentToString(nsIInputStream* inputStream,
--- a/suite/profile/migration/src/nsThunderbirdProfileMigrator.h
+++ b/suite/profile/migration/src/nsThunderbirdProfileMigrator.h
@@ -17,17 +17,17 @@
 
 class nsIFile;
 class nsIPrefBranch;
 class nsIPrefService;
 
 #define NS_THUNDERBIRDPROFILEMIGRATOR_CID \
 { 0x6ba91adb, 0xa4ed, 0x405f, { 0xbd, 0x6c, 0xe9, 0x04, 0xa9, 0x9d, 0x9a, 0xd8 } }
 
-class nsThunderbirdProfileMigrator MOZ_FINAL : public nsNetscapeProfileMigratorBase
+class nsThunderbirdProfileMigrator final : public nsNetscapeProfileMigratorBase
 {
 public:
   NS_DECL_ISUPPORTS
 
   nsThunderbirdProfileMigrator();
 
   // nsISuiteProfileMigrator methods
   NS_IMETHOD Migrate(uint16_t aItems, nsIProfileStartup *aStartup,
--- a/suite/profile/nsSuiteDirectoryProvider.h
+++ b/suite/profile/nsSuiteDirectoryProvider.h
@@ -14,17 +14,17 @@
 #include "nsIProperties.h"
 #include "mozilla/Attributes.h"
 
 #define NS_SUITEDIRECTORYPROVIDER_CONTRACTID "@mozilla.org/suite/directory-provider;1"
 // {9aa21826-9d1d-433d-8c10-f313b26fa9dd}
 #define NS_SUITEDIRECTORYPROVIDER_CID \
   { 0x9aa21826, 0x9d1d, 0x433d, { 0x8c, 0x10, 0xf3, 0x13, 0xb2, 0x6f, 0xa9, 0xdd } }
 
-class nsSuiteDirectoryProvider MOZ_FINAL : public nsIDirectoryServiceProvider2
+class nsSuiteDirectoryProvider final : public nsIDirectoryServiceProvider2
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
 
 private:
   ~nsSuiteDirectoryProvider() {}
@@ -33,17 +33,17 @@ private:
 			 nsIFile* aParentDir, nsIFile* aTarget);
 
   void AppendDistroSearchDirs(nsIProperties* aDirSvc,
                               nsCOMArray<nsIFile> &array);
 
   void AppendFileKey(const char *key, nsIProperties* aDirSvc,
                      nsCOMArray<nsIFile> &array);
 
-  class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator
+  class AppendingEnumerator final : public nsISimpleEnumerator
   {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISIMPLEENUMERATOR
 
     AppendingEnumerator(nsISimpleEnumerator* aBase,
                         const char* const aLeafName);
 
--- a/suite/shell/src/nsGNOMEShellService.h
+++ b/suite/shell/src/nsGNOMEShellService.h
@@ -10,17 +10,17 @@
 #include "nsStringGlue.h"
 #include "mozilla/Attributes.h"
 
 #define NS_SUITEGNOMEINTEGRATION_CID \
 {0xc16cfa25, 0xa74a, 0x420b, {0xa5, 0x45, 0x4b, 0xc0, 0x6b, 0x08, 0xa8, 0x65}}
 
 struct ProtocolAssociation;
 
-class nsGNOMEShellService MOZ_FINAL : public nsIShellService
+class nsGNOMEShellService final : public nsIShellService
 {
 public:
   nsGNOMEShellService() : mCheckedThisSessionClient(false) { }
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
 
   nsresult Init();
--- a/suite/shell/src/nsMacShellService.h
+++ b/suite/shell/src/nsMacShellService.h
@@ -12,17 +12,17 @@
 #include "nsCOMPtr.h"
 #include "mozilla/Attributes.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #define NS_SUITEMACINTEGRATION_CID \
 {0xac17e6f0, 0x50c9, 0x4901, {0xab, 0x08, 0xf8, 0x70, 0xbf, 0xcd, 0x12, 0xce}}
 
-class nsMacShellService MOZ_FINAL : public nsIShellService,
+class nsMacShellService final : public nsIShellService,
                                     public nsIWebProgressListener
 {
 public:
   nsMacShellService() : mCheckedThisSessionClient(false) {};
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
   NS_DECL_NSIWEBPROGRESSLISTENER
--- a/suite/shell/src/nsWindowsShellService.h
+++ b/suite/shell/src/nsWindowsShellService.h
@@ -17,17 +17,17 @@
 typedef struct {
   const char* keyName;
   const char* valueName;
   const char* valueData;
 
   int32_t flags;
 } SETTING;
 
-class nsWindowsShellService MOZ_FINAL : public nsIWindowsShellService
+class nsWindowsShellService final : public nsIWindowsShellService
 {
 public:
   nsWindowsShellService() : mCheckedThisSessionClient(false) {};
   nsresult Init();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
   NS_DECL_NSIWINDOWSSHELLSERVICE