Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up the last couple of fancy C++ casts. Implemented nsRDFElement::IndexOf().

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@15761 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1998-12-04 03:59:54 +00:00
parent ab5a31d3a8
commit 09b4935ee9
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/rdf/src/nsMemoryDataSource.cpp
View File

@@ -186,8 +186,7 @@ public:
virtual PRBool Equals(const nsHashKey* aKey) const {
NodeHashKey* that;
//if (! (that = dynamic_cast<NodeHashKey*>(aKey)))
if (! (that = (NodeHashKey*)(aKey)))
if (! (that = NS_DYNAMIC_CAST(NodeHashKey*, aKey)))
return PR_FALSE;
return (that->mNode == this->mNode);

21
mozilla/rdf/src/nsRDFElement.cpp
View File

@@ -756,7 +756,7 @@ nsRDFElement::ChildCount(PRInt32& aResult) const
{
nsresult rv;
if (!mChildren) {
nsRDFElement* unconstThis = const_cast<nsRDFElement*>(this);
nsRDFElement* unconstThis = NS_CONST_CAST(nsRDFElement*, this);
if (NS_FAILED(rv = unconstThis->GenerateChildren()))
return rv;
}
@@ -770,7 +770,7 @@ nsRDFElement::ChildAt(PRInt32 aIndex, nsIContent*& aResult) const
{
nsresult rv;
if (!mChildren) {
nsRDFElement* unconstThis = const_cast<nsRDFElement*>(this);
nsRDFElement* unconstThis = NS_CONST_CAST(nsRDFElement*, this);
if (NS_FAILED(rv = unconstThis->GenerateChildren()))
return rv;
}
@@ -787,8 +787,15 @@ nsRDFElement::ChildAt(PRInt32 aIndex, nsIContent*& aResult) const
NS_IMETHODIMP
nsRDFElement::IndexOf(nsIContent* aPossibleChild, PRInt32& aResult) const
{
PR_ASSERT(0);
return NS_ERROR_NOT_IMPLEMENTED;
nsresult rv;
if (! mChildren) {
nsRDFElement* unconstThis = NS_CONST_CAST(nsRDFElement*, this);
if (NS_FAILED(rv = unconstThis->GenerateChildren()))
return rv;
}
aResult = mChildren->IndexOf(aPossibleChild);
return NS_OK;
}
NS_IMETHODIMP
@@ -1368,7 +1375,7 @@ nsRDFElement::CreateChild(nsIRDFNode* value,
child->mResource = value;
NS_ADDREF(child->mResource);
child->mParent = NS_STATIC_CAST(nsIContent*, const_cast<nsRDFElement*>(this));
child->mParent = NS_STATIC_CAST(nsIContent*, NS_CONST_CAST(nsRDFElement*, this));
NS_ADDREF(child->mParent);
result = child;
@@ -1400,7 +1407,7 @@ nsRDFElement::CreateChild(nsIRDFNode* property,
NS_ADDREF(child);
child->mDocument = mDocument;
child->mResource = property;
child->mParent = NS_STATIC_CAST(nsIContent*, const_cast<nsRDFElement*>(this));
child->mParent = NS_STATIC_CAST(nsIContent*, NS_CONST_CAST(nsRDFElement*, this));
NS_ADDREF(child->mDocument);
NS_ADDREF(child->mResource);
@@ -1453,7 +1460,7 @@ nsRDFElement::CreateChild(nsIRDFNode* property,
grandchild->mDocument = mDocument;
grandchild->mResource = value;
grandchild->mParent = NS_STATIC_CAST(nsIContent*, const_cast<nsRDFElement*>(child));
grandchild->mParent = NS_STATIC_CAST(nsIContent*, NS_CONST_CAST(nsRDFElement*, child));
NS_ADDREF(grandchild->mDocument);
NS_ADDREF(grandchild->mResource);

3
mozilla/rdf/src/nsRDFResourceManager.cpp
View File

@@ -106,8 +106,7 @@ public:
virtual PRBool Equals(const nsHashKey* aKey) const {
ResourceHashKey* that;
//if (! (that = dynamic_cast<ResourceHashKey*>(aKey)))
if (! (that = (ResourceHashKey*)(aKey)))
if (! (that = NS_DYNAMIC_CAST(ResourceHashKey*, aKey)))
return PR_FALSE;
return (that->mResource == this->mResource);