From 1d951eac729aba2f8b7e9d88f1fbf9a099c3f6d6 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Thu, 7 Sep 2000 23:12:41 +0000 Subject: [PATCH] using NS_LITERAL_STRING --- content/xul/content/src/nsXULPopupListener.cpp | 10 +++++----- rdf/content/src/nsXULPopupListener.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp index 77527697a19..5eca0e83a91 100644 --- a/content/xul/content/src/nsXULPopupListener.cpp +++ b/content/xul/content/src/nsXULPopupListener.cpp @@ -597,7 +597,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) // Handle the _child case for popups and context menus nsCOMPtr popupContent; - if (identifier.EqualsWithConversion("_child")) { + if (identifier == NS_LITERAL_STRING("_child")) { nsCOMPtr popupset; nsCOMPtr popup; GetImmediateChild(content, nsXULAtoms::popupset, getter_AddRefs(popupset)); @@ -649,10 +649,10 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) if (domWindow != nsnull) { // Find out if we're anchored. nsAutoString anchorAlignment; anchorAlignment.AssignWithConversion("none"); - mElement->GetAttribute(NS_ConvertASCIItoUCS2("popupanchor"), anchorAlignment); + mElement->GetAttribute(NS_LITERAL_STRING("popupanchor"), anchorAlignment); nsAutoString popupAlignment; popupAlignment.AssignWithConversion("topleft"); - mElement->GetAttribute(NS_ConvertASCIItoUCS2("popupalign"), popupAlignment); + mElement->GetAttribute(NS_LITERAL_STRING("popupalign"), popupAlignment); PRInt32 xPos = aClientX, yPos = aClientY; @@ -708,8 +708,8 @@ XULPopupListenerImpl :: sTooltipCallback (nsITimer *aTimer, void *aClosure) if ( element ) { // check that node is enabled before showing tooltip nsAutoString disabledState; - element->GetAttribute ( NS_ConvertASCIItoUCS2("disabled"), disabledState ); - if ( !disabledState.EqualsWithConversion("true") ) { + element->GetAttribute ( NS_LITERAL_STRING("disabled"), disabledState ); + if ( disabledState != NS_LITERAL_STRING("true") ) { doc->SetTooltipNode ( element ); doc->SetPopupNode ( element ); self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+21); diff --git a/rdf/content/src/nsXULPopupListener.cpp b/rdf/content/src/nsXULPopupListener.cpp index 77527697a19..5eca0e83a91 100644 --- a/rdf/content/src/nsXULPopupListener.cpp +++ b/rdf/content/src/nsXULPopupListener.cpp @@ -597,7 +597,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) // Handle the _child case for popups and context menus nsCOMPtr popupContent; - if (identifier.EqualsWithConversion("_child")) { + if (identifier == NS_LITERAL_STRING("_child")) { nsCOMPtr popupset; nsCOMPtr popup; GetImmediateChild(content, nsXULAtoms::popupset, getter_AddRefs(popupset)); @@ -649,10 +649,10 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) if (domWindow != nsnull) { // Find out if we're anchored. nsAutoString anchorAlignment; anchorAlignment.AssignWithConversion("none"); - mElement->GetAttribute(NS_ConvertASCIItoUCS2("popupanchor"), anchorAlignment); + mElement->GetAttribute(NS_LITERAL_STRING("popupanchor"), anchorAlignment); nsAutoString popupAlignment; popupAlignment.AssignWithConversion("topleft"); - mElement->GetAttribute(NS_ConvertASCIItoUCS2("popupalign"), popupAlignment); + mElement->GetAttribute(NS_LITERAL_STRING("popupalign"), popupAlignment); PRInt32 xPos = aClientX, yPos = aClientY; @@ -708,8 +708,8 @@ XULPopupListenerImpl :: sTooltipCallback (nsITimer *aTimer, void *aClosure) if ( element ) { // check that node is enabled before showing tooltip nsAutoString disabledState; - element->GetAttribute ( NS_ConvertASCIItoUCS2("disabled"), disabledState ); - if ( !disabledState.EqualsWithConversion("true") ) { + element->GetAttribute ( NS_LITERAL_STRING("disabled"), disabledState ); + if ( disabledState != NS_LITERAL_STRING("true") ) { doc->SetTooltipNode ( element ); doc->SetPopupNode ( element ); self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+21);