Bug 703068 - Annotate 10 methods with MOZ_OVERRIDE in mailnews/compose. r=mbanner
authorArnaud Sourioux <six.dsn@gmail.com>
Tue, 16 Jul 2013 11:31:35 -0400
changeset 16092 b34d771ffae67169d296aec86e0b05a21ef93dcd
parent 16091 b0a0d184737c4e3aedd710aa58db099dd1149535
child 16093 4b57451b431906eefc9edbbcc427bb2c357e61ba
push id1000
push userbugzilla@standard8.plus.com
push dateMon, 16 Sep 2013 20:21:48 +0000
treeherdercomm-beta@77f0178eb807 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbanner
bugs703068
Bug 703068 - Annotate 10 methods with MOZ_OVERRIDE in mailnews/compose. r=mbanner
mailnews/compose/src/nsMsgCopy.h
mailnews/compose/src/nsSmtpProtocol.h
--- a/mailnews/compose/src/nsMsgCopy.h
+++ b/mailnews/compose/src/nsMsgCopy.h
@@ -1,16 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 _nsMsgCopy_H_
 #define _nsMsgCopy_H_
 
+#include "mozilla/Attributes.h"
 #include "nscore.h"
 #include "nsIFile.h"
 #include "nsMsgSend.h"
 #include "nsIMsgFolder.h"
 #include "nsITransactionManager.h"
 #include "nsIMsgCopyServiceListener.h"
 #include "nsIMsgCopyService.h"
 
@@ -30,25 +31,25 @@ class CopyListener : public nsIMsgCopySe
 {
 public:
   CopyListener(void);
   virtual ~CopyListener(void);
 
   // nsISupports interface
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD OnStartCopy();
+  NS_IMETHOD OnStartCopy() MOZ_OVERRIDE;
   
-  NS_IMETHOD OnProgress(uint32_t aProgress, uint32_t aProgressMax);
+  NS_IMETHOD OnProgress(uint32_t aProgress, uint32_t aProgressMax) MOZ_OVERRIDE;
 
-  NS_IMETHOD SetMessageKey(uint32_t aMessageKey);
+  NS_IMETHOD SetMessageKey(uint32_t aMessageKey) MOZ_OVERRIDE;
   
-  NS_IMETHOD GetMessageId(nsACString& aMessageId);
+  NS_IMETHOD GetMessageId(nsACString& aMessageId) MOZ_OVERRIDE;
   
-  NS_IMETHOD OnStopCopy(nsresult aStatus);
+  NS_IMETHOD OnStopCopy(nsresult aStatus) MOZ_OVERRIDE;
 
   NS_IMETHOD SetMsgComposeAndSendObject(nsIMsgSend *obj);
   
   bool                            mCopyInProgress;
 
 private:
   nsCOMPtr<nsIMsgSend>       mComposeAndSend;
 };
--- a/mailnews/compose/src/nsSmtpProtocol.h
+++ b/mailnews/compose/src/nsSmtpProtocol.h
@@ -1,16 +1,17 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 nsSmtpProtocol_h___
 #define nsSmtpProtocol_h___
 
+#include "mozilla/Attributes.h"
 #include "nsMsgProtocol.h"
 #include "nsIStreamListener.h"
 #include "nsISmtpUrl.h"
 #include "nsIMsgStatusFeedback.h"
 #include "nsMsgLineBuffer.h"
 #include "nsIAuthModule.h"
 #include "MailNewsTypes2.h" // for nsMsgSocketType
 
@@ -76,25 +77,25 @@ class nsSmtpProtocol : public nsMsgAsync
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
 
     // Creating a protocol instance requires the URL which needs to be run.
     nsSmtpProtocol(nsIURI * aURL);
     virtual ~nsSmtpProtocol();
 
-    virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nullptr);
-    virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false);
+    virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nullptr) MOZ_OVERRIDE;
+    virtual nsresult SendData(const char * dataBuffer, bool aSuppressLogging = false) MOZ_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);
+    NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) MOZ_OVERRIDE;
 
 private:
     // 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;
 
     // the nsISmtpURL that is currently running
@@ -141,17 +142,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);
+                                          uint64_t sourceOffset, uint32_t length) MOZ_OVERRIDE;
 
     ////////////////////////////////////////////////////////////////////////////////////////
     // Communication methods --> Reading and writing protocol
     ////////////////////////////////////////////////////////////////////////////////////////
 
     void UpdateStatus(int32_t aStatusID);
     void UpdateStatusWithString(const PRUnichar * aStatusString);
 
@@ -197,16 +198,16 @@ private:
                                const PRUnichar **formatStrings, 
                                nsACString &aPassword);
 
     void    InitPrefAuthMethods(int32_t authMethodPrefValue);
     nsresult ChooseAuthMethod();
     void    MarkAuthMethodAsFailed(int32_t failedAuthMethod);
     void    ResetAuthMethods();
 
-    virtual const char* GetType() {return "smtp";}
+    virtual const char* GetType() MOZ_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___