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

small changes to clients of string converting APIs

This commit is contained in:
scc%netscape.com 2000-03-26 10:52:00 +00:00
Родитель 37269d1894
Коммит 210cd384fb
24 изменённых файлов: 179 добавлений и 179 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -790,7 +790,7 @@ nsresult nsXULAttributes::UpdateClassList(const nsString& aValue)
nsresult nsXULAttributes::UpdateStyleRule(nsIURI* aDocURL, const nsString& aValue) nsresult nsXULAttributes::UpdateStyleRule(nsIURI* aDocURL, const nsString& aValue)
{ {
if (aValue == "") if (aValue.IsEmpty())
{ {
// XXX: Removing the rule. Is this sufficient? // XXX: Removing the rule. Is this sufficient?
mStyleRule = nsnull; mStyleRule = nsnull;

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

@ -189,7 +189,7 @@ struct XULBroadcastListener
: mAttributeList(nsnull) : mAttributeList(nsnull)
{ {
mListener = aListener; // WEAK REFERENCE mListener = aListener; // WEAK REFERENCE
if (aAttribute != "*") { if (!aAttribute.Equals("*")) {
mAttributeList = new nsVoidArray(); mAttributeList = new nsVoidArray();
mAttributeList->AppendElement((void*)(new nsString(aAttribute))); mAttributeList->AppendElement((void*)(new nsString(aAttribute)));
} }
@ -3134,8 +3134,8 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED || aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED ||
aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE || aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE ||
aEvent->message == NS_DRAGDROP_GESTURE || aEvent->message == NS_DRAGDROP_GESTURE ||
tagName == "menu" || tagName == "menuitem" || tagName == "menulist" || tagName.Equals("menu") || tagName.Equals("menuitem") || tagName.Equals("menulist") ||
tagName == "menubar" || tagName == "menupopup" || tagName == "key" || tagName == "keyset") { tagName.Equals("menubar") || tagName.Equals("menupopup") || tagName.Equals("key") || tagName.Equals("keyset")) {
nsCOMPtr<nsIEventListenerManager> listenerManager; nsCOMPtr<nsIEventListenerManager> listenerManager;
if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) { if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
NS_ERROR("Unable to instantiate a listener manager on this event."); NS_ERROR("Unable to instantiate a listener manager on this event.");
@ -3315,7 +3315,7 @@ nsXULElement::AddBroadcastListener(const nsString& attr, nsIDOMElement* anElemen
// We need to sync up the initial attribute value. // We need to sync up the initial attribute value.
nsCOMPtr<nsIContent> listener( do_QueryInterface(anElement) ); nsCOMPtr<nsIContent> listener( do_QueryInterface(anElement) );
if (attr == "*") { if (attr.Equals("*")) {
// All of the attributes found on this node should be set on the // All of the attributes found on this node should be set on the
// listener. // listener.
if (Attributes()) { if (Attributes()) {
@ -3366,7 +3366,7 @@ nsXULElement::RemoveBroadcastListener(const nsString& attr, nsIDOMElement* anEle
NS_REINTERPRET_CAST(XULBroadcastListener*, BroadcastListeners()->ElementAt(i)); NS_REINTERPRET_CAST(XULBroadcastListener*, BroadcastListeners()->ElementAt(i));
if (xulListener->mListener == anElement) { if (xulListener->mListener == anElement) {
if (xulListener->ObservingEverything() || attr == "*") { if (xulListener->ObservingEverything() || attr.Equals("*")) {
// Do the removal. // Do the removal.
BroadcastListeners()->RemoveElementAt(i); BroadcastListeners()->RemoveElementAt(i);
delete xulListener; delete xulListener;
@ -3681,7 +3681,7 @@ nsXULElement::GetElementsByAttribute(nsIDOMNode* aNode,
return rv; return rv;
} }
if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue == "*")) { if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue.Equals("*"))) {
if (NS_FAILED(rv = aElements->AppendNode(child))) { if (NS_FAILED(rv = aElements->AppendNode(child))) {
NS_ERROR("unable to append element to node list"); NS_ERROR("unable to append element to node list");
return rv; return rv;
@ -3775,7 +3775,7 @@ nsXULElement::GetContentStyleRules(nsISupportsArray* aRules)
nsAutoString hidden; nsAutoString hidden;
GetAttribute(kNameSpaceID_None, hiddenAtom, hidden); GetAttribute(kNameSpaceID_None, hiddenAtom, hidden);
if (width != "" || hidden != "") { if (!width.IsEmpty() || !hidden.IsEmpty()) {
// XXX This should ultimately be factored out if we find that // XXX This should ultimately be factored out if we find that
// a bunch of XUL widgets are implementing attributes that need // a bunch of XUL widgets are implementing attributes that need
// to be mapped into style. I'm hoping treecol will be the only // to be mapped into style. I'm hoping treecol will be the only
@ -4040,7 +4040,7 @@ nsXULElement::Click()
nsCOMPtr<nsIPresContext> context; nsCOMPtr<nsIPresContext> context;
nsAutoString tagName; nsAutoString tagName;
GetTagName(tagName); GetTagName(tagName);
PRBool isButton = (tagName == "titledbutton"); PRBool isButton = (tagName.Equals("titledbutton"));
for (PRInt32 i=0; i<numShells; i++) { for (PRInt32 i=0; i<numShells; i++) {
shell = getter_AddRefs(doc->GetShellAt(i)); shell = getter_AddRefs(doc->GetShellAt(i));
@ -4077,7 +4077,7 @@ nsXULElement::SetFocus(nsIPresContext* aPresContext)
{ {
nsAutoString disabled; nsAutoString disabled;
GetAttribute("disabled", disabled); GetAttribute("disabled", disabled);
if (disabled == "true") if (disabled.Equals("true"))
return NS_OK; return NS_OK;
nsIEventStateManager* esm; nsIEventStateManager* esm;
@ -4183,10 +4183,10 @@ nsXULElement::MapStyleInto(nsIMutableStyleContext* aContext, nsIPresContext* aPr
nsAutoString hiddenVal; nsAutoString hiddenVal;
GetAttribute("width", widthVal); GetAttribute("width", widthVal);
GetAttribute("hidden", hiddenVal); GetAttribute("hidden", hiddenVal);
if (hiddenVal != "") if (!hiddenVal.IsEmpty())
widthVal = "0*"; widthVal = "0*";
if (widthVal != "") { if (!widthVal.IsEmpty()) {
PRInt32 intVal; PRInt32 intVal;
float floatVal; float floatVal;
nsHTMLUnit unit = eHTMLUnit_Null; nsHTMLUnit unit = eHTMLUnit_Null;

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

@ -395,7 +395,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY)
nsAutoString identifier; nsAutoString identifier;
mElement->GetAttribute(type, identifier); mElement->GetAttribute(type, identifier);
if (identifier == "") if (identifier.IsEmpty())
return rv; return rv;
// Try to find the popup content and the document. We don't use FindDocumentForNode() // Try to find the popup content and the document. We don't use FindDocumentForNode()
@ -485,7 +485,7 @@ XULPopupListenerImpl :: sTooltipCallback (nsITimer *aTimer, void *aClosure)
// check that node is enabled before showing tooltip // check that node is enabled before showing tooltip
nsAutoString disabledState; nsAutoString disabledState;
element->GetAttribute ( "disabled", disabledState ); element->GetAttribute ( "disabled", disabledState );
if ( disabledState != "true" ) { if ( !disabledState.Equals("true") ) {
doc->SetTooltipNode ( element ); doc->SetTooltipNode ( element );
self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+16); self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+16);
} // if node enabled } // if node enabled

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

@ -331,9 +331,9 @@ nsXULTreeElement::ToggleItemSelection(nsIDOMXULElement* aTreeItem)
nsAutoString isSelected; nsAutoString isSelected;
aTreeItem->GetAttribute("selected", isSelected); aTreeItem->GetAttribute("selected", isSelected);
if (isSelected == "true") if (isSelected.Equals("true"))
RemoveItemFromSelectionInternal(aTreeItem); RemoveItemFromSelectionInternal(aTreeItem);
else if (multiple == "true" || length == 0) else if (multiple.Equals("true") || length == 0)
AddItemToSelectionInternal(aTreeItem); AddItemToSelectionInternal(aTreeItem);
else else
return NS_OK; return NS_OK;
@ -355,9 +355,9 @@ nsXULTreeElement::ToggleCellSelection(nsIDOMXULElement* aTreeCell)
nsAutoString isSelected; nsAutoString isSelected;
aTreeCell->GetAttribute("selected", isSelected); aTreeCell->GetAttribute("selected", isSelected);
if (isSelected == "true") if (isSelected.Equals("true"))
RemoveCellFromSelectionInternal(aTreeCell); RemoveCellFromSelectionInternal(aTreeCell);
else if (multiple == "true" || length == 0) else if (multiple.Equals("true") || length == 0)
AddCellToSelectionInternal(aTreeCell); AddCellToSelectionInternal(aTreeCell);
else else
return NS_OK; return NS_OK;
@ -376,7 +376,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement
nsAutoString multiple; nsAutoString multiple;
mOuter->GetAttribute("multiple", multiple); mOuter->GetAttribute("multiple", multiple);
if (multiple != "true") { if (!multiple.Equals("true")) {
// We're a single selection tree only. This // We're a single selection tree only. This
// is not allowed. // is not allowed.
return NS_OK; return NS_OK;
@ -534,7 +534,7 @@ nsXULTreeElement::FireOnSelectHandler()
nsCOMPtr<nsIAtom> kSuppressSelectChange = dont_AddRef(NS_NewAtom("suppressonselect")); nsCOMPtr<nsIAtom> kSuppressSelectChange = dont_AddRef(NS_NewAtom("suppressonselect"));
nsAutoString value; nsAutoString value;
content->GetAttribute(kNameSpaceID_None, kSuppressSelectChange, value); content->GetAttribute(kNameSpaceID_None, kSuppressSelectChange, value);
if (value == "true") if (value.Equals("true"))
return NS_OK; return NS_OK;
PRInt32 count = document->GetNumberOfShells(); PRInt32 count = document->GetNumberOfShells();
@ -755,7 +755,7 @@ nsXULTreeElement::IndexOfContent(nsIContent* aRoot,
nsAutoString isOpen; nsAutoString isOpen;
rv = child->GetAttribute(kNameSpaceID_None, kOpenAtom, isOpen); rv = child->GetAttribute(kNameSpaceID_None, kOpenAtom, isOpen);
if (isOpen != "true") if (!isOpen.Equals("true"))
parentIsOpen=PR_FALSE; parentIsOpen=PR_FALSE;
} }

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

@ -470,7 +470,7 @@ nsXULCommandDispatcher::SetScriptObject(void *aScriptObject)
PRBool PRBool
nsXULCommandDispatcher::Matches(const nsString& aList, const nsString& aElement) nsXULCommandDispatcher::Matches(const nsString& aList, const nsString& aElement)
{ {
if (aList == "*") if (aList.Equals("*"))
return PR_TRUE; // match _everything_! return PR_TRUE; // match _everything_!
PRInt32 indx = aList.Find(aElement); PRInt32 indx = aList.Find(aElement);

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

@ -3650,7 +3650,7 @@ nsXULDocument::GetElementsByAttribute(nsIDOMNode* aNode,
return rv; return rv;
} }
if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue == "*")) { if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue.Equals("*"))) {
if (NS_FAILED(rv = aElements->AppendNode(aNode))) { if (NS_FAILED(rv = aElements->AppendNode(aNode))) {
NS_ERROR("unable to append element to node list"); NS_ERROR("unable to append element to node list");
return rv; return rv;
@ -5822,7 +5822,7 @@ nsXULDocument::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aResu
gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace); gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace);
nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX; nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX;
progID += nameSpace; progID.Append(nameSpace);
// Retrieve the appropriate factory. // Retrieve the appropriate factory.
NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv); NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv);

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

@ -747,7 +747,7 @@ nsXULContentUtils::MakeElementURI(nsIDocument* aDocument, const nsString& aEleme
if (! spec) if (! spec)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
aURI = spec; aURI.Assign(spec);
if (aElementID.First() != '#') { if (aElementID.First() != '#') {
aURI.Append('#'); aURI.Append('#');

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

@ -3279,7 +3279,7 @@ RDFGenericBuilderImpl::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory
gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace); gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace);
nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX; nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX;
progID += nameSpace; progID.Append(nameSpace);
// Retrieve the appropriate factory. // Retrieve the appropriate factory.
NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv); NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv);

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

@ -143,7 +143,7 @@ rdf_MakeAbsoluteURI(nsIURI* aURL, nsCString& aURI)
rv = NS_MakeAbsoluteURI(aURI.GetBuffer(), aURL, getter_Copies(result)); rv = NS_MakeAbsoluteURI(aURI.GetBuffer(), aURL, getter_Copies(result));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
aURI = result; aURI.Assign(result);
} }
else { else {
// There are some ugly URIs (e.g., "NC:Foo") that netlib can't // There are some ugly URIs (e.g., "NC:Foo") that netlib can't

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

@ -3279,7 +3279,7 @@ RDFGenericBuilderImpl::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory
gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace); gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace);
nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX; nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX;
progID += nameSpace; progID.Append(nameSpace);
// Retrieve the appropriate factory. // Retrieve the appropriate factory.
NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv); NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv);

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

@ -790,7 +790,7 @@ nsresult nsXULAttributes::UpdateClassList(const nsString& aValue)
nsresult nsXULAttributes::UpdateStyleRule(nsIURI* aDocURL, const nsString& aValue) nsresult nsXULAttributes::UpdateStyleRule(nsIURI* aDocURL, const nsString& aValue)
{ {
if (aValue == "") if (aValue.IsEmpty())
{ {
// XXX: Removing the rule. Is this sufficient? // XXX: Removing the rule. Is this sufficient?
mStyleRule = nsnull; mStyleRule = nsnull;

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

@ -139,7 +139,7 @@ nsXULCheckboxElement::GetChecked(PRBool* aChecked)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("checked", value); mOuter->GetAttribute("checked", value);
if(value == "true") if(value.Equals("true"))
*aChecked = PR_TRUE; *aChecked = PR_TRUE;
else else
*aChecked = PR_FALSE; *aChecked = PR_FALSE;
@ -168,7 +168,7 @@ nsXULCheckboxElement::GetDisabled(PRBool* aDisabled)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("disabled", value); mOuter->GetAttribute("disabled", value);
if(value == "true") if(value.Equals("true"))
*aDisabled = PR_TRUE; *aDisabled = PR_TRUE;
else else
*aDisabled = PR_FALSE; *aDisabled = PR_FALSE;

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

@ -470,7 +470,7 @@ nsXULCommandDispatcher::SetScriptObject(void *aScriptObject)
PRBool PRBool
nsXULCommandDispatcher::Matches(const nsString& aList, const nsString& aElement) nsXULCommandDispatcher::Matches(const nsString& aList, const nsString& aElement)
{ {
if (aList == "*") if (aList.Equals("*"))
return PR_TRUE; // match _everything_! return PR_TRUE; // match _everything_!
PRInt32 indx = aList.Find(aElement); PRInt32 indx = aList.Find(aElement);

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

@ -747,7 +747,7 @@ nsXULContentUtils::MakeElementURI(nsIDocument* aDocument, const nsString& aEleme
if (! spec) if (! spec)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
aURI = spec; aURI.Assign(spec);
if (aElementID.First() != '#') { if (aElementID.First() != '#') {
aURI.Append('#'); aURI.Append('#');

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

@ -3650,7 +3650,7 @@ nsXULDocument::GetElementsByAttribute(nsIDOMNode* aNode,
return rv; return rv;
} }
if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue == "*")) { if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue.Equals("*"))) {
if (NS_FAILED(rv = aElements->AppendNode(aNode))) { if (NS_FAILED(rv = aElements->AppendNode(aNode))) {
NS_ERROR("unable to append element to node list"); NS_ERROR("unable to append element to node list");
return rv; return rv;
@ -5822,7 +5822,7 @@ nsXULDocument::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aResu
gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace); gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace);
nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX; nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX;
progID += nameSpace; progID.Append(nameSpace);
// Retrieve the appropriate factory. // Retrieve the appropriate factory.
NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv); NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv);

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

@ -189,7 +189,7 @@ struct XULBroadcastListener
: mAttributeList(nsnull) : mAttributeList(nsnull)
{ {
mListener = aListener; // WEAK REFERENCE mListener = aListener; // WEAK REFERENCE
if (aAttribute != "*") { if (!aAttribute.Equals("*")) {
mAttributeList = new nsVoidArray(); mAttributeList = new nsVoidArray();
mAttributeList->AppendElement((void*)(new nsString(aAttribute))); mAttributeList->AppendElement((void*)(new nsString(aAttribute)));
} }
@ -3134,8 +3134,8 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED || aEvent->message == NS_MENU_DESTROY || aEvent->message == NS_FORM_SELECTED ||
aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE || aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE ||
aEvent->message == NS_DRAGDROP_GESTURE || aEvent->message == NS_DRAGDROP_GESTURE ||
tagName == "menu" || tagName == "menuitem" || tagName == "menulist" || tagName.Equals("menu") || tagName.Equals("menuitem") || tagName.Equals("menulist") ||
tagName == "menubar" || tagName == "menupopup" || tagName == "key" || tagName == "keyset") { tagName.Equals("menubar") || tagName.Equals("menupopup") || tagName.Equals("key") || tagName.Equals("keyset")) {
nsCOMPtr<nsIEventListenerManager> listenerManager; nsCOMPtr<nsIEventListenerManager> listenerManager;
if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) { if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
NS_ERROR("Unable to instantiate a listener manager on this event."); NS_ERROR("Unable to instantiate a listener manager on this event.");
@ -3315,7 +3315,7 @@ nsXULElement::AddBroadcastListener(const nsString& attr, nsIDOMElement* anElemen
// We need to sync up the initial attribute value. // We need to sync up the initial attribute value.
nsCOMPtr<nsIContent> listener( do_QueryInterface(anElement) ); nsCOMPtr<nsIContent> listener( do_QueryInterface(anElement) );
if (attr == "*") { if (attr.Equals("*")) {
// All of the attributes found on this node should be set on the // All of the attributes found on this node should be set on the
// listener. // listener.
if (Attributes()) { if (Attributes()) {
@ -3366,7 +3366,7 @@ nsXULElement::RemoveBroadcastListener(const nsString& attr, nsIDOMElement* anEle
NS_REINTERPRET_CAST(XULBroadcastListener*, BroadcastListeners()->ElementAt(i)); NS_REINTERPRET_CAST(XULBroadcastListener*, BroadcastListeners()->ElementAt(i));
if (xulListener->mListener == anElement) { if (xulListener->mListener == anElement) {
if (xulListener->ObservingEverything() || attr == "*") { if (xulListener->ObservingEverything() || attr.Equals("*")) {
// Do the removal. // Do the removal.
BroadcastListeners()->RemoveElementAt(i); BroadcastListeners()->RemoveElementAt(i);
delete xulListener; delete xulListener;
@ -3681,7 +3681,7 @@ nsXULElement::GetElementsByAttribute(nsIDOMNode* aNode,
return rv; return rv;
} }
if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue == "*")) { if ((attrValue == aValue) || (attrValue.Length() > 0 && aValue.Equals("*"))) {
if (NS_FAILED(rv = aElements->AppendNode(child))) { if (NS_FAILED(rv = aElements->AppendNode(child))) {
NS_ERROR("unable to append element to node list"); NS_ERROR("unable to append element to node list");
return rv; return rv;
@ -3775,7 +3775,7 @@ nsXULElement::GetContentStyleRules(nsISupportsArray* aRules)
nsAutoString hidden; nsAutoString hidden;
GetAttribute(kNameSpaceID_None, hiddenAtom, hidden); GetAttribute(kNameSpaceID_None, hiddenAtom, hidden);
if (width != "" || hidden != "") { if (!width.IsEmpty() || !hidden.IsEmpty()) {
// XXX This should ultimately be factored out if we find that // XXX This should ultimately be factored out if we find that
// a bunch of XUL widgets are implementing attributes that need // a bunch of XUL widgets are implementing attributes that need
// to be mapped into style. I'm hoping treecol will be the only // to be mapped into style. I'm hoping treecol will be the only
@ -4040,7 +4040,7 @@ nsXULElement::Click()
nsCOMPtr<nsIPresContext> context; nsCOMPtr<nsIPresContext> context;
nsAutoString tagName; nsAutoString tagName;
GetTagName(tagName); GetTagName(tagName);
PRBool isButton = (tagName == "titledbutton"); PRBool isButton = (tagName.Equals("titledbutton"));
for (PRInt32 i=0; i<numShells; i++) { for (PRInt32 i=0; i<numShells; i++) {
shell = getter_AddRefs(doc->GetShellAt(i)); shell = getter_AddRefs(doc->GetShellAt(i));
@ -4077,7 +4077,7 @@ nsXULElement::SetFocus(nsIPresContext* aPresContext)
{ {
nsAutoString disabled; nsAutoString disabled;
GetAttribute("disabled", disabled); GetAttribute("disabled", disabled);
if (disabled == "true") if (disabled.Equals("true"))
return NS_OK; return NS_OK;
nsIEventStateManager* esm; nsIEventStateManager* esm;
@ -4183,10 +4183,10 @@ nsXULElement::MapStyleInto(nsIMutableStyleContext* aContext, nsIPresContext* aPr
nsAutoString hiddenVal; nsAutoString hiddenVal;
GetAttribute("width", widthVal); GetAttribute("width", widthVal);
GetAttribute("hidden", hiddenVal); GetAttribute("hidden", hiddenVal);
if (hiddenVal != "") if (!hiddenVal.IsEmpty())
widthVal = "0*"; widthVal = "0*";
if (widthVal != "") { if (!widthVal.IsEmpty()) {
PRInt32 intVal; PRInt32 intVal;
float floatVal; float floatVal;
nsHTMLUnit unit = eHTMLUnit_Null; nsHTMLUnit unit = eHTMLUnit_Null;

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

@ -582,451 +582,451 @@ PRBool nsXULKeyListenerImpl::IsMatchingKeyCode(const PRUint32 theChar, const nsS
switch ( theChar ) { switch ( theChar ) {
case VK_CANCEL: case VK_CANCEL:
if(keyName == "VK_CANCEL") if(keyName.Equals("VK_CANCEL"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_BACK: case VK_BACK:
if(keyName == "VK_BACK") if(keyName.Equals("VK_BACK"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_TAB: case VK_TAB:
if(keyName == "VK_TAB") if(keyName.Equals("VK_TAB"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_CLEAR: case VK_CLEAR:
if(keyName == "VK_CLEAR") if(keyName.Equals("VK_CLEAR"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_RETURN: case VK_RETURN:
if(keyName == "VK_RETURN") if(keyName.Equals("VK_RETURN"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_ENTER: case VK_ENTER:
if(keyName == "VK_ENTER") if(keyName.Equals("VK_ENTER"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SHIFT: case VK_SHIFT:
if(keyName == "VK_SHIFT") if(keyName.Equals("VK_SHIFT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_CONTROL: case VK_CONTROL:
if(keyName == "VK_CONTROL") if(keyName.Equals("VK_CONTROL"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_ALT: case VK_ALT:
if(keyName == "VK_ALT") if(keyName.Equals("VK_ALT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_PAUSE: case VK_PAUSE:
if(keyName == "VK_PAUSE") if(keyName.Equals("VK_PAUSE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_CAPS_LOCK: case VK_CAPS_LOCK:
if(keyName == "VK_CAPS_LOCK") if(keyName.Equals("VK_CAPS_LOCK"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_ESCAPE: case VK_ESCAPE:
if(keyName == "VK_ESCAPE") if(keyName.Equals("VK_ESCAPE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SPACE: case VK_SPACE:
if(keyName == "VK_SPACE") if(keyName.Equals("VK_SPACE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_PAGE_UP: case VK_PAGE_UP:
if(keyName == "VK_PAGE_UP") if(keyName.Equals("VK_PAGE_UP"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_PAGE_DOWN: case VK_PAGE_DOWN:
if(keyName == "VK_PAGE_DOWN") if(keyName.Equals("VK_PAGE_DOWN"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_END: case VK_END:
if(keyName == "VK_END") if(keyName.Equals("VK_END"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_HOME: case VK_HOME:
if(keyName == "VK_HOME") if(keyName.Equals("VK_HOME"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_LEFT: case VK_LEFT:
if(keyName == "VK_LEFT") if(keyName.Equals("VK_LEFT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_UP: case VK_UP:
if(keyName == "VK_UP") if(keyName.Equals("VK_UP"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_RIGHT: case VK_RIGHT:
if(keyName == "VK_RIGHT") if(keyName.Equals("VK_RIGHT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_DOWN: case VK_DOWN:
if(keyName == "VK_DOWN") if(keyName.Equals("VK_DOWN"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_PRINTSCREEN: case VK_PRINTSCREEN:
if(keyName == "VK_PRINTSCREEN") if(keyName.Equals("VK_PRINTSCREEN"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_INSERT: case VK_INSERT:
if(keyName == "VK_INSERT") if(keyName.Equals("VK_INSERT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_DELETE: case VK_DELETE:
if(keyName == "VK_DELETE") if(keyName.Equals("VK_DELETE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_0: case VK_0:
if(keyName == "VK_0") if(keyName.Equals("VK_0"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_1: case VK_1:
if(keyName == "VK_1") if(keyName.Equals("VK_1"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_2: case VK_2:
if(keyName == "VK_2") if(keyName.Equals("VK_2"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_3: case VK_3:
if(keyName == "VK_3") if(keyName.Equals("VK_3"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_4: case VK_4:
if(keyName == "VK_4") if(keyName.Equals("VK_4"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_5: case VK_5:
if(keyName == "VK_5") if(keyName.Equals("VK_5"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_6: case VK_6:
if(keyName == "VK_6") if(keyName.Equals("VK_6"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_7: case VK_7:
if(keyName == "VK_7") if(keyName.Equals("VK_7"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_8: case VK_8:
if(keyName == "VK_8") if(keyName.Equals("VK_8"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_9: case VK_9:
if(keyName == "VK_9") if(keyName.Equals("VK_9"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SEMICOLON: case VK_SEMICOLON:
if(keyName == "VK_SEMICOLON") if(keyName.Equals("VK_SEMICOLON"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_EQUALS: case VK_EQUALS:
if(keyName == "VK_EQUALS") if(keyName.Equals("VK_EQUALS"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_A: case VK_A:
if(keyName == "VK_A" || keyName == "A" || keyName == "a") if(keyName.Equals("VK_A") || keyName.Equals("A") || keyName.Equals("a"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_B: case VK_B:
if(keyName == "VK_B" || keyName == "B" || keyName == "b") if(keyName.Equals("VK_B") || keyName.Equals("B") || keyName.Equals("b"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_C: case VK_C:
if(keyName == "VK_C" || keyName == "C" || keyName == "c") if(keyName.Equals("VK_C") || keyName.Equals("C") || keyName.Equals("c"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_D: case VK_D:
if(keyName == "VK_D" || keyName == "D" || keyName == "d") if(keyName.Equals("VK_D") || keyName.Equals("D") || keyName.Equals("d"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_E: case VK_E:
if(keyName == "VK_E" || keyName == "E" || keyName == "e") if(keyName.Equals("VK_E") || keyName.Equals("E") || keyName.Equals("e"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F: case VK_F:
if(keyName == "VK_F" || keyName == "F" || keyName == "f") if(keyName.Equals("VK_F") || keyName.Equals("F") || keyName.Equals("f"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_G: case VK_G:
if(keyName == "VK_G" || keyName == "G" || keyName == "g") if(keyName.Equals("VK_G") || keyName.Equals("G") || keyName.Equals("g"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_H: case VK_H:
if(keyName == "VK_H" || keyName == "H" || keyName == "h") if(keyName.Equals("VK_H") || keyName.Equals("H") || keyName.Equals("h"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_I: case VK_I:
if(keyName == "VK_I" || keyName == "I" || keyName == "i") if(keyName.Equals("VK_I") || keyName.Equals("I") || keyName.Equals("i"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_J: case VK_J:
if(keyName == "VK_J" || keyName == "J" || keyName == "j") if(keyName.Equals("VK_J") || keyName.Equals("J") || keyName.Equals("j"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_K: case VK_K:
if(keyName == "VK_K" || keyName == "K" || keyName == "k") if(keyName.Equals("VK_K") || keyName.Equals("K") || keyName.Equals("k"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_L: case VK_L:
if(keyName == "VK_L" || keyName == "L" || keyName == "l") if(keyName.Equals("VK_L") || keyName.Equals("L") || keyName.Equals("l"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_M: case VK_M:
if(keyName == "VK_M" || keyName == "M" || keyName == "m") if(keyName.Equals("VK_M") || keyName.Equals("M") || keyName.Equals("m"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_N: case VK_N:
if(keyName == "VK_N" || keyName == "N" || keyName == "n") if(keyName.Equals("VK_N") || keyName.Equals("N") || keyName.Equals("n"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_O: case VK_O:
if(keyName == "VK_O" || keyName == "O" || keyName == "o") if(keyName.Equals("VK_O") || keyName.Equals("O") || keyName.Equals("o"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_P: case VK_P:
if(keyName == "VK_P" || keyName == "P" || keyName == "p") if(keyName.Equals("VK_P") || keyName.Equals("P") || keyName.Equals("p"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_Q: case VK_Q:
if(keyName == "VK_Q" || keyName == "Q" || keyName == "q") if(keyName.Equals("VK_Q") || keyName.Equals("Q") || keyName.Equals("q"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_R: case VK_R:
if(keyName == "VK_R" || keyName == "R" || keyName == "r") if(keyName.Equals("VK_R") || keyName.Equals("R") || keyName.Equals("r"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_S: case VK_S:
if(keyName == "VK_S" || keyName == "S" || keyName == "s") if(keyName.Equals("VK_S") || keyName.Equals("S") || keyName.Equals("s"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_T: case VK_T:
if(keyName == "VK_T" || keyName == "T" || keyName == "t") if(keyName.Equals("VK_T") || keyName.Equals("T") || keyName.Equals("t"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_U: case VK_U:
if(keyName == "VK_U" || keyName == "U" || keyName == "u") if(keyName.Equals("VK_U") || keyName.Equals("U") || keyName.Equals("u"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_V: case VK_V:
if(keyName == "VK_V" || keyName == "V" || keyName == "v") if(keyName.Equals("VK_V") || keyName.Equals("V") || keyName.Equals("v"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_W: case VK_W:
if(keyName == "VK_W" || keyName == "W" || keyName == "w") if(keyName.Equals("VK_W") || keyName.Equals("W") || keyName.Equals("w"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_X: case VK_X:
if(keyName == "VK_X" || keyName == "X" || keyName == "x") if(keyName.Equals("VK_X") || keyName.Equals("X") || keyName.Equals("x"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_Y: case VK_Y:
if(keyName == "VK_Y" || keyName == "Y" || keyName == "y") if(keyName.Equals("VK_Y") || keyName.Equals("Y") || keyName.Equals("y"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_Z: case VK_Z:
if(keyName == "VK_Z" || keyName == "Z" || keyName == "z") if(keyName.Equals("VK_Z") || keyName.Equals("Z") || keyName.Equals("z"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD0: case VK_NUMPAD0:
if(keyName == "VK_NUMPAD0") if(keyName.Equals("VK_NUMPAD0"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD1: case VK_NUMPAD1:
if(keyName == "VK_NUMPAD1") if(keyName.Equals("VK_NUMPAD1"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD2: case VK_NUMPAD2:
if(keyName == "VK_NUMPAD2") if(keyName.Equals("VK_NUMPAD2"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD3: case VK_NUMPAD3:
if(keyName == "VK_NUMPAD3") if(keyName.Equals("VK_NUMPAD3"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD4: case VK_NUMPAD4:
if(keyName == "VK_NUMPAD4") if(keyName.Equals("VK_NUMPAD4"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD5: case VK_NUMPAD5:
if(keyName == "VK_NUMPAD5") if(keyName.Equals("VK_NUMPAD5"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD6: case VK_NUMPAD6:
if(keyName == "VK_NUMPAD6") if(keyName.Equals("VK_NUMPAD6"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD7: case VK_NUMPAD7:
if(keyName == "VK_NUMPAD7") if(keyName.Equals("VK_NUMPAD7"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD8: case VK_NUMPAD8:
if(keyName == "VK_NUMPAD8") if(keyName.Equals("VK_NUMPAD8"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUMPAD9: case VK_NUMPAD9:
if(keyName == "VK_NUMPAD9") if(keyName.Equals("VK_NUMPAD9"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_MULTIPLY: case VK_MULTIPLY:
if(keyName == "VK_MULTIPLY") if(keyName.Equals("VK_MULTIPLY"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_ADD: case VK_ADD:
if(keyName == "VK_ADD") if(keyName.Equals("VK_ADD"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SEPARATOR: case VK_SEPARATOR:
if(keyName == "VK_SEPARATOR") if(keyName.Equals("VK_SEPARATOR"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SUBTRACT: case VK_SUBTRACT:
if(keyName == "VK_SUBTRACT") if(keyName.Equals("VK_SUBTRACT"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_DECIMAL: case VK_DECIMAL:
if(keyName == "VK_DECIMAL") if(keyName.Equals("VK_DECIMAL"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_DIVIDE: case VK_DIVIDE:
if(keyName == "VK_DIVIDE") if(keyName.Equals("VK_DIVIDE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F1: case VK_F1:
if(keyName == "VK_F1") if(keyName.Equals("VK_F1"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F2: case VK_F2:
if(keyName == "VK_F2") if(keyName.Equals("VK_F2"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F3: case VK_F3:
if(keyName == "VK_F3") if(keyName.Equals("VK_F3"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F4: case VK_F4:
if(keyName == "VK_F4") if(keyName.Equals("VK_F4"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F5: case VK_F5:
if(keyName == "VK_F5") if(keyName.Equals("VK_F5"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F6: case VK_F6:
if(keyName == "VK_F6") if(keyName.Equals("VK_F6"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F7: case VK_F7:
if(keyName == "VK_F7") if(keyName.Equals("VK_F7"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F8: case VK_F8:
if(keyName == "VK_F8") if(keyName.Equals("VK_F8"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F9: case VK_F9:
if(keyName == "VK_F9") if(keyName.Equals("VK_F9"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F10: case VK_F10:
if(keyName == "VK_F10") if(keyName.Equals("VK_F10"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F11: case VK_F11:
if(keyName == "VK_F11") if(keyName.Equals("VK_F11"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F12: case VK_F12:
if(keyName == "VK_F12") if(keyName.Equals("VK_F12"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F13: case VK_F13:
if(keyName == "VK_F13") if(keyName.Equals("VK_F13"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F14: case VK_F14:
if(keyName == "VK_F14") if(keyName.Equals("VK_F14"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F15: case VK_F15:
if(keyName == "VK_F15") if(keyName.Equals("VK_F15"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F16: case VK_F16:
if(keyName == "VK_F16") if(keyName.Equals("VK_F16"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F17: case VK_F17:
if(keyName == "VK_F17") if(keyName.Equals("VK_F17"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F18: case VK_F18:
if(keyName == "VK_F18") if(keyName.Equals("VK_F18"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F19: case VK_F19:
if(keyName == "VK_F19") if(keyName.Equals("VK_F19"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F20: case VK_F20:
if(keyName == "VK_F20") if(keyName.Equals("VK_F20"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F21: case VK_F21:
if(keyName == "VK_F21") if(keyName.Equals("VK_F21"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F22: case VK_F22:
if(keyName == "VK_F22") if(keyName.Equals("VK_F22"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F23: case VK_F23:
if(keyName == "VK_F23") if(keyName.Equals("VK_F23"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_F24: case VK_F24:
if(keyName == "VK_F24") if(keyName.Equals("VK_F24"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_NUM_LOCK: case VK_NUM_LOCK:
if(keyName == "VK_NUM_LOCK") if(keyName.Equals("VK_NUM_LOCK"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SCROLL_LOCK: case VK_SCROLL_LOCK:
if(keyName == "VK_SCROLL_LOCK") if(keyName.Equals("VK_SCROLL_LOCK"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_COMMA: case VK_COMMA:
if(keyName == "VK_COMMA") if(keyName.Equals("VK_COMMA"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_PERIOD: case VK_PERIOD:
if(keyName == "VK_PERIOD") if(keyName.Equals("VK_PERIOD"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_SLASH: case VK_SLASH:
if(keyName == "VK_SLASH") if(keyName.Equals("VK_SLASH"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_BACK_QUOTE: case VK_BACK_QUOTE:
if(keyName == "VK_BACK_QUOTE") if(keyName.Equals("VK_BACK_QUOTE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_OPEN_BRACKET: case VK_OPEN_BRACKET:
if(keyName == "VK_OPEN_BRACKET") if(keyName.Equals("VK_OPEN_BRACKET"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_BACK_SLASH: case VK_BACK_SLASH:
if(keyName == "VK_BACK_SLASH") if(keyName.Equals("VK_BACK_SLASH"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_CLOSE_BRACKET: case VK_CLOSE_BRACKET:
if(keyName == "VK_CLOSE_BRACKET") if(keyName.Equals("VK_CLOSE_BRACKET"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
case VK_QUOTE: case VK_QUOTE:
if(keyName == "VK_QUOTE") if(keyName.Equals("VK_QUOTE"))
ret = PR_TRUE; ret = PR_TRUE;
break; break;
} }
@ -1050,7 +1050,7 @@ PRBool nsXULKeyListenerImpl::IsMatchingCharCode(const nsString &theChar, const n
NS_IMETHODIMP nsXULKeyListenerImpl::GetKeyBindingDocument(nsCAutoString& aURLStr, nsIDOMXULDocument** aResult) NS_IMETHODIMP nsXULKeyListenerImpl::GetKeyBindingDocument(nsCAutoString& aURLStr, nsIDOMXULDocument** aResult)
{ {
nsCOMPtr<nsIDOMXULDocument> document; nsCOMPtr<nsIDOMXULDocument> document;
if (aURLStr != nsCAutoString("")) { if (!aURLStr.IsEmpty()) {
nsCOMPtr<nsIURL> uri; nsCOMPtr<nsIURL> uri;
nsComponentManager::CreateInstance("component://netscape/network/standard-url", nsComponentManager::CreateInstance("component://netscape/network/standard-url",
nsnull, nsnull,
@ -1440,7 +1440,7 @@ nsXULKeyListenerImpl::HandleEventUsingKeyset(nsIDOMElement* aKeysetElement, nsID
// Get the cancel attribute. // Get the cancel attribute.
nsAutoString cancelValue; nsAutoString cancelValue;
keyElement->GetAttribute(nsAutoString("cancel"), cancelValue); keyElement->GetAttribute(nsAutoString("cancel"), cancelValue);
if (cancelValue == "true") { if (cancelValue.Equals("true")) {
return NS_OK; return NS_OK;
} }
@ -1522,7 +1522,7 @@ nsXULKeyListenerImpl::HandleEventUsingKeyset(nsIDOMElement* aKeysetElement, nsID
nsCOMPtr<nsIContent> keyContent = do_QueryInterface(keyElement); nsCOMPtr<nsIContent> keyContent = do_QueryInterface(keyElement);
nsAutoString value; nsAutoString value;
keyContent->GetAttribute(kNameSpaceID_None, eventName, value); keyContent->GetAttribute(kNameSpaceID_None, eventName, value);
if (value != "") { if (!value.IsEmpty()) {
if (handlerOwner) { if (handlerOwner) {
handlerOwner->CompileEventHandler(context, scriptObject, eventName, value, &handler); handlerOwner->CompileEventHandler(context, scriptObject, eventName, value, &handler);
} }

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

@ -128,7 +128,7 @@ nsXULMenuListElement::GetDisabled(PRBool* aDisabled)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("disabled", value); mOuter->GetAttribute("disabled", value);
if(value == "true") if(value.Equals("true"))
*aDisabled = PR_TRUE; *aDisabled = PR_TRUE;
else else
*aDisabled = PR_FALSE; *aDisabled = PR_FALSE;
@ -215,7 +215,7 @@ nsXULMenuListElement::GetSelectedItem(nsIDOMElement** aResult)
nsAutoString value; nsAutoString value;
GetValue(value); GetValue(value);
if (value == "") { if (value.IsEmpty()) {
nsCOMPtr<nsIContent> parent(do_QueryInterface(mOuter)); nsCOMPtr<nsIContent> parent(do_QueryInterface(mOuter));
nsCOMPtr<nsIContent> child; nsCOMPtr<nsIContent> child;
GetMenuChildrenElement(parent, getter_AddRefs(child)); GetMenuChildrenElement(parent, getter_AddRefs(child));
@ -230,7 +230,7 @@ nsXULMenuListElement::GetSelectedItem(nsIDOMElement** aResult)
nsAutoString isSelected; nsAutoString isSelected;
selectedElement->GetAttribute(nsAutoString("selected"), isSelected); selectedElement->GetAttribute(nsAutoString("selected"), isSelected);
if (isSelected == "true") { if (isSelected.Equals("true")) {
SetSelectedItem(selectedElement); SetSelectedItem(selectedElement);
break; break;
} }

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

@ -100,7 +100,7 @@ nsXULPopupElement::OpenPopup(nsIDOMElement* aElement, PRInt32 aXPos, PRInt32 aYP
nsString tagName; nsString tagName;
nsCOMPtr<nsIDOMElement> popupSetElement = do_QueryInterface(popupSet); nsCOMPtr<nsIDOMElement> popupSetElement = do_QueryInterface(popupSet);
popupSetElement->GetTagName(tagName); popupSetElement->GetTagName(tagName);
if (tagName != "popupset" && tagName != "menu") if (!tagName.Equals("popupset") && !tagName.Equals("menu"))
return NS_OK; return NS_OK;
// Now obtain the popup set frame. // Now obtain the popup set frame.
@ -158,7 +158,7 @@ nsXULPopupElement::ClosePopup()
nsString tagName; nsString tagName;
nsCOMPtr<nsIDOMElement> popupSetElement = do_QueryInterface(popupSet); nsCOMPtr<nsIDOMElement> popupSetElement = do_QueryInterface(popupSet);
popupSetElement->GetTagName(tagName); popupSetElement->GetTagName(tagName);
if (tagName != "popupset" && tagName != "menu") if (!tagName.Equals("popupset") && !tagName.Equals("menu"))
return NS_OK; return NS_OK;
// Now obtain the popup set frame. // Now obtain the popup set frame.

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

@ -395,7 +395,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY)
nsAutoString identifier; nsAutoString identifier;
mElement->GetAttribute(type, identifier); mElement->GetAttribute(type, identifier);
if (identifier == "") if (identifier.IsEmpty())
return rv; return rv;
// Try to find the popup content and the document. We don't use FindDocumentForNode() // Try to find the popup content and the document. We don't use FindDocumentForNode()
@ -485,7 +485,7 @@ XULPopupListenerImpl :: sTooltipCallback (nsITimer *aTimer, void *aClosure)
// check that node is enabled before showing tooltip // check that node is enabled before showing tooltip
nsAutoString disabledState; nsAutoString disabledState;
element->GetAttribute ( "disabled", disabledState ); element->GetAttribute ( "disabled", disabledState );
if ( disabledState != "true" ) { if ( !disabledState.Equals("true") ) {
doc->SetTooltipNode ( element ); doc->SetTooltipNode ( element );
self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+16); self->LaunchPopup (self->mMouseClientX, self->mMouseClientY+16);
} // if node enabled } // if node enabled

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

@ -139,7 +139,7 @@ nsXULRadioElement::GetChecked(PRBool* aChecked)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("checked", value); mOuter->GetAttribute("checked", value);
if(value == "true") if(value.Equals("true"))
*aChecked = PR_TRUE; *aChecked = PR_TRUE;
else else
*aChecked = PR_FALSE; *aChecked = PR_FALSE;
@ -164,7 +164,7 @@ nsXULRadioElement::GetDisabled(PRBool* aDisabled)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("disabled", value); mOuter->GetAttribute("disabled", value);
if(value == "true") if(value.Equals("true"))
*aDisabled = PR_TRUE; *aDisabled = PR_TRUE;
else else
*aDisabled = PR_FALSE; *aDisabled = PR_FALSE;

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

@ -3279,7 +3279,7 @@ RDFGenericBuilderImpl::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory
gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace); gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, nameSpace);
nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX; nsCAutoString progID = NS_ELEMENT_FACTORY_PROGID_PREFIX;
progID += nameSpace; progID.Append(nameSpace);
// Retrieve the appropriate factory. // Retrieve the appropriate factory.
NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv); NS_WITH_SERVICE(nsIElementFactory, elementFactory, progID, &rv);

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

@ -139,7 +139,7 @@ nsXULTitledButtonElement::GetDisabled(PRBool* aDisabled)
{ {
nsAutoString value; nsAutoString value;
mOuter->GetAttribute("disabled", value); mOuter->GetAttribute("disabled", value);
if(value == "true") if(value.Equals("true"))
*aDisabled = PR_TRUE; *aDisabled = PR_TRUE;
else else
*aDisabled = PR_FALSE; *aDisabled = PR_FALSE;

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

@ -331,9 +331,9 @@ nsXULTreeElement::ToggleItemSelection(nsIDOMXULElement* aTreeItem)
nsAutoString isSelected; nsAutoString isSelected;
aTreeItem->GetAttribute("selected", isSelected); aTreeItem->GetAttribute("selected", isSelected);
if (isSelected == "true") if (isSelected.Equals("true"))
RemoveItemFromSelectionInternal(aTreeItem); RemoveItemFromSelectionInternal(aTreeItem);
else if (multiple == "true" || length == 0) else if (multiple.Equals("true") || length == 0)
AddItemToSelectionInternal(aTreeItem); AddItemToSelectionInternal(aTreeItem);
else else
return NS_OK; return NS_OK;
@ -355,9 +355,9 @@ nsXULTreeElement::ToggleCellSelection(nsIDOMXULElement* aTreeCell)
nsAutoString isSelected; nsAutoString isSelected;
aTreeCell->GetAttribute("selected", isSelected); aTreeCell->GetAttribute("selected", isSelected);
if (isSelected == "true") if (isSelected.Equals("true"))
RemoveCellFromSelectionInternal(aTreeCell); RemoveCellFromSelectionInternal(aTreeCell);
else if (multiple == "true" || length == 0) else if (multiple.Equals("true") || length == 0)
AddCellToSelectionInternal(aTreeCell); AddCellToSelectionInternal(aTreeCell);
else else
return NS_OK; return NS_OK;
@ -376,7 +376,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement
nsAutoString multiple; nsAutoString multiple;
mOuter->GetAttribute("multiple", multiple); mOuter->GetAttribute("multiple", multiple);
if (multiple != "true") { if (!multiple.Equals("true")) {
// We're a single selection tree only. This // We're a single selection tree only. This
// is not allowed. // is not allowed.
return NS_OK; return NS_OK;
@ -534,7 +534,7 @@ nsXULTreeElement::FireOnSelectHandler()
nsCOMPtr<nsIAtom> kSuppressSelectChange = dont_AddRef(NS_NewAtom("suppressonselect")); nsCOMPtr<nsIAtom> kSuppressSelectChange = dont_AddRef(NS_NewAtom("suppressonselect"));
nsAutoString value; nsAutoString value;
content->GetAttribute(kNameSpaceID_None, kSuppressSelectChange, value); content->GetAttribute(kNameSpaceID_None, kSuppressSelectChange, value);
if (value == "true") if (value.Equals("true"))
return NS_OK; return NS_OK;
PRInt32 count = document->GetNumberOfShells(); PRInt32 count = document->GetNumberOfShells();
@ -755,7 +755,7 @@ nsXULTreeElement::IndexOfContent(nsIContent* aRoot,
nsAutoString isOpen; nsAutoString isOpen;
rv = child->GetAttribute(kNameSpaceID_None, kOpenAtom, isOpen); rv = child->GetAttribute(kNameSpaceID_None, kOpenAtom, isOpen);
if (isOpen != "true") if (!isOpen.Equals("true"))
parentIsOpen=PR_FALSE; parentIsOpen=PR_FALSE;
} }