Bug 1503839 - clean up some more ns*WeakReference*.h includes. r=jorgk
authoraceman <acelists@atlas.sk>
Thu, 01 Nov 2018 14:50:00 +0100
changeset 33643 3cb2a9dc80d3c779144daa85c2fb7977e1a4adc5
parent 33642 53c3270b2956df2826a253723631edec04f2cd86
child 33644 fa7b4b68119e8a24335b103eca102c6315d672cf
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1503839
Bug 1503839 - clean up some more ns*WeakReference*.h includes. r=jorgk
mailnews/addrbook/src/nsAbLDAPDirectory.cpp
mailnews/addrbook/src/nsAbMDBDirProperty.cpp
mailnews/base/search/public/nsMsgSearchScopeTerm.h
mailnews/base/src/nsMessengerUnixIntegration.cpp
mailnews/base/src/nsMessengerWinIntegration.cpp
mailnews/base/src/nsMsgDBView.h
mailnews/base/src/nsMsgQuickSearchDBView.h
mailnews/base/src/nsMsgSearchDBView.h
mailnews/base/src/nsMsgStatusFeedback.h
mailnews/base/src/nsMsgWindow.h
mailnews/base/util/nsMsgDBFolder.h
mailnews/base/util/nsMsgMailNewsUrl.h
mailnews/compose/src/nsMsgComposeService.h
mailnews/imap/src/nsImapUndoTxn.h
mailnews/jsaccount/src/JaMsgFolder.h
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
@@ -29,16 +29,17 @@
 #include "nsIAbLDAPCard.h"
 #include "nsAbUtils.h"
 #include "nsArrayUtils.h"
 #include "nsIPrefService.h"
 #include "nsIMsgAccountManager.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgUtils.h"
 #include "mozilla/Services.h"
+#include "nsIWeakReference.h"
 
 #define kDefaultMaxHits 100
 
 using namespace mozilla;
 
 nsAbLDAPDirectory::nsAbLDAPDirectory() :
   nsAbDirProperty(),
   mPerformingQuery(false),
--- a/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
@@ -7,16 +7,17 @@
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsAbBaseCID.h"
 #include "nsAddrDatabase.h"
 #include "nsIAbCard.h"
 #include "nsArrayUtils.h"
 #include "mdb.h"
 #include "nsComponentManagerUtils.h"
+#include "nsIWeakReference.h"
 
 nsAbMDBDirProperty::nsAbMDBDirProperty(void)
   : nsAbDirProperty()
 {
   m_dbRowID = 0;
 }
 
 nsAbMDBDirProperty::~nsAbMDBDirProperty(void)
--- a/mailnews/base/search/public/nsMsgSearchScopeTerm.h
+++ b/mailnews/base/search/public/nsMsgSearchScopeTerm.h
@@ -8,17 +8,16 @@
 
 #include "nsMsgSearchCore.h"
 #include "nsMsgSearchScopeTerm.h"
 #include "nsIMsgSearchAdapter.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgSearchAdapter.h"
 #include "nsIMsgSearchSession.h"
 #include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
 #include "nsIWeakReferenceUtils.h"
 
 class nsMsgSearchScopeTerm : public nsIMsgSearchScopeTerm
 {
 public:
   nsMsgSearchScopeTerm (nsIMsgSearchSession *, nsMsgSearchScopeValue, nsIMsgFolder *);
   nsMsgSearchScopeTerm ();
 
--- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
@@ -21,17 +21,16 @@
 #include "nsIWindowMediator.h"
 #include "mozIDOMWindow.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"
 #include "nsIBaseWindow.h"
 #include "MailNewsTypes.h"
 #include "nsIMessengerWindowService.h"
 #include "prprf.h"
-#include "nsIWeakReference.h"
 #include "nsIStringBundle.h"
 #include "nsIAlertsService.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIMsgDatabase.h"
 #include "nsIMsgHdr.h"
 #include "nsAutoPtr.h"
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -27,17 +27,16 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"
 #include "nsIBaseWindow.h"
 #include "nsIWidget.h"
 #include "nsWidgetsCID.h"
 #include "MailNewsTypes.h"
 #include "nsIMessengerWindowService.h"
 #include "prprf.h"
-#include "nsIWeakReference.h"
 #include "nsIStringBundle.h"
 #include "nsIAlertsService.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIProperties.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIWeakReferenceUtils.h"
--- a/mailnews/base/src/nsMsgDBView.h
+++ b/mailnews/base/src/nsMsgDBView.h
@@ -15,17 +15,16 @@
 #include "nsIDBChangeListener.h"
 #include "nsITreeView.h"
 #include "nsITreeBoxObject.h"
 #include "nsITreeSelection.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgThread.h"
 #include "DateTimeFormat.h"
 #include "nsIImapIncomingServer.h"
-#include "nsIWeakReference.h"
 #include "nsIMsgFilterPlugin.h"
 #include "nsIStringBundle.h"
 #include "nsMsgTagService.h"
 #include "nsCOMArray.h"
 #include "nsTArray.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIMsgCustomColumnHandler.h"
--- a/mailnews/base/src/nsMsgQuickSearchDBView.h
+++ b/mailnews/base/src/nsMsgQuickSearchDBView.h
@@ -7,17 +7,17 @@
 #define _nsMsgQuickSearchDBView_H_
 
 #include "mozilla/Attributes.h"
 #include "nsMsgThreadedDBView.h"
 #include "nsIMsgSearchNotify.h"
 #include "nsIMsgSearchSession.h"
 #include "nsCOMArray.h"
 #include "nsIMsgHdr.h"
-
+#include "nsIWeakReferenceUtils.h"
 
 class nsMsgQuickSearchDBView : public nsMsgThreadedDBView, public nsIMsgSearchNotify
 {
 public:
   nsMsgQuickSearchDBView();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIMSGSEARCHNOTIFY
--- a/mailnews/base/src/nsMsgSearchDBView.h
+++ b/mailnews/base/src/nsMsgSearchDBView.h
@@ -8,16 +8,17 @@
 
 #include "mozilla/Attributes.h"
 #include "nsMsgGroupView.h"
 #include "nsIMsgCopyServiceListener.h"
 #include "nsIMsgSearchNotify.h"
 #include "nsMsgXFViewThread.h"
 #include "nsCOMArray.h"
 #include "mozilla/UniquePtr.h"
+#include "nsIWeakReferenceUtils.h"
 
 class nsMsgSearchDBView : public nsMsgGroupView,
                           public nsIMsgCopyServiceListener,
                           public nsIMsgSearchNotify
 {
 public:
   nsMsgSearchDBView();
 
--- a/mailnews/base/src/nsMsgStatusFeedback.h
+++ b/mailnews/base/src/nsMsgStatusFeedback.h
@@ -9,16 +9,17 @@
 #include "nsIWebProgressListener.h"
 #include "nsIObserver.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgStatusFeedback.h"
 #include "nsIProgressEventSink.h"
 #include "nsIStringBundle.h"
 #include "nsWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 
 class nsMsgStatusFeedback : public nsIMsgStatusFeedback,
                             public nsIProgressEventSink,
                             public nsIWebProgressListener,
                             public nsSupportsWeakReference
 {
 public:
   nsMsgStatusFeedback();
--- a/mailnews/base/src/nsMsgWindow.h
+++ b/mailnews/base/src/nsMsgWindow.h
@@ -10,16 +10,17 @@
 #include "nsIMsgStatusFeedback.h"
 #include "nsITransactionManager.h"
 #include "nsIMsgFolder.h"
 #include "nsCOMPtr.h"
 #include "nsIDocShell.h"
 #include "nsIURIContentListener.h"
 #include "nsIMimeMiscStatus.h"
 #include "nsWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIInterfaceRequestor.h"
 
 class nsMsgWindow : public nsIMsgWindow,
                     public nsIURIContentListener,
                     public nsIMsgWindowTest,
                     public nsSupportsWeakReference
 {
 
--- a/mailnews/base/util/nsMsgDBFolder.h
+++ b/mailnews/base/util/nsMsgDBFolder.h
@@ -14,16 +14,17 @@
 #include "nsIMsgDatabase.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsCOMPtr.h"
 #include "nsIDBChangeListener.h"
 #include "nsIMsgPluggableStore.h"
 #include "nsIURL.h"
 #include "nsIFile.h"
 #include "nsWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIMsgFilterList.h"
 #include "nsIUrlListener.h"
 #include "nsIMsgHdr.h"
 #include "nsIOutputStream.h"
 #include "nsITransport.h"
 #include "nsIStringBundle.h"
 #include "nsTObserverArray.h"
 #include "nsCOMArray.h"
--- a/mailnews/base/util/nsMsgMailNewsUrl.h
+++ b/mailnews/base/util/nsMsgMailNewsUrl.h
@@ -18,17 +18,17 @@
 #include "nsIMsgMailNewsUrl.h"
 #include "nsIURL.h"
 #include "nsIURIWithSpecialOrigin.h"
 #include "nsILoadGroup.h"
 #include "nsIMsgSearchSession.h"
 #include "nsICacheEntry.h"
 #include "nsICacheSession.h"
 #include "nsIMimeMiscStatus.h"
-#include "nsWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsString.h"
 #include "nsIURIMutator.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Okay, I found that all of the mail and news url interfaces needed to support
 // several common interfaces (in addition to those provided through nsIURI).
 // So I decided to group them all in this implementation so we don't have to
 // duplicate the code.
--- a/mailnews/compose/src/nsMsgComposeService.h
+++ b/mailnews/compose/src/nsMsgComposeService.h
@@ -6,16 +6,17 @@
 #define MSGCOMP_TRACE_PERFORMANCE 1
 
 #include "nsIMsgComposeService.h"
 #include "nsCOMPtr.h"
 #include "mozIDOMWindow.h"
 #include "nsIXULWindow.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
+#include "nsIWeakReference.h"
 #include "nsIMimeStreamConverter.h"
 #include "nsInterfaceHashtable.h"
 
 #include "nsICommandLineHandler.h"
 #define ICOMMANDLINEHANDLER nsICommandLineHandler
 
 class nsMsgComposeService :
   public nsIMsgComposeService,
--- a/mailnews/imap/src/nsImapUndoTxn.h
+++ b/mailnews/imap/src/nsImapUndoTxn.h
@@ -10,17 +10,17 @@
 #include "nsIMsgFolder.h"
 #include "nsIImapIncomingServer.h"
 #include "nsIUrlListener.h"
 #include "nsMsgTxn.h"
 #include "MailNewsTypes.h"
 #include "nsTArray.h"
 #include "nsIMsgOfflineImapOperation.h"
 #include "nsCOMPtr.h"
-#include "nsWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsCOMArray.h"
 
 class nsImapMoveCopyMsgTxn : public nsMsgTxn, nsIUrlListener
 {
 public:
 
   nsImapMoveCopyMsgTxn();
   nsImapMoveCopyMsgTxn(nsIMsgFolder* srcFolder, nsTArray<nsMsgKey>* srcKeyArray,
--- a/mailnews/jsaccount/src/JaMsgFolder.h
+++ b/mailnews/jsaccount/src/JaMsgFolder.h
@@ -11,17 +11,16 @@
 #include "DelegateList.h"
 #include "msgIOverride.h"
 #include "nsIMsgFolder.h"
 #include "nsMsgDBFolder.h"
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsWeakReference.h"
 #include "nsNetUtil.h"
 #include "nsIDBChangeListener.h"
 #include "nsIUrlListener.h"
 #include "nsIMsgFilterPlugin.h"
 #include "nsIInterfaceRequestor.h"
 
 namespace mozilla {
 namespace mailnews {