From b7b3395bad34e1a77bf2f06adc92f766284e6771 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org>
Date: Wed, 23 May 2001 01:21:04 +0000
Subject: [PATCH] bug #75220: fixing stragglers, people who checked in uses of
 |nsLiteralC?String| after it had already been removed from the build

---
 content/html/document/src/nsHTMLContentSink.cpp | 2 +-
 netwerk/cache/src/nsDiskCacheEntry.cpp          | 4 ++--
 profile/src/nsProfile.cpp                       | 2 +-
 xpinstall/src/nsSoftwareUpdate.cpp              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
index 7372ffb6b099..2409c71ddcbd 100644
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -3494,7 +3494,7 @@ HTMLContentSink::StartLayout()
 
     rv = mDocumentURI->GetSpec(getter_Copies(ref));
 
-    nsLiteralCString refstr(ref);
+    nsDependentCString refstr(ref);
 
     nsReadingIterator<char> start, end;
 
diff --git a/netwerk/cache/src/nsDiskCacheEntry.cpp b/netwerk/cache/src/nsDiskCacheEntry.cpp
index 22a754888f5d..012378fc18d2 100644
--- a/netwerk/cache/src/nsDiskCacheEntry.cpp
+++ b/netwerk/cache/src/nsDiskCacheEntry.cpp
@@ -150,7 +150,7 @@ NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo);
 NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(char ** clientID)
 {
     NS_ENSURE_ARG_POINTER(clientID);
-    return ClientIDFromCacheKey(nsLiteralCString(mDiskEntry->mKeyStart), clientID);
+    return ClientIDFromCacheKey(nsDependentCString(mDiskEntry->mKeyStart), clientID);
 }
 
 extern const char DISK_CACHE_DEVICE_ID[];
@@ -165,7 +165,7 @@ NS_IMETHODIMP nsDiskCacheEntryInfo::GetDeviceID(char ** deviceID)
 NS_IMETHODIMP nsDiskCacheEntryInfo::GetKey(char ** clientKey)
 {
     NS_ENSURE_ARG_POINTER(clientKey);
-    return ClientKeyFromCacheKey(nsLiteralCString(mDiskEntry->mKeyStart), clientKey);
+    return ClientKeyFromCacheKey(nsDependentCString(mDiskEntry->mKeyStart), clientKey);
 }
 
 NS_IMETHODIMP nsDiskCacheEntryInfo::GetFetchCount(PRInt32 *aFetchCount)
diff --git a/profile/src/nsProfile.cpp b/profile/src/nsProfile.cpp
index b06e7993ab7f..d96f460b6407 100644
--- a/profile/src/nsProfile.cpp
+++ b/profile/src/nsProfile.cpp
@@ -1197,7 +1197,7 @@ nsresult nsProfile::ShouldDeleteProfileParentDir(nsIFile *profileDir, PRBool *is
     if (NS_FAILED(rv)) return rv;
 
     PRBool endsWithSalt = PR_FALSE;    
-    nsLiteralCString leafNameString(leafName.get());
+    nsDependentCString leafNameString(leafName.get());
     if (leafNameString.Length() >= kSaltExtensionCString.Length())
     {
         nsReadingIterator<char> stringEnd;
diff --git a/xpinstall/src/nsSoftwareUpdate.cpp b/xpinstall/src/nsSoftwareUpdate.cpp
index 2f10afb990b7..7a4b5a058946 100644
--- a/xpinstall/src/nsSoftwareUpdate.cpp
+++ b/xpinstall/src/nsSoftwareUpdate.cpp
@@ -219,7 +219,7 @@ NS_IMETHODIMP nsSoftwareUpdate::Observe(nsISupports *aSubject,
                                         const PRUnichar *aTopic, 
                                         const PRUnichar *aData)
 {
-    nsLiteralString topicString(aTopic);
+    nsDependentString topicString(aTopic);
     if (topicString.Equals(NS_LITERAL_STRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID)))
       Shutdown();