From 987b0c8dfc4c936edc413d5e7c8ea289b9f00660 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sat, 22 May 2004 18:49:53 +0000 Subject: [PATCH] Test backout to maybe fix mac orange. Bug 232691 git-svn-id: svn://10.0.0.236/trunk@156774 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/SpecialSystemDirectory.cpp | 2 +- mozilla/xpcom/io/nsAppFileLocationProvider.cpp | 2 +- mozilla/xpcom/io/nsDirectoryService.cpp | 2 +- mozilla/xpcom/reflect/xptinfo/src/xptiManifest.cpp | 2 +- mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/xpcom/io/SpecialSystemDirectory.cpp b/mozilla/xpcom/io/SpecialSystemDirectory.cpp index 8d057fa241a..d211eb3f8e9 100644 --- a/mozilla/xpcom/io/SpecialSystemDirectory.cpp +++ b/mozilla/xpcom/io/SpecialSystemDirectory.cpp @@ -756,7 +756,7 @@ GetOSXFolderType(short aDomain, OSType aFolderType, nsILocalFile **localFile) err = ::FSFindFolder(aDomain, aFolderType, kCreateFolder, &fsRef); if (err == noErr) { - NS_NewLocalFile(EmptyString(), PR_TRUE, localFile); + NS_NewLocalFile(nsString(), PR_TRUE, localFile); nsCOMPtr localMacFile(do_QueryInterface(*localFile)); if (localMacFile) rv = localMacFile->InitWithFSRef(&fsRef); diff --git a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp index 1fee21c96ba..e5bd9801680 100755 --- a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp +++ b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp @@ -353,7 +353,7 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi FSRef fsRef; OSErr err = ::FSFindFolder(kUserDomain, kDomainLibraryFolderType, kCreateFolder, &fsRef); if (err) return NS_ERROR_FAILURE; - NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(localDir)); + NS_NewLocalFile(nsString(), PR_TRUE, getter_AddRefs(localDir)); if (!localDir) return NS_ERROR_FAILURE; nsCOMPtr localDirMac(do_QueryInterface(localDir)); rv = localDirMac->InitWithFSRef(&fsRef); diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp index ef0705ebf38..ba106da4bbf 100644 --- a/mozilla/xpcom/io/nsDirectoryService.cpp +++ b/mozilla/xpcom/io/nsDirectoryService.cpp @@ -878,7 +878,7 @@ nsDirectoryService::GetFile(const char *prop, PRBool *persistent, nsIFile **_ret } else if (inAtom == nsDirectoryService::sDefaultDownloadDirectory) { - NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(localFile)); + NS_NewLocalFile(nsString(), PR_TRUE, getter_AddRefs(localFile)); nsCOMPtr localMacFile(do_QueryInterface(localFile)); if (localMacFile) diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiManifest.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiManifest.cpp index 50bbac89a83..71d9c2b420e 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiManifest.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiManifest.cpp @@ -76,7 +76,7 @@ CurrentAppDirMatchesPersistentDescriptor(xptiInterfaceInfoManager* aMgr, aMgr->GetApplicationDir(getter_AddRefs(appDir)); nsCOMPtr descDir; - nsresult rv = NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); + nsresult rv = NS_NewNativeLocalFile(nsCString(), PR_FALSE, getter_AddRefs(descDir)); if(NS_FAILED(rv)) return PR_FALSE; diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp index b9602726784..e9d13ba90cf 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp @@ -417,7 +417,7 @@ PRBool xptiWorkingSet::DirectoryAtMatchesPersistentDescriptor(PRUint32 i, return PR_FALSE; nsCOMPtr descDir; - nsresult rv = NS_NewNativeLocalFile(EmptyCString(), PR_FALSE, getter_AddRefs(descDir)); + nsresult rv = NS_NewNativeLocalFile(nsCString(), PR_FALSE, getter_AddRefs(descDir)); if(NS_FAILED(rv)) return PR_FALSE;