replaced nsString2.h references with nsString.h

mailnews/base/search/public/nsMsgFilterCore.h

@@ -20,7 +20,7 @@
 #define _nsMsgFilterCore_H_
 
 #include "MailNewsTypes.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsMsgSearchCore.h"
 
 typedef enum

mailnews/base/search/public/nsMsgSearchCore.h

@@ -20,7 +20,7 @@
 #define _nsMsgSearchCore_H_
 
 #include "MailNewsTypes.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIMsgHeaderParser.h"
 #include "nsCOMPtr.h"
 

mailnews/base/src/nsMsgAccountManager.cpp

@@ -27,7 +27,7 @@
 #include "nsCOMPtr.h"
 #include "prmem.h"
 #include "plstr.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsXPIDLString.h"
 
 #include "nsCRT.h"  // for nsCRT::strtok

mailnews/base/util/nsMsgUtils.cpp

@@ -21,7 +21,7 @@
 #include "nsFileSpec.h"
 #include "nsIServiceManager.h"
 #include "nsCOMPtr.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID)
 {

mailnews/db/msgdb/public/nsMsgHdr.h

@@ -20,7 +20,7 @@
 #define _nsMsgHdr_H
 
 #include "nsIMsgHdr.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "MailNewsTypes.h"
 #include "xp.h"
 #include "mdb.h"

mailnews/db/msgdb/src/nsMsgDatabase.cpp

@@ -25,7 +25,7 @@
 #include "nsIEnumerator.h"
 #include "nsMsgThread.h"
 #include "nsFileStream.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIMsgHeaderParser.h"
 #include "nsMsgBaseCID.h"
 

mailnews/db/msgdb/src/nsMsgHdr.cpp

@@ -19,7 +19,6 @@
 #include "msgCore.h"
 #include "nsMsgHdr.h"
 #include "nsMsgDatabase.h"
-#include "nsString2.h"
 #include "nsMsgUtils.h"
 
 NS_IMPL_ISUPPORTS(nsMsgHdr, nsIMsgDBHdr::GetIID())

mailnews/imap/src/nsIMAPBodyShell.h

@@ -25,7 +25,7 @@ nsIMAPBodyShell and associated classes
 
 #include "nsImapCore.h"
 #include "nsIMAPGenericParser.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 class nsImapProtocol;
 

mailnews/imap/src/nsIMAPGenericParser.cpp

@@ -21,7 +21,7 @@
 #include "nsImapCore.h"
 #include "nsImapProtocol.h"
 #include "nsIMAPGenericParser.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 /*************************************************
    The following functions are used to implement

mailnews/imap/src/nsIMAPNamespace.cpp

@@ -22,7 +22,7 @@
 #include "nsIMAPNamespace.h"
 #include "nsImapProtocol.h"
 #include "nsIMAPGenericParser.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 //////////////////// nsIMAPNamespace  /////////////////////////////////////////////////////////////
 

mailnews/imap/src/nsImapCore.h

@@ -20,7 +20,7 @@
 #define _nsImapCore_H_
 
 #include "MailNewsTypes.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 class nsIMAPNamespace;
 class nsImapProtocol;

mailnews/imap/src/nsImapIncomingServer.cpp

@@ -18,7 +18,7 @@
 
 #include "msgCore.h"
 
-#include "nsString2.h"
+#include "nsString.h"
 
 #include "nsIImapIncomingServer.h"
 #include "nsIMAPHostSessionList.h"

mailnews/imap/src/nsImapProtocol.cpp

@@ -47,7 +47,6 @@ PRLogModuleInfo *IMAP;
 #include "nsIOutputStream.h"
 #include "nsINetService.h"
 
-#include "nsString2.h"
 
 #include "nsIMsgIncomingServer.h"
 #include "nsIImapIncomingServer.h"

mailnews/imap/src/nsImapServerResponseParser.h

@@ -22,7 +22,7 @@
 #include "nsImapCore.h"
 #include "nsIMAPHostSessionList.h"
 #include "nsImapSearchResults.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 class nsIMAPNamespace;
 class nsIMAPNamespaceList;

mailnews/local/src/nsLocalMailFolder.cpp

@@ -45,7 +45,7 @@
 #include "nsIMsgIncomingServer.h"
 #include "nsMsgBaseCID.h"
 #include "nsMsgLocalCID.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsLocalFolderSummarySpec.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);

mailnews/local/src/nsPop3Protocol.cpp

@@ -25,7 +25,7 @@
 #include "prio.h"
 #include "plstr.h"
 #include "MailNewsTypes.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 #include "nsINetService.h"
 #include "nsIMsgIncomingServer.h"

mailnews/news/src/nsNntpService.cpp

@@ -43,7 +43,7 @@
 #include "nsNewsDatabase.h"
 #include "nsMsgDBCID.h"
 
-#include "nsString2.h"
+#include "nsString.h"
 
 #include "nsNNTPNewsgroup.h"
 #include "nsCOMPtr.h"