Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 06:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to sync with nsString2

Browse Source
This commit is contained in:
rickg%netscape.com 1999-04-22 05:57:36 +00:00
parent 7a2c297f6a
commit a4545edb43
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rdf/base/src/nsRDFContentSink.cpp
View File

@ -818,7 +818,7 @@ RDFContentSinkImpl::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
value.Trim(" \t\n\r");
nsIRDFLiteral* literal;
if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(value, &literal))) {
if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(value.GetUnicode(), &literal))) {
rv = rdf_ContainerAppendElement(mDataSource,
GetContextElement(1),
literal);
@ -832,7 +832,7 @@ RDFContentSinkImpl::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
value.Trim(" \t\n\r");
nsCOMPtr<nsIRDFLiteral> target;
rv = gRDFService->GetLiteral(value, getter_AddRefs(target));
rv = gRDFService->GetLiteral(value.GetUnicode(), getter_AddRefs(target));
if (NS_FAILED(rv)) return rv;
rv = mDataSource->Assert(GetContextElement(1), GetContextElement(0), target, PR_TRUE);
@ -985,7 +985,7 @@ RDFContentSinkImpl::GetIdAboutAttribute(const nsIParserNode& aNode,
nsAutoString uri = aNode.GetValueAt(i);
nsRDFParserUtils::StripAndConvert(uri);
return gRDFService->GetUnicodeResource(uri, aResource);
return gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
}
if (attr.get() == kIdAtom) {
@ -1000,7 +1000,7 @@ RDFContentSinkImpl::GetIdAboutAttribute(const nsIParserNode& aNode,
rdf_PossiblyMakeAbsolute(docURI, tag);
return gRDFService->GetUnicodeResource(tag, aResource);
return gRDFService->GetUnicodeResource(tag.GetUnicode(), aResource);
}
if (attr.get() == kAboutEachAtom) {
@ -1051,7 +1051,7 @@ RDFContentSinkImpl::GetResourceAttribute(const nsIParserNode& aNode,
mDocumentURL->GetSpec(&documentURL);
rdf_PossiblyMakeAbsolute(documentURL, uri);
return gRDFService->GetUnicodeResource(uri, aResource);
return gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
}
}
return NS_ERROR_FAILURE;
@ -1095,11 +1095,11 @@ RDFContentSinkImpl::AddProperties(const nsIParserNode& aNode,
nsresult rv;
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(k, getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(k.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFLiteral> target;
rv = gRDFService->GetLiteral(v, getter_AddRefs(target));
rv = gRDFService->GetLiteral(v.GetUnicode(), getter_AddRefs(target));
if (NS_FAILED(rv)) return rv;
mDataSource->Assert(aSubject, property, target, PR_TRUE);
@ -1216,7 +1216,7 @@ RDFContentSinkImpl::OpenObject(const nsIParserNode& aNode)
typeStr.Append(tag->GetUnicode());
nsCOMPtr<nsIRDFResource> type;
rv = gRDFService->GetUnicodeResource(typeStr, getter_AddRefs(type));
rv = gRDFService->GetUnicodeResource(typeStr.GetUnicode(), getter_AddRefs(type));
if (NS_FAILED(rv)) return rv;
rv = mDataSource->Assert(rdfResource, kRDF_type, type, PR_TRUE);
@ -1258,7 +1258,7 @@ RDFContentSinkImpl::OpenProperty(const nsIParserNode& aNode)
// name. We can do this 'cause we don't need it anymore...
ns.Append(tag->GetUnicode());
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(ns, getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(ns.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFResource> target;

10
rdf/base/src/rdfutil.cpp
View File

@ -267,7 +267,7 @@ static PRUint32 gCounter = 0;
s.Append(++gCounter, 10);
nsIRDFResource* resource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(s, &resource)))
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(s.GetUnicode(), &resource)))
return rv;
// XXX an ugly but effective way to make sure that this
@ -380,7 +380,7 @@ rdf_MakeContainer(nsIRDFDataSource* aDataSource, nsIRDFResource* aContainer, nsI
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFLiteral> nextVal;
rv = gRDFService->GetLiteral(nsAutoString("1"), getter_AddRefs(nextVal));
rv = gRDFService->GetLiteral(nsAutoString("1").GetUnicode(), getter_AddRefs(nextVal));
if (NS_FAILED(rv)) return rv;
rv = aDataSource->Assert(aContainer, kRDF_nextVal, nextVal, PR_TRUE);
@ -448,7 +448,7 @@ rdf_ContainerSetNextValue(nsIRDFDataSource* aDataSource,
s.Append(aIndex, 10);
nsCOMPtr<nsIRDFLiteral> nextVal;
if (NS_FAILED(rv = gRDFService->GetLiteral(s, getter_AddRefs(nextVal)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(s.GetUnicode(), getter_AddRefs(nextVal)))) {
NS_ERROR("unable to get nextVal literal");
return rv;
}
@ -512,7 +512,7 @@ rdf_ContainerGetNextValue(nsIRDFDataSource* aDataSource,
nextValStr.Append("_");
nextValStr.Append(nextVal, 10);
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(nextValStr, aResult)))
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(nextValStr.GetUnicode(), aResult)))
goto done;
// Now increment the RDF:nextVal property.
@ -525,7 +525,7 @@ rdf_ContainerGetNextValue(nsIRDFDataSource* aDataSource,
nextValStr.Truncate();
nextValStr.Append(nextVal, 10);
if (NS_FAILED(rv = gRDFService->GetLiteral(nextValStr, &nextValLiteral)))
if (NS_FAILED(rv = gRDFService->GetLiteral(nextValStr.GetUnicode(), &nextValLiteral)))
goto done;
if (NS_FAILED(rv = aDataSource->Assert(aContainer, kRDF_nextVal, nextValLiteral, PR_TRUE)))