Bug 1423798 - Remove headers included for backwards compat in nsStrin…

…g.h. r=njn on a CLOSED TREE Remove the headers included for "backwards compatibility" and just include them where required. --HG-- extra : source : e2beba7e6875120ebbbcadf24bcbcb5b86411a94 extra : amend_source : 11f07a27431cd468511f0bd45afe36150c6e342c
dothq · Dec 7, 2017 · 6058ba5 · 6058ba5
1 parent 57cb45d
commit 6058ba5
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 8 deletions.
diff --git a/dom/base/NodeInfo.h b/dom/base/NodeInfo.h
@@ -26,6 +26,7 @@
 #include "nsString.h"
 #include "mozilla/Attributes.h"
 #include "nsAtom.h"
+#include "plhash.h"
 
 class nsIDocument;
 class nsNodeInfoManager;

diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp
@@ -11,6 +11,7 @@
 #include "mozilla/dom/DOMStringList.h"
 #include "nsIPrefetchService.h"
 #include "nsCPrefetchService.h"
+#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"

diff --git a/dom/xslt/xpath/txXPCOMExtensionFunction.cpp b/dom/xslt/xpath/txXPCOMExtensionFunction.cpp
@@ -8,6 +8,7 @@
 #include "nsDependentString.h"
 #include "nsAtom.h"
 #include "nsIInterfaceInfoManager.h"
+#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "txExpr.h"
 #include "txIFunctionEvaluationContext.h"

diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
@@ -18,6 +18,7 @@
 #include "nsILoadGroup.h"
 #include "nsIStringBundle.h"
 #include "nsIURI.h"
+#include "nsMemory.h"
 #include "XPathResult.h"
 #include "txExecutionState.h"
 #include "txMozillaTextOutput.h"

diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp
@@ -22,6 +22,7 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIServiceManager.h"
+#include "nsMemory.h"
 #include "nsNativeCharsetUtils.h"
 #include "mozilla/Telemetry.h"
 

diff --git a/extensions/auth/nsAuthSSPI.cpp b/extensions/auth/nsAuthSSPI.cpp
@@ -18,6 +18,7 @@
 #include "nsIServiceManager.h"
 #include "nsIDNSService.h"
 #include "nsIDNSRecord.h"
+#include "nsMemory.h"
 #include "nsNetCID.h"
 #include "nsCOMPtr.h"
 #include "nsICryptoHash.h"

diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
@@ -5,6 +5,7 @@
 
 #include "nsAuth.h"
 #include "nsAuthSambaNTLM.h"
+#include "nsMemory.h"
 #include "prenv.h"
 #include "plbase64.h"
 #include "prerror.h"

diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp
@@ -10,6 +10,7 @@
 #include "nsUnicodeProperties.h"
 #include "nsCRT.h"
 #include "mozilla/Likely.h"
+#include "nsMemory.h"
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(mozEnglishWordUtils)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(mozEnglishWordUtils)

diff --git a/intl/hyphenation/glue/nsHyphenationManager.cpp b/intl/hyphenation/glue/nsHyphenationManager.cpp
@@ -21,6 +21,7 @@
 #include "nsCRT.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
+#include "nsMemory.h"
 
 using namespace mozilla;
 

diff --git a/layout/style/nsCSSDataBlock.h b/layout/style/nsCSSDataBlock.h
@@ -16,6 +16,7 @@
 #include "nsCSSProps.h"
 #include "nsCSSPropertyIDSet.h"
 #include "nsCSSValue.h"
+#include "nsMemory.h"
 #include "nsStyleStruct.h"
 
 struct nsRuleData;

diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
@@ -36,6 +36,7 @@
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsSerializationHelper.h"
+#include "nsMemory.h"
 
 #include "mozIStorageService.h"
 #include "mozIStorageStatement.h"

diff --git a/security/manager/ssl/nsKeygenHandler.cpp b/security/manager/ssl/nsKeygenHandler.cpp
@@ -19,6 +19,7 @@
 #include "nsITokenDialogs.h"
 #include "nsKeygenHandlerContent.h"
 #include "nsKeygenThread.h"
+#include "nsMemory.h"
 #include "nsNSSComponent.h" // for PIPNSS string bundle calls.
 #include "nsNSSHelper.h"
 #include "nsReadableUtils.h"

diff --git a/storage/Variant.h b/storage/Variant.h
@@ -10,6 +10,7 @@
 #include <utility>
 
 #include "nsIVariant.h"
+#include "nsMemory.h"
 #include "nsString.h"
 #include "nsTArray.h"
 

diff --git a/xpcom/base/LogModulePrefWatcher.cpp b/xpcom/base/LogModulePrefWatcher.cpp
@@ -8,6 +8,7 @@
 
 #include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
+#include "nsMemory.h"
 #include "nsString.h"
 #include "nsXULAppAPI.h"
 #include "base/process_util.h"

diff --git a/xpcom/string/nsString.h b/xpcom/string/nsString.h
@@ -15,8 +15,6 @@
 #include "nsDependentSubstring.h"
 #include "nsReadableUtils.h"
 
-#include <new>
-
 // enable support for the obsolete string API if not explicitly disabled
 #ifndef MOZ_STRING_WITH_OBSOLETE_API
 #define MOZ_STRING_WITH_OBSOLETE_API 1
@@ -154,10 +152,4 @@ class NS_ConvertUTF8toUTF16 : public nsAutoString
 #include "nsLiteralString.h"
 #include "nsPromiseFlatString.h"
 
-// need to include these for backwards compatibility
-#include "nsMemory.h"
-#include <string.h>
-#include <stdio.h>
-#include "plhash.h"
-
 #endif // !defined(nsString_h___)