From b11557a256cd84da2784d8503b099e965969f9d9 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Wed, 13 Sep 2000 04:47:36 +0000 Subject: [PATCH] if you want a pointer to the characters, your going to have to |.get()| it git-svn-id: svn://10.0.0.236/trunk@78967 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 2 +- mozilla/content/base/src/nsNodeInfo.cpp | 3 ++- mozilla/content/html/content/src/nsHTMLAnchorElement.cpp | 2 +- mozilla/content/xbl/src/nsBindingManager.cpp | 2 +- mozilla/content/xbl/src/nsXBLService.cpp | 2 +- mozilla/layout/base/nsPresState.cpp | 2 +- mozilla/layout/base/src/nsDocument.cpp | 2 +- mozilla/layout/base/src/nsNodeInfo.cpp | 3 ++- mozilla/layout/base/src/nsPresState.cpp | 2 +- mozilla/layout/base/src/nsXIFConverter.cpp | 4 ++-- mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp | 2 +- mozilla/layout/xbl/src/nsBindingManager.cpp | 2 +- mozilla/layout/xbl/src/nsXBLService.cpp | 2 +- 13 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 07af13eba45..1f40124d73d 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -1083,7 +1083,7 @@ NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAReadableString& aChar for (PRInt32 i = 0; i < n; i++) { nsIObserver* observer = (nsIObserver*) mCharSetObservers.ElementAt(i); observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset").get(), - nsPromiseFlatString(aCharSetID)); + nsPromiseFlatString(aCharSetID).get()); } } return NS_OK; diff --git a/mozilla/content/base/src/nsNodeInfo.cpp b/mozilla/content/base/src/nsNodeInfo.cpp index f607b86310d..bae5d9c904d 100644 --- a/mozilla/content/base/src/nsNodeInfo.cpp +++ b/mozilla/content/base/src/nsNodeInfo.cpp @@ -347,7 +347,8 @@ nsNodeInfo::NamespaceEquals(const nsAReadableString& aNamespaceURI) NS_IMETHODIMP_(PRBool) nsNodeInfo::QualifiedNameEquals(const nsAReadableString& aQualifiedName) { - const PRUnichar *qname = nsPromiseFlatString(aQualifiedName); + nsPromiseFlatString flatName(aQualifiedName); + const PRUnichar *qname = flatName.get(); PRUint32 i = 0; if (mInner.mPrefix) { diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp index ead487d64b5..cb2e7666eeb 100644 --- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp @@ -345,7 +345,7 @@ nsHTMLAnchorElement::StringToAttribute(nsIAtom* aAttribute, } } else if (aAttribute == nsHTMLAtoms::suppress) { - if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true").get())) { + if (nsCRT::strcasecmp(nsPromiseFlatString(aValue).get(), NS_LITERAL_STRING("true").get())) { aResult.SetEmptyValue(); // XXX? shouldn't just leave "true" return NS_CONTENT_ATTR_HAS_VALUE; } diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index 8ee0b1cd4a3..1258533d204 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -419,7 +419,7 @@ nsBindingManager::LoadBindingDocument(nsIDocument* aBoundDoc, const nsAReadableS return rv; // Load the binding doc. - nsCString url; url.AssignWithConversion((const PRUnichar*)nsPromiseFlatString(aURL)); + nsCString url; url.AssignWithConversion((const PRUnichar*)nsPromiseFlatString(aURL).get()); nsCOMPtr info; xblService->LoadBindingDocumentInfo(nsnull, aBoundDoc, url, nsCAutoString(), PR_TRUE, getter_AddRefs(info)); if (!info) diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index ac8eb43da9d..12495e46289 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -618,7 +618,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, const nsAReadableString& aURL, // See if the URIs match. nsCAutoString uri; styleBinding->GetBindingURI(uri); - if (uri.EqualsWithConversion((const PRUnichar *) nsPromiseFlatString(aURL))) + if (uri.EqualsWithConversion((const PRUnichar *) nsPromiseFlatString(aURL).get())) return NS_OK; else { FlushStyleBindings(aContent); diff --git a/mozilla/layout/base/nsPresState.cpp b/mozilla/layout/base/nsPresState.cpp index 23ae965ec56..6d876e03dd1 100644 --- a/mozilla/layout/base/nsPresState.cpp +++ b/mozilla/layout/base/nsPresState.cpp @@ -91,7 +91,7 @@ nsPresState::SetStateProperty(const nsAReadableString& aName, const nsAReadableS nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_WSTRING_PROGID, nsnull, NS_GET_IID(nsISupportsWString), getter_AddRefs(supportsStr)); - supportsStr->SetData(nsPromiseFlatString(aValue)); + supportsStr->SetData(nsPromiseFlatString(aValue).get()); mPropertyTable->Put(&key, supportsStr); return NS_OK; diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 07af13eba45..1f40124d73d 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -1083,7 +1083,7 @@ NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAReadableString& aChar for (PRInt32 i = 0; i < n; i++) { nsIObserver* observer = (nsIObserver*) mCharSetObservers.ElementAt(i); observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset").get(), - nsPromiseFlatString(aCharSetID)); + nsPromiseFlatString(aCharSetID).get()); } } return NS_OK; diff --git a/mozilla/layout/base/src/nsNodeInfo.cpp b/mozilla/layout/base/src/nsNodeInfo.cpp index f607b86310d..bae5d9c904d 100644 --- a/mozilla/layout/base/src/nsNodeInfo.cpp +++ b/mozilla/layout/base/src/nsNodeInfo.cpp @@ -347,7 +347,8 @@ nsNodeInfo::NamespaceEquals(const nsAReadableString& aNamespaceURI) NS_IMETHODIMP_(PRBool) nsNodeInfo::QualifiedNameEquals(const nsAReadableString& aQualifiedName) { - const PRUnichar *qname = nsPromiseFlatString(aQualifiedName); + nsPromiseFlatString flatName(aQualifiedName); + const PRUnichar *qname = flatName.get(); PRUint32 i = 0; if (mInner.mPrefix) { diff --git a/mozilla/layout/base/src/nsPresState.cpp b/mozilla/layout/base/src/nsPresState.cpp index 23ae965ec56..6d876e03dd1 100644 --- a/mozilla/layout/base/src/nsPresState.cpp +++ b/mozilla/layout/base/src/nsPresState.cpp @@ -91,7 +91,7 @@ nsPresState::SetStateProperty(const nsAReadableString& aName, const nsAReadableS nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_WSTRING_PROGID, nsnull, NS_GET_IID(nsISupportsWString), getter_AddRefs(supportsStr)); - supportsStr->SetData(nsPromiseFlatString(aValue)); + supportsStr->SetData(nsPromiseFlatString(aValue).get()); mPropertyTable->Put(&key, supportsStr); return NS_OK; diff --git a/mozilla/layout/base/src/nsXIFConverter.cpp b/mozilla/layout/base/src/nsXIFConverter.cpp index 33b9194a842..99c9f3574f0 100644 --- a/mozilla/layout/base/src/nsXIFConverter.cpp +++ b/mozilla/layout/base/src/nsXIFConverter.cpp @@ -539,7 +539,7 @@ nsXIFConverter::BeginLeaf(const nsAReadableString& aTag) // XXX: Complete hack to prevent the style leaf // From being created until the style sheet work // is redone. -- gpk 1/27/99 - if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE").get()) == 0) + if (nsCRT::strcasecmp(nsPromiseFlatString(aTag).get(), NS_LITERAL_STRING("STYLE").get()) == 0) return NS_OK; @@ -556,7 +556,7 @@ nsXIFConverter::EndLeaf(const nsAReadableString& aTag) // XXX: Complete hack to prevent the style leaf // From being created until the style sheet work // is redone. -- gpk 1/27/99 - if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE").get()) == 0) + if (nsCRT::strcasecmp(nsPromiseFlatString(aTag).get(), NS_LITERAL_STRING("STYLE").get()) == 0) return NS_OK; diff --git a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp index ead487d64b5..cb2e7666eeb 100644 --- a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp @@ -345,7 +345,7 @@ nsHTMLAnchorElement::StringToAttribute(nsIAtom* aAttribute, } } else if (aAttribute == nsHTMLAtoms::suppress) { - if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true").get())) { + if (nsCRT::strcasecmp(nsPromiseFlatString(aValue).get(), NS_LITERAL_STRING("true").get())) { aResult.SetEmptyValue(); // XXX? shouldn't just leave "true" return NS_CONTENT_ATTR_HAS_VALUE; } diff --git a/mozilla/layout/xbl/src/nsBindingManager.cpp b/mozilla/layout/xbl/src/nsBindingManager.cpp index 8ee0b1cd4a3..1258533d204 100644 --- a/mozilla/layout/xbl/src/nsBindingManager.cpp +++ b/mozilla/layout/xbl/src/nsBindingManager.cpp @@ -419,7 +419,7 @@ nsBindingManager::LoadBindingDocument(nsIDocument* aBoundDoc, const nsAReadableS return rv; // Load the binding doc. - nsCString url; url.AssignWithConversion((const PRUnichar*)nsPromiseFlatString(aURL)); + nsCString url; url.AssignWithConversion((const PRUnichar*)nsPromiseFlatString(aURL).get()); nsCOMPtr info; xblService->LoadBindingDocumentInfo(nsnull, aBoundDoc, url, nsCAutoString(), PR_TRUE, getter_AddRefs(info)); if (!info) diff --git a/mozilla/layout/xbl/src/nsXBLService.cpp b/mozilla/layout/xbl/src/nsXBLService.cpp index ac8eb43da9d..12495e46289 100644 --- a/mozilla/layout/xbl/src/nsXBLService.cpp +++ b/mozilla/layout/xbl/src/nsXBLService.cpp @@ -618,7 +618,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, const nsAReadableString& aURL, // See if the URIs match. nsCAutoString uri; styleBinding->GetBindingURI(uri); - if (uri.EqualsWithConversion((const PRUnichar *) nsPromiseFlatString(aURL))) + if (uri.EqualsWithConversion((const PRUnichar *) nsPromiseFlatString(aURL).get())) return NS_OK; else { FlushStyleBindings(aContent);