From 022ac24279f94bba61fe4486b04a728025c03549 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Fri, 15 Jul 2005 21:41:47 +0000
Subject: [PATCH] More uses of EmptyC?String().  Bug 232691, patch by Charles
 Fenwick <clf03f@garnet.acns.fsu.edu>, r+sr=bzbarsky, a=bsmedberg

---
 camino/src/preferences/PreferenceManager.mm            | 2 +-
 editor/libeditor/html/nsHTMLDataTransfer.cpp           | 2 +-
 extensions/xforms/nsXFormsUtils.cpp                    | 2 +-
 java/webclient/src_moz/NavigationActionEvents.cpp      | 2 +-
 toolkit/components/downloads/src/nsDownloadManager.cpp | 2 +-
 widget/src/cocoa/nsFilePicker.mm                       | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/camino/src/preferences/PreferenceManager.mm b/camino/src/preferences/PreferenceManager.mm
index fc4eacd1bdf..f11840c99b1 100644
--- a/camino/src/preferences/PreferenceManager.mm
+++ b/camino/src/preferences/PreferenceManager.mm
@@ -878,7 +878,7 @@ static void SCProxiesChangedCallback(SCDynamicStoreRef store, CFArrayRef changed
     return nil;
 
   nsCOMPtr<nsILocalFile> profDirFile;
-  rv = NS_NewNativeLocalFile(nsCString(), PR_TRUE, getter_AddRefs(profDirFile));
+  rv = NS_NewNativeLocalFile(EmptyCString(), PR_TRUE, getter_AddRefs(profDirFile));
   if (NS_SUCCEEDED(rv)) {
     // profDirDesc is ASCII so no loss
     rv = profDirFile->SetPersistentDescriptor(NS_LossyConvertUCS2toASCII(profDirDesc));
diff --git a/editor/libeditor/html/nsHTMLDataTransfer.cpp b/editor/libeditor/html/nsHTMLDataTransfer.cpp
index f2cb7ba3e9c..9ab4e373b03 100644
--- a/editor/libeditor/html/nsHTMLDataTransfer.cpp
+++ b/editor/libeditor/html/nsHTMLDataTransfer.cpp
@@ -292,7 +292,7 @@ nsHTMLEditor::InsertHTMLWithContext(const nsAString & aInputString,
   // pasting just the cell text which is what we want anyway. 
   // A paste from an excel cell always starts with a new line, two spaces and then the td tag
   if (StringBeginsWith(aInputString, NS_LITERAL_STRING("\n  <td"))) 
-    contextStr = NS_LITERAL_STRING("");
+    contextStr.Truncate();
 #endif
 
   res = CreateDOMFragmentFromPaste(aInputString, contextStr, aInfoStr, 
diff --git a/extensions/xforms/nsXFormsUtils.cpp b/extensions/xforms/nsXFormsUtils.cpp
index 182c45fe5d9..b3468ba8c26 100644
--- a/extensions/xforms/nsXFormsUtils.cpp
+++ b/extensions/xforms/nsXFormsUtils.cpp
@@ -350,7 +350,7 @@ nsXFormsUtils::GetNodeContext(nsIDOMElement           *aElement,
     NS_ENSURE_STATE(modelInt);
 
     nsCOMPtr<nsIDOMDocument> instanceDoc;
-    modelInt->GetInstanceDocument(NS_LITERAL_STRING(""),
+    modelInt->GetInstanceDocument(EmptyString(),
                                   getter_AddRefs(instanceDoc));
     NS_ENSURE_STATE(instanceDoc);
 
diff --git a/java/webclient/src_moz/NavigationActionEvents.cpp b/java/webclient/src_moz/NavigationActionEvents.cpp
index 4fc1b04e826..cbe49f504e1 100644
--- a/java/webclient/src_moz/NavigationActionEvents.cpp
+++ b/java/webclient/src_moz/NavigationActionEvents.cpp
@@ -166,7 +166,7 @@ wsLoadFromStreamEvent::handleEvent ()
 	
         rv = mNativeBrowserControl->mWindow->LoadStream(mShim, uri, 
 						nsDependentCString(mContentType),
-					        NS_LITERAL_CSTRING(""),
+					        EmptyCString(),
                                                 nsnull);
         // make it so we don't issue multiple LoadStream calls 
         // for this InputStreamShim instance.
diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
index eac700cd3fd..47b076df59c 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
@@ -2142,7 +2142,7 @@ nsDownload::OnStateChange(nsIWebProgress* aWebProgress,
             // click open the download manager and the items they downloaded will have
             // been removed. 
             alerts->ShowAlertNotification(NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, message, !removeWhenDone, 
-                                          NS_LITERAL_STRING(""), mDownloadManager);
+                                          EmptyString(), mDownloadManager);
           }
         }
       }
diff --git a/widget/src/cocoa/nsFilePicker.mm b/widget/src/cocoa/nsFilePicker.mm
index b6989328940..a6d7fb2bdd6 100644
--- a/widget/src/cocoa/nsFilePicker.mm
+++ b/widget/src/cocoa/nsFilePicker.mm
@@ -196,7 +196,7 @@ nsFilePicker::GetLocalFiles(const nsString& inTitle, PRBool inAllowMultiple, nsC
     if (theURL)
     {
       nsCOMPtr<nsILocalFile> localFile;
-      NS_NewLocalFile(nsString(), PR_TRUE, getter_AddRefs(localFile));
+      NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(localFile));
       nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
       if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)theURL)))
         outFiles.AppendObject(localFile);
@@ -250,7 +250,7 @@ nsFilePicker::GetLocalFolder(const nsString& inTitle, nsILocalFile** outFile)
   if (theURL)
   {
     nsCOMPtr<nsILocalFile> localFile;
-    NS_NewLocalFile(nsString(), PR_TRUE, getter_AddRefs(localFile));
+    NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(localFile));
     nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
     if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)theURL)))
     {
@@ -304,7 +304,7 @@ nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultNam
   if (fileURL)
   { 
     nsCOMPtr<nsILocalFile> localFile;
-    NS_NewLocalFile(nsString(), PR_TRUE, getter_AddRefs(localFile));
+    NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(localFile));
     nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
     if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)fileURL)))
     {