mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

update to sync with nsString2

This commit is contained in:
rickg%netscape.com 1999-04-22 06:06:17 +00:00
Родитель 3cdb056cd6
Коммит ad10a964e8
13 изменённых файлов: 40 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
content/xul/content/src/nsXULAttributes.cpp
Просмотреть файл

@ -130,7 +130,7 @@ nsXULAttribute::GetNodeName(nsString& aNodeName)
NS_IMETHODIMP
nsXULAttribute::GetNodeValue(nsString& aNodeValue)
{
aNodeValue.SetString(mValue);
aNodeValue=mValue;
return NS_OK;
}
NS_IMETHODIMP
@ -262,7 +262,7 @@ nsXULAttribute::GetSpecified(PRBool* aSpecified)
NS_IMETHODIMP
nsXULAttribute::GetValue(nsString& aValue)
{
aValue.SetString(mValue);
aValue=mValue;
return NS_OK;
}
@ -621,7 +621,7 @@ static const PRUnichar kNullCh = PRUnichar('\0');
nsAutoString classStr(aClassString); // copy to work buffer
classStr.Append(kNullCh); // put an extra null at the end
PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr;
PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
PRUnichar* end = start;
while (kNullCh != *start) {

2
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -2391,7 +2391,7 @@ RDFElementImpl::GetResource(nsIRDFResource** aResource)
NS_RELEASE(docURL);
}
}
return gRDFService->GetUnicodeResource(uri, aResource);
return gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
}
*aResource = nsnull;

4
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -2515,7 +2515,7 @@ XULDocumentImpl::GetElementById(const nsString& aId, nsIDOMElement** aReturn)
rdf_PossiblyMakeAbsolute(documentURL, uri);
nsCOMPtr<nsIRDFResource> resource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(uri, getter_AddRefs(resource)))) {
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), getter_AddRefs(resource)))) {
NS_ERROR("unable to get resource");
return rv;
}
@ -3598,6 +3598,6 @@ XULDocumentImpl::MakeProperty(PRInt32 aNameSpaceID, nsIAtom* aTag, nsIRDFResourc
uri.Append(aTag->GetUnicode());
rv = gRDFService->GetUnicodeResource(uri, aResult);
rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResult);
return rv;
}

10
content/xul/templates/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -884,7 +884,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// element; e.g., re-rooting an item in the tree.
nsCOMPtr<nsIRDFResource> newResource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue, getter_AddRefs(newResource)))) {
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue.GetUnicode(), getter_AddRefs(newResource)))) {
NS_ERROR("unable to get new resource");
return rv;
}
@ -972,7 +972,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -984,7 +984,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// Assert the new value
{
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1074,7 +1074,7 @@ RDFGenericBuilderImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1486,7 +1486,7 @@ RDFGenericBuilderImpl::GetResource(PRInt32 aNameSpaceID,
uri.Append(tag);
nsresult rv = gRDFService->GetUnicodeResource(uri, aResource);
nsresult rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
return rv;
}

2
rdf/content/src/nsRDFContentUtils.cpp
Просмотреть файл

@ -213,7 +213,7 @@ nsRDFContentUtils::GetElementResource(nsIContent* aElement, nsIRDFResource** aRe
NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = rdf->GetUnicodeResource(uri, aResult);
rv = rdf->GetUnicodeResource(uri.GetUnicode(), aResult);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create resource");
if (NS_FAILED(rv)) return rv;

2
rdf/content/src/nsRDFElement.cpp
Просмотреть файл

@ -2391,7 +2391,7 @@ RDFElementImpl::GetResource(nsIRDFResource** aResource)
NS_RELEASE(docURL);
}
}
return gRDFService->GetUnicodeResource(uri, aResource);
return gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
}
*aResource = nsnull;

10
rdf/content/src/nsRDFGenericBuilder.cpp
Просмотреть файл

@ -884,7 +884,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// element; e.g., re-rooting an item in the tree.
nsCOMPtr<nsIRDFResource> newResource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue, getter_AddRefs(newResource)))) {
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue.GetUnicode(), getter_AddRefs(newResource)))) {
NS_ERROR("unable to get new resource");
return rv;
}
@ -972,7 +972,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -984,7 +984,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// Assert the new value
{
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1074,7 +1074,7 @@ RDFGenericBuilderImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1486,7 +1486,7 @@ RDFGenericBuilderImpl::GetResource(PRInt32 aNameSpaceID,
uri.Append(tag);
nsresult rv = gRDFService->GetUnicodeResource(uri, aResource);
nsresult rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
return rv;
}

12
rdf/content/src/nsRDFTreeBuilder.cpp
Просмотреть файл

@ -782,7 +782,7 @@ RDFTreeBuilderImpl::OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild)
// RDF. So let's assert it into the graph. First we
// need the property resource.
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(propertyStr, getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(propertyStr.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
// And now we need the child's resource.
@ -928,7 +928,7 @@ RDFTreeBuilderImpl::OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild)
// unassert it from the graph. First we need the
// property resource.
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(propertyStr, getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(propertyStr.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
// And now we need the child's resource.
@ -1331,7 +1331,7 @@ RDFTreeBuilderImpl::SetWidgetAttribute(nsIContent* aTreeItemElement,
NS_ASSERTION(text != nsnull, "unable to find text child");
if (text)
text->SetText(value, value.Length(), PR_TRUE);
text->SetText(value.GetUnicode(), value.Length(), PR_TRUE);
}
@ -1369,7 +1369,7 @@ RDFTreeBuilderImpl::UnsetWidgetAttribute(nsIContent* aTreeItemElement,
NS_ASSERTION(text != nsnull, "unable to find text child");
if (text)
text->SetText(nsAutoString(), 0, PR_TRUE);
text->SetText(nsAutoString().GetUnicode(), 0, PR_TRUE);
}
// no matter what, it's also been created as an attribute.
@ -1622,7 +1622,7 @@ RDFTreeBuilderImpl::CreateTreeItemCells(nsIContent* aTreeItemElement)
// First construct a property resource from the URI...
nsCOMPtr<nsIRDFResource> property;
if (NS_FAILED(gRDFService->GetUnicodeResource(uri, getter_AddRefs(property)))) {
if (NS_FAILED(gRDFService->GetUnicodeResource(uri.GetUnicode(), getter_AddRefs(property)))) {
NS_ERROR("unable to construct resource for xul:treecell");
return rv; // XXX fatal
}
@ -1720,7 +1720,7 @@ RDFTreeBuilderImpl::GetColumnForProperty(nsIContent* aTreeElement,
}
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
if (0 == nsCRT::strcmp(uri, propertyURI)) {
if (0 == nsCRT::strcmp(uri.GetUnicode(), propertyURI)) {
*aIndex = index;
return NS_OK;
}

10
rdf/content/src/nsRDFXULBuilder.cpp
Просмотреть файл

@ -1296,7 +1296,7 @@ RDFXULBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& aName
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(nameSpaceID, nameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1308,7 +1308,7 @@ RDFXULBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& aName
// Assert the new value
{
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1368,7 +1368,7 @@ RDFXULBuilderImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aN
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(nameSpaceID, nameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -2337,7 +2337,7 @@ RDFXULBuilderImpl::GetGraphNodeForXULElement(nsIDOMNode* aNode, nsIRDFNode** aRe
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFLiteral> literal;
rv = gRDFService->GetLiteral(data, getter_AddRefs(literal));
rv = gRDFService->GetLiteral(data.GetUnicode(), getter_AddRefs(literal));
if (NS_FAILED(rv)) return rv;
*aResult = literal;
@ -2425,7 +2425,7 @@ RDFXULBuilderImpl::GetResource(PRInt32 aNameSpaceID,
uri.Append(tag);
nsresult rv = gRDFService->GetUnicodeResource(uri, aResource);
nsresult rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
return rv;
}

6
rdf/content/src/nsXULAttributes.cpp
Просмотреть файл

@ -130,7 +130,7 @@ nsXULAttribute::GetNodeName(nsString& aNodeName)
NS_IMETHODIMP
nsXULAttribute::GetNodeValue(nsString& aNodeValue)
{
aNodeValue.SetString(mValue);
aNodeValue=mValue;
return NS_OK;
}
NS_IMETHODIMP
@ -262,7 +262,7 @@ nsXULAttribute::GetSpecified(PRBool* aSpecified)
NS_IMETHODIMP
nsXULAttribute::GetValue(nsString& aValue)
{
aValue.SetString(mValue);
aValue=mValue;
return NS_OK;
}
@ -621,7 +621,7 @@ static const PRUnichar kNullCh = PRUnichar('\0');
nsAutoString classStr(aClassString); // copy to work buffer
classStr.Append(kNullCh); // put an extra null at the end
PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr;
PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
PRUnichar* end = start;
while (kNullCh != *start) {

4
rdf/content/src/nsXULDocument.cpp
Просмотреть файл

@ -2515,7 +2515,7 @@ XULDocumentImpl::GetElementById(const nsString& aId, nsIDOMElement** aReturn)
rdf_PossiblyMakeAbsolute(documentURL, uri);
nsCOMPtr<nsIRDFResource> resource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(uri, getter_AddRefs(resource)))) {
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), getter_AddRefs(resource)))) {
NS_ERROR("unable to get resource");
return rv;
}
@ -3598,6 +3598,6 @@ XULDocumentImpl::MakeProperty(PRInt32 aNameSpaceID, nsIAtom* aTag, nsIRDFResourc
uri.Append(aTag->GetUnicode());
rv = gRDFService->GetUnicodeResource(uri, aResult);
rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResult);
return rv;
}

2
rdf/content/src/nsXULElement.cpp
Просмотреть файл

@ -2391,7 +2391,7 @@ RDFElementImpl::GetResource(nsIRDFResource** aResource)
NS_RELEASE(docURL);
}
}
return gRDFService->GetUnicodeResource(uri, aResource);
return gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
}
*aResource = nsnull;

10
rdf/content/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -884,7 +884,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// element; e.g., re-rooting an item in the tree.
nsCOMPtr<nsIRDFResource> newResource;
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue, getter_AddRefs(newResource)))) {
if (NS_FAILED(rv = gRDFService->GetUnicodeResource(aValue.GetUnicode(), getter_AddRefs(newResource)))) {
NS_ERROR("unable to get new resource");
return rv;
}
@ -972,7 +972,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -984,7 +984,7 @@ RDFGenericBuilderImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& a
// Assert the new value
{
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(aValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1074,7 +1074,7 @@ RDFGenericBuilderImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString
nsAutoString oldValue;
if (NS_CONTENT_ATTR_HAS_VALUE == element->GetAttribute(attrNameSpaceID, attrNameAtom, oldValue)) {
nsCOMPtr<nsIRDFLiteral> value;
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue, getter_AddRefs(value)))) {
if (NS_FAILED(rv = gRDFService->GetLiteral(oldValue.GetUnicode(), getter_AddRefs(value)))) {
NS_ERROR("unable to construct literal");
return rv;
}
@ -1486,7 +1486,7 @@ RDFGenericBuilderImpl::GetResource(PRInt32 aNameSpaceID,
uri.Append(tag);
nsresult rv = gRDFService->GetUnicodeResource(uri, aResource);
nsresult rv = gRDFService->GetUnicodeResource(uri.GetUnicode(), aResource);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
return rv;
}