Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove #define nsString2 nsString and #define nsAutoString2 nsAutoString and fix last few uses of them. r=dbradley, rs=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@102294 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-09-05 12:42:54 +00:00
parent 54a31f5907
commit 1536b0881b
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/mailnews/absync/src/nsAbSync.cpp
View File

@@ -33,6 +33,7 @@
#include "nsIDirectoryService.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsEscape.h"
#include "nsSyncDecoderRing.h"
#include "plstr.h"
@@ -816,7 +817,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
char *pVal = PR_smprintf("phone%d", phoneCount);
if (pVal)
{
char *utfString = nsString2(aName).ToNewUTF8String();
char *utfString = ToNewUTF8String(nsDependentString(aName));
// Now, URL Encode the value string....
char *myTStr = nsEscape(utfString, url_Path);
@@ -846,7 +847,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
}
else // Good ole' normal tag...
{
char *utfString = nsString2(aName).ToNewUTF8String();
char *utfString = ToNewUTF8String(nsDependentString(aName));
// Now, URL Encode the value string....
char *myTStr = nsEscape(utfString, url_Path);
@@ -887,7 +888,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
// Just some sanity...
if (aName)
{
char *utfString = nsString2(aName).ToNewUTF8String();
char *utfString = ToNewUTF8String(nsDependentString(aName));
// Now, URL Encode the value string....
char *myTStr = nsEscape(utfString, url_Path);

2
mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
View File

@@ -37,7 +37,7 @@
#include "nsIMIMEService.h"
#include "nsMimeTypes.h"
#include "nsNetUtil.h"
#include "nsString2.h"
#include "nsString.h"
#include "nsReadableUtils.h"
#include "plstr.h"
#include "prprf.h"

3
mozilla/string/obsolete/nsString2.h
View File

@@ -64,9 +64,6 @@
class nsISizeOfHandler;
#define nsString2 nsString
#define nsAutoString2 nsAutoString
class NS_COM nsString :
public nsAFlatString,
public nsStr {

3
mozilla/xpcom/string/obsolete/nsString2.h
View File

@@ -64,9 +64,6 @@
class nsISizeOfHandler;
#define nsString2 nsString
#define nsAutoString2 nsAutoString
class NS_COM nsString :
public nsAFlatString,
public nsStr {