From d4e5d4a14b30cbaf8d11548c059258d997443417 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Thu, 17 Jun 1999 06:28:23 +0000 Subject: [PATCH] FIndwidgetrootelement is an obsolete function. Removing it. git-svn-id: svn://10.0.0.236/branches/TREEWIDGET_19990616_BRANCH@35780 18797224-902f-48f8-a5cc-f745e15eee43 --- .../templates/src/nsXULTemplateBuilder.cpp | 41 ------------------- .../rdf/content/src/nsRDFGenericBuilder.cpp | 41 ------------------- mozilla/rdf/content/src/nsRDFGenericBuilder.h | 4 -- .../rdf/content/src/nsXULTemplateBuilder.cpp | 41 ------------------- 4 files changed, 127 deletions(-) diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp index 09467824c3e..da6221ce836 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -1831,47 +1831,6 @@ RDFGenericBuilderImpl::EnsureElementHasGenericChild(nsIContent* parent, return NS_OK; } -nsresult -RDFGenericBuilderImpl::FindWidgetRootElement(nsIContent* aElement, - nsIContent** aWidgetElement) -{ - nsresult rv; - - nsCOMPtr rootAtom; - if (NS_FAILED(rv = GetRootWidgetAtom(getter_AddRefs(rootAtom)))) { - return rv; - } - - // walk up the tree until you find rootAtom - nsCOMPtr element(do_QueryInterface(aElement)); - - while (element) { - PRInt32 nameSpaceID; - if (NS_FAILED(rv = element->GetNameSpaceID(nameSpaceID))) - return rv; // XXX fatal - - if (nameSpaceID == kNameSpaceID_XUL) { - nsCOMPtr tag; - if (NS_FAILED(rv = element->GetTag(*getter_AddRefs(tag)))) - return rv; - - if (tag == rootAtom) { - *aWidgetElement = element; - NS_ADDREF(*aWidgetElement); - return NS_OK; - } - } - - // up to the parent... - nsCOMPtr parent; - element->GetParent(*getter_AddRefs(parent)); - element = parent; - } - - //NS_ERROR("must not've started from within the XUL widget"); - return NS_ERROR_FAILURE; -} - PRBool RDFGenericBuilderImpl::IsItemOrFolder(nsIContent* aElement) diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp index 09467824c3e..da6221ce836 100644 --- a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp +++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp @@ -1831,47 +1831,6 @@ RDFGenericBuilderImpl::EnsureElementHasGenericChild(nsIContent* parent, return NS_OK; } -nsresult -RDFGenericBuilderImpl::FindWidgetRootElement(nsIContent* aElement, - nsIContent** aWidgetElement) -{ - nsresult rv; - - nsCOMPtr rootAtom; - if (NS_FAILED(rv = GetRootWidgetAtom(getter_AddRefs(rootAtom)))) { - return rv; - } - - // walk up the tree until you find rootAtom - nsCOMPtr element(do_QueryInterface(aElement)); - - while (element) { - PRInt32 nameSpaceID; - if (NS_FAILED(rv = element->GetNameSpaceID(nameSpaceID))) - return rv; // XXX fatal - - if (nameSpaceID == kNameSpaceID_XUL) { - nsCOMPtr tag; - if (NS_FAILED(rv = element->GetTag(*getter_AddRefs(tag)))) - return rv; - - if (tag == rootAtom) { - *aWidgetElement = element; - NS_ADDREF(*aWidgetElement); - return NS_OK; - } - } - - // up to the parent... - nsCOMPtr parent; - element->GetParent(*getter_AddRefs(parent)); - element = parent; - } - - //NS_ERROR("must not've started from within the XUL widget"); - return NS_ERROR_FAILURE; -} - PRBool RDFGenericBuilderImpl::IsItemOrFolder(nsIContent* aElement) diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.h b/mozilla/rdf/content/src/nsRDFGenericBuilder.h index c46b6dc8b11..ef606d6910b 100644 --- a/mozilla/rdf/content/src/nsRDFGenericBuilder.h +++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.h @@ -92,10 +92,6 @@ public: nsIAtom* aTag, nsIContent** aResult); - nsresult - FindWidgetRootElement(nsIContent* aElement, - nsIContent** aRootElement); - virtual nsresult AddWidgetItem(nsIContent* aWidgetElement, nsIRDFResource* aProperty, diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp index 09467824c3e..da6221ce836 100644 --- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp +++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp @@ -1831,47 +1831,6 @@ RDFGenericBuilderImpl::EnsureElementHasGenericChild(nsIContent* parent, return NS_OK; } -nsresult -RDFGenericBuilderImpl::FindWidgetRootElement(nsIContent* aElement, - nsIContent** aWidgetElement) -{ - nsresult rv; - - nsCOMPtr rootAtom; - if (NS_FAILED(rv = GetRootWidgetAtom(getter_AddRefs(rootAtom)))) { - return rv; - } - - // walk up the tree until you find rootAtom - nsCOMPtr element(do_QueryInterface(aElement)); - - while (element) { - PRInt32 nameSpaceID; - if (NS_FAILED(rv = element->GetNameSpaceID(nameSpaceID))) - return rv; // XXX fatal - - if (nameSpaceID == kNameSpaceID_XUL) { - nsCOMPtr tag; - if (NS_FAILED(rv = element->GetTag(*getter_AddRefs(tag)))) - return rv; - - if (tag == rootAtom) { - *aWidgetElement = element; - NS_ADDREF(*aWidgetElement); - return NS_OK; - } - } - - // up to the parent... - nsCOMPtr parent; - element->GetParent(*getter_AddRefs(parent)); - element = parent; - } - - //NS_ERROR("must not've started from within the XUL widget"); - return NS_ERROR_FAILURE; -} - PRBool RDFGenericBuilderImpl::IsItemOrFolder(nsIContent* aElement)