[webkit-changes] cvs commit: WebCore/kwq DOM.mm KWQAccObject.mm
KWQClipboard.mm KWQFont.mm KWQKHTMLPart.mm KWQLoader.mm
KWQRenderTreeDebug.cpp KWQString.h WebCoreBridge.mm
Darin
darin at opensource.apple.com
Thu Aug 25 10:47:29 PDT 2005
darin 05/08/25 10:47:28
Modified: . ChangeLog
kjs identifier.h ustring.h
. ChangeLog
khtml khtml_part.cpp khtmlview.cpp
khtml/css css_base.cpp css_ruleimpl.cpp
css_stylesheetimpl.cpp css_valueimpl.cpp
cssparser.cpp cssstyleselector.cpp
khtml/dom dom_string.cpp dom_string.h
khtml/ecma kjs_binding.cpp kjs_css.cpp kjs_dom.cpp
kjs_events.cpp kjs_html.cpp kjs_range.cpp
kjs_views.cpp kjs_window.cpp xmlhttprequest.cpp
xmlserializer.cpp
khtml/editing apply_style_command.cpp
composite_edit_command.cpp
delete_selection_command.cpp jsediting.cpp
markup.cpp selection.cpp visible_position.cpp
visible_text.cpp
khtml/html html_baseimpl.cpp html_documentimpl.cpp
html_elementimpl.cpp html_formimpl.cpp
html_headimpl.cpp html_imageimpl.cpp
html_inlineimpl.cpp html_miscimpl.cpp
html_objectimpl.cpp html_tableimpl.cpp
htmlparser.cpp htmltokenizer.cpp
khtml/misc loader.cpp
khtml/rendering break_lines.cpp font.cpp render_applet.cpp
render_block.cpp render_box.cpp render_form.cpp
render_frames.cpp render_image.cpp render_line.cpp
render_list.cpp render_object.cpp render_text.cpp
render_text.h
khtml/xbl xbl_binding.cpp xbl_docimpl.cpp
xbl_protohandler.cpp
khtml/xml dom2_rangeimpl.cpp dom2_rangeimpl.h
dom_atomicstring.h dom_atomicstringlist.h
dom_docimpl.cpp dom_elementimpl.cpp
dom_nodeimpl.cpp dom_position.cpp
dom_stringimpl.cpp dom_textimpl.cpp dom_textimpl.h
xml_tokenizer.cpp
khtml/xsl xsl_stylesheetimpl.cpp
kwq DOM.mm KWQAccObject.mm KWQClipboard.mm KWQFont.mm
KWQKHTMLPart.mm KWQLoader.mm KWQRenderTreeDebug.cpp
KWQString.h WebCoreBridge.mm
Log:
JavaScriptCore:
Reviewed by John Sullivan.
- rename KJS::UString::string() to KJS::UString::domString()
- rename KJS::Identifier::string() to KJS::Identifier::domString()
* kjs/identifier.h: Renamed.
* kjs/ustring.h: Ditto.
WebCore:
Reviewed by John Sullivan.
- rename KJS::UString::string to KJS::UString::domString
- rename KJS::Identifier::string to KJS::Identifier::domString
- rename DOM::DOMString::string to DOM::DOMString::qstring
It was confusing to have functions named string() with subtly
different meaning. In some cases, we made a string of the wrong type
and then it got converted to the other type.
* khtml/css/css_base.cpp:
(CSSSelector::print):
(CSSSelector::selectorText):
* khtml/css/css_ruleimpl.cpp:
(CSSImportRuleImpl::init):
* khtml/css/css_stylesheetimpl.cpp:
(CSSStyleSheetImpl::parseString):
(MediaListImpl::setMediaText):
* khtml/css/css_valueimpl.cpp:
(DOM::quoteStringIfNeeded):
(DOM::CSSStyleDeclarationImpl::setProperty):
(DOM::CSSMutableStyleDeclarationImpl::setProperty):
* khtml/css/cssparser.cpp:
(CSSParser::parseValue):
(CSSParser::parseColor):
(CSSParser::parseDeclaration):
(CSSParser::parseShortHand):
(CSSParser::parseContent):
(CSSParser::parseBackgroundImage):
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::matchRules):
(khtml::checkPseudoState):
(khtml::CSSStyleSelector::checkOneSelector):
(khtml::CSSRuleSet::addRulesFromSheet):
* khtml/dom/dom_string.cpp:
(DOM::DOMString::percentage):
(DOM::DOMString::qstring):
* khtml/dom/dom_string.h:
* khtml/ecma/kjs_binding.cpp:
(KJS::UString::domString):
(KJS::Identifier::domString):
* khtml/ecma/kjs_css.cpp:
(KJS::DOMCSSStyleDeclaration::put):
(KJS::DOMCSSStyleDeclarationProtoFunc::callAsFunction):
(KJS::DOMStyleSheetList::nameGetter):
(KJS::DOMStyleSheetList::getOwnPropertySlot):
(KJS::DOMMediaList::put):
(KJS::KJS::DOMMediaListProtoFunc::callAsFunction):
(KJS::DOMCSSStyleSheetProtoFunc::callAsFunction):
(KJS::DOMCSSRule::putValueProperty):
(KJS::DOMCSSRuleFunc::callAsFunction):
(KJS::DOMCSSValue::put):
(KJS::DOMCSSPrimitiveValueProtoFunc::callAsFunction):
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNode::putValueProperty):
(KJS::DOMNodeProtoFunc::callAsFunction):
(KJS::DOMNodeList::nameGetter):
(KJS::DOMNodeList::getOwnPropertySlot):
(KJS::DOMAttr::putValueProperty):
(KJS::DOMDocument::putValueProperty):
(KJS::DOMDocumentProtoFunc::callAsFunction):
(KJS::DOMElement::attributeGetter):
(KJS::DOMElement::getOwnPropertySlot):
(KJS::DOMElementProtoFunc::callAsFunction):
(KJS::DOMDOMImplementationProtoFunc::callAsFunction):
(KJS::DOMNamedNodeMapProtoFunc::callAsFunction):
(KJS::DOMProcessingInstruction::put):
(KJS::DOMNamedNodesCollection::getOwnPropertySlot):
(KJS::DOMCharacterData::put):
(KJS::DOMCharacterDataProtoFunc::callAsFunction):
* khtml/ecma/kjs_events.cpp:
(KJS::DOMEventProtoFunc::callAsFunction):
(KJS::DOMUIEventProtoFunc::callAsFunction):
(KJS::DOMMouseEventProtoFunc::callAsFunction):
(KJS::DOMKeyboardEventProtoFunc::callAsFunction):
(KJS::DOMMutationEventProtoFunc::callAsFunction):
(KJS::Clipboard::putValueProperty):
(KJS::ClipboardProtoFunc::callAsFunction):
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::HTMLDocFunction::callAsFunction):
(KJS::HTMLDocument::namedItemGetter):
(KJS::HTMLDocument::getOwnPropertySlot):
(KJS::KJS::HTMLDocument::putValueProperty):
(KJS::HTMLElement::framesetNameGetter):
(KJS::HTMLElement::getOwnPropertySlot):
(KJS::HTMLElement::anchorGetter):
(KJS::HTMLElement::areaGetter):
(KJS::KJS::HTMLElement::put):
(KJS::HTMLElement::putValueProperty):
(KJS::KJS::HTMLCollection::callAsFunction):
(KJS::KJS::HTMLCollection::getNamedItems):
(KJS::KJS::HTMLCollectionProtoFunc::callAsFunction):
(KJS::OptionConstructorImp::construct):
(KJS::Image::putValueProperty):
(KJS::KJS::Context2DFunction::callAsFunction):
(KJS::colorRefFromValue):
(KJS::colorFromValue):
* khtml/ecma/kjs_range.cpp:
(KJS::DOMRangeProtoFunc::callAsFunction):
* khtml/ecma/kjs_views.cpp:
(KJS::DOMAbstractViewFunc::callAsFunction):
* khtml/ecma/kjs_window.cpp:
(KJS::Window::namedItemGetter):
(KJS::Window::getOwnPropertySlot):
(KJS::Window::isSafeScript):
(KJS::WindowFunc::callAsFunction):
(KJS::SelectionFunc::callAsFunction):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequestProtoFunc::callAsFunction):
* khtml/ecma/xmlserializer.cpp:
(KJS::XMLSerializerProtoFunc::callAsFunction):
* khtml/editing/apply_style_command.cpp:
(khtml::StyleChange::init):
* khtml/editing/composite_edit_command.cpp:
(khtml::CompositeEditCommand::deleteInsignificantText):
* khtml/editing/delete_selection_command.cpp:
(khtml::debugPosition):
(khtml::debugNode):
* khtml/editing/jsediting.cpp:
(DOM::JSEditor::queryCommandSupported):
* khtml/editing/markup.cpp:
(khtml::stringValueForRange):
(khtml::renderedText):
(khtml::startMarkup):
(khtml::endMarkup):
(khtml::completeURLs):
(khtml::createMarkup):
* khtml/editing/selection.cpp:
(khtml::Selection::debugRenderer):
(khtml::Selection::debugPosition):
(khtml::Selection::formatForDebugger):
* khtml/editing/visible_position.cpp:
(khtml::VisiblePosition::debugPosition):
* khtml/editing/visible_text.cpp:
(khtml::TextIterator::handleTextNode):
(khtml::TextIterator::handleTextBox):
* khtml/html/html_baseimpl.cpp:
(HTMLBodyElementImpl::parseMappedAttribute):
(HTMLFrameElementImpl::isURLAllowed):
(HTMLFrameElementImpl::openURL):
(HTMLFrameElementImpl::parseMappedAttribute):
(HTMLFrameElementImpl::attach):
(HTMLFrameElementImpl::detach):
(HTMLFrameElementImpl::contentPart):
(HTMLFrameSetElementImpl::parseMappedAttribute):
(HTMLIFrameElementImpl::attach):
* khtml/html/html_documentimpl.cpp:
(DOM::HTMLDocumentImpl::setCookie):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::parseMappedAttribute):
(HTMLElementImpl::createContextualFragment):
(HTMLElementImpl::addHTMLAlignment):
* khtml/html/html_formimpl.cpp:
(DOM::FormDataList::appendData):
(DOM::HTMLFormElementImpl::formWouldHaveSecureSubmission):
(DOM::HTMLFormElementImpl::formData):
(DOM::HTMLFormElementImpl::parseEnctype):
(DOM::HTMLFormElementImpl::submit):
(DOM::HTMLFormElementImpl::parseMappedAttribute):
(DOM::HTMLGenericFormElementImpl::state):
(DOM::HTMLGenericFormElementImpl::findMatchingState):
(DOM::HTMLButtonElementImpl::parseMappedAttribute):
(DOM::HTMLInputElementImpl::state):
(DOM::HTMLInputElementImpl::parseMappedAttribute):
(DOM::HTMLInputElementImpl::appendFormData):
(DOM::HTMLLabelElementImpl::parseMappedAttribute):
(DOM::HTMLSelectElementImpl::parseMappedAttribute):
(DOM::HTMLSelectElementImpl::appendFormData):
(DOM::HTMLKeygenElementImpl::appendFormData):
(DOM::HTMLOptionElementImpl::value):
(DOM::HTMLTextAreaElementImpl::state):
(DOM::HTMLTextAreaElementImpl::parseMappedAttribute):
(DOM::HTMLTextAreaElementImpl::updateValue):
(DOM::HTMLTextAreaElementImpl::setValue):
(DOM::FormDataList::appendFile):
* khtml/html/html_headimpl.cpp:
(HTMLBaseElementImpl::process):
(HTMLLinkElementImpl::parseMappedAttribute):
(HTMLLinkElementImpl::tokenizeRelAttribute):
(HTMLLinkElementImpl::process):
(HTMLScriptElementImpl::insertedIntoDocument):
(HTMLScriptElementImpl::notifyFinished):
(HTMLScriptElementImpl::evaluateScript):
(HTMLStyleElementImpl::parseMappedAttribute):
* khtml/html/html_imageimpl.cpp:
(HTMLImageElementImpl::parseMappedAttribute):
(HTMLImageElementImpl::width):
(HTMLImageElementImpl::height):
* khtml/html/html_inlineimpl.cpp:
(DOM::HTMLAnchorElementImpl::defaultEventHandler):
* khtml/html/html_miscimpl.cpp:
(DOM::HTMLCollectionImpl::updateNameCache):
(DOM::HTMLCollectionImpl::namedItems):
(DOM::HTMLFormCollectionImpl::updateNameCache):
* khtml/html/html_objectimpl.cpp:
(DOM::HTMLAppletElementImpl::createRenderer):
(DOM::HTMLEmbedElementImpl::parseMappedAttribute):
(DOM::HTMLObjectElementImpl::parseMappedAttribute):
(DOM::HTMLParamElementImpl::isURLAttribute):
* khtml/html/html_tableimpl.cpp:
(DOM::HTMLTableElementImpl::addChild):
(DOM::HTMLTableElementImpl::parseMappedAttribute):
(DOM::HTMLTablePartElementImpl::parseMappedAttribute):
(DOM::HTMLTableSectionElementImpl::addChild):
(DOM::HTMLTableRowElementImpl::addChild):
* khtml/html/htmlparser.cpp:
(HTMLParser::handleError):
(HTMLParser::processCloseTag):
* khtml/html/htmltokenizer.cpp:
(khtml::HTMLTokenizer::parseComment):
(khtml::HTMLTokenizer::parseTag):
(khtml::HTMLTokenizer::finish):
(khtml::HTMLTokenizer::processToken):
(khtml::HTMLTokenizer::notifyFinished):
* khtml/khtml_part.cpp:
(khtml::PartStyleSheetLoader::setStyleSheet):
(KHTMLPart::executeScript):
(KHTMLPart::checkEmitLoadEvent):
(KHTMLPart::findTextNext):
(KHTMLPart::overURL):
(KHTMLPart::backgroundURL):
(KHTMLPart::updateActions):
(KHTMLPart::khtmlMousePressEvent):
(KHTMLPart::handleMouseMoveEventDrag):
(KHTMLPart::handleMouseMoveEventOver):
* khtml/khtmlview.cpp:
(KHTMLToolTip::maybeTip):
(KHTMLView::viewportMouseDoubleClickEvent):
(KHTMLView::focusNextPrevNode):
* khtml/misc/loader.cpp:
(CachedObject::finish):
(CachedCSSStyleSheet::checkNotify):
(CachedXSLStyleSheet::checkNotify):
(CachedXBLDocument::checkNotify):
(DocLoader::requestImage):
(DocLoader::requestStyleSheet):
(DocLoader::requestScript):
(DocLoader::requestXSLStyleSheet):
(DocLoader::requestXBLDocument):
(Loader::servePendingRequests):
(Loader::slotFinished):
(Loader::cancelRequests):
(Cache::requestImage):
(Cache::requestStyleSheet):
(Cache::requestScript):
(Cache::requestXSLStyleSheet):
(Cache::requestXBLDocument):
(Cache::removeCacheEntry):
* khtml/rendering/break_lines.cpp:
(khtml::isBreakable):
* khtml/rendering/font.cpp:
(Font::drawText):
(Font::width):
* khtml/rendering/render_applet.cpp:
(RenderApplet::createWidgetIfNecessary):
* khtml/rendering/render_block.cpp:
(khtml::RenderBlock::updateFirstLetter):
* khtml/rendering/render_box.cpp:
(RenderBox::~RenderBox):
* khtml/rendering/render_form.cpp:
(RenderSubmitButton::rawText):
(RenderLineEdit::RenderLineEdit):
(RenderLineEdit::updateFromElement):
(RenderFileButton::updateFromElement):
(RenderSelect::updateFromElement):
(RenderTextArea::updateFromElement):
(RenderSlider::updateFromElement):
* khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* khtml/rendering/render_image.cpp:
(RenderImage::setPixmap):
(RenderImage::paint):
* khtml/rendering/render_line.cpp:
(khtml::EllipsisBox::paint):
* khtml/rendering/render_list.cpp:
(RenderListItem::paint):
(RenderListMarker::paint):
* khtml/rendering/render_object.cpp:
(RenderObject::information):
* khtml/rendering/render_text.cpp:
(InlineTextBox::paint):
(InlineTextBox::selectionStartEnd):
(RenderText::RenderText):
(RenderText::originalString):
(RenderText::setText):
(RenderText::position):
(RenderTextFragment::originalString):
* khtml/rendering/render_text.h:
(khtml::RenderText::qstring):
* khtml/xbl/xbl_binding.cpp:
(XBL::m_nextBinding):
(XBL::XBLBinding::setXBLDocument):
* khtml/xbl/xbl_docimpl.cpp:
(XBL::XBLDocumentImpl::setPrototypeBinding):
(XBL::XBLDocumentImpl::prototypeBinding):
* khtml/xbl/xbl_protohandler.cpp:
(XBL::m_unused):
* khtml/xml/dom2_rangeimpl.cpp:
(DOM::RangeImpl::createContextualFragment):
(DOM::RangeImpl::formatForDebugger):
* khtml/xml/dom2_rangeimpl.h:
* khtml/xml/dom_atomicstring.h:
(DOM::AtomicString::qstring):
* khtml/xml/dom_atomicstringlist.h:
(DOM::AtomicStringList::qstring):
* khtml/xml/dom_docimpl.cpp:
(DOMImplementationImpl::hasFeature):
(DOMImplementationImpl::createHTMLDocument):
(DocumentImpl::getElementById):
(DocumentImpl::addElementById):
(DocumentImpl::removeElementById):
(DocumentImpl::getElementByAccessKey):
(DocumentImpl::updateTitle):
(DocumentImpl::write):
(DocumentImpl::processHttpEquiv):
(DocumentImpl::prepareMouseEvent):
(DocumentImpl::setSelectedStylesheetSet):
(DocumentImpl::recalcStyleSelector):
(DocumentImpl::defaultEventHandler):
(DocumentImpl::addImageMap):
(DocumentImpl::removeImageMap):
(DocumentImpl::getImageMap):
(DocumentImpl::completeURL):
* khtml/xml/dom_elementimpl.cpp:
(ElementImpl::recalcStyle):
(ElementImpl::dump):
(ElementImpl::formatForDebugger):
(NamedMappedAttrMapImpl::parseClassAttribute):
(StyledElementImpl::addCSSColor):
* khtml/xml/dom_nodeimpl.cpp:
(DOM::NodeImpl::dump):
(DOM::appendAttributeDesc):
(DOM::NodeImpl::showNode):
(DOM::NodeImpl::formatForDebugger):
* khtml/xml/dom_position.cpp:
(DOM::Position::debugPosition):
(DOM::Position::formatForDebugger):
* khtml/xml/dom_stringimpl.cpp:
(DOM::parseLength):
(DOM::DOMStringImpl::toInt):
* khtml/xml/dom_textimpl.cpp:
(CharacterDataImpl::dump):
(CommentImpl::nodeName):
(TextImpl::nodeName):
(TextImpl::formatForDebugger):
* khtml/xml/dom_textimpl.h:
(DOM::CharacterDataImpl::qstring):
* khtml/xml/xml_tokenizer.cpp:
(khtml::XMLTokenizer::executeScripts):
(khtml::XMLTokenizer::notifyFinished):
(khtml::parseXMLDocumentFragment):
(khtml::XMLNamespaceStack::pushNamespaces):
(khtml::parseAttributes):
* khtml/xsl/xsl_stylesheetimpl.cpp:
(DOM::XSLStyleSheetImpl::loadChildSheets):
(DOM::XSLStyleSheetImpl::locateStylesheetSubResource):
(DOM::XSLImportRuleImpl::loadSheet):
* kwq/DOM.mm:
(-[DOMElement _getURLAttribute:]):
(-[DOMRange _text]):
* kwq/KWQAccObject.mm:
(-[KWQAccObject helpText]):
(-[KWQAccObject accessibilityDescription]):
(-[KWQAccObject accessibilityAttributeValue:]):
* kwq/KWQClipboard.mm:
(cocoaTypeFromMIMEType):
(KWQClipboard::setData):
* kwq/KWQFont.mm:
(QFont::family):
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::searchForLabelsAboveCell):
(KWQKHTMLPart::searchForLabelsBeforeElement):
(KWQKHTMLPart::matchLabelsAgainstElement):
(KWQKHTMLPart::setTitle):
(KWQKHTMLPart::fileWrapperForElement):
(KWQKHTMLPart::attributedString):
* kwq/KWQLoader.mm:
(KWQServeRequest):
(KWQCheckCacheObjectStatus):
* kwq/KWQRenderTreeDebug.cpp:
(getTagName):
(writeTextRun):
* kwq/KWQString.h:
(QConstString::qstring):
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge _documentTypeString]):
(-[WebCoreBridge copyDOMNode:copier:]):
(-[WebCoreBridge elementAtPoint:]):
(-[WebCoreBridge URLWithAttributeString:]):
(-[WebCoreBridge domain]):
Revision Changes Path
1.806 +10 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -r1.805 -r1.806
--- ChangeLog 19 Aug 2005 20:24:16 -0000 1.805
+++ ChangeLog 25 Aug 2005 17:46:52 -0000 1.806
@@ -1,3 +1,13 @@
+2005-08-25 Darin Adler <darin at apple.com>
+
+ Reviewed by John Sullivan.
+
+ - rename KJS::UString::string() to KJS::UString::domString()
+ - rename KJS::Identifier::string() to KJS::Identifier::domString()
+
+ * kjs/identifier.h: Renamed.
+ * kjs/ustring.h: Ditto.
+
2005-08-19 Darin Adler <darin at apple.com>
Reviewed by Maciej.
1.17 +1 -1 JavaScriptCore/kjs/identifier.h
Index: identifier.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/identifier.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- identifier.h 19 Aug 2005 20:24:17 -0000 1.16
+++ identifier.h 25 Aug 2005 17:46:54 -0000 1.17
@@ -37,7 +37,7 @@
explicit Identifier(const UString &s) : _ustring(add(s.rep)) { }
const UString &ustring() const { return _ustring; }
- DOM::DOMString string() const;
+ DOM::DOMString domString() const;
QString qstring() const;
const UChar *data() const { return _ustring.data(); }
1.39 +1 -1 JavaScriptCore/kjs/ustring.h
Index: ustring.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/ustring.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ustring.h 19 Aug 2005 20:24:17 -0000 1.38
+++ ustring.h 25 Aug 2005 17:46:54 -0000 1.39
@@ -354,7 +354,7 @@
/**
* @see UString(const QString&).
*/
- DOM::DOMString string() const;
+ DOM::DOMString domString() const;
/**
* @see UString(const QString&).
*/
1.11 +393 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 25 Aug 2005 17:21:58 -0000 1.10
+++ ChangeLog 25 Aug 2005 17:46:54 -0000 1.11
@@ -1,3 +1,396 @@
+2005-08-25 Darin Adler <darin at apple.com>
+
+ Reviewed by John Sullivan.
+
+ - rename KJS::UString::string to KJS::UString::domString
+ - rename KJS::Identifier::string to KJS::Identifier::domString
+ - rename DOM::DOMString::string to DOM::DOMString::qstring
+
+ It was confusing to have functions named string() with subtly
+ different meaning. In some cases, we made a string of the wrong type
+ and then it got converted to the other type.
+
+ * khtml/css/css_base.cpp:
+ (CSSSelector::print):
+ (CSSSelector::selectorText):
+ * khtml/css/css_ruleimpl.cpp:
+ (CSSImportRuleImpl::init):
+ * khtml/css/css_stylesheetimpl.cpp:
+ (CSSStyleSheetImpl::parseString):
+ (MediaListImpl::setMediaText):
+ * khtml/css/css_valueimpl.cpp:
+ (DOM::quoteStringIfNeeded):
+ (DOM::CSSStyleDeclarationImpl::setProperty):
+ (DOM::CSSMutableStyleDeclarationImpl::setProperty):
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ (CSSParser::parseColor):
+ (CSSParser::parseDeclaration):
+ (CSSParser::parseShortHand):
+ (CSSParser::parseContent):
+ (CSSParser::parseBackgroundImage):
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::matchRules):
+ (khtml::checkPseudoState):
+ (khtml::CSSStyleSelector::checkOneSelector):
+ (khtml::CSSRuleSet::addRulesFromSheet):
+ * khtml/dom/dom_string.cpp:
+ (DOM::DOMString::percentage):
+ (DOM::DOMString::qstring):
+ * khtml/dom/dom_string.h:
+ * khtml/ecma/kjs_binding.cpp:
+ (KJS::UString::domString):
+ (KJS::Identifier::domString):
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::DOMCSSStyleDeclaration::put):
+ (KJS::DOMCSSStyleDeclarationProtoFunc::callAsFunction):
+ (KJS::DOMStyleSheetList::nameGetter):
+ (KJS::DOMStyleSheetList::getOwnPropertySlot):
+ (KJS::DOMMediaList::put):
+ (KJS::KJS::DOMMediaListProtoFunc::callAsFunction):
+ (KJS::DOMCSSStyleSheetProtoFunc::callAsFunction):
+ (KJS::DOMCSSRule::putValueProperty):
+ (KJS::DOMCSSRuleFunc::callAsFunction):
+ (KJS::DOMCSSValue::put):
+ (KJS::DOMCSSPrimitiveValueProtoFunc::callAsFunction):
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::putValueProperty):
+ (KJS::DOMNodeProtoFunc::callAsFunction):
+ (KJS::DOMNodeList::nameGetter):
+ (KJS::DOMNodeList::getOwnPropertySlot):
+ (KJS::DOMAttr::putValueProperty):
+ (KJS::DOMDocument::putValueProperty):
+ (KJS::DOMDocumentProtoFunc::callAsFunction):
+ (KJS::DOMElement::attributeGetter):
+ (KJS::DOMElement::getOwnPropertySlot):
+ (KJS::DOMElementProtoFunc::callAsFunction):
+ (KJS::DOMDOMImplementationProtoFunc::callAsFunction):
+ (KJS::DOMNamedNodeMapProtoFunc::callAsFunction):
+ (KJS::DOMProcessingInstruction::put):
+ (KJS::DOMNamedNodesCollection::getOwnPropertySlot):
+ (KJS::DOMCharacterData::put):
+ (KJS::DOMCharacterDataProtoFunc::callAsFunction):
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::DOMEventProtoFunc::callAsFunction):
+ (KJS::DOMUIEventProtoFunc::callAsFunction):
+ (KJS::DOMMouseEventProtoFunc::callAsFunction):
+ (KJS::DOMKeyboardEventProtoFunc::callAsFunction):
+ (KJS::DOMMutationEventProtoFunc::callAsFunction):
+ (KJS::Clipboard::putValueProperty):
+ (KJS::ClipboardProtoFunc::callAsFunction):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::KJS::HTMLDocFunction::callAsFunction):
+ (KJS::HTMLDocument::namedItemGetter):
+ (KJS::HTMLDocument::getOwnPropertySlot):
+ (KJS::KJS::HTMLDocument::putValueProperty):
+ (KJS::HTMLElement::framesetNameGetter):
+ (KJS::HTMLElement::getOwnPropertySlot):
+ (KJS::HTMLElement::anchorGetter):
+ (KJS::HTMLElement::areaGetter):
+ (KJS::KJS::HTMLElement::put):
+ (KJS::HTMLElement::putValueProperty):
+ (KJS::KJS::HTMLCollection::callAsFunction):
+ (KJS::KJS::HTMLCollection::getNamedItems):
+ (KJS::KJS::HTMLCollectionProtoFunc::callAsFunction):
+ (KJS::OptionConstructorImp::construct):
+ (KJS::Image::putValueProperty):
+ (KJS::KJS::Context2DFunction::callAsFunction):
+ (KJS::colorRefFromValue):
+ (KJS::colorFromValue):
+ * khtml/ecma/kjs_range.cpp:
+ (KJS::DOMRangeProtoFunc::callAsFunction):
+ * khtml/ecma/kjs_views.cpp:
+ (KJS::DOMAbstractViewFunc::callAsFunction):
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::Window::namedItemGetter):
+ (KJS::Window::getOwnPropertySlot):
+ (KJS::Window::isSafeScript):
+ (KJS::WindowFunc::callAsFunction):
+ (KJS::SelectionFunc::callAsFunction):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequestProtoFunc::callAsFunction):
+ * khtml/ecma/xmlserializer.cpp:
+ (KJS::XMLSerializerProtoFunc::callAsFunction):
+ * khtml/editing/apply_style_command.cpp:
+ (khtml::StyleChange::init):
+ * khtml/editing/composite_edit_command.cpp:
+ (khtml::CompositeEditCommand::deleteInsignificantText):
+ * khtml/editing/delete_selection_command.cpp:
+ (khtml::debugPosition):
+ (khtml::debugNode):
+ * khtml/editing/jsediting.cpp:
+ (DOM::JSEditor::queryCommandSupported):
+ * khtml/editing/markup.cpp:
+ (khtml::stringValueForRange):
+ (khtml::renderedText):
+ (khtml::startMarkup):
+ (khtml::endMarkup):
+ (khtml::completeURLs):
+ (khtml::createMarkup):
+ * khtml/editing/selection.cpp:
+ (khtml::Selection::debugRenderer):
+ (khtml::Selection::debugPosition):
+ (khtml::Selection::formatForDebugger):
+ * khtml/editing/visible_position.cpp:
+ (khtml::VisiblePosition::debugPosition):
+ * khtml/editing/visible_text.cpp:
+ (khtml::TextIterator::handleTextNode):
+ (khtml::TextIterator::handleTextBox):
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLBodyElementImpl::parseMappedAttribute):
+ (HTMLFrameElementImpl::isURLAllowed):
+ (HTMLFrameElementImpl::openURL):
+ (HTMLFrameElementImpl::parseMappedAttribute):
+ (HTMLFrameElementImpl::attach):
+ (HTMLFrameElementImpl::detach):
+ (HTMLFrameElementImpl::contentPart):
+ (HTMLFrameSetElementImpl::parseMappedAttribute):
+ (HTMLIFrameElementImpl::attach):
+ * khtml/html/html_documentimpl.cpp:
+ (DOM::HTMLDocumentImpl::setCookie):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::parseMappedAttribute):
+ (HTMLElementImpl::createContextualFragment):
+ (HTMLElementImpl::addHTMLAlignment):
+ * khtml/html/html_formimpl.cpp:
+ (DOM::FormDataList::appendData):
+ (DOM::HTMLFormElementImpl::formWouldHaveSecureSubmission):
+ (DOM::HTMLFormElementImpl::formData):
+ (DOM::HTMLFormElementImpl::parseEnctype):
+ (DOM::HTMLFormElementImpl::submit):
+ (DOM::HTMLFormElementImpl::parseMappedAttribute):
+ (DOM::HTMLGenericFormElementImpl::state):
+ (DOM::HTMLGenericFormElementImpl::findMatchingState):
+ (DOM::HTMLButtonElementImpl::parseMappedAttribute):
+ (DOM::HTMLInputElementImpl::state):
+ (DOM::HTMLInputElementImpl::parseMappedAttribute):
+ (DOM::HTMLInputElementImpl::appendFormData):
+ (DOM::HTMLLabelElementImpl::parseMappedAttribute):
+ (DOM::HTMLSelectElementImpl::parseMappedAttribute):
+ (DOM::HTMLSelectElementImpl::appendFormData):
+ (DOM::HTMLKeygenElementImpl::appendFormData):
+ (DOM::HTMLOptionElementImpl::value):
+ (DOM::HTMLTextAreaElementImpl::state):
+ (DOM::HTMLTextAreaElementImpl::parseMappedAttribute):
+ (DOM::HTMLTextAreaElementImpl::updateValue):
+ (DOM::HTMLTextAreaElementImpl::setValue):
+ (DOM::FormDataList::appendFile):
+ * khtml/html/html_headimpl.cpp:
+ (HTMLBaseElementImpl::process):
+ (HTMLLinkElementImpl::parseMappedAttribute):
+ (HTMLLinkElementImpl::tokenizeRelAttribute):
+ (HTMLLinkElementImpl::process):
+ (HTMLScriptElementImpl::insertedIntoDocument):
+ (HTMLScriptElementImpl::notifyFinished):
+ (HTMLScriptElementImpl::evaluateScript):
+ (HTMLStyleElementImpl::parseMappedAttribute):
+ * khtml/html/html_imageimpl.cpp:
+ (HTMLImageElementImpl::parseMappedAttribute):
+ (HTMLImageElementImpl::width):
+ (HTMLImageElementImpl::height):
+ * khtml/html/html_inlineimpl.cpp:
+ (DOM::HTMLAnchorElementImpl::defaultEventHandler):
+ * khtml/html/html_miscimpl.cpp:
+ (DOM::HTMLCollectionImpl::updateNameCache):
+ (DOM::HTMLCollectionImpl::namedItems):
+ (DOM::HTMLFormCollectionImpl::updateNameCache):
+ * khtml/html/html_objectimpl.cpp:
+ (DOM::HTMLAppletElementImpl::createRenderer):
+ (DOM::HTMLEmbedElementImpl::parseMappedAttribute):
+ (DOM::HTMLObjectElementImpl::parseMappedAttribute):
+ (DOM::HTMLParamElementImpl::isURLAttribute):
+ * khtml/html/html_tableimpl.cpp:
+ (DOM::HTMLTableElementImpl::addChild):
+ (DOM::HTMLTableElementImpl::parseMappedAttribute):
+ (DOM::HTMLTablePartElementImpl::parseMappedAttribute):
+ (DOM::HTMLTableSectionElementImpl::addChild):
+ (DOM::HTMLTableRowElementImpl::addChild):
+ * khtml/html/htmlparser.cpp:
+ (HTMLParser::handleError):
+ (HTMLParser::processCloseTag):
+ * khtml/html/htmltokenizer.cpp:
+ (khtml::HTMLTokenizer::parseComment):
+ (khtml::HTMLTokenizer::parseTag):
+ (khtml::HTMLTokenizer::finish):
+ (khtml::HTMLTokenizer::processToken):
+ (khtml::HTMLTokenizer::notifyFinished):
+ * khtml/khtml_part.cpp:
+ (khtml::PartStyleSheetLoader::setStyleSheet):
+ (KHTMLPart::executeScript):
+ (KHTMLPart::checkEmitLoadEvent):
+ (KHTMLPart::findTextNext):
+ (KHTMLPart::overURL):
+ (KHTMLPart::backgroundURL):
+ (KHTMLPart::updateActions):
+ (KHTMLPart::khtmlMousePressEvent):
+ (KHTMLPart::handleMouseMoveEventDrag):
+ (KHTMLPart::handleMouseMoveEventOver):
+ * khtml/khtmlview.cpp:
+ (KHTMLToolTip::maybeTip):
+ (KHTMLView::viewportMouseDoubleClickEvent):
+ (KHTMLView::focusNextPrevNode):
+ * khtml/misc/loader.cpp:
+ (CachedObject::finish):
+ (CachedCSSStyleSheet::checkNotify):
+ (CachedXSLStyleSheet::checkNotify):
+ (CachedXBLDocument::checkNotify):
+ (DocLoader::requestImage):
+ (DocLoader::requestStyleSheet):
+ (DocLoader::requestScript):
+ (DocLoader::requestXSLStyleSheet):
+ (DocLoader::requestXBLDocument):
+ (Loader::servePendingRequests):
+ (Loader::slotFinished):
+ (Loader::cancelRequests):
+ (Cache::requestImage):
+ (Cache::requestStyleSheet):
+ (Cache::requestScript):
+ (Cache::requestXSLStyleSheet):
+ (Cache::requestXBLDocument):
+ (Cache::removeCacheEntry):
+ * khtml/rendering/break_lines.cpp:
+ (khtml::isBreakable):
+ * khtml/rendering/font.cpp:
+ (Font::drawText):
+ (Font::width):
+ * khtml/rendering/render_applet.cpp:
+ (RenderApplet::createWidgetIfNecessary):
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::updateFirstLetter):
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::~RenderBox):
+ * khtml/rendering/render_form.cpp:
+ (RenderSubmitButton::rawText):
+ (RenderLineEdit::RenderLineEdit):
+ (RenderLineEdit::updateFromElement):
+ (RenderFileButton::updateFromElement):
+ (RenderSelect::updateFromElement):
+ (RenderTextArea::updateFromElement):
+ (RenderSlider::updateFromElement):
+ * khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * khtml/rendering/render_image.cpp:
+ (RenderImage::setPixmap):
+ (RenderImage::paint):
+ * khtml/rendering/render_line.cpp:
+ (khtml::EllipsisBox::paint):
+ * khtml/rendering/render_list.cpp:
+ (RenderListItem::paint):
+ (RenderListMarker::paint):
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::information):
+ * khtml/rendering/render_text.cpp:
+ (InlineTextBox::paint):
+ (InlineTextBox::selectionStartEnd):
+ (RenderText::RenderText):
+ (RenderText::originalString):
+ (RenderText::setText):
+ (RenderText::position):
+ (RenderTextFragment::originalString):
+ * khtml/rendering/render_text.h:
+ (khtml::RenderText::qstring):
+ * khtml/xbl/xbl_binding.cpp:
+ (XBL::m_nextBinding):
+ (XBL::XBLBinding::setXBLDocument):
+ * khtml/xbl/xbl_docimpl.cpp:
+ (XBL::XBLDocumentImpl::setPrototypeBinding):
+ (XBL::XBLDocumentImpl::prototypeBinding):
+ * khtml/xbl/xbl_protohandler.cpp:
+ (XBL::m_unused):
+ * khtml/xml/dom2_rangeimpl.cpp:
+ (DOM::RangeImpl::createContextualFragment):
+ (DOM::RangeImpl::formatForDebugger):
+ * khtml/xml/dom2_rangeimpl.h:
+ * khtml/xml/dom_atomicstring.h:
+ (DOM::AtomicString::qstring):
+ * khtml/xml/dom_atomicstringlist.h:
+ (DOM::AtomicStringList::qstring):
+ * khtml/xml/dom_docimpl.cpp:
+ (DOMImplementationImpl::hasFeature):
+ (DOMImplementationImpl::createHTMLDocument):
+ (DocumentImpl::getElementById):
+ (DocumentImpl::addElementById):
+ (DocumentImpl::removeElementById):
+ (DocumentImpl::getElementByAccessKey):
+ (DocumentImpl::updateTitle):
+ (DocumentImpl::write):
+ (DocumentImpl::processHttpEquiv):
+ (DocumentImpl::prepareMouseEvent):
+ (DocumentImpl::setSelectedStylesheetSet):
+ (DocumentImpl::recalcStyleSelector):
+ (DocumentImpl::defaultEventHandler):
+ (DocumentImpl::addImageMap):
+ (DocumentImpl::removeImageMap):
+ (DocumentImpl::getImageMap):
+ (DocumentImpl::completeURL):
+ * khtml/xml/dom_elementimpl.cpp:
+ (ElementImpl::recalcStyle):
+ (ElementImpl::dump):
+ (ElementImpl::formatForDebugger):
+ (NamedMappedAttrMapImpl::parseClassAttribute):
+ (StyledElementImpl::addCSSColor):
+ * khtml/xml/dom_nodeimpl.cpp:
+ (DOM::NodeImpl::dump):
+ (DOM::appendAttributeDesc):
+ (DOM::NodeImpl::showNode):
+ (DOM::NodeImpl::formatForDebugger):
+ * khtml/xml/dom_position.cpp:
+ (DOM::Position::debugPosition):
+ (DOM::Position::formatForDebugger):
+ * khtml/xml/dom_stringimpl.cpp:
+ (DOM::parseLength):
+ (DOM::DOMStringImpl::toInt):
+ * khtml/xml/dom_textimpl.cpp:
+ (CharacterDataImpl::dump):
+ (CommentImpl::nodeName):
+ (TextImpl::nodeName):
+ (TextImpl::formatForDebugger):
+ * khtml/xml/dom_textimpl.h:
+ (DOM::CharacterDataImpl::qstring):
+ * khtml/xml/xml_tokenizer.cpp:
+ (khtml::XMLTokenizer::executeScripts):
+ (khtml::XMLTokenizer::notifyFinished):
+ (khtml::parseXMLDocumentFragment):
+ (khtml::XMLNamespaceStack::pushNamespaces):
+ (khtml::parseAttributes):
+ * khtml/xsl/xsl_stylesheetimpl.cpp:
+ (DOM::XSLStyleSheetImpl::loadChildSheets):
+ (DOM::XSLStyleSheetImpl::locateStylesheetSubResource):
+ (DOM::XSLImportRuleImpl::loadSheet):
+ * kwq/DOM.mm:
+ (-[DOMElement _getURLAttribute:]):
+ (-[DOMRange _text]):
+ * kwq/KWQAccObject.mm:
+ (-[KWQAccObject helpText]):
+ (-[KWQAccObject accessibilityDescription]):
+ (-[KWQAccObject accessibilityAttributeValue:]):
+ * kwq/KWQClipboard.mm:
+ (cocoaTypeFromMIMEType):
+ (KWQClipboard::setData):
+ * kwq/KWQFont.mm:
+ (QFont::family):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::searchForLabelsAboveCell):
+ (KWQKHTMLPart::searchForLabelsBeforeElement):
+ (KWQKHTMLPart::matchLabelsAgainstElement):
+ (KWQKHTMLPart::setTitle):
+ (KWQKHTMLPart::fileWrapperForElement):
+ (KWQKHTMLPart::attributedString):
+ * kwq/KWQLoader.mm:
+ (KWQServeRequest):
+ (KWQCheckCacheObjectStatus):
+ * kwq/KWQRenderTreeDebug.cpp:
+ (getTagName):
+ (writeTextRun):
+ * kwq/KWQString.h:
+ (QConstString::qstring):
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge _documentTypeString]):
+ (-[WebCoreBridge copyDOMNode:copier:]):
+ (-[WebCoreBridge elementAtPoint:]):
+ (-[WebCoreBridge URLWithAttributeString:]):
+ (-[WebCoreBridge domain]):
+
2005-08-25 Anders Carlsson <andersca at mac.com>
Reviewed and landed by Darin.
1.335 +18 -18 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- khtml_part.cpp 14 Aug 2005 09:12:43 -0000 1.334
+++ khtml_part.cpp 25 Aug 2005 17:46:55 -0000 1.335
@@ -158,7 +158,7 @@
virtual void setStyleSheet(const DOM::DOMString&, const DOM::DOMString &sheet)
{
if ( m_part )
- m_part->setUserStyleSheet( sheet.string() );
+ m_part->setUserStyleSheet( sheet.qstring() );
delete this;
}
@@ -816,7 +816,7 @@
QVariant KHTMLPart::executeScript( DOM::NodeImpl *n, const QString &script, bool forceUserGesture )
{
#ifdef KJS_VERBOSE
- kdDebug(6070) << "KHTMLPart::executeScript n=" << n.nodeName().string().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " << script << endl;
+ kdDebug(6070) << "KHTMLPart::executeScript n=" << n.nodeName().qstring().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " << script << endl;
#endif
KJSProxy *proxy = jScript();
@@ -2005,7 +2005,7 @@
KHTMLPart* htmlFrame = static_cast<KHTMLPart *>(p);
if (htmlFrame->d->m_doc)
{
- kdDebug() << "KHTMLPart::checkCompleted setting frame domain to " << domain.string() << endl;
+ kdDebug() << "KHTMLPart::checkCompleted setting frame domain to " << domain.qstring() << endl;
htmlFrame->d->m_doc->setDomain( domain );
}
}
@@ -2378,12 +2378,12 @@
if ( isRegExp ) {
QRegExp matcher( str );
matcher.setCaseSensitive( caseSensitive );
- d->m_findPos = matcher.search(s.string(), d->m_findPos+1);
+ d->m_findPos = matcher.search(s.qstring(), d->m_findPos+1);
if ( d->m_findPos != -1 )
matchLen = matcher.matchedLength();
}
else {
- d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive);
+ d->m_findPos = s.qstring().find(str, d->m_findPos+1, caseSensitive);
matchLen = str.length();
}
@@ -2819,13 +2819,13 @@
#if 0
else if (u.protocol() == QString::fromLatin1("http")) {
DOM::Node hrefNode = nodeUnderMouse().parentNode();
- while (hrefNode.nodeName().string() != QString::fromLatin1("A") && !hrefNode.isNull())
+ while (hrefNode.nodeName().qstring() != QString::fromLatin1("A") && !hrefNode.isNull())
hrefNode = hrefNode.parentNode();
if (!hrefNode.isNull()) {
DOM::Node hreflangNode = hrefNode.attributes().getNamedItem("HREFLANG");
if (!hreflangNode.isNull()) {
- QString countryCode = hreflangNode.nodeValue().string().lower();
+ QString countryCode = hreflangNode.nodeValue().qstring().lower();
// Map the language code to an appropriate country code.
if (countryCode == QString::fromLatin1("en"))
countryCode = QString::fromLatin1("gb");
@@ -2991,7 +2991,7 @@
if (!d->m_doc || !d->m_doc->isHTMLDocument())
return KURL();
- QString relURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( backgroundAttr ).string();
+ QString relURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( backgroundAttr ).qstring();
return KURL( m_url, relURL );
}
@@ -3156,7 +3156,7 @@
// ### frames
if ( d->m_doc && d->m_doc->isHTMLDocument() && static_cast<HTMLDocumentImpl*>(d->m_doc)->body() && !d->m_bClearing )
- bgURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( backgroundAttr ).string();
+ bgURL = static_cast<HTMLDocumentImpl*>(d->m_doc)->body()->getAttribute( backgroundAttr ).qstring();
d->m_paSaveBackground->setEnabled( !bgURL.isEmpty() );
}
@@ -4719,8 +4719,8 @@
d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
}
else {
- d->m_strSelectedURL = event->url().string();
- d->m_strSelectedURLTarget = event->target().string();
+ d->m_strSelectedURL = event->url().qstring();
+ d->m_strSelectedURLTarget = event->target().qstring();
}
#if !APPLE_CHANGES
@@ -4787,7 +4787,7 @@
if (i) {
KMultipleDrag *mdrag = new KMultipleDrag( d->m_view->viewport());
mdrag->addDragObject(new QImageDrag(i->currentImage(), 0L));
- KURL u( completeURL( khtml::parseURL(i->getAttribute(srcAttr)).string()));
+ KURL u( completeURL( khtml::parseURL(i->getAttribute(srcAttr)).qstring()));
KURLDrag* urlDrag = KURLDrag::newDrag(u, 0L);
if (!d->m_referrer.isEmpty())
urlDrag->metaData()["referrer"] = d->m_referrer;
@@ -4838,18 +4838,18 @@
int x(mouse->x() - vx);
int y(mouse->y() - vy);
- d->m_overURL = url.string() + QString("?%1,%2").arg(x).arg(y);
- d->m_overURLTarget = target.string();
- overURL(d->m_overURL, target.string(), shiftPressed);
+ d->m_overURL = url.qstring() + QString("?%1,%2").arg(x).arg(y);
+ d->m_overURLTarget = target.qstring();
+ overURL(d->m_overURL, target.qstring(), shiftPressed);
return true;
}
}
}
// normal link
if (d->m_overURL.isEmpty() || d->m_overURL != url || d->m_overURLTarget != target) {
- d->m_overURL = url.string();
- d->m_overURLTarget = target.string();
- overURL(d->m_overURL, target.string(), shiftPressed);
+ d->m_overURL = url.qstring();
+ d->m_overURLTarget = target.qstring();
+ overURL(d->m_overURL, target.qstring(), shiftPressed);
}
}
else { // Not over a link...
1.142 +3 -3 WebCore/khtml/khtmlview.cpp
Index: khtmlview.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- khtmlview.cpp 24 Aug 2005 01:46:49 -0000 1.141
+++ khtmlview.cpp 25 Aug 2005 17:46:55 -0000 1.142
@@ -258,7 +258,7 @@
AtomicString s = static_cast<DOM::ElementImpl*>( node )->getAttribute(ATTR_TITLE);
if (!s.isEmpty()) {
QRect r( m_view->contentsToViewport( node->getRect().topLeft() ), node->getRect().size() );
- tip( r, s.string() );
+ tip( r, s.qstring() );
}
break;
}
@@ -870,7 +870,7 @@
// ###
//if ( url.length() )
- //emit doubleClick( url.string(), _mouse->button() );
+ //emit doubleClick( url.qstring(), _mouse->button() );
}
#endif
@@ -1518,7 +1518,7 @@
anchor = static_cast<HTMLAnchorElementImpl *>(newFocusNode);
if (anchor && !anchor->areaHref().isNull())
- m_part->overURL(anchor->areaHref().string(), 0);
+ m_part->overURL(anchor->areaHref().qstring(), 0);
else
m_part->overURL(QString(), 0);
}
1.19 +11 -11 WebCore/khtml/css/css_base.cpp
Index: css_base.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_base.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- css_base.cpp 28 Jul 2005 23:27:11 -0000 1.18
+++ css_base.cpp 25 Aug 2005 17:46:57 -0000 1.19
@@ -94,8 +94,8 @@
void CSSSelector::print(void)
{
- kdDebug( 6080 ) << "[Selector: tag = " << tag.localName().string() << ", attr = \"" << attr.localName().string() << "\", match = \"" << match
- << "\" value = \"" << value.string().latin1() << "\" relation = " << (int)relation
+ kdDebug( 6080 ) << "[Selector: tag = " << tag.localName().qstring() << ", attr = \"" << attr.localName().qstring() << "\", match = \"" << match
+ << "\" value = \"" << value.qstring().latin1() << "\" relation = " << (int)relation
<< "]" << endl;
if ( tagHistory )
tagHistory->print();
@@ -255,22 +255,22 @@
if (localName == starAtom && cs->match == CSSSelector::Id)
{
str = "#";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (localName == starAtom && cs->match == CSSSelector::Class)
{
str = ".";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (localName == starAtom && cs->match == CSSSelector::PseudoClass)
{
str = ":";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (localName == starAtom && cs->match == CSSSelector::PseudoElement)
{
str = "::";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else
{
@@ -281,22 +281,22 @@
if (cs->match == CSSSelector::Id)
{
str += "#";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (cs->match == CSSSelector::Class)
{
str += ".";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (cs->match == CSSSelector::PseudoClass)
{
str += ":";
- str += cs->value.string();
+ str += cs->value.qstring();
}
else if (cs->match == CSSSelector::PseudoElement)
{
str += "::";
- str += cs->value.string();
+ str += cs->value.qstring();
}
// optional attribute
if (cs->hasAttribute()) {
@@ -330,7 +330,7 @@
kdWarning(6080) << "Unhandled case in CSSStyleRuleImpl::selectorText : match=" << cs->match << endl;
}
str += "\"";
- str += cs->value.string();
+ str += cs->value.qstring();
str += "\"]";
}
}
1.22 +2 -2 WebCore/khtml/css/css_ruleimpl.cpp
Index: css_ruleimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_ruleimpl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- css_ruleimpl.cpp 30 Jul 2005 21:19:45 -0000 1.21
+++ css_ruleimpl.cpp 25 Aug 2005 17:46:57 -0000 1.22
@@ -163,13 +163,13 @@
CSSStyleSheetImpl *parentSheet = parentStyleSheet();
if (!parentSheet->href().isNull()) {
// use parent styleheet's URL as the base URL
- absHref = KURL(parentSheet->href().string(),m_strHref.string()).url();
+ absHref = KURL(parentSheet->href().qstring(),m_strHref.qstring()).url();
}
/*
else {
// use documents's URL as the base URL
DocumentImpl *doc = static_cast<CSSStyleSheetImpl*>(root)->doc();
- absHref = KURL(doc->URL(),m_strHref.string()).url();
+ absHref = KURL(doc->URL(),m_strHref.qstring()).url();
}
*/
1.16 +4 -4 WebCore/khtml/css/css_stylesheetimpl.cpp
Index: css_stylesheetimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_stylesheetimpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- css_stylesheetimpl.cpp 30 Jul 2005 21:19:45 -0000 1.15
+++ css_stylesheetimpl.cpp 25 Aug 2005 17:46:57 -0000 1.16
@@ -19,7 +19,7 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
- * $Id: css_stylesheetimpl.cpp,v 1.15 2005/07/30 21:19:45 darin Exp $
+ * $Id: css_stylesheetimpl.cpp,v 1.16 2005/08/25 17:46:57 darin Exp $
*/
//#define CSS_STYLESHEET_DEBUG
@@ -238,7 +238,7 @@
bool CSSStyleSheetImpl::parseString(const DOMString &string, bool strict)
{
#ifdef CSS_STYLESHEET_DEBUG
- kdDebug( 6080 ) << "parsing sheet, len=" << string.length() << ", sheet is " << string.string() << endl;
+ kdDebug( 6080 ) << "parsing sheet, len=" << string.length() << ", sheet is " << string.qstring() << endl;
#endif
strictParsing = strict;
@@ -392,8 +392,8 @@
void MediaListImpl::setMediaText(const DOM::DOMString &value)
{
m_lstMedia.clear();
- QString val = value.string();
- QStringList list = QStringList::split( ',', value.string() );
+ QString val = value.qstring();
+ QStringList list = QStringList::split( ',', value.qstring() );
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
DOMString medium = (*it).stripWhiteSpace();
1.74 +4 -4 WebCore/khtml/css/css_valueimpl.cpp
Index: css_valueimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_valueimpl.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- css_valueimpl.cpp 6 Aug 2005 16:33:02 -0000 1.73
+++ css_valueimpl.cpp 25 Aug 2005 17:46:57 -0000 1.74
@@ -125,7 +125,7 @@
}
// FIXME: Also need to transform control characters into \ sequences.
- QString s = string.string();
+ QString s = string.qstring();
s.replace('\\', "\\\\");
s.replace('\'', "\\'");
return '\'' + s + '\'';
@@ -170,7 +170,7 @@
int propID = propertyID(propertyName);
if (!propID) // set exception?
return;
- bool important = priority.string().find("important", 0, false) != -1;
+ bool important = priority.qstring().find("important", 0, false) != -1;
setProperty(propID, value, important, exception);
}
@@ -447,8 +447,8 @@
bool success = parser.parseValue(this, propertyID, value, important);
if (!success) {
#if !APPLE_CHANGES
- kdDebug( 6080 ) << "CSSMutableStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string()
- << "] value: [" << value.string() << "]"<< endl;
+ kdDebug( 6080 ) << "CSSMutableStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).qstring()
+ << "] value: [" << value.qstring() << "]"<< endl;
#endif
exceptionCode = CSSException::SYNTAX_ERR + CSSException::_EXCEPTION_OFFSET;
} else if (notifyChanged)
1.103 +10 -10 WebCore/khtml/css/cssparser.cpp
Index: cssparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssparser.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- cssparser.cpp 29 Jul 2005 23:02:42 -0000 1.102
+++ cssparser.cpp 25 Aug 2005 17:46:57 -0000 1.103
@@ -202,7 +202,7 @@
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "CSSParser::parseValue: id=" << _id << " important=" << _important
- << " value='" << string.string() << "'" << endl;
+ << " value='" << string.qstring() << "'" << endl;
#endif
styleElement = declaration->stylesheet();
@@ -240,7 +240,7 @@
DOM::CSSParser parser(true);
// First try creating a color specified by name or the "#" syntax.
- if (!parser.parseColor(string.string(), color)) {
+ if (!parser.parseColor(string.qstring(), color)) {
// Now try to create a color from the rgb() or rgba() syntax.
bool ok = parser.parseColor(dummyStyleDeclaration, string);
@@ -284,7 +284,7 @@
bool CSSParser::parseDeclaration( CSSMutableStyleDeclarationImpl *declaration, const DOMString &string )
{
#ifdef CSS_DEBUG
- kdDebug( 6080 ) << "CSSParser::parseDeclaration:value='" << string.string() << "'" << endl;
+ kdDebug( 6080 ) << "CSSParser::parseDeclaration:value='" << string.qstring() << "'" << endl;
#endif
styleElement = declaration->stylesheet();
@@ -721,7 +721,7 @@
DOMString uri = khtml::parseURL( domString( value->string ) );
if (!uri.isEmpty()) {
parsedValue = new CSSImageValueImpl(
- DOMString(KURL( styleElement->baseURL().string(), uri.string()).url()),
+ DOMString(KURL( styleElement->baseURL().qstring(), uri.qstring()).url()),
styleElement);
valueList->next();
}
@@ -960,7 +960,7 @@
if (val->unit == CSSPrimitiveValue::CSS_URI) {
DOMString value = khtml::parseURL(domString(val->string));
parsedValue = new CSSPrimitiveValueImpl(
- DOMString(KURL(styleElement->baseURL().string(), value.string()).url()),
+ DOMString(KURL(styleElement->baseURL().qstring(), value.qstring()).url()),
CSSPrimitiveValue::CSS_URI);
}
@@ -1388,12 +1388,12 @@
for (int propIndex = 0; !found && propIndex < numProperties; ++propIndex) {
if (!fnd[propIndex]) {
#ifdef CSS_DEBUG
- kdDebug(6080) << "LOOKING FOR: " << getPropertyName(properties[propIndex]).string() << endl;
+ kdDebug(6080) << "LOOKING FOR: " << getPropertyName(properties[propIndex]).qstring() << endl;
#endif
if ( parseValue( properties[propIndex], important ) ) {
fnd[propIndex] = found = true;
#ifdef CSS_DEBUG
- kdDebug(6080) << "FOUND: " << getPropertyName(properties[propIndex]).string() << endl;
+ kdDebug(6080) << "FOUND: " << getPropertyName(properties[propIndex]).qstring() << endl;
#endif
}
}
@@ -1489,9 +1489,9 @@
// url
DOMString value = khtml::parseURL(domString(val->string));
parsedValue = new CSSImageValueImpl(
- DOMString(KURL( styleElement->baseURL().string(), value.string()).url() ), styleElement );
+ DOMString(KURL( styleElement->baseURL().qstring(), value.qstring()).url() ), styleElement );
#ifdef CSS_DEBUG
- kdDebug( 6080 ) << "content, url=" << value.string() << " base=" << styleElement->baseURL().string() << endl;
+ kdDebug( 6080 ) << "content, url=" << value.qstring() << " base=" << styleElement->baseURL().qstring() << endl;
#endif
} else if ( val->unit == Value::Function ) {
// attr( X )
@@ -1545,7 +1545,7 @@
if (valueList->current()->unit == CSSPrimitiveValue::CSS_URI) {
DOMString uri = khtml::parseURL(domString(valueList->current()->string));
if (!uri.isEmpty())
- return new CSSImageValueImpl(DOMString(KURL(styleElement->baseURL().string(), uri.string()).url()),
+ return new CSSImageValueImpl(DOMString(KURL(styleElement->baseURL().qstring(), uri.qstring()).url()),
styleElement);
}
return 0;
1.200 +16 -16 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- cssstyleselector.cpp 16 Aug 2005 00:47:42 -0000 1.199
+++ cssstyleselector.cpp 25 Aug 2005 17:46:57 -0000 1.200
@@ -337,7 +337,7 @@
if (element->hasClass()) {
for (const AtomicStringList* singleClass = element->getClassList();
singleClass; singleClass = singleClass->next())
- matchRulesForList(rules->getClassRules(singleClass->string().implementation()),
+ matchRulesForList(rules->getClassRules(singleClass->qstring().implementation()),
firstRuleIndex, lastRuleIndex);
}
matchRulesForList(rules->getTagRules(element->localName().implementation()),
@@ -555,7 +555,7 @@
}
QConstString cu(attr.unicode(), attr.length());
- QString u = cu.string();
+ QString u = cu.qstring();
if ( !u.contains("://") ) {
if ( u[0] == '/' )
u.prepend(currentEncodedURL->host);
@@ -565,7 +565,7 @@
u.prepend(currentEncodedURL->path);
cleanpath( u );
}
- //completeURL( attr.string() );
+ //completeURL( attr.qstring() );
pseudoState = KHTMLFactory::vLinks()->contains( u ) ? PseudoVisited : PseudoLink;
}
@@ -1116,7 +1116,7 @@
if (!e->hasClass())
return false;
for (const AtomicStringList* c = e->getClassList(); c; c = c->next())
- if (c->string() == sel->value)
+ if (c->qstring() == sel->value)
return true;
return false;
}
@@ -1152,8 +1152,8 @@
if (spacePos != -1)
return false;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QString str = value.qstring();
+ QString selStr = sel->value.qstring();
int startSearchAt = 0;
while (true) {
int foundPos = str.find(selStr, startSearchAt, isXMLDoc);
@@ -1173,8 +1173,8 @@
case CSSSelector::Contain:
{
//kdDebug( 6080 ) << "checking for contains match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QString str = value.qstring();
+ QString selStr = sel->value.qstring();
int pos = str.find(selStr, 0, isXMLDoc);
if(pos == -1) return false;
break;
@@ -1182,8 +1182,8 @@
case CSSSelector::Begin:
{
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QString str = value.qstring();
+ QString selStr = sel->value.qstring();
int pos = str.find(selStr, 0, isXMLDoc);
if(pos != 0) return false;
break;
@@ -1191,8 +1191,8 @@
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QString str = value.qstring();
+ QString selStr = sel->value.qstring();
if (isXMLDoc && !str.endsWith(selStr)) return false;
if (!isXMLDoc) {
int pos = str.length() - selStr.length();
@@ -1204,8 +1204,8 @@
case CSSSelector::Hyphen:
{
//kdDebug( 6080 ) << "checking for hyphen match" << endl;
- QString str = value.string();
- QString selStr = sel->value.string();
+ QString str = value.qstring();
+ QString selStr = sel->value.qstring();
if(str.length() < selStr.length()) return false;
// Check if str begins with selStr:
if(str.find(selStr, 0, isXMLDoc) != 0) return false;
@@ -1483,7 +1483,7 @@
CSSImportRuleImpl *import = static_cast<CSSImportRuleImpl *>(item);
//kdDebug( 6080 ) << "@import: Media: "
- // << import->media()->mediaText().string() << endl;
+ // << import->media()->mediaText().qstring() << endl;
if (!import->media() || import->media()->contains(medium))
addRulesFromSheet(import->styleSheet(), medium);
@@ -1494,7 +1494,7 @@
//DOMString mediaText = media->mediaText();
//kdDebug( 6080 ) << "@media: Media: "
- // << r->media()->mediaText().string() << endl;
+ // << r->media()->mediaText().qstring() << endl;
if ((!r->media() || r->media()->contains(medium)) && rules) {
// Traverse child elements of the @media rule.
1.19 +2 -2 WebCore/khtml/dom/dom_string.cpp
Index: dom_string.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dom_string.cpp 21 Jun 2005 22:27:54 -0000 1.18
+++ dom_string.cpp 25 Aug 2005 17:46:59 -0000 1.19
@@ -204,7 +204,7 @@
if ( *(impl->s+impl->l-1) != QChar('%'))
return false;
- _percentage = QConstString(impl->s, impl->l-1).string().toInt();
+ _percentage = QConstString(impl->s, impl->l-1).qstring().toInt();
return true;
}
@@ -214,7 +214,7 @@
return impl->s;
}
-QString DOMString::string() const
+QString DOMString::qstring() const
{
if(!impl) return QString::null;
1.14 +1 -1 WebCore/khtml/dom/dom_string.h
Index: dom_string.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dom_string.h 21 Jun 2005 22:27:54 -0000 1.13
+++ dom_string.h 25 Aug 2005 17:46:59 -0000 1.14
@@ -101,7 +101,7 @@
DOMString upper() const;
QChar *unicode() const;
- QString string() const;
+ QString qstring() const;
int toInt() const;
khtml::Length* toLengthArray(int& len) const;
1.41 +2 -3 WebCore/khtml/ecma/kjs_binding.cpp
Index: kjs_binding.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kjs_binding.cpp 17 Aug 2005 04:06:09 -0000 1.40
+++ kjs_binding.cpp 25 Aug 2005 17:47:00 -0000 1.41
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
/*
* This file is part of the KDE libraries
* Copyright (C) 1999-2001 Harri Porten (porten at kde.org)
@@ -265,7 +264,7 @@
rep = UString::Rep::createCopying(reinterpret_cast<const UChar *>(d.unicode()), d.length());
}
-DOMString UString::string() const
+DOMString UString::domString() const
{
if (isNull())
return DOMString();
@@ -288,7 +287,7 @@
return QConstString((QChar*) data(), size());
}
-DOMString Identifier::string() const
+DOMString Identifier::domString() const
{
if (isNull())
return DOMString();
1.36 +17 -17 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kjs_css.cpp 16 Aug 2005 00:47:43 -0000 1.35
+++ kjs_css.cpp 25 Aug 2005 17:47:00 -0000 1.36
@@ -208,7 +208,7 @@
DOMExceptionTranslator exception(exec);
CSSStyleDeclarationImpl &styleDecl = *m_impl;
if (propertyName == "cssText") {
- styleDecl.setCssText(value->toString(exec).string(), exception);
+ styleDecl.setCssText(value->toString(exec).domString(), exception);
} else {
if (isCSSPropertyName(propertyName)) {
bool pixelOrPos;
@@ -244,7 +244,7 @@
DOMExceptionTranslator exception(exec);
CSSStyleDeclarationImpl &styleDecl = *static_cast<DOMCSSStyleDeclaration *>(thisObj)->impl();
UString str = args[0]->toString(exec);
- DOM::DOMString s = str.string();
+ DOM::DOMString s = str.domString();
switch (id) {
case DOMCSSStyleDeclaration::GetPropertyValue:
@@ -256,7 +256,7 @@
case DOMCSSStyleDeclaration::GetPropertyPriority:
return getStringOrNull(styleDecl.getPropertyPriority(s));
case DOMCSSStyleDeclaration::SetProperty:
- styleDecl.setProperty(s, args[1]->toString(exec).string(), args[2]->toString(exec).string(), exception);
+ styleDecl.setProperty(s, args[1]->toString(exec).domString(), args[2]->toString(exec).domString(), exception);
return Undefined();
case DOMCSSStyleDeclaration::Item:
return getStringOrNull(styleDecl.item(args[0]->toInt32(exec)));
@@ -381,7 +381,7 @@
ValueImp *DOMStyleSheetList::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
{
DOMStyleSheetList *thisObj = static_cast<DOMStyleSheetList *>(slot.slotBase());
- ElementImpl *element = thisObj->m_doc->getElementById(propertyName.string());
+ ElementImpl *element = thisObj->m_doc->getElementById(propertyName.domString());
return getDOMStyleSheet(exec, static_cast<HTMLStyleElementImpl *>(element)->sheet());
}
@@ -417,7 +417,7 @@
// so we can't use DOMNamedNodesCollection.....
// We could duplicate it for stylesheets though - worth it ?
// Other problem of this implementation: it doesn't look for the ID attribute!
- DOM::NameNodeListImpl namedList( m_doc.documentElement().handle(), p.string() );
+ DOM::NameNodeListImpl namedList( m_doc.documentElement().handle(), p.domString() );
int len = namedList.length();
if ( len ) {
QValueList<DOM::Node> styleSheets;
@@ -436,7 +436,7 @@
// ### Bad implementation because returns a single element (are IDs always unique?)
// and doesn't look for name attribute (see implementation above).
// But unicity of stylesheet ids is good practice anyway ;)
- ElementImpl *element = m_doc->getElementById(propertyName.string());
+ ElementImpl *element = m_doc->getElementById(propertyName.domString());
if (element && element->hasTagName(styleTag)) {
slot.setCustom(this, nameGetter);
return true;
@@ -542,7 +542,7 @@
{
MediaListImpl &mediaList = *m_impl;
if (propertyName == "mediaText")
- mediaList.setMediaText(value->toString(exec).string());
+ mediaList.setMediaText(value->toString(exec).domString());
else
DOMObject::put(exec, propertyName, value, attr);
}
@@ -561,10 +561,10 @@
case DOMMediaList::Item:
return getStringOrNull(mediaList.item(args[0]->toInt32(exec)));
case DOMMediaList::DeleteMedium:
- mediaList.deleteMedium(args[0]->toString(exec).string());
+ mediaList.deleteMedium(args[0]->toString(exec).domString());
return Undefined();
case DOMMediaList::AppendMedium:
- mediaList.appendMedium(args[0]->toString(exec).string());
+ mediaList.appendMedium(args[0]->toString(exec).domString());
return Undefined();
default:
return Undefined();
@@ -630,13 +630,13 @@
CSSStyleSheetImpl &styleSheet = *static_cast<CSSStyleSheetImpl *>(static_cast<DOMCSSStyleSheet *>(thisObj)->impl());
switch (id) {
case DOMCSSStyleSheet::InsertRule:
- return Number(styleSheet.insertRule(args[0]->toString(exec).string(), args[1]->toInt32(exec), exception));
+ return Number(styleSheet.insertRule(args[0]->toString(exec).domString(), args[1]->toInt32(exec), exception));
case DOMCSSStyleSheet::DeleteRule:
styleSheet.deleteRule(args[0]->toInt32(exec), exception);
return Undefined();
case DOMCSSStyleSheet::AddRule: {
long index = args.size() >= 3 ? args[2]->toInt32(exec) : -1;
- styleSheet.addRule(args[0]->toString(exec).string(), args[1]->toString(exec).string(), index, exception);
+ styleSheet.addRule(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), index, exception);
// As per Microsoft documentation, always return -1.
return Number(-1);
}
@@ -880,17 +880,17 @@
switch (token) {
// for DOM::CSSRule::STYLE_RULE:
case Style_SelectorText:
- static_cast<CSSStyleRuleImpl *>(m_impl.get())->setSelectorText(value->toString(exec).string());
+ static_cast<CSSStyleRuleImpl *>(m_impl.get())->setSelectorText(value->toString(exec).domString());
return;
// for DOM::CSSRule::PAGE_RULE:
case Page_SelectorText:
- static_cast<CSSPageRuleImpl *>(m_impl.get())->setSelectorText(value->toString(exec).string());
+ static_cast<CSSPageRuleImpl *>(m_impl.get())->setSelectorText(value->toString(exec).domString());
return;
// for DOM::CSSRule::CHARSET_RULE:
case Charset_Encoding:
- static_cast<CSSCharsetRuleImpl *>(m_impl.get())->setEncoding(value->toString(exec).string());
+ static_cast<CSSCharsetRuleImpl *>(m_impl.get())->setEncoding(value->toString(exec).domString());
return;
default:
@@ -907,7 +907,7 @@
if (cssRule.type() == DOM::CSSRule::MEDIA_RULE) {
CSSMediaRuleImpl &rule = static_cast<CSSMediaRuleImpl &>(cssRule);
if (id == DOMCSSRule::Media_InsertRule)
- return Number(rule.insertRule(args[0]->toString(exec).string(),args[1]->toInt32(exec)));
+ return Number(rule.insertRule(args[0]->toString(exec).domString(), args[1]->toInt32(exec)));
else if (id == DOMCSSRule::Media_DeleteRule)
rule.deleteRule(args[0]->toInt32(exec));
}
@@ -1004,7 +1004,7 @@
{
CSSValueImpl &cssValue = *m_impl;
if (propertyName == "cssText")
- cssValue.setCssText(value->toString(exec).string());
+ cssValue.setCssText(value->toString(exec).domString());
else
DOMObject::put(exec, propertyName, value, attr);
}
@@ -1116,7 +1116,7 @@
case DOMCSSPrimitiveValue::GetFloatValue:
return Number(val.getFloatValue(args[0]->toInt32(exec)));
case DOMCSSPrimitiveValue::SetStringValue:
- val.setStringValue(args[0]->toInt32(exec), args[1]->toString(exec).string(), exception);
+ val.setStringValue(args[0]->toInt32(exec), args[1]->toString(exec).domString(), exception);
return Undefined();
case DOMCSSPrimitiveValue::GetStringValue:
return getStringOrNull(val.getStringValue());
1.90 +55 -56 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kjs_dom.cpp 25 Aug 2005 17:12:11 -0000 1.89
+++ kjs_dom.cpp 25 Aug 2005 17:47:00 -0000 1.90
@@ -454,10 +454,10 @@
NodeImpl &node = *m_impl;
switch (token) {
case NodeValue:
- node.setNodeValue(value->toString(exec).string(), exception);
+ node.setNodeValue(value->toString(exec).domString(), exception);
break;
case Prefix:
- node.setPrefix(value->toString(exec).string().implementation(), exception);
+ node.setPrefix(value->toString(exec).domString().implementation(), exception);
break;
case OnAbort:
setListener(exec,DOM::EventImpl::ABORT_EVENT,value);
@@ -653,18 +653,18 @@
node.normalize();
return Undefined();
case DOMNode::IsSupported:
- return Boolean(node.isSupported(args[0]->toString(exec).string(),
- args[1]->isUndefinedOrNull() ? DOMString() : args[1]->toString(exec).string()));
+ return Boolean(node.isSupported(args[0]->toString(exec).domString(),
+ args[1]->isUndefinedOrNull() ? DOMString() : args[1]->toString(exec).domString()));
case DOMNode::AddEventListener: {
JSEventListener *listener = Window::retrieveActive(exec)->getJSEventListener(args[1]);
if (listener)
- node.addEventListener(args[0]->toString(exec).string(),listener,args[2]->toBoolean(exec));
+ node.addEventListener(args[0]->toString(exec).domString(),listener,args[2]->toBoolean(exec));
return Undefined();
}
case DOMNode::RemoveEventListener: {
JSEventListener *listener = Window::retrieveActive(exec)->getJSEventListener(args[1]);
if (listener)
- node.removeEventListener(args[0]->toString(exec).string(),listener,args[2]->toBoolean(exec));
+ node.removeEventListener(args[0]->toString(exec).domString(),listener,args[2]->toBoolean(exec));
return Undefined();
}
case DOMNode::DispatchEvent:
@@ -737,7 +737,7 @@
ValueImp *DOMNodeList::nameGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
{
DOMNodeList *thisObj = static_cast<DOMNodeList *>(slot.slotBase());
- return getDOMNode(exec, thisObj->m_impl->itemById(propertyName.string()));
+ return getDOMNode(exec, thisObj->m_impl->itemById(propertyName.domString()));
}
bool DOMNodeList::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
@@ -761,7 +761,7 @@
slot.setCustomIndex(this, idx, indexGetter);
return true;
} else {
- if (list.itemById(propertyName.string())) {
+ if (list.itemById(propertyName.domString())) {
slot.setCustom(this, nameGetter);
return true;
}
@@ -855,7 +855,7 @@
DOMExceptionTranslator exception(exec);
switch (token) {
case ValueProperty:
- static_cast<AttrImpl *>(impl())->setValue(value->toString(exec).string(), exception);
+ static_cast<AttrImpl *>(impl())->setValue(value->toString(exec).domString(), exception);
return;
default:
kdWarning() << "DOMAttr::putValueProperty unhandled token " << token << endl;
@@ -989,7 +989,7 @@
DocumentImpl &doc = *static_cast<DocumentImpl *>(impl());
switch (token) {
case SelectedStylesheetSet: {
- doc.setSelectedStylesheetSet(value->toString(exec).string());
+ doc.setSelectedStylesheetSet(value->toString(exec).domString());
break;
}
}
@@ -1003,7 +1003,7 @@
NodeImpl &node = *static_cast<DOMNode *>(thisObj)->impl();
DocumentImpl &doc = static_cast<DocumentImpl &>(node);
UString str = args[0]->toString(exec);
- DOM::DOMString s = str.string();
+ DOM::DOMString s = str.domString();
switch(id) {
case DOMDocument::CreateElement:
@@ -1017,8 +1017,7 @@
case DOMDocument::CreateCDATASection:
return getDOMNode(exec, doc.createCDATASection(s, exception));
case DOMDocument::CreateProcessingInstruction:
- return getDOMNode(exec, doc.createProcessingInstruction(args[0]->toString(exec).string(),
- args[1]->toString(exec).string(), exception));
+ return getDOMNode(exec, doc.createProcessingInstruction(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), exception));
case DOMDocument::CreateAttribute:
return getDOMNode(exec,doc.createAttribute(s, exception));
case DOMDocument::CreateEntityReference:
@@ -1030,13 +1029,13 @@
case DOMDocument::ImportNode: // DOM2
return getDOMNode(exec,doc.importNode(toNode(args[0]), args[1]->toBoolean(exec), exception));
case DOMDocument::CreateElementNS: // DOM2
- return getDOMNode(exec,doc.createElementNS(s, args[1]->toString(exec).string(), exception));
+ return getDOMNode(exec,doc.createElementNS(s, args[1]->toString(exec).domString(), exception));
case DOMDocument::CreateAttributeNS: // DOM2
- return getDOMNode(exec,doc.createAttributeNS(s, args[1]->toString(exec).string(), exception));
+ return getDOMNode(exec,doc.createAttributeNS(s, args[1]->toString(exec).domString(), exception));
case DOMDocument::GetElementsByTagNameNS: // DOM2
- return getDOMNodeList(exec,doc.getElementsByTagNameNS(s, args[1]->toString(exec).string()).get());
+ return getDOMNodeList(exec,doc.getElementsByTagNameNS(s, args[1]->toString(exec).domString()).get());
case DOMDocument::GetElementById:
- return getDOMNode(exec,doc.getElementById(args[0]->toString(exec).string()));
+ return getDOMNode(exec,doc.getElementById(args[0]->toString(exec).domString()));
case DOMDocument::CreateRange:
return getDOMRange(exec,doc.createRange());
case DOMDocument::CreateNodeIterator: {
@@ -1063,26 +1062,26 @@
return getDOMEvent(exec,doc.createEvent(s, exception));
case DOMDocument::GetOverrideStyle:
if (ElementImpl *element0 = toElement(args[0]))
- return getDOMCSSStyleDeclaration(exec,doc.getOverrideStyle(element0, args[1]->toString(exec).string()));
+ return getDOMCSSStyleDeclaration(exec,doc.getOverrideStyle(element0, args[1]->toString(exec).domString()));
// FIXME: Is undefined right here, or should we raise an exception?
return Undefined();
case DOMDocument::ExecCommand: {
- return Boolean(doc.execCommand(args[0]->toString(exec).string(), args[1]->toBoolean(exec), args[2]->toString(exec).string()));
+ return Boolean(doc.execCommand(args[0]->toString(exec).domString(), args[1]->toBoolean(exec), args[2]->toString(exec).domString()));
}
case DOMDocument::QueryCommandEnabled: {
- return Boolean(doc.queryCommandEnabled(args[0]->toString(exec).string()));
+ return Boolean(doc.queryCommandEnabled(args[0]->toString(exec).domString()));
}
case DOMDocument::QueryCommandIndeterm: {
- return Boolean(doc.queryCommandIndeterm(args[0]->toString(exec).string()));
+ return Boolean(doc.queryCommandIndeterm(args[0]->toString(exec).domString()));
}
case DOMDocument::QueryCommandState: {
- return Boolean(doc.queryCommandState(args[0]->toString(exec).string()));
+ return Boolean(doc.queryCommandState(args[0]->toString(exec).domString()));
}
case DOMDocument::QueryCommandSupported: {
- return Boolean(doc.queryCommandSupported(args[0]->toString(exec).string()));
+ return Boolean(doc.queryCommandSupported(args[0]->toString(exec).domString()));
}
case DOMDocument::QueryCommandValue: {
- DOM::DOMString commandValue(doc.queryCommandValue(args[0]->toString(exec).string()));
+ DOM::DOMString commandValue(doc.queryCommandValue(args[0]->toString(exec).domString()));
// Method returns null DOMString to signal command is unsupported.
// Microsoft documentation for this method says:
// "If not supported [for a command identifier], this method returns a Boolean set to false."
@@ -1166,7 +1165,7 @@
DOMElement *thisObj = static_cast<DOMElement *>(slot.slotBase());
ElementImpl *element = static_cast<ElementImpl *>(thisObj->impl());
- DOM::DOMString attr = element->getAttribute(propertyName.string());
+ DOM::DOMString attr = element->getAttribute(propertyName.domString());
return getStringOrNull(attr);
}
@@ -1192,7 +1191,7 @@
// FIXME: do we really want to do this attribute lookup thing? Mozilla doesn't do it,
// and it seems like it could interfere with XBL.
- DOM::DOMString attr = element.getAttribute(propertyName.string());
+ DOM::DOMString attr = element.getAttribute(propertyName.domString());
if (!attr.isNull()) {
slot.setCustom(this, attributeGetter);
return true;
@@ -1213,39 +1212,39 @@
case DOMElement::GetAttribute:
// getStringOrNull should be used here, since if the attribute isn't present at all, you should
// return null and not "".
- return getStringOrNull(element.getAttribute(args[0]->toString(exec).string()));
+ return getStringOrNull(element.getAttribute(args[0]->toString(exec).domString()));
case DOMElement::SetAttribute:
- element.setAttribute(args[0]->toString(exec).string(), args[1]->toString(exec).string(), exception);
+ element.setAttribute(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), exception);
return Undefined();
case DOMElement::RemoveAttribute:
- element.removeAttribute(args[0]->toString(exec).string(), exception);
+ element.removeAttribute(args[0]->toString(exec).domString(), exception);
return Undefined();
case DOMElement::GetAttributeNode:
- return getDOMNode(exec,element.getAttributeNode(args[0]->toString(exec).string()));
+ return getDOMNode(exec,element.getAttributeNode(args[0]->toString(exec).domString()));
case DOMElement::SetAttributeNode:
return getDOMNode(exec,element.setAttributeNode(toAttr(args[0]), exception).get());
case DOMElement::RemoveAttributeNode:
return getDOMNode(exec,element.removeAttributeNode(toAttr(args[0]), exception).get());
case DOMElement::GetElementsByTagName:
- return getDOMNodeList(exec, element.getElementsByTagName(args[0]->toString(exec).string()).get());
+ return getDOMNodeList(exec, element.getElementsByTagName(args[0]->toString(exec).domString()).get());
case DOMElement::HasAttribute: // DOM2
- return Boolean(element.hasAttribute(args[0]->toString(exec).string()));
+ return Boolean(element.hasAttribute(args[0]->toString(exec).domString()));
case DOMElement::GetAttributeNS: // DOM2
- return String(element.getAttributeNS(args[0]->toString(exec).string(),args[1]->toString(exec).string()).string());
+ return String(element.getAttributeNS(args[0]->toString(exec).domString(),args[1]->toString(exec).domString()).domString());
case DOMElement::SetAttributeNS: // DOM2
- element.setAttributeNS(args[0]->toString(exec).string(), args[1]->toString(exec).string(), args[2]->toString(exec).string(), exception);
+ element.setAttributeNS(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), args[2]->toString(exec).domString(), exception);
return Undefined();
case DOMElement::RemoveAttributeNS: // DOM2
- element.removeAttributeNS(args[0]->toString(exec).string(), args[1]->toString(exec).string(), exception);
+ element.removeAttributeNS(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), exception);
return Undefined();
case DOMElement::GetAttributeNodeNS: // DOM2
- return getDOMNode(exec,element.getAttributeNodeNS(args[0]->toString(exec).string(),args[1]->toString(exec).string()));
+ return getDOMNode(exec,element.getAttributeNodeNS(args[0]->toString(exec).domString(),args[1]->toString(exec).domString()));
case DOMElement::SetAttributeNodeNS: // DOM2
return getDOMNode(exec, element.setAttributeNodeNS(toAttr(args[0]), exception).get());
case DOMElement::GetElementsByTagNameNS: // DOM2
- return getDOMNodeList(exec, element.getElementsByTagNameNS(args[0]->toString(exec).string() ,args[1]->toString(exec).string()).get());
+ return getDOMNodeList(exec, element.getElementsByTagNameNS(args[0]->toString(exec).domString(), args[1]->toString(exec).domString()).get());
case DOMElement::HasAttributeNS: // DOM2
- return Boolean(element.hasAttributeNS(args[0]->toString(exec).string(),args[1]->toString(exec).string()));
+ return Boolean(element.hasAttributeNS(args[0]->toString(exec).domString(),args[1]->toString(exec).domString()));
case DOMElement::ScrollIntoView:
element.scrollIntoView(args[0]->isUndefinedOrNull() || args[0]->toBoolean(exec));
return Undefined();
@@ -1316,18 +1315,18 @@
switch(id) {
case DOMDOMImplementation::HasFeature:
- return Boolean(implementation.hasFeature(args[0]->toString(exec).string(),
- args[1]->isUndefinedOrNull() ? DOMString() : args[1]->toString(exec).string()));
+ return Boolean(implementation.hasFeature(args[0]->toString(exec).domString(),
+ args[1]->isUndefinedOrNull() ? DOMString() : args[1]->toString(exec).domString()));
case DOMDOMImplementation::CreateDocumentType: // DOM2
- return getDOMNode(exec, implementation.createDocumentType(args[0]->toString(exec).string(),
- args[1]->toString(exec).string(), args[2]->toString(exec).string(), exception));
+ return getDOMNode(exec, implementation.createDocumentType(args[0]->toString(exec).domString(),
+ args[1]->toString(exec).domString(), args[2]->toString(exec).domString(), exception));
case DOMDOMImplementation::CreateDocument: // DOM2
- return getDOMNode(exec, implementation.createDocument(args[0]->toString(exec).string(),
- args[1]->toString(exec).string(), toDocumentType(args[2]), exception));
+ return getDOMNode(exec, implementation.createDocument(args[0]->toString(exec).domString(),
+ args[1]->toString(exec).domString(), toDocumentType(args[2]), exception));
case DOMDOMImplementation::CreateCSSStyleSheet: // DOM2
- return getDOMStyleSheet(exec, implementation.createCSSStyleSheet(args[0]->toString(exec).string(), args[1]->toString(exec).string(), exception));
+ return getDOMStyleSheet(exec, implementation.createCSSStyleSheet(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), exception));
case DOMDOMImplementation::CreateHTMLDocument: // DOM2-HTML
- return getDOMNode(exec, implementation.createHTMLDocument(args[0]->toString(exec).string()));
+ return getDOMNode(exec, implementation.createHTMLDocument(args[0]->toString(exec).domString()));
default:
break;
}
@@ -1457,19 +1456,19 @@
switch(id) {
case DOMNamedNodeMap::GetNamedItem:
- return getDOMNode(exec, map.getNamedItem(args[0]->toString(exec).string()));
+ return getDOMNode(exec, map.getNamedItem(args[0]->toString(exec).domString()));
case DOMNamedNodeMap::SetNamedItem:
return getDOMNode(exec, map.setNamedItem(toNode(args[0]), exception).get());
case DOMNamedNodeMap::RemoveNamedItem:
- return getDOMNode(exec, map.removeNamedItem(args[0]->toString(exec).string(), exception).get());
+ return getDOMNode(exec, map.removeNamedItem(args[0]->toString(exec).domString(), exception).get());
case DOMNamedNodeMap::Item:
return getDOMNode(exec, map.item(args[0]->toInt32(exec)));
case DOMNamedNodeMap::GetNamedItemNS: // DOM2
- return getDOMNode(exec, map.getNamedItemNS(args[0]->toString(exec).string(), args[1]->toString(exec).string()));
+ return getDOMNode(exec, map.getNamedItemNS(args[0]->toString(exec).domString(), args[1]->toString(exec).domString()));
case DOMNamedNodeMap::SetNamedItemNS: // DOM2
return getDOMNode(exec, map.setNamedItemNS(toNode(args[0]), exception).get());
case DOMNamedNodeMap::RemoveNamedItemNS: // DOM2
- return getDOMNode(exec, map.removeNamedItemNS(args[0]->toString(exec).string(), args[1]->toString(exec).string(), exception).get());
+ return getDOMNode(exec, map.removeNamedItemNS(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), exception).get());
default:
break;
}
@@ -1521,7 +1520,7 @@
DOMExceptionTranslator exception(exec);
// Not worth using the hashtable for this one ;)
if (propertyName == "data")
- pi->setData(value->toString(exec).string(), exception);
+ pi->setData(value->toString(exec).domString(), exception);
else
DOMNode::put(exec, propertyName, value, attr);
}
@@ -1920,7 +1919,7 @@
for (QValueListConstIterator< SharedPtr<NodeImpl> > it = m_nodes.begin(); it != end; ++it, ++i) {
NodeImpl *node = (*it).get();
if (node->hasAttributes() &&
- node->attributes()->id() == propertyName.string()) {
+ node->attributes()->id() == propertyName.domString()) {
slot.setCustomIndex(this, i, indexGetter);
return true;
}
@@ -1984,7 +1983,7 @@
{
DOMExceptionTranslator exception(exec);
if (propertyName == "data")
- static_cast<CharacterDataImpl *>(impl())->setData(value->toString(exec).string(), exception);
+ static_cast<CharacterDataImpl *>(impl())->setData(value->toString(exec).domString(), exception);
else
DOMNode::put(exec, propertyName,value,attr);
}
@@ -2004,10 +2003,10 @@
return getStringOrNull(data.substringData(args[0]->toInt32(exec), count, exception));
}
case DOMCharacterData::AppendData:
- data.appendData(args[0]->toString(exec).string(), exception);
+ data.appendData(args[0]->toString(exec).domString(), exception);
return Undefined();
case DOMCharacterData::InsertData:
- data.insertData(args[0]->toInt32(exec), args[1]->toString(exec).string(), exception);
+ data.insertData(args[0]->toInt32(exec), args[1]->toString(exec).domString(), exception);
return Undefined();
case DOMCharacterData::DeleteData: {
const int count = args[1]->toInt32(exec);
@@ -2022,7 +2021,7 @@
if (count < 0)
setDOMException(exec, DOMException::INDEX_SIZE_ERR);
else
- data.replaceData(args[0]->toInt32(exec), count, args[2]->toString(exec).string(), exception);
+ data.replaceData(args[0]->toInt32(exec), count, args[2]->toString(exec).domString(), exception);
return Undefined();
}
default:
1.57 +14 -14 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kjs_events.cpp 16 Aug 2005 00:47:44 -0000 1.56
+++ kjs_events.cpp 25 Aug 2005 17:47:01 -0000 1.57
@@ -521,7 +521,7 @@
event.preventDefault();
return Undefined();
case DOMEvent::InitEvent:
- event.initEvent(args[0]->toString(exec).string(),args[1]->toBoolean(exec),args[2]->toBoolean(exec));
+ event.initEvent(args[0]->toString(exec).domString(),args[1]->toBoolean(exec),args[2]->toBoolean(exec));
return Undefined();
};
return Undefined();
@@ -663,7 +663,7 @@
UIEventImpl &uiEvent = *static_cast<UIEventImpl *>(static_cast<DOMUIEvent *>(thisObj)->impl());
switch (id) {
case DOMUIEvent::InitUIEvent:
- uiEvent.initUIEvent(args[0]->toString(exec).string(),
+ uiEvent.initUIEvent(args[0]->toString(exec).domString(),
args[1]->toBoolean(exec),
args[2]->toBoolean(exec),
toAbstractView(args[3]),
@@ -802,7 +802,7 @@
MouseEventImpl &mouseEvent = *static_cast<MouseEventImpl *>(static_cast<DOMMouseEvent *>(thisObj)->impl());
switch (id) {
case DOMMouseEvent::InitMouseEvent:
- mouseEvent.initMouseEvent(args[0]->toString(exec).string(), // typeArg
+ mouseEvent.initMouseEvent(args[0]->toString(exec).domString(), // typeArg
args[1]->toBoolean(exec), // canBubbleArg
args[2]->toBoolean(exec), // cancelableArg
toAbstractView(args[3]), // viewArg
@@ -895,11 +895,11 @@
KeyboardEventImpl &event = *static_cast<KeyboardEventImpl *>(static_cast<DOMUIEvent *>(thisObj)->impl());
switch (id) {
case DOMKeyboardEvent::InitKeyboardEvent:
- event.initKeyboardEvent(args[0]->toString(exec).string(), // typeArg
+ event.initKeyboardEvent(args[0]->toString(exec).domString(), // typeArg
args[1]->toBoolean(exec), // canBubbleArg
args[2]->toBoolean(exec), // cancelableArg
toAbstractView(args[3]), // viewArg
- args[4]->toString(exec).string(), // keyIdentifier
+ args[4]->toString(exec).domString(), // keyIdentifier
args[5]->toInt32(exec), // keyLocationArg
args[6]->toBoolean(exec), // ctrlKeyArg
args[7]->toBoolean(exec), // altKeyArg
@@ -998,13 +998,13 @@
MutationEventImpl &mutationEvent = *static_cast<MutationEventImpl *>(static_cast<DOMEvent *>(thisObj)->impl());
switch (id) {
case DOMMutationEvent::InitMutationEvent:
- mutationEvent.initMutationEvent(args[0]->toString(exec).string(), // typeArg,
+ mutationEvent.initMutationEvent(args[0]->toString(exec).domString(), // typeArg,
args[1]->toBoolean(exec), // canBubbleArg
args[2]->toBoolean(exec), // cancelableArg
toNode(args[3]), // relatedNodeArg
- args[4]->toString(exec).string(), // prevValueArg
- args[5]->toString(exec).string(), // newValueArg
- args[6]->toString(exec).string(), // attrNameArg
+ args[4]->toString(exec).domString(), // prevValueArg
+ args[5]->toString(exec).domString(), // newValueArg
+ args[6]->toString(exec).domString(), // attrNameArg
args[7]->toInt32(exec)); // attrChangeArg
return Undefined();
}
@@ -1176,12 +1176,12 @@
case DropEffect:
// can never set this when not for dragging, thus getting always returns NULL string
if (clipboard->isForDragging())
- clipboard->setDropEffect(value->toString(exec).string());
+ clipboard->setDropEffect(value->toString(exec).domString());
break;
case EffectAllowed:
// can never set this when not for dragging, thus getting always returns NULL string
if (clipboard->isForDragging())
- clipboard->setEffectAllowed(value->toString(exec).string());
+ clipboard->setEffectAllowed(value->toString(exec).domString());
break;
default:
kdWarning() << "Clipboard::putValueProperty unhandled token " << token << endl;
@@ -1200,7 +1200,7 @@
cb->clipboard->clearAllData();
return Undefined();
} else if (args.size() == 1) {
- cb->clipboard->clearData(args[0]->toString(exec).string());
+ cb->clipboard->clearData(args[0]->toString(exec).domString());
return Undefined();
} else {
return throwError(exec, SyntaxError, "clearData: Invalid number of arguments");
@@ -1209,7 +1209,7 @@
{
if (args.size() == 1) {
bool success;
- DOM::DOMString result = cb->clipboard->getData(args[0]->toString(exec).string(), success);
+ DOM::DOMString result = cb->clipboard->getData(args[0]->toString(exec).domString(), success);
if (success) {
return String(result);
} else {
@@ -1221,7 +1221,7 @@
}
case Clipboard::SetData:
if (args.size() == 2) {
- return Boolean(cb->clipboard->setData(args[0]->toString(exec).string(), args[1]->toString(exec).string()));
+ return Boolean(cb->clipboard->setData(args[0]->toString(exec).domString(), args[1]->toString(exec).domString()));
} else {
return throwError(exec, SyntaxError, "setData: Invalid number of arguments");
}
1.136 +48 -48 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kjs_html.cpp 16 Aug 2005 00:47:44 -0000 1.135
+++ kjs_html.cpp 25 Aug 2005 17:47:01 -0000 1.136
@@ -191,11 +191,11 @@
if (id == HTMLDocument::WriteLn)
str += "\n";
//kdDebug() << "document.write: " << str.ascii() << endl;
- doc.write(str.string());
+ doc.write(str.domString());
return Undefined();
}
case HTMLDocument::GetElementsByName:
- return getDOMNodeList(exec, doc.getElementsByName(args[0]->toString(exec).string()).get());
+ return getDOMNodeList(exec, doc.getElementsByName(args[0]->toString(exec).domString()).get());
case HTMLDocument::CaptureEvents:
case HTMLDocument::ReleaseEvents:
// Do nothing for now. These are NS-specific legacy calls.
@@ -267,7 +267,7 @@
HTMLDocument *thisObj = static_cast<HTMLDocument *>(slot.slotBase());
HTMLDocumentImpl &doc = *static_cast<HTMLDocumentImpl *>(thisObj->impl());
- DOMString name = propertyName.string();
+ DOMString name = propertyName.domString();
SharedPtr<DOM::HTMLCollectionImpl> collection = doc.documentNamedItems(name);
if (collection->length() == 1) {
@@ -377,7 +377,7 @@
{
HTMLDocumentImpl &doc = *static_cast<HTMLDocumentImpl *>(impl());
- DOMString name = propertyName.string();
+ DOMString name = propertyName.domString();
if (doc.hasNamedItem(name) || doc.hasDocExtraNamedItem(name)) {
slot.setCustom(this, namedItemGetter);
return true;
@@ -412,16 +412,16 @@
switch (token) {
case Title:
- doc.setTitle(value->toString(exec).string());
+ doc.setTitle(value->toString(exec).domString());
break;
case Body:
doc.setBody(toHTMLElement(value), exception);
break;
case Domain: // not part of the DOM
- doc.setDomain(value->toString(exec).string());
+ doc.setDomain(value->toString(exec).domString());
break;
case Cookie:
- doc.setCookie(value->toString(exec).string());
+ doc.setCookie(value->toString(exec).domString());
break;
case Location: {
KHTMLPart *part = doc.part();
@@ -444,18 +444,18 @@
}
case BgColor:
if (bodyElement)
- bodyElement->setBgColor(value->toString(exec).string());
+ bodyElement->setBgColor(value->toString(exec).domString());
break;
case FgColor:
if (bodyElement)
- bodyElement->setText(value->toString(exec).string());
+ bodyElement->setText(value->toString(exec).domString());
break;
case AlinkColor:
if (bodyElement) {
// this check is a bit silly, but some benchmarks like to set the
// document's link colors over and over to the same value and we
// don't want to incur a style update each time.
- DOMString newColor = value->toString(exec).string();
+ DOMString newColor = value->toString(exec).domString();
if (bodyElement->aLink() != newColor)
bodyElement->setALink(newColor);
}
@@ -465,7 +465,7 @@
// this check is a bit silly, but some benchmarks like to set the
// document's link colors over and over to the same value and we
// don't want to incur a style update each time.
- DOMString newColor = value->toString(exec).string();
+ DOMString newColor = value->toString(exec).domString();
if (bodyElement->link() != newColor)
bodyElement->setLink(newColor);
}
@@ -475,17 +475,17 @@
// this check is a bit silly, but some benchmarks like to set the
// document's link colors over and over to the same value and we
// don't want to incur a style update each time.
- DOMString newColor = value->toString(exec).string();
+ DOMString newColor = value->toString(exec).domString();
if (bodyElement->vLink() != newColor)
bodyElement->setVLink(newColor);
}
break;
case Dir:
- body->setDir(value->toString(exec).string());
+ body->setDir(value->toString(exec).domString());
break;
case DesignMode:
{
- DOMString modeString = value->toString(exec).string();
+ DOMString modeString = value->toString(exec).domString();
DocumentImpl::InheritedBool mode;
if (!strcasecmp(modeString, "on"))
mode = DocumentImpl::on;
@@ -1286,7 +1286,7 @@
HTMLElement *thisObj = static_cast<HTMLElement *>(slot.slotBase());
HTMLElementImpl *element = static_cast<HTMLElementImpl *>(thisObj->impl());
- NodeImpl *frame = element->children()->namedItem(propertyName.string());
+ NodeImpl *frame = element->children()->namedItem(propertyName.domString());
if (DocumentImpl* doc = static_cast<HTMLFrameElementImpl *>(frame)->contentDocument())
if (Window *window = Window::retrieveWindow(doc->part()))
return window;
@@ -1353,7 +1353,7 @@
return true;
}
} else if (element.hasLocalName(framesetTag)) {
- NodeImpl *frame = element.children()->namedItem(propertyName.string());
+ NodeImpl *frame = element.children()->namedItem(propertyName.domString());
if (frame && frame->hasTagName(frameTag)) {
slot.setCustom(this, framesetNameGetter);
}
@@ -1899,20 +1899,20 @@
case AnchorCoords: return String(anchor.coords());
case AnchorHref: return String(anchor.href());
case AnchorHrefLang: return String(anchor.hreflang());
- case AnchorHash: return String('#'+KURL(anchor.href().string()).ref());
- case AnchorHost: return String(KURL(anchor.href().string()).host());
+ case AnchorHash: return String('#'+KURL(anchor.href().qstring()).ref());
+ case AnchorHost: return String(KURL(anchor.href().qstring()).host());
case AnchorHostname: {
- KURL url(anchor.href().string());
+ KURL url(anchor.href().qstring());
kdDebug(6070) << "anchor::hostname uses:" <<url.url()<<endl;
if (url.port()==0)
return String(url.host());
else
return String(url.host() + ":" + QString::number(url.port()));
}
- case AnchorPathName: return String(KURL(anchor.href().string()).path());
- case AnchorPort: return String(QString::number(KURL(anchor.href().string()).port()));
- case AnchorProtocol: return String(KURL(anchor.href().string()).protocol()+":");
- case AnchorSearch: return String(KURL(anchor.href().string()).query());
+ case AnchorPathName: return String(KURL(anchor.href().qstring()).path());
+ case AnchorPort: return String(QString::number(KURL(anchor.href().qstring()).port()));
+ case AnchorProtocol: return String(KURL(anchor.href().qstring()).protocol()+":");
+ case AnchorSearch: return String(KURL(anchor.href().qstring()).query());
case AnchorName: return String(anchor.name());
case AnchorRel: return String(anchor.rel());
case AnchorRev: return String(anchor.rev());
@@ -2027,20 +2027,20 @@
case AreaAlt: return String(area.alt());
case AreaCoords: return String(area.coords());
case AreaHref: return String(area.href());
- case AreaHash: return String('#'+KURL(area.href().string()).ref());
- case AreaHost: return String(KURL(area.href().string()).host());
+ case AreaHash: return String('#'+KURL(area.href().qstring()).ref());
+ case AreaHost: return String(KURL(area.href().qstring()).host());
case AreaHostName: {
- KURL url(area.href().string());
+ KURL url(area.href().qstring());
kdDebug(6070) << "link::hostname uses:" <<url.url()<<endl;
if (url.port()==0)
return String(url.host());
else
return String(url.host() + ":" + QString::number(url.port()));
}
- case AreaPathName: return String(KURL(area.href().string()).path());
- case AreaPort: return String(QString::number(KURL(area.href().string()).port()));
- case AreaProtocol: return String(KURL(area.href().string()).protocol()+":");
- case AreaSearch: return String(KURL(area.href().string()).query());
+ case AreaPathName: return String(KURL(area.href().qstring()).path());
+ case AreaPort: return String(QString::number(KURL(area.href().qstring()).port()));
+ case AreaProtocol: return String(KURL(area.href().qstring()).protocol()+":");
+ case AreaSearch: return String(KURL(area.href().qstring()).query());
case AreaNoHref: return Boolean(area.noHref());
case AreaShape: return String(area.shape());
case AreaTabIndex: return Number(area.tabIndex());
@@ -2517,13 +2517,13 @@
void KJS::HTMLElement::put(ExecState *exec, const Identifier &propertyName, ValueImp *value, int attr)
{
#ifdef KJS_VERBOSE
- DOM::DOMString str = value.isNull() ? DOM::DOMString() : value->toString(exec).string();
+ DOM::DOMString str = value.isNull() ? DOM::DOMString() : value->toString(exec).domString();
#endif
HTMLElementImpl &element = *static_cast<HTMLElementImpl *>(impl());
#ifdef KJS_VERBOSE
kdDebug(6070) << "KJS::HTMLElement::tryPut " << propertyName.qstring()
- << " thisTag=" << element.tagName().string()
- << " str=" << str.string() << endl;
+ << " thisTag=" << element.tagName().qstring()
+ << " str=" << str.qstring() << endl;
#endif
// First look at dynamic properties
if (element.hasLocalName(selectTag)) {
@@ -3221,7 +3221,7 @@
void HTMLElement::putValueProperty(ExecState *exec, int token, ValueImp *value, int)
{
DOMExceptionTranslator exception(exec);
- DOM::DOMString str = value->toString(exec).string();
+ DOM::DOMString str = value->toString(exec).domString();
// Check our set of generic properties first.
HTMLElementImpl &element = *static_cast<HTMLElementImpl *>(impl());
@@ -3384,7 +3384,7 @@
unsigned int u = args[1]->toString(exec).toULong(&ok);
if (ok)
{
- DOM::DOMString pstr = s.string();
+ DOM::DOMString pstr = s.domString();
NodeImpl *node = collection.namedItem(pstr);
while (node) {
if (!u)
@@ -3402,7 +3402,7 @@
#ifdef KJS_VERBOSE
kdDebug(6070) << "KJS::HTMLCollection::getNamedItems " << propertyName.ascii() << endl;
#endif
- DOM::DOMString pstr = propertyName.string();
+ DOM::DOMString pstr = propertyName.domString();
QValueList< SharedPtr<NodeImpl> > namedItems = m_impl->namedItems(pstr);
@@ -3429,7 +3429,7 @@
case KJS::HTMLCollection::Item:
return getDOMNode(exec,coll.item(args[0]->toUInt32(exec)));
case KJS::HTMLCollection::Tags:
- return getDOMNodeList(exec, coll.base()->getElementsByTagName(args[0]->toString(exec).string()).get());
+ return getDOMNodeList(exec, coll.base()->getElementsByTagName(args[0]->toString(exec).domString()).get());
case KJS::HTMLCollection::NamedItem:
return static_cast<HTMLCollection *>(thisObj)->getNamedItems(exec, Identifier(args[0]->toString(exec)));
default:
@@ -3572,9 +3572,9 @@
t->ref();
opt->appendChild(t, exception);
if (exception == 0 && sz > 0)
- t->setData(args[0]->toString(exec).string(), exception); // set the text
+ t->setData(args[0]->toString(exec).domString(), exception); // set the text
if (exception == 0 && sz > 1)
- opt->setValue(args[1]->toString(exec).string());
+ opt->setValue(args[1]->toString(exec).domString());
if (exception == 0 && sz > 2)
opt->setDefaultSelected(args[2]->toBoolean(exec));
if (exception == 0 && sz > 3)
@@ -3689,7 +3689,7 @@
{
src = value->toString(exec);
if ( img ) img->deref(this);
- img = doc ? doc->docLoader()->requestImage( src.string() ) : 0;
+ img = doc ? doc->docLoader()->requestImage( src.domString() ) : 0;
if ( img ) img->ref(this);
break;
}
@@ -3811,7 +3811,7 @@
switch (numArgs) {
case 1: {
if (args[0]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).domString());
QColor qc(color);
CGContextSetRGBStrokeColor(drawingContext, qc.red()/255., qc.green()/255., qc.blue()/255., qc.alpha()/255.);
@@ -3825,7 +3825,7 @@
case 2: {
float a = args[1]->toNumber(exec);
if (args[0]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).domString());
QColor qc(color);
CGContextSetRGBStrokeColor(drawingContext, qc.red()/255., qc.green()/255., qc.blue()/255., a);
}
@@ -3868,7 +3868,7 @@
switch (numArgs) {
case 1: {
if (args[0]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).domString());
QColor qc(color);
CGContextSetRGBFillColor(drawingContext, qc.red()/255., qc.green()/255., qc.blue()/255., qc.alpha()/255.);
}
@@ -3881,7 +3881,7 @@
case 2: {
float a = args[1]->toNumber(exec);
if (args[0]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[0]->toString(exec).domString());
QColor qc(color);
CGContextSetRGBFillColor(drawingContext, qc.red()/255., qc.green()/255., qc.blue()/255., a);
}
@@ -4178,7 +4178,7 @@
switch (numArgs - 3) {
case 1: {
if (args[3]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[3]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[3]->toString(exec).domString());
QColor qc(color);
components[0] = qc.red()/255.;
components[1] = qc.green()/255.;
@@ -4196,7 +4196,7 @@
case 2: {
float a = args[4]->toNumber(exec);
if (args[3]->isString()) {
- QRgb color = DOM::CSSParser::parseColor(args[3]->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(args[3]->toString(exec).domString());
QColor qc(color);
components[0] = qc.red()/255.;
components[1] = qc.green()/255.;
@@ -4610,7 +4610,7 @@
float components[4];
if (value->isString()) {
- QRgb color = DOM::CSSParser::parseColor(value->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(value->toString(exec).domString());
QColor qc(color);
components[0] = qc.red()/255.;
components[1] = qc.green()/255.;
@@ -4629,7 +4629,7 @@
QColor colorFromValue(ExecState *exec, ValueImp *value)
{
- QRgb color = DOM::CSSParser::parseColor(value->toString(exec).string());
+ QRgb color = DOM::CSSParser::parseColor(value->toString(exec).domString());
return QColor(color);
}
1.16 +1 -2 WebCore/khtml/ecma/kjs_range.cpp
Index: kjs_range.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_range.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kjs_range.cpp 16 Aug 2005 00:47:45 -0000 1.15
+++ kjs_range.cpp 25 Aug 2005 17:47:01 -0000 1.16
@@ -175,8 +175,7 @@
range.detach(exception);
break;
case DOMRange::CreateContextualFragment:
- DOMString str = args[0]->toString(exec).string();
- result = getDOMNode(exec, range.createContextualFragment(str, exception));
+ result = getDOMNode(exec, range.createContextualFragment(args[0]->toString(exec).domString(), exception));
break;
};
1.11 +1 -1 WebCore/khtml/ecma/kjs_views.cpp
Index: kjs_views.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kjs_views.cpp 16 Aug 2005 00:47:45 -0000 1.10
+++ kjs_views.cpp 25 Aug 2005 17:47:01 -0000 1.11
@@ -78,7 +78,7 @@
else {
if (DocumentImpl* doc = arg0->getDocument())
doc->updateLayoutIgnorePendingStylesheets();
- return getDOMCSSStyleDeclaration(exec, abstractView.getComputedStyle(arg0, args[1]->toString(exec).string().implementation()));
+ return getDOMCSSStyleDeclaration(exec, abstractView.getComputedStyle(arg0, args[1]->toString(exec).domString().implementation()));
}
}
}
1.174 +10 -10 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kjs_window.cpp 19 Aug 2005 22:29:53 -0000 1.173
+++ kjs_window.cpp 25 Aug 2005 17:47:01 -0000 1.174
@@ -959,7 +959,7 @@
DocumentImpl *doc = thisObj->m_part->xmlDocImpl();
assert(thisObj->isSafeScript(exec) && doc && doc->isHTMLDocument());
- DOMString name = propertyName.string();
+ DOMString name = propertyName.domString();
SharedPtr<DOM::HTMLCollectionImpl> collection = doc->windowNamedItems(name);
if (collection->length() == 1)
return getDOMNode(exec, collection->firstItem());
@@ -1054,7 +1054,7 @@
// allow shortcuts like 'Image1' instead of document.images.Image1
DocumentImpl *doc = m_part->xmlDocImpl();
if (isSafeScript(exec) && doc && doc->isHTMLDocument()) {
- DOMString name = propertyName.string();
+ DOMString name = propertyName.domString();
if (static_cast<HTMLDocumentImpl *>(doc)->hasNamedItem(name) || doc->getElementById(name)) {
slot.setCustom(this, namedItemGetter);
return true;
@@ -1390,7 +1390,7 @@
thisDomain = ancestorPart->xmlDocImpl()->domain();
}
- //kdDebug(6070) << "current domain:" << actDomain.string() << ", frame domain:" << thisDomain.string() << endl;
+ //kdDebug(6070) << "current domain:" << actDomain.qstring() << ", frame domain:" << thisDomain.qstring() << endl;
if ( actDomain == thisDomain )
return true;
@@ -1405,7 +1405,7 @@
KWQ(m_part)->addMessageToConsole(message, 1, QString());
#endif
- kdWarning(6070) << "Javascript: access denied for current frame '" << actDomain.string() << "' to frame '" << thisDomain.string() << "'" << endl;
+ kdWarning(6070) << "Javascript: access denied for current frame '" << actDomain.qstring() << "' to frame '" << thisDomain.qstring() << "'" << endl;
return false;
}
@@ -1768,7 +1768,7 @@
khtmlpart->end();
if (oldDoc) {
- kdDebug(6070) << "Setting domain to " << oldDoc->domain().string() << endl;
+ kdDebug(6070) << "Setting domain to " << oldDoc->domain().qstring() << endl;
khtmlpart->xmlDocImpl()->setDomain( oldDoc->domain(), true );
khtmlpart->xmlDocImpl()->setBaseURL( oldDoc->baseURL() );
}
@@ -1981,7 +1981,7 @@
if (listener) {
DocumentImpl* docimpl = part->xmlDocImpl();
if (docimpl)
- docimpl->addWindowEventListener(DOM::EventImpl::typeToId(args[0]->toString(exec).string()),listener,args[2]->toBoolean(exec));
+ docimpl->addWindowEventListener(DOM::EventImpl::typeToId(args[0]->toString(exec).domString()),listener,args[2]->toBoolean(exec));
}
return Undefined();
}
@@ -1992,7 +1992,7 @@
if (listener) {
DocumentImpl* docimpl = part->xmlDocImpl();
if (docimpl)
- docimpl->removeWindowEventListener(DOM::EventImpl::typeToId(args[0]->toString(exec).string()),listener,args[2]->toBoolean(exec));
+ docimpl->removeWindowEventListener(DOM::EventImpl::typeToId(args[0]->toString(exec).domString()),listener,args[2]->toBoolean(exec));
}
return Undefined();
}
@@ -2647,9 +2647,9 @@
TypingCommand::closeTyping(part->lastEditCommand());
khtml::Selection s(part->selection());
khtml::Selection::EAlter alter = khtml::Selection::MOVE;
- if (args[0]->toString(exec).string().lower() == "extend")
+ if (args[0]->toString(exec).domString().lower() == "extend")
alter = khtml::Selection::EXTEND;
- DOMString directionString = args[1]->toString(exec).string().lower();
+ DOMString directionString = args[1]->toString(exec).domString().lower();
khtml::Selection::EDirection direction = khtml::Selection::FORWARD;
if (directionString == "backward")
direction = khtml::Selection::BACKWARD;
@@ -2658,7 +2658,7 @@
if (directionString == "right")
direction = khtml::Selection::RIGHT;
khtml::ETextGranularity granularity = khtml::CHARACTER;
- DOMString granularityString = args[2]->toString(exec).string().lower();
+ DOMString granularityString = args[2]->toString(exec).domString().lower();
if (granularityString == "word")
granularity = khtml::WORD;
else if (granularityString == "line")
1.40 +1 -1 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xmlhttprequest.cpp 23 Aug 2005 16:45:12 -0000 1.39
+++ xmlhttprequest.cpp 25 Aug 2005 17:47:02 -0000 1.40
@@ -715,7 +715,7 @@
if (args.size() >= 1) {
if (args[0]->toObject(exec)->inherits(&DOMDocument::info)) {
DocumentImpl *doc = static_cast<DocumentImpl *>(static_cast<DOMDocument *>(args[0]->toObject(exec))->impl());
- body = doc->toString().string();
+ body = doc->toString().qstring();
// FIXME: also need to set content type, including encoding!
} else {
// converting certain values (like null) to object can set an exception
1.8 +1 -1 WebCore/khtml/ecma/xmlserializer.cpp
Index: xmlserializer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlserializer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmlserializer.cpp 16 Aug 2005 00:47:46 -0000 1.7
+++ xmlserializer.cpp 25 Aug 2005 17:47:02 -0000 1.8
@@ -87,7 +87,7 @@
}
NodeImpl *node = static_cast<NodeImpl *>(static_cast<DOMNode *>(args[0]->toObject(exec))->impl());
- return getStringOrNull(node->toString().string());
+ return getStringOrNull(node->toString());
}
}
1.10 +2 -2 WebCore/khtml/editing/apply_style_command.cpp
Index: apply_style_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/apply_style_command.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apply_style_command.cpp 30 Jul 2005 02:33:14 -0000 1.9
+++ apply_style_command.cpp 25 Aug 2005 17:47:04 -0000 1.10
@@ -146,9 +146,9 @@
if (property->id() == CSS_PROP__KHTML_TEXT_DECORATIONS_IN_EFFECT) {
// we have to special-case text decorations
CSSProperty alteredProperty = CSSProperty(CSS_PROP_TEXT_DECORATION, property->value(), property->isImportant());
- styleText += alteredProperty.cssText().string();
+ styleText += alteredProperty.cssText().qstring();
} else {
- styleText += property->cssText().string();
+ styleText += property->cssText().qstring();
}
}
1.8 +1 -1 WebCore/khtml/editing/composite_edit_command.cpp
Index: composite_edit_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- composite_edit_command.cpp 30 Jul 2005 02:33:14 -0000 1.7
+++ composite_edit_command.cpp 25 Aug 2005 17:47:05 -0000 1.8
@@ -364,7 +364,7 @@
gapStart = kMax(gapStart, start);
gapEnd = kMin(gapEnd, end);
if (!str) {
- str = textNode->string()->substring(start, end - start);
+ str = textNode->qstring()->substring(start, end - start);
str->ref();
}
// remove text in the gap
1.15 +2 -2 WebCore/khtml/editing/delete_selection_command.cpp
Index: delete_selection_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/delete_selection_command.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- delete_selection_command.cpp 30 Jul 2005 02:33:14 -0000 1.14
+++ delete_selection_command.cpp 25 Aug 2005 17:47:05 -0000 1.15
@@ -90,7 +90,7 @@
if (pos.isNull())
LOG(Editing, "%s <null>", prefix);
else
- LOG(Editing, "%s%s %p : %d", prefix, pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ LOG(Editing, "%s%s %p : %d", prefix, pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
}
static void debugNode(const char *prefix, const NodeImpl *node)
@@ -100,7 +100,7 @@
if (!node)
LOG(Editing, "%s <null>", prefix);
else
- LOG(Editing, "%s%s %p", prefix, node->nodeName().string().latin1(), node);
+ LOG(Editing, "%s%s %p", prefix, node->nodeName().qstring().latin1(), node);
}
static Position positionBeforePossibleContainingSpecialElement(const Position &pos)
1.29 +1 -1 WebCore/khtml/editing/jsediting.cpp
Index: jsediting.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/jsediting.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jsediting.cpp 6 Jul 2005 01:28:42 -0000 1.28
+++ jsediting.cpp 25 Aug 2005 17:47:05 -0000 1.29
@@ -118,7 +118,7 @@
bool JSEditor::queryCommandSupported(const DOMString &command)
{
- if (!supportsPasteCommand && command.string().lower() == "paste")
+ if (!supportsPasteCommand && command.qstring().lower() == "paste")
return false;
return commandImp(command) != 0;
}
1.30 +10 -10 WebCore/khtml/editing/markup.cpp
Index: markup.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- markup.cpp 22 Aug 2005 20:24:39 -0000 1.29
+++ markup.cpp 25 Aug 2005 17:47:05 -0000 1.30
@@ -105,7 +105,7 @@
str.remove(0, range->startOffset(exceptionCode));
}
}
- return str.string();
+ return str.qstring();
}
static QString renderedText(const NodeImpl *node, const RangeImpl *range)
@@ -130,7 +130,7 @@
endOffset = range->endOffset(exceptionCode);
RenderText *textRenderer = static_cast<RenderText *>(r);
- QString str = node->nodeValue().string();
+ QString str = node->nodeValue().qstring();
for (InlineTextBox *box = textRenderer->firstTextBox(); box; box = box->nextTextBox()) {
unsigned start = box->m_start;
unsigned end = box->m_start + box->m_len;
@@ -190,7 +190,7 @@
defaultStyle->diff(style);
if (style->length() > 0) {
// FIXME: Handle case where style->cssText() has illegal characters in it, like "
- QString openTag = QString("<span class=\"") + AppleStyleSpanClass + "\" style=\"" + style->cssText().string() + "\">";
+ QString openTag = QString("<span class=\"") + AppleStyleSpanClass + "\" style=\"" + style->cssText().qstring() + "\">";
markup = openTag + markup + "</span>";
}
style->deref();
@@ -199,11 +199,11 @@
return annotate ? convertHTMLTextToInterchangeFormat(markup) : markup;
}
case Node::COMMENT_NODE:
- return static_cast<const CommentImpl *>(node)->toString().string();
+ return static_cast<const CommentImpl *>(node)->toString().qstring();
case Node::DOCUMENT_NODE:
return "";
default: {
- QString markup = QChar('<') + node->nodeName().string();
+ QString markup = QChar('<') + node->nodeName().qstring();
if (type == Node::ELEMENT_NODE) {
const ElementImpl *el = static_cast<const ElementImpl *>(node);
DOMString additionalStyle;
@@ -223,7 +223,7 @@
unsigned long length = attrs->length();
if (length == 0 && additionalStyle.length() > 0) {
// FIXME: Handle case where additionalStyle has illegal characters in it, like "
- markup += " " + styleAttr.localName().string() + "=\"" + additionalStyle.string() + "\"";
+ markup += " " + styleAttr.localName().qstring() + "=\"" + additionalStyle.qstring() + "\"";
}
else {
for (unsigned int i=0; i<length; i++) {
@@ -233,7 +233,7 @@
value += "; " + additionalStyle;
// FIXME: Handle case where value has illegal characters in it, like "
// FIXME: Namespaces! XML! Ack!
- markup += " " + attr->name().localName().string() + "=\"" + value.string() + "\"";
+ markup += " " + attr->name().localName().qstring() + "=\"" + value.qstring() + "\"";
}
}
}
@@ -251,7 +251,7 @@
hasEndTag = (htmlElt->endTagRequirement() != TagStatusForbidden);
}
if (hasEndTag)
- return "</" + node->nodeName().string() + ">";
+ return "</" + node->nodeName().qstring() + ">";
return "";
}
@@ -298,7 +298,7 @@
for (unsigned long i = 0; i < length; i++) {
AttributeImpl *attr = attrs->attributeItem(i);
if (e->isURLAttribute(attr))
- e->setAttribute(attr->name(), KURL(baseURL, attr->value().string()).url());
+ e->setAttribute(attr->name(), KURL(baseURL, attr->value().qstring()).url());
}
}
}
@@ -454,7 +454,7 @@
// add in the "default style" for this markup
// FIXME: Handle case where value has illegal characters in it, like "
- QString openTag = QString("<span class=\"") + AppleStyleSpanClass + "\" style=\"" + defaultStyle->cssText().string() + "\">";
+ QString openTag = QString("<span class=\"") + AppleStyleSpanClass + "\" style=\"" + defaultStyle->cssText().qstring() + "\">";
markups.prepend(openTag);
markups.append("</span>");
defaultStyle->deref();
1.91 +6 -6 WebCore/khtml/editing/selection.cpp
Index: selection.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/selection.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- selection.cpp 9 Jul 2005 20:19:07 -0000 1.90
+++ selection.cpp 25 Aug 2005 17:47:05 -0000 1.91
@@ -937,7 +937,7 @@
{
if (r->node()->isElementNode()) {
ElementImpl *element = static_cast<ElementImpl *>(r->node());
- fprintf(stderr, "%s%s\n", selected ? "==> " : " ", element->localName().string().latin1());
+ fprintf(stderr, "%s%s\n", selected ? "==> " : " ", element->localName().qstring().latin1());
}
else if (r->isText()) {
RenderText *textRenderer = static_cast<RenderText *>(r);
@@ -947,7 +947,7 @@
}
static const int max = 36;
- QString text = DOMString(textRenderer->string()).string();
+ QString text = DOMString(textRenderer->qstring()).qstring();
int textLength = text.length();
if (selected) {
int offset = 0;
@@ -1019,14 +1019,14 @@
if (m_start == m_end) {
Position pos = m_start;
- fprintf(stderr, "pos: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "pos: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
}
else {
Position pos = m_start;
- fprintf(stderr, "start: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "start: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
fprintf(stderr, "-----------------------------------\n");
pos = m_end;
- fprintf(stderr, "end: %s %p:%ld\n", pos.node()->nodeName().string().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "end: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
fprintf(stderr, "-----------------------------------\n");
}
@@ -1089,7 +1089,7 @@
result += s;
}
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#undef FormatBufferSize
1.55 +1 -1 WebCore/khtml/editing/visible_position.cpp
Index: visible_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_position.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- visible_position.cpp 30 Jul 2005 02:33:15 -0000 1.54
+++ visible_position.cpp 25 Aug 2005 17:47:05 -0000 1.55
@@ -401,7 +401,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, m_deepPosition.node()->nodeName().string().latin1(), m_deepPosition.node(), m_deepPosition.offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, m_deepPosition.node()->nodeName().qstring().latin1(), m_deepPosition.node(), m_deepPosition.offset());
}
#ifndef NDEBUG
1.34 +2 -2 WebCore/khtml/editing/visible_text.cpp
Index: visible_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_text.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- visible_text.cpp 15 Aug 2005 05:01:53 -0000 1.33
+++ visible_text.cpp 25 Aug 2005 17:47:05 -0000 1.34
@@ -216,7 +216,7 @@
m_lastTextNode = m_node;
RenderText *renderer = static_cast<RenderText *>(m_node->renderer());
- DOMString str = renderer->string();
+ DOMString str = renderer->qstring();
// handle pre-formatted text
if (renderer->style()->whiteSpace() == khtml::PRE) {
@@ -266,7 +266,7 @@
void TextIterator::handleTextBox()
{
RenderText *renderer = static_cast<RenderText *>(m_node->renderer());
- DOMString str = renderer->string();
+ DOMString str = renderer->qstring();
long start = m_offset;
long end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
while (m_textBox) {
1.79 +20 -20 WebCore/khtml/html/html_baseimpl.cpp
Index: html_baseimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- html_baseimpl.cpp 30 Jul 2005 02:33:16 -0000 1.78
+++ html_baseimpl.cpp 25 Aug 2005 17:47:07 -0000 1.79
@@ -94,7 +94,7 @@
void HTMLBodyElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
{
if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL(attr->value()).string();
+ QString url = khtml::parseURL(attr->value()).qstring();
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == marginwidthAttr) {
@@ -149,22 +149,22 @@
getDocument()->recalcStyle(Force);
} else if (attr->name() == onloadAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::LOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else if (attr->name() == onunloadAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::UNLOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else if (attr->name() == onblurAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else if (attr->name() == onfocusAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else if (attr->name() == onresizeAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::RESIZE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else if (attr->name() == onscrollAttr) {
getDocument()->setHTMLWindowEventListener(EventImpl::SCROLL_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), NULL));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), NULL));
} else
HTMLElementImpl::parseMappedAttribute(attr);
}
@@ -298,7 +298,7 @@
return false;
}
- KURL newURL(getDocument()->completeURL(URLString.string()));
+ KURL newURL(getDocument()->completeURL(URLString.qstring()));
newURL.setRef(QString::null);
// Don't allow more than 1000 total frames in a set. This seems
@@ -371,11 +371,11 @@
// Load the frame contents.
KHTMLPart *part = w->part();
- KHTMLPart *framePart = part->findFrame(m_name.string());
+ KHTMLPart *framePart = part->findFrame(m_name.qstring());
if (framePart) {
- framePart->openURL(getDocument()->completeURL(relativeURL.string()));
+ framePart->openURL(getDocument()->completeURL(relativeURL.qstring()));
} else {
- part->requestFrame(static_cast<RenderFrame *>(m_render), relativeURL.string(), m_name.string());
+ part->requestFrame(static_cast<RenderFrame *>(m_render), relativeURL.qstring(), m_name.qstring());
}
}
@@ -418,10 +418,10 @@
// FIXME: If we are already attached, this has no effect.
} else if (attr->name() == onloadAttr) {
setHTMLEventListener(EventImpl::LOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onunloadAttr) {
setHTMLEventListener(EventImpl::UNLOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLElementImpl::parseMappedAttribute(attr);
}
@@ -472,11 +472,11 @@
}
// we need a unique name for every frame in the frameset. Hope that's unique enough.
- if (m_name.isEmpty() || part->frameExists(m_name.string()))
+ if (m_name.isEmpty() || part->frameExists(m_name.qstring()))
m_name = AtomicString(part->requestFrameName());
// load the frame contents
- part->requestFrame(static_cast<RenderFrame*>(m_render), relativeURL.string(), m_name.string());
+ part->requestFrame(static_cast<RenderFrame*>(m_render), relativeURL.qstring(), m_name.qstring());
}
void HTMLFrameElementImpl::detach()
@@ -485,7 +485,7 @@
if (m_render && part) {
part->decrementFrameCount();
- KHTMLPart *framePart = part->findFrame(m_name.string());
+ KHTMLPart *framePart = part->findFrame(m_name.qstring());
if (framePart)
framePart->frameDetached();
}
@@ -527,7 +527,7 @@
}
// Find the part for the subframe that this element represents.
- return ownerDocumentPart->findFrame(m_name.string());
+ return ownerDocumentPart->findFrame(m_name.qstring());
}
DocumentImpl* HTMLFrameElementImpl::contentDocument() const
@@ -684,10 +684,10 @@
frameborder = false;
} else if (attr->name() == onloadAttr) {
setHTMLEventListener(EventImpl::LOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onunloadAttr) {
setHTMLEventListener(EventImpl::UNLOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLElementImpl::parseMappedAttribute(attr);
}
@@ -920,7 +920,7 @@
if (m_render && part) {
// we need a unique name for every frame in the frameset. Hope that's unique enough.
part->incrementFrameCount();
- if (m_name.isEmpty() || part->frameExists(m_name.string()))
+ if (m_name.isEmpty() || part->frameExists(m_name.qstring()))
m_name = AtomicString(part->requestFrameName());
static_cast<RenderPartObject*>(m_render)->updateWidget();
1.67 +2 -2 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- html_documentimpl.cpp 30 Jul 2005 02:33:17 -0000 1.66
+++ html_documentimpl.cpp 25 Aug 2005 17:47:07 -0000 1.67
@@ -195,7 +195,7 @@
void HTMLDocumentImpl::setCookie( const DOMString & value )
{
#if APPLE_CHANGES
- return KWQKCookieJar::setCookie(URL(), m_policyBaseURL.string(), value.string());
+ return KWQKCookieJar::setCookie(URL(), m_policyBaseURL.qstring(), value.qstring());
#else
long windowId = 0;
KHTMLView *v = view ();
@@ -206,7 +206,7 @@
QByteArray params;
QDataStream stream(params, IO_WriteOnly);
QString fake_header("Set-Cookie: ");
- fake_header.append(value.string());
+ fake_header.append(value.qstring());
fake_header.append("\n");
stream << URL() << fake_header.utf8() << windowId;
if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
1.97 +30 -30 WebCore/khtml/html/html_elementimpl.cpp
Index: html_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- html_elementimpl.cpp 19 Aug 2005 23:58:26 -0000 1.96
+++ html_elementimpl.cpp 25 Aug 2005 17:47:07 -0000 1.97
@@ -155,88 +155,88 @@
// standard events
else if (attr->name() == onclickAttr) {
setHTMLEventListener(EventImpl::KHTML_CLICK_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == oncontextmenuAttr) {
setHTMLEventListener(EventImpl::CONTEXTMENU_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondblclickAttr) {
setHTMLEventListener(EventImpl::KHTML_DBLCLICK_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmousedownAttr) {
setHTMLEventListener(EventImpl::MOUSEDOWN_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmousemoveAttr) {
setHTMLEventListener(EventImpl::MOUSEMOVE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmouseoutAttr) {
setHTMLEventListener(EventImpl::MOUSEOUT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmouseoverAttr) {
setHTMLEventListener(EventImpl::MOUSEOVER_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmouseupAttr) {
setHTMLEventListener(EventImpl::MOUSEUP_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onmousewheelAttr) {
setHTMLEventListener(EventImpl::MOUSEWHEEL_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::DOMFOCUSIN_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onkeydownAttr) {
setHTMLEventListener(EventImpl::KEYDOWN_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onkeypressAttr) {
setHTMLEventListener(EventImpl::KEYPRESS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onkeyupAttr) {
setHTMLEventListener(EventImpl::KEYUP_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onscrollAttr) {
setHTMLEventListener(EventImpl::SCROLL_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onbeforecutAttr) {
setHTMLEventListener(EventImpl::BEFORECUT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == oncutAttr) {
setHTMLEventListener(EventImpl::CUT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onbeforecopyAttr) {
setHTMLEventListener(EventImpl::BEFORECOPY_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == oncopyAttr) {
setHTMLEventListener(EventImpl::COPY_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onbeforepasteAttr) {
setHTMLEventListener(EventImpl::BEFOREPASTE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onpasteAttr) {
setHTMLEventListener(EventImpl::PASTE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragenterAttr) {
setHTMLEventListener(EventImpl::DRAGENTER_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragoverAttr) {
setHTMLEventListener(EventImpl::DRAGOVER_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragleaveAttr) {
setHTMLEventListener(EventImpl::DRAGLEAVE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondropAttr) {
setHTMLEventListener(EventImpl::DROP_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragstartAttr) {
setHTMLEventListener(EventImpl::DRAGSTART_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragAttr) {
setHTMLEventListener(EventImpl::DRAG_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == ondragendAttr) {
setHTMLEventListener(EventImpl::DRAGEND_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onselectstartAttr) {
setHTMLEventListener(EventImpl::SELECTSTART_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
}
}
@@ -292,7 +292,7 @@
{
HTMLTokenizer tok(docPtr(), fragment);
tok.setForceSynchronous(true); // disable asynchronous parsing
- tok.write( html.string(), true );
+ tok.write( html.qstring(), true );
tok.finish();
assert(!tok.processingData()); // make sure we're done (see 3963151)
}
@@ -450,7 +450,7 @@
void HTMLElementImpl::addHTMLAlignment(MappedAttributeImpl* attr)
{
- //qDebug("alignment is %s", alignment.string().latin1() );
+ //qDebug("alignment is %s", alignment.qstring().latin1() );
// vertical alignment with respect to the current baseline of the text
// right or left means floating images
int propfloat = -1;
1.186 +55 -55 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- html_formimpl.cpp 14 Aug 2005 08:07:22 -0000 1.185
+++ html_formimpl.cpp 25 Aug 2005 17:47:08 -0000 1.186
@@ -81,13 +81,13 @@
FormDataList(QTextCodec *);
void appendData(const DOMString &key, const DOMString &value)
- { appendString(key.string()); appendString(value.string()); }
+ { appendString(key.qstring()); appendString(value.qstring()); }
void appendData(const DOMString &key, const QString &value)
- { appendString(key.string()); appendString(value); }
+ { appendString(key.qstring()); appendString(value); }
void appendData(const DOMString &key, const QCString &value)
- { appendString(key.string()); appendString(value); }
+ { appendString(key.qstring()); appendString(value); }
void appendData(const DOMString &key, int value)
- { appendString(key.string()); appendString(QString::number(value)); }
+ { appendString(key.qstring()); appendString(QString::number(value)); }
void appendFile(const DOMString &key, const DOMString &filename);
QValueListConstIterator<FormDataListItem> begin() const
@@ -139,7 +139,7 @@
if (url.isNull()) {
return false;
}
- return getDocument()->completeURL(url.string()).startsWith("https:", false);
+ return getDocument()->completeURL(url.qstring()).startsWith("https:", false);
}
#endif
@@ -335,7 +335,7 @@
QCString enc_string = ""; // used for non-multipart data
// find out the QTextcodec to use
- QString str = m_acceptcharset.string();
+ QString str = m_acceptcharset.qstring();
str.replace(',', ' ');
QStringList charsets = QStringList::split(' ', str);
QTextCodec* codec = 0;
@@ -367,7 +367,7 @@
if (!current->disabled() && current->appendFormData(lst, m_multipart))
{
- //kdDebug(6030) << "adding name " << current->name().string() << endl;
+ //kdDebug(6030) << "adding name " << current->name().qstring() << endl;
for(QValueListConstIterator<FormDataListItem> it = lst.begin(); it != lst.end(); ++it )
{
if (!m_multipart)
@@ -391,7 +391,7 @@
else
{
QCString hstr("--");
- hstr += m_boundary.string().latin1();
+ hstr += m_boundary.qstring().latin1();
hstr += "\r\n";
hstr += "Content-Disposition: form-data; name=\"";
hstr += (*it).m_data.data();
@@ -402,7 +402,7 @@
if (current->hasLocalName(inputTag) &&
static_cast<HTMLInputElementImpl*>(current)->inputType() == HTMLInputElementImpl::FILE)
{
- QString path = static_cast<HTMLInputElementImpl*>(current)->value().string();
+ QString path = static_cast<HTMLInputElementImpl*>(current)->value().qstring();
#if !APPLE_CHANGES
if (path.length()) fileUploads << path;
#endif
@@ -467,7 +467,7 @@
#endif
if (m_multipart)
- enc_string = ("--" + m_boundary.string() + "--\r\n").ascii();
+ enc_string = ("--" + m_boundary.qstring() + "--\r\n").ascii();
form_data.appendData(enc_string.data(), enc_string.length());
return true;
@@ -475,12 +475,12 @@
void HTMLFormElementImpl::parseEnctype( const DOMString& type )
{
- if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1)
+ if(type.qstring().find("multipart", 0, false) != -1 || type.qstring().find("form-data", 0, false) != -1)
{
m_enctype = "multipart/form-data";
m_multipart = true;
m_post = true;
- } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1)
+ } else if (type.qstring().find("text", 0, false) != -1 || type.qstring().find("plain", 0, false) != -1)
{
m_enctype = "text/plain";
m_multipart = false;
@@ -553,7 +553,7 @@
|| input->inputType() == HTMLInputElementImpl::PASSWORD
|| input->inputType() == HTMLInputElementImpl::SEARCH)
{
- KWQ(part)->recordFormValue(input->name().string(), input->value().string(), this);
+ KWQ(part)->recordFormValue(input->name().qstring(), input->value().qstring(), this);
if (input->renderer() && input->inputType() == HTMLInputElementImpl::SEARCH)
static_cast<RenderLineEdit*>(input->renderer())->addSearchResult();
}
@@ -564,7 +564,7 @@
static_cast<HTMLInputElementImpl*>(current)->autoComplete() )
{
HTMLInputElementImpl *input = static_cast<HTMLInputElementImpl *>(current);
- view->addFormCompletionItem(input->name().string(), input->value().string());
+ view->addFormCompletionItem(input->name().qstring(), input->value().qstring());
}
#endif
@@ -584,14 +584,14 @@
FormData form_data;
if (formData(form_data)) {
if(m_post) {
- part->submitForm( "post", m_url.string(), form_data,
- m_target.string(),
- enctype().string(),
- boundary().string() );
+ part->submitForm( "post", m_url.qstring(), form_data,
+ m_target.qstring(),
+ enctype().qstring(),
+ boundary().qstring() );
}
else {
- part->submitForm( "get", m_url.string(), form_data,
- m_target.string() );
+ part->submitForm( "get", m_url.qstring(), form_data,
+ m_target.qstring() );
}
}
@@ -663,10 +663,10 @@
m_autocomplete = strcasecmp( attr->value(), "off" );
} else if (attr->name() == onsubmitAttr) {
setHTMLEventListener(EventImpl::SUBMIT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onresetAttr) {
setHTMLEventListener(EventImpl::RESET_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == nameAttr) {
DOMString newNameAttr = attr->value();
if (inDocument() && getDocument()->isHTMLDocument()) {
@@ -1153,13 +1153,13 @@
QString HTMLGenericFormElementImpl::state( )
{
// Build a string that contains ElementName&ElementType&
- return encodedElementName(name().string()) + stateSeparator + type().string() + stateSeparator;
+ return encodedElementName(name().qstring()) + stateSeparator + type().qstring() + stateSeparator;
}
QString HTMLGenericFormElementImpl::findMatchingState(QStringList &states)
{
- QString encName = encodedElementName(name().string());
- QString typeStr = type().string();
+ QString encName = encodedElementName(name().qstring());
+ QString typeStr = type().qstring();
for (QStringList::Iterator it = states.begin(); it != states.end(); ++it) {
QString state = *it;
int sep1 = state.find(stateSeparator);
@@ -1235,10 +1235,10 @@
// Do nothing.
} else if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onblurAttr) {
setHTMLEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLGenericFormElementImpl::parseMappedAttribute(attr);
}
@@ -1532,7 +1532,7 @@
case RADIO:
return state + (checked() ? "on" : "off");
default:
- return state + value().string()+'.'; // Make sure the string is not empty!
+ return state + value().qstring()+'.'; // Make sure the string is not empty!
}
}
@@ -1829,25 +1829,25 @@
addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
} else if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onblurAttr) {
setHTMLEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onselectAttr) {
setHTMLEventListener(EventImpl::SELECT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onchangeAttr) {
setHTMLEventListener(EventImpl::CHANGE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == oninputAttr) {
setHTMLEventListener(EventImpl::INPUT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
}
// Search field and slider attributes all just cause updateFromElement to be called through style
// recalcing.
else if (attr->name() == onsearchAttr) {
setHTMLEventListener(EventImpl::SEARCH_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == resultsAttr) {
m_maxResults = !attr->isNull() ? attr->value().toInt() : -1;
setChanged();
@@ -2047,8 +2047,8 @@
case IMAGE:
if (m_activeSubmit)
{
- encoding.appendData(name().isEmpty() ? QString::fromLatin1("x") : (name().string() + ".x"), clickX());
- encoding.appendData(name().isEmpty() ? QString::fromLatin1("y") : (name().string() + ".y"), clickY());
+ encoding.appendData(name().isEmpty() ? QString::fromLatin1("x") : (name().qstring() + ".x"), clickX());
+ encoding.appendData(name().isEmpty() ? QString::fromLatin1("y") : (name().qstring() + ".y"), clickY());
if (!name().isEmpty() && !value().isEmpty())
encoding.appendData(name(), value());
return true;
@@ -2058,7 +2058,7 @@
case SUBMIT:
if (m_activeSubmit)
{
- QString enc_str = valueWithDefault().string();
+ QString enc_str = valueWithDefault().qstring();
if (!enc_str.isEmpty()) {
encoding.appendData(name(), enc_str);
return true;
@@ -2085,7 +2085,7 @@
return true;
#else
KURL fileurl("file:///");
- fileurl.setPath(value().string());
+ fileurl.setPath(value().qstring());
KIO::UDSEntry filestat;
if (!KIO::NetAccess::stat(fileurl, filestat)) {
@@ -2550,10 +2550,10 @@
{
if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onblurAttr) {
setHTMLEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLElementImpl::parseMappedAttribute(attr);
}
@@ -2971,13 +2971,13 @@
// FIXME: ignore for the moment
} else if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onblurAttr) {
setHTMLEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onchangeAttr) {
setHTMLEventListener(EventImpl::CHANGE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLGenericFormElementImpl::parseMappedAttribute(attr);
}
@@ -3010,7 +3010,7 @@
(items[0]->hasLocalName(optionTag))) {
HTMLOptionElementImpl *option = static_cast<HTMLOptionElementImpl*>(items[0]);
if (option->value().isNull())
- encoded_values.appendData(name(), option->text().string().stripWhiteSpace());
+ encoded_values.appendData(name(), option->text().qstring().stripWhiteSpace());
else
encoded_values.appendData(name(), option->value());
successful = true;
@@ -3221,7 +3221,7 @@
if (!m_keyType.isNull() && strcasecmp(m_keyType, "rsa")) {
return false;
}
- QString value = KSSLKeyGen::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.string(), getDocument()->part()->baseURL());
+ QString value = KSSLKeyGen::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.qstring(), getDocument()->part()->baseURL());
if (value.isNull()) {
return false;
}
@@ -3420,7 +3420,7 @@
if ( !m_value.isNull() )
return m_value;
// Use the text if the value wasn't set.
- return text().string().stripWhiteSpace();
+ return text().qstring().stripWhiteSpace();
}
void HTMLOptionElementImpl::setValue(const DOMString &value)
@@ -3497,7 +3497,7 @@
QString HTMLTextAreaElementImpl::state( )
{
// Make sure the string is not empty!
- return HTMLGenericFormElementImpl::state() + value().string()+'.';
+ return HTMLGenericFormElementImpl::state() + value().qstring()+'.';
}
void HTMLTextAreaElementImpl::restoreState(QStringList &states)
@@ -3578,16 +3578,16 @@
// ignore for the moment
} else if (attr->name() == onfocusAttr) {
setHTMLEventListener(EventImpl::FOCUS_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onblurAttr) {
setHTMLEventListener(EventImpl::BLUR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onselectAttr) {
setHTMLEventListener(EventImpl::SELECT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onchangeAttr) {
setHTMLEventListener(EventImpl::CHANGE_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else
HTMLGenericFormElementImpl::parseMappedAttribute(attr);
}
@@ -3616,7 +3616,7 @@
m_value = static_cast<RenderTextArea*>( m_render )->text();
m_valueMatchesRenderer = true;
} else {
- m_value = defaultValue().string();
+ m_value = defaultValue().qstring();
m_valueMatchesRenderer = false;
}
m_valueIsValid = true;
@@ -3631,7 +3631,7 @@
void HTMLTextAreaElementImpl::setValue(const DOMString &value)
{
- m_value = value.string();
+ m_value = value.qstring();
m_valueMatchesRenderer = false;
if (m_render)
m_render->updateFromElement();
@@ -3806,8 +3806,8 @@
void FormDataList::appendFile(const DOMString &key, const DOMString &filename)
{
- appendString(key.string());
- m_list.append(filename.string());
+ appendString(key.qstring());
+ m_list.append(filename.qstring());
}
} // namespace
1.55 +14 -14 WebCore/khtml/html/html_headimpl.cpp
Index: html_headimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_headimpl.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- html_headimpl.cpp 30 Jul 2005 02:33:17 -0000 1.54
+++ html_headimpl.cpp 25 Aug 2005 17:47:08 -0000 1.55
@@ -88,10 +88,10 @@
return;
if(!m_href.isEmpty() && getDocument()->part())
- getDocument()->setBaseURL( KURL( getDocument()->part()->url(), m_href.string() ).url() );
+ getDocument()->setBaseURL( KURL( getDocument()->part()->url(), m_href.qstring() ).url() );
if(!m_target.isEmpty())
- getDocument()->setBaseTarget( m_target.string() );
+ getDocument()->setBaseTarget( m_target.qstring() );
// ### should changing a document's base URL dynamically automatically update all images, stylesheets etc?
}
@@ -168,13 +168,13 @@
tokenizeRelAttribute(attr->value());
process();
} else if (attr->name() == hrefAttr) {
- m_url = getDocument()->completeURL( khtml::parseURL(attr->value()).string() );
+ m_url = getDocument()->completeURL( khtml::parseURL(attr->value()).qstring() );
process();
} else if (attr->name() == typeAttr) {
m_type = attr->value();
process();
} else if (attr->name() == mediaAttr) {
- m_media = attr->value().string().lower();
+ m_media = attr->value().qstring().lower();
process();
} else if (attr->name() == disabledAttr) {
setDisabledState(!attr->isNull());
@@ -185,7 +185,7 @@
void HTMLLinkElementImpl::tokenizeRelAttribute(const AtomicString& relStr)
{
m_isStyleSheet = m_isIcon = m_alternate = false;
- QString rel = relStr.string().lower();
+ QString rel = relStr.qstring().lower();
if (rel == "stylesheet")
m_isStyleSheet = true;
else if (rel == "icon" || rel == "shortcut icon")
@@ -212,16 +212,16 @@
if (!inDocument())
return;
- QString type = m_type.string().lower();
+ QString type = m_type.qstring().lower();
KHTMLPart* part = getDocument()->part();
// IE extension: location of small icon for locationbar / bookmarks
if (part && m_isIcon && !m_url.isEmpty() && !part->parentPart()) {
if (!type.isEmpty()) // Mozilla extension to IE extension: icon specified with type
- part->browserExtension()->setTypedIconURL(KURL(m_url.string()), type);
+ part->browserExtension()->setTypedIconURL(KURL(m_url.qstring()), type);
else
- part->browserExtension()->setIconURL(KURL(m_url.string()));
+ part->browserExtension()->setIconURL(KURL(m_url.qstring()));
}
// Stylesheet
@@ -238,7 +238,7 @@
if (!isAlternate())
getDocument()->addPendingSheet();
- QString chset = getAttribute(charsetAttr).string();
+ QString chset = getAttribute(charsetAttr).qstring();
if (m_cachedSheet)
m_cachedSheet->deref(this);
m_cachedSheet = getDocument()->docLoader()->requestStyleSheet(m_url, chset);
@@ -512,9 +512,9 @@
if (m_createdByParser)
return;
- QString url = getAttribute(srcAttr).string();
+ QString url = getAttribute(srcAttr).qstring();
if (!url.isEmpty()) {
- QString charset = getAttribute(charsetAttr).string();
+ QString charset = getAttribute(charsetAttr).qstring();
m_cachedScript = getDocument()->docLoader()->requestScript(DOMString(url), charset);
m_cachedScript->ref(this);
return;
@@ -544,7 +544,7 @@
assert(cs == m_cachedScript);
- evaluateScript(cs->url().string(), cs->script());
+ evaluateScript(cs->url().qstring(), cs->script());
cs->deref(this);
m_cachedScript = 0;
@@ -560,7 +560,7 @@
KJSProxy *proxy = KJSProxy::proxy(part);
if (proxy) {
m_evaluated = true;
- proxy->evaluate(URL, 0, script.string(), 0);
+ proxy->evaluate(URL, 0, script.qstring(), 0);
DocumentImpl::updateDocumentsRendering();
}
}
@@ -676,7 +676,7 @@
if (attr->name() == typeAttr)
m_type = attr->value().domString().lower();
else if (attr->name() == mediaAttr)
- m_media = attr->value().string().lower();
+ m_media = attr->value().qstring().lower();
else
HTMLElementImpl::parseMappedAttribute(attr);
}
1.49 +7 -7 WebCore/khtml/html/html_imageimpl.cpp
Index: html_imageimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- html_imageimpl.cpp 30 Jul 2005 02:33:17 -0000 1.48
+++ html_imageimpl.cpp 25 Aug 2005 17:47:09 -0000 1.49
@@ -207,7 +207,7 @@
if (attr->value().domString()[0] == '#')
usemap = attr->value();
else {
- QString url = getDocument()->completeURL(khtml::parseURL(attr->value()).string());
+ QString url = getDocument()->completeURL(khtml::parseURL(attr->value()).qstring());
// ### we remove the part before the anchor and hope
// the map is on the same html page....
usemap = url;
@@ -217,17 +217,17 @@
ismap = true;
} else if (attr->name() == onabortAttr) {
setHTMLEventListener(EventImpl::ABORT_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onerrorAttr) {
setHTMLEventListener(EventImpl::ERROR_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onloadAttr) {
setHTMLEventListener(EventImpl::LOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
}
#if APPLE_CHANGES
else if (attr->name() == compositeAttr)
- _compositeOperator = attr->value().string();
+ _compositeOperator = attr->value().qstring();
#endif
else if (attr->name() == nameAttr) {
DOMString newNameAttr = attr->value();
@@ -294,7 +294,7 @@
// check the attribute first for an explicit pixel value
DOM::DOMString attrWidth = getAttribute(widthAttr);
bool ok;
- long width = attrWidth.string().toLong(&ok);
+ long width = attrWidth.qstring().toLong(&ok);
if (ok) {
return width;
}
@@ -321,7 +321,7 @@
// check the attribute first for an explicit pixel value
DOM::DOMString attrHeight = getAttribute(heightAttr);
bool ok;
- long height = attrHeight.string().toLong(&ok);
+ long height = attrHeight.qstring().toLong(&ok);
if (ok) {
return height;
}
1.47 +2 -2 WebCore/khtml/html/html_inlineimpl.cpp
Index: html_inlineimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- html_inlineimpl.cpp 30 Jul 2005 02:33:17 -0000 1.46
+++ html_inlineimpl.cpp 25 Aug 2005 17:47:09 -0000 1.47
@@ -146,9 +146,9 @@
}
}
- url = khtml::parseURL(getAttribute(hrefAttr)).string();
+ url = khtml::parseURL(getAttribute(hrefAttr)).qstring();
- utarget = getAttribute(targetAttr).string();
+ utarget = getAttribute(targetAttr).qstring();
if ( e && e->button() == 1 )
utarget = "_blank";
1.34 +8 -8 WebCore/khtml/html/html_miscimpl.cpp
Index: html_miscimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- html_miscimpl.cpp 16 Aug 2005 23:57:06 -0000 1.33
+++ html_miscimpl.cpp 25 Aug 2005 17:47:09 -0000 1.34
@@ -427,8 +427,8 @@
if (!n->isHTMLElement())
continue;
HTMLElementImpl* e = static_cast<HTMLElementImpl*>(n);
- QString idAttrVal = e->getAttribute(idAttr).string();
- QString nameAttrVal = e->getAttribute(nameAttr).string();
+ QString idAttrVal = e->getAttribute(idAttr).qstring();
+ QString nameAttrVal = e->getAttribute(nameAttr).qstring();
if (!idAttrVal.isEmpty()) {
// add to id cache
QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttrVal);
@@ -466,8 +466,8 @@
resetCollectionInfo();
updateNameCache();
- QPtrVector<NodeImpl> *idResults = info->idCache.find(name.string());
- QPtrVector<NodeImpl> *nameResults = info->nameCache.find(name.string());
+ QPtrVector<NodeImpl> *idResults = info->idCache.find(name.qstring());
+ QPtrVector<NodeImpl> *nameResults = info->nameCache.find(name.qstring());
for (unsigned i = 0; idResults && i < idResults->count(); ++i) {
result.append(SharedPtr<NodeImpl>(idResults->at(i)));
@@ -705,8 +705,8 @@
for (unsigned i = 0; i < f->formElements.count(); ++i) {
HTMLGenericFormElementImpl* e = f->formElements[i];
if (e->isEnumeratable()) {
- QString idAttrVal = e->getAttribute(idAttr).string();
- QString nameAttrVal = e->getAttribute(nameAttr).string();
+ QString idAttrVal = e->getAttribute(idAttr).qstring();
+ QString nameAttrVal = e->getAttribute(nameAttr).qstring();
if (!idAttrVal.isEmpty()) {
// add to id cache
QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttrVal);
@@ -732,8 +732,8 @@
for (unsigned i = 0; i < f->imgElements.count(); ++i) {
HTMLImageElementImpl* e = f->imgElements[i];
- QString idAttrVal = e->getAttribute(idAttr).string();
- QString nameAttrVal = e->getAttribute(nameAttr).string();
+ QString idAttrVal = e->getAttribute(idAttr).qstring();
+ QString nameAttrVal = e->getAttribute(nameAttr).qstring();
if (!idAttrVal.isEmpty() && !foundInputElements.find(idAttrVal)) {
// add to id cache
QPtrVector<NodeImpl> *idVector = info->idCache.find(idAttrVal);
1.75 +12 -12 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- html_objectimpl.cpp 30 Jul 2005 02:33:18 -0000 1.74
+++ html_objectimpl.cpp 25 Aug 2005 17:47:09 -0000 1.75
@@ -172,23 +172,23 @@
{
QMap<QString, QString> args;
- args.insert( "code", getAttribute(codeAttr).string());
+ args.insert( "code", getAttribute(codeAttr).qstring());
DOMString codeBase = getAttribute(codebaseAttr);
if(!codeBase.isNull())
- args.insert( "codeBase", codeBase.string() );
+ args.insert( "codeBase", codeBase.qstring() );
DOMString name = getDocument()->htmlMode() != DocumentImpl::XHtml ?
getAttribute(nameAttr) : getAttribute(idAttr);
if(!name.isNull())
- args.insert( "name", name.string() );
+ args.insert( "name", name.qstring() );
DOMString archive = getAttribute(archiveAttr);
if(!archive.isNull())
- args.insert( "archive", archive.string() );
+ args.insert( "archive", archive.qstring() );
args.insert( "baseURL", getDocument()->baseURL() );
DOMString mayScript = getAttribute(mayscriptAttr);
if (!mayScript.isNull())
- args.insert("mayScript", mayScript.string());
+ args.insert("mayScript", mayScript.qstring());
// Other arguments (from <PARAM> tags) are added later.
@@ -446,7 +446,7 @@
void HTMLEmbedElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
{
- QString val = attr->value().string();
+ QString val = attr->value().qstring();
int pos;
if (attr->name() == typeAttr) {
@@ -456,7 +456,7 @@
serviceType = serviceType.left( pos );
} else if (attr->name() == codeAttr ||
attr->name() == srcAttr) {
- url = khtml::parseURL(attr->value()).string();
+ url = khtml::parseURL(attr->value()).qstring();
} else if (attr->name() == widthAttr) {
addCSSLength( attr, CSS_PROP_WIDTH, attr->value() );
} else if (attr->name() == heightAttr) {
@@ -628,7 +628,7 @@
void HTMLObjectElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
{
- QString val = attr->value().string();
+ QString val = attr->value().qstring();
int pos;
if (attr->name() == typeAttr) {
serviceType = val.lower();
@@ -642,7 +642,7 @@
m_imageLoader = 0;
}
} else if (attr->name() == dataAttr) {
- url = khtml::parseURL( val ).string();
+ url = khtml::parseURL( val ).qstring();
if (m_render)
needWidgetUpdate = true;
if (m_render && isImageType()) {
@@ -668,10 +668,10 @@
needWidgetUpdate = true;
} else if (attr->name() == onloadAttr) {
setHTMLEventListener(EventImpl::LOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == onunloadAttr) {
setHTMLEventListener(EventImpl::UNLOAD_EVENT,
- getDocument()->createHTMLEventListener(attr->value().string(), this));
+ getDocument()->createHTMLEventListener(attr->value().qstring(), this));
} else if (attr->name() == nameAttr) {
DOMString newNameAttr = attr->value();
if (inDocument() && getDocument()->isHTMLDocument()) {
@@ -1051,7 +1051,7 @@
if (attr->name() == valueAttr) {
AttributeImpl *attr = attributes()->getAttributeItem(nameAttr);
if (attr) {
- DOMString value = attr->value().string().lower();
+ DOMString value = attr->value().qstring().lower();
if (value == "src" || value == "movie" || value == "data") {
return true;
}
1.59 +5 -5 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- html_tableimpl.cpp 30 Jul 2005 02:33:18 -0000 1.58
+++ html_tableimpl.cpp 25 Aug 2005 17:47:09 -0000 1.59
@@ -315,7 +315,7 @@
NodeImpl *HTMLTableElementImpl::addChild(NodeImpl *child)
{
#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().string() << "(Table)::addChild( " << child->nodeName().string() << " )" << endl;
+ kdDebug( 6030 ) << nodeName().qstring() << "(Table)::addChild( " << child->nodeName().qstring() << " )" << endl;
#endif
if (child->hasTagName(formTag)) {
@@ -461,7 +461,7 @@
m_solid = true;
}
} else if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL( attr->value() ).string();
+ QString url = khtml::parseURL( attr->value() ).qstring();
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == frameAttr) {
@@ -737,7 +737,7 @@
if (attr->name() == bgcolorAttr) {
addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
} else if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL( attr->value() ).string();
+ QString url = khtml::parseURL( attr->value() ).qstring();
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == bordercolorAttr) {
@@ -787,7 +787,7 @@
NodeImpl *HTMLTableSectionElementImpl::addChild(NodeImpl *child)
{
#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().string() << "(Tbody)::addChild( " << child->nodeName().string() << " )" << endl;
+ kdDebug( 6030 ) << nodeName().qstring() << "(Tbody)::addChild( " << child->nodeName().qstring() << " )" << endl;
#endif
if (child->hasTagName(formTag)) {
@@ -910,7 +910,7 @@
NodeImpl *HTMLTableRowElementImpl::addChild(NodeImpl *child)
{
#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().string() << "(Trow)::addChild( " << child->nodeName().string() << " )" << endl;
+ kdDebug( 6030 ) << nodeName().qstring() << "(Trow)::addChild( " << child->nodeName().qstring() << " )" << endl;
#endif
if (child->hasTagName(formTag)) {
1.105 +2 -2 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- htmlparser.cpp 23 Aug 2005 22:53:20 -0000 1.104
+++ htmlparser.cpp 25 Aug 2005 17:47:10 -0000 1.105
@@ -504,7 +504,7 @@
TextImpl *t = static_cast<TextImpl *>(n);
if (t->containsOnlyWhitespace())
return false;
- DOMStringImpl *i = t->string();
+ DOMStringImpl *i = t->qstring();
unsigned int pos = 0;
while (pos < i->l && (*(i->s+pos) == QChar(' ') ||
*(i->s+pos) == QChar(0xa0))) pos++;
@@ -851,7 +851,7 @@
popBlock(t->tagName);
}
#ifdef PARSER_DEBUG
- kdDebug( 6035 ) << "closeTag --> current = " << current->nodeName().string() << endl;
+ kdDebug( 6035 ) << "closeTag --> current = " << current->nodeName().qstring() << endl;
#endif
}
1.107 +16 -16 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- htmltokenizer.cpp 23 Aug 2005 19:25:05 -0000 1.106
+++ htmltokenizer.cpp 25 Aug 2005 17:47:10 -0000 1.107
@@ -582,7 +582,7 @@
scriptCode[ scriptCodeSize++ ] = *src;
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
qDebug("comment is now: *%s*",
- QConstString((QChar*)src.current(), kMin(16, src.length())).string().latin1());
+ QConstString((QChar*)src.current(), kMin(16, src.length())).qstring().latin1());
#endif
if ((!strict || canClose) && *src == '>') {
@@ -889,7 +889,7 @@
while(l < src.length() && (*(src.current()+l)).latin1() != '>')
l++;
qDebug("src is now: *%s*, tquote: %d",
- QConstString((QChar*)src.current(), l).string().latin1(), tquote);
+ QConstString((QChar*)src.current(), l).qstring().latin1(), tquote);
#endif
switch(tag) {
case NoTag:
@@ -1249,13 +1249,13 @@
view /* are we a regular tokenizer or just for innerHTML ? */
) {
if ((a = currToken.attrs->getAttributeItem(srcAttr)))
- scriptSrc = parser->doc()->completeURL(parseURL( a->value() ).string() );
+ scriptSrc = parser->doc()->completeURL(parseURL( a->value() ).qstring() );
if ((a = currToken.attrs->getAttributeItem(charsetAttr)))
- scriptSrcCharset = a->value().string().stripWhiteSpace();
+ scriptSrcCharset = a->value().qstring().stripWhiteSpace();
if ( scriptSrcCharset.isEmpty() )
scriptSrcCharset = parser->doc()->part()->encoding();
/* Check type before language, since language is deprecated */
- if ((a = currToken.attrs->getAttributeItem(typeAttr)) != 0 && !a->value().string().isEmpty())
+ if ((a = currToken.attrs->getAttributeItem(typeAttr)) != 0 && !a->value().qstring().isEmpty())
foundTypeAttribute = true;
else
a = currToken.attrs->getAttributeItem(languageAttr);
@@ -1274,7 +1274,7 @@
Mozilla 1.5 and WinIE 6 both accept the empty string, but neither accept a whitespace-only string.
We want to accept all the values that either of these browsers accept, but not other values.
*/
- QString type = a->value().string().stripWhiteSpace().lower();
+ QString type = a->value().qstring().stripWhiteSpace().lower();
if( type.compare("application/x-javascript") != 0 &&
type.compare("text/javascript") != 0 &&
type.compare("text/javascript1.0") != 0 &&
@@ -1294,7 +1294,7 @@
Neither Mozilla 1.5 nor WinIE 6 accept leading or trailing whitespace.
We want to accept all the values that either of these browsers accept, but not other values.
*/
- QString lang = a->value().string();
+ QString lang = a->value().qstring();
lang = lang.lower();
if( lang.compare("") != 0 &&
lang.compare("javascript") != 0 &&
@@ -1810,7 +1810,7 @@
food += QString(scriptCode, scriptCodeSize);
}
else {
- pos = QConstString(scriptCode, scriptCodeSize).string().find('>');
+ pos = QConstString(scriptCode, scriptCodeSize).qstring().find('>');
food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
}
KHTML_DELETE_QCHAR_VEC(scriptCode);
@@ -1836,7 +1836,7 @@
{
#ifdef TOKEN_DEBUG
if(currToken.id) {
- qDebug( "unexpected token id: %d, str: *%s*", currToken.id,QConstString( buffer,dest-buffer ).string().latin1() );
+ qDebug( "unexpected token id: %d, str: *%s*", currToken.id,QConstString( buffer,dest-buffer ).qstring().latin1() );
assert(0);
}
@@ -1856,10 +1856,10 @@
dest = buffer;
#ifdef TOKEN_DEBUG
- QString name = getTagName(currToken.id).string();
+ QString name = getTagName(currToken.id).qstring();
QString text;
if(currToken.text)
- text = QConstString(currToken.text->s, currToken.text->l).string();
+ text = QConstString(currToken.text->s, currToken.text->l).qstring();
kdDebug( 6036 ) << "Token --> " << name << " id = " << currToken.id << endl;
if (currToken.flat)
@@ -1871,8 +1871,8 @@
kdDebug( 6036 ) << "Attributes: " << l << endl;
for (unsigned long i = 0; i < l; ++i) {
AttributeImpl* c = currToken.attrs->attributeItem(i);
- kdDebug( 6036 ) << " " << c->name().string()
- << "=\"" << c->value().string() << "\"" << endl;
+ kdDebug( 6036 ) << " " << c->name().qstring()
+ << "=\"" << c->value().qstring() << "\"" << endl;
}
}
kdDebug( 6036 ) << endl;
@@ -1929,13 +1929,13 @@
CachedScript* cs = cachedScript.dequeue();
DOMString scriptSource = cs->script();
#ifdef TOKEN_DEBUG
- kdDebug( 6036 ) << "External script is:" << endl << scriptSource.string() << endl;
+ kdDebug( 6036 ) << "External script is:" << endl << scriptSource.qstring() << endl;
#endif
setSrc(TokenizerString());
// make sure we forget about the script before we execute the new one
// infinite recursion might happen otherwise
- QString cachedScriptUrl( cs->url().string() );
+ QString cachedScriptUrl( cs->url().qstring() );
cs->deref(this);
#ifdef INSTRUMENT_LAYOUT_SCHEDULING
@@ -1943,7 +1943,7 @@
printf("external script beginning execution at %d\n", parser->doc()->elapsedTime());
#endif
- scriptExecution( scriptSource.string(), cachedScriptUrl );
+ scriptExecution( scriptSource.qstring(), cachedScriptUrl );
// The state of cachedScript.isEmpty() can change inside the scriptExecution()
// call above, so test afterwards.
1.73 +29 -29 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- loader.cpp 16 Aug 2005 19:03:18 -0000 1.72
+++ loader.cpp 25 Aug 2005 17:47:13 -0000 1.73
@@ -100,17 +100,17 @@
m_status = Uncacheable;
else
m_status = Cached;
- KURL url(m_url.string());
+ KURL url(m_url.qstring());
if (m_expireDateChanged && url.protocol().startsWith("http"))
{
m_expireDateChanged = false;
KIO::http_update_cache(url, false, m_expireDate);
#ifdef CACHE_DEBUG
- kdDebug(6060) << " Setting expire date for image "<<m_url.string()<<" to " << m_expireDate << endl;
+ kdDebug(6060) << " Setting expire date for image "<<m_url.qstring()<<" to " << m_expireDate << endl;
#endif
}
#ifdef CACHE_DEBUG
- else kdDebug(6060) << " No expire date for image "<<m_url.string()<<endl;
+ else kdDebug(6060) << " No expire date for image "<<m_url.qstring()<<endl;
#endif
}
@@ -237,7 +237,7 @@
if(m_loading) return;
#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.string() << endl;
+ kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.qstring() << endl;
#endif
CachedObjectClientWalker w(m_clients);
@@ -1135,7 +1135,7 @@
return;
#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.string() << endl;
+ kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.qstring() << endl;
#endif
CachedObjectClientWalker w(m_clients);
@@ -1212,7 +1212,7 @@
if(m_loading) return;
#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedXBLDocument:: finishedLoading " << m_url.string() << endl;
+ kdDebug( 6060 ) << "CachedXBLDocument:: finishedLoading " << m_url.qstring() << endl;
#endif
CachedObjectClientWalker w(m_clients);
@@ -1305,7 +1305,7 @@
CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
{
- KURL fullURL = m_doc->completeURL( url.string() );
+ KURL fullURL = m_doc->completeURL( url.qstring() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
#if APPLE_CHANGES
@@ -1327,7 +1327,7 @@
CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, const QString& charset)
{
- KURL fullURL = m_doc->completeURL( url.string() );
+ KURL fullURL = m_doc->completeURL( url.qstring() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
#if APPLE_CHANGES
@@ -1349,7 +1349,7 @@
CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString& charset)
{
- KURL fullURL = m_doc->completeURL( url.string() );
+ KURL fullURL = m_doc->completeURL( url.qstring() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
#if APPLE_CHANGES
@@ -1372,7 +1372,7 @@
#ifdef KHTML_XSLT
CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const DOM::DOMString &url)
{
- KURL fullURL = m_doc->completeURL(url.string());
+ KURL fullURL = m_doc->completeURL(url.qstring());
if (m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
@@ -1396,7 +1396,7 @@
#ifndef KHTML_NO_XBL
CachedXBLDocument* DocLoader::requestXBLDocument(const DOM::DOMString &url)
{
- KURL fullURL = m_doc->completeURL(url.string());
+ KURL fullURL = m_doc->completeURL(url.qstring());
// FIXME: Is this right for XBL?
if (m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
@@ -1508,10 +1508,10 @@
Request *req = m_requestsPending.take(0);
#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "starting Loader url=" << req->object->url().string() << endl;
+ kdDebug( 6060 ) << "starting Loader url=" << req->object->url().qstring() << endl;
#endif
- KURL u(req->object->url().string());
+ KURL u(req->object->url().qstring());
#if APPLE_CHANGES
KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/, true);
#else
@@ -1529,7 +1529,7 @@
job->addMetaData("referrer", r.url());
QString domain = r.host();
if (req->m_docLoader->doc()->isHTMLDocument())
- domain = static_cast<HTMLDocumentImpl*>(req->m_docLoader->doc())->domain().string();
+ domain = static_cast<HTMLDocumentImpl*>(req->m_docLoader->doc())->domain().qstring();
if (crossDomain(u.host(), domain))
job->addMetaData("cross-domain", "true");
}
@@ -1592,7 +1592,7 @@
r->object->finish();
#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "Loader:: JOB FINISHED " << r->object << ": " << r->object->url().string() << endl;
+ kdDebug( 6060 ) << "Loader:: JOB FINISHED " << r->object << ": " << r->object->url().qstring() << endl;
#endif
delete r;
@@ -1725,7 +1725,7 @@
{
if ( pIt.current()->m_docLoader == dl )
{
- kdDebug( 6060 ) << "cancelling pending request for " << pIt.current()->object->url().string() << endl;
+ kdDebug( 6060 ) << "cancelling pending request for " << pIt.current()->object->url().qstring() << endl;
//emit requestFailed( dl, pIt.current()->object );
Cache::removeCacheEntry( pIt.current()->object );
m_requestsPending.remove( pIt );
@@ -1741,7 +1741,7 @@
{
if ( lIt.current()->m_docLoader == dl )
{
- //kdDebug( 6060 ) << "cancelling loading request for " << lIt.current()->object->url().string() << endl;
+ //kdDebug( 6060 ) << "cancelling loading request for " << lIt.current()->object->url().qstring() << endl;
KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
Cache::removeCacheEntry( lIt.current()->object );
m_requestsLoading.remove( lIt.currentKey() );
@@ -1758,7 +1758,7 @@
{
if ( bdIt.current()->m_docLoader == dl )
{
- kdDebug( 6060 ) << "cancelling pending request for " << bdIt.current()->object->url().string() << endl;
+ kdDebug( 6060 ) << "cancelling pending request for " << bdIt.current()->object->url().qstring() << endl;
//emit requestFailed( dl, bdIt.current()->object );
Cache::removeCacheEntry( bdIt.current()->object );
m_requestsBackgroundDecoding.remove( bdIt );
@@ -1871,9 +1871,9 @@
// this brings the _url to a standard form...
KURL kurl;
if (dl)
- kurl = dl->m_doc->completeURL( url.string() );
+ kurl = dl->m_doc->completeURL( url.qstring() );
else
- kurl = url.string();
+ kurl = url.qstring();
return requestImage(dl, kurl, reload, _expireDate);
}
@@ -1963,12 +1963,12 @@
KIO::CacheControl cachePolicy;
if ( dl )
{
- kurl = dl->m_doc->completeURL( url.string() );
+ kurl = dl->m_doc->completeURL( url.qstring() );
cachePolicy = dl->cachePolicy();
}
else
{
- kurl = url.string();
+ kurl = url.qstring();
cachePolicy = KIO::CC_Verify;
}
@@ -2049,12 +2049,12 @@
KIO::CacheControl cachePolicy;
if ( dl )
{
- kurl = dl->m_doc->completeURL( url.string() );
+ kurl = dl->m_doc->completeURL( url.qstring() );
cachePolicy = dl->cachePolicy();
}
else
{
- kurl = url.string();
+ kurl = url.qstring();
cachePolicy = KIO::CC_Verify;
}
@@ -2137,11 +2137,11 @@
KURL kurl;
KIO::CacheControl cachePolicy;
if (dl) {
- kurl = dl->m_doc->completeURL(url.string());
+ kurl = dl->m_doc->completeURL(url.qstring());
cachePolicy = dl->cachePolicy();
}
else {
- kurl = url.string();
+ kurl = url.qstring();
cachePolicy = KIO::CC_Verify;
}
@@ -2211,11 +2211,11 @@
KURL kurl;
KIO::CacheControl cachePolicy;
if (dl) {
- kurl = dl->m_doc->completeURL(url.string());
+ kurl = dl->m_doc->completeURL(url.qstring());
cachePolicy = dl->cachePolicy();
}
else {
- kurl = url.string();
+ kurl = url.qstring();
cachePolicy = KIO::CC_Verify;
}
@@ -2405,7 +2405,7 @@
void Cache::removeCacheEntry( CachedObject *object )
{
- QString key = object->url().string();
+ QString key = object->url().qstring();
// this indicates the deref() method of CachedObject to delete itself when the reference counter
// drops down to zero
1.22 +1 -1 WebCore/khtml/rendering/break_lines.cpp
Index: break_lines.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/break_lines.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- break_lines.cpp 29 Jul 2005 23:42:48 -0000 1.21
+++ break_lines.cpp 25 Aug 2005 17:47:13 -0000 1.22
@@ -48,7 +48,7 @@
cachedString = new QCString;
if ( !thaiIt )
thaiIt = ThBreakIterator::createWordInstance();
- *cachedString = thaiCodec->fromUnicode( QConstString( (QChar *)s, len ).string() );
+ *cachedString = thaiCodec->fromUnicode( QConstString( (QChar *)s, len ).qstring() );
}
thaiIt->setText((tchar *)cachedString->data());
for(int i = thaiIt->first(); i != thaiIt->DONE; i = thaiIt->next() ) {
1.44 +3 -3 WebCore/khtml/rendering/font.cpp
Index: font.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/font.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- font.cpp 15 Aug 2005 04:31:06 -0000 1.43
+++ font.cpp 25 Aug 2005 17:47:13 -0000 1.44
@@ -56,7 +56,7 @@
p->drawText(x, y, tabWidth, xpos, str + pos, std::min(slen - pos, len), from, to, toAdd, bg, d, visuallyOrdered,
letterSpacing, wordSpacing, fontDef.smallCaps);
#else
- QString qstr = QConstString(str, slen).string();
+ QString qstr = QConstString(str, slen).qstring();
//fprintf (stdout, "x %d, y %d, pos %d, qstr.length() %d, len %d, toAdd %d, from %d, to %d, str \"%s\"\n", x, y, pos, qstr.length(), len, toAdd, from, to, qstr.ascii());
// hack for fonts that don't have a welldefined nbsp
@@ -142,7 +142,7 @@
return ROUND_TO_INT(fm.floatWidth(chs+pos, slen-pos, 0, len, tabWidth, xpos, letterSpacing, wordSpacing, fontDef.smallCaps));
// return fm.width(chs + pos, len);
#else
- QString qstr = QConstString(chs+pos, len).string();
+ QString qstr = QConstString(chs+pos, len).qstring();
// hack for fonts that don't have a welldefined nbsp
if ( !fontDef.hasNbsp ) {
// str.setLength() always does a deep copy, so the replacement code below is safe.
@@ -180,7 +180,7 @@
if ( !fontDef.hasNbsp && (chs+pos)->unicode() == 0xa0 )
w = fm.width( QChar( ' ' ) );
else
- w = fm.charWidth( QConstString( chs, slen).string(), pos );
+ w = fm.charWidth( QConstString( chs, slen).qstring(), pos );
if ( letterSpacing )
w += letterSpacing;
1.34 +1 -1 WebCore/khtml/rendering/render_applet.cpp
Index: render_applet.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_applet.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- render_applet.cpp 30 Jul 2005 02:33:22 -0000 1.33
+++ render_applet.cpp 25 Aug 2005 17:47:14 -0000 1.34
@@ -105,7 +105,7 @@
while (child) {
if (child->hasTagName(paramTag)) {
HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>(child);
- m_args.insert(p->name().string(), p->value().string());
+ m_args.insert(p->name().qstring(), p->value().qstring());
}
child = child->nextSibling();
}
1.199 +1 -1 WebCore/khtml/rendering/render_block.cpp
Index: render_block.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- render_block.cpp 19 Aug 2005 23:38:39 -0000 1.198
+++ render_block.cpp 25 Aug 2005 17:47:14 -0000 1.199
@@ -3352,7 +3352,7 @@
( (oldText->s+length)->isSpace() || (oldText->s+length)->isPunct() ) )
length++;
length++;
- //kdDebug( 6040 ) << "letter= '" << DOMString(oldText->substring(0,length)).string() << "'" << endl;
+ //kdDebug( 6040 ) << "letter= '" << DOMString(oldText->substring(0,length)).qstring() << "'" << endl;
RenderTextFragment* remainingText =
new (renderArena()) RenderTextFragment(textObj->node(), oldText, length, oldText->l-length);
1.163 +1 -1 WebCore/khtml/rendering/render_box.cpp
Index: render_box.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- render_box.cpp 25 Aug 2005 00:41:54 -0000 1.162
+++ render_box.cpp 25 Aug 2005 17:47:14 -0000 1.163
@@ -130,7 +130,7 @@
RenderBox::~RenderBox()
{
- //kdDebug( 6040 ) << "Element destructor: this=" << nodeName().string() << endl;
+ //kdDebug( 6040 ) << "Element destructor: this=" << nodeName().qstring() << endl;
}
void RenderBox::detach()
1.116 +13 -13 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- render_form.cpp 8 Aug 2005 21:11:59 -0000 1.115
+++ render_form.cpp 25 Aug 2005 17:47:14 -0000 1.116
@@ -293,7 +293,7 @@
QString RenderSubmitButton::rawText()
{
- QString value = element()->valueWithDefault().string();
+ QString value = element()->valueWithDefault().qstring();
value = value.stripWhiteSpace();
value.replace(QChar('\\'), backslashAsCurrencySymbol());
#if APPLE_CHANGES
@@ -465,7 +465,7 @@
edit->setEchoMode( QLineEdit::Password );
if ( element->autoComplete() ) {
- QStringList completions = view()->formCompletionItems(element->name().string());
+ QStringList completions = view()->formCompletionItems(element->name().qstring());
if (completions.count()) {
edit->completionObject()->setItems(completions);
edit->setContextMenuEnabled(true);
@@ -581,7 +581,7 @@
if (!e->valueMatchesRenderer()) {
QString widgetText = w->text();
- QString newText = e->value().string();
+ QString newText = e->value().qstring();
newText.replace(QChar('\\'), backslashAsCurrencySymbol());
if (widgetText != newText) {
w->blockSignals(true);
@@ -603,10 +603,10 @@
#if APPLE_CHANGES
// Handle updating the search attributes.
- w->setPlaceholderString(e->getAttribute(placeholderAttr).string());
+ w->setPlaceholderString(e->getAttribute(placeholderAttr).qstring());
if (w->type() == QLineEdit::Search) {
w->setLiveSearch(!e->getAttribute(incrementalAttr).isNull());
- w->setAutoSaveName(e->getAttribute(autosaveAttr).string());
+ w->setAutoSaveName(e->getAttribute(autosaveAttr).qstring());
w->setMaxResults(e->maxResults());
}
#endif
@@ -900,10 +900,10 @@
void RenderFileButton::updateFromElement()
{
#if APPLE_CHANGES
- static_cast<KWQFileButton *>(widget())->setFilename(element()->value().string());
+ static_cast<KWQFileButton *>(widget())->setFilename(element()->value().qstring());
#else
m_edit->blockSignals(true);
- m_edit->setText(element()->value().string());
+ m_edit->setText(element()->value().qstring());
m_edit->blockSignals(false);
int ml = element()->maxLength();
if ( ml <= 0 || ml > 1024 )
@@ -1101,7 +1101,7 @@
for (listIndex = 0; listIndex < int(listItems.size()); listIndex++) {
if (listItems[listIndex]->hasTagName(optgroupTag)) {
- QString label = listItems[listIndex]->getAttribute(labelAttr).string();
+ QString label = listItems[listIndex]->getAttribute(labelAttr).qstring();
label.replace(QChar('\\'), backslashAsCurrencySymbol());
// In WinIE, an optgroup can't start or end with whitespace (other than the indent
@@ -1125,7 +1125,7 @@
#endif
}
else if (listItems[listIndex]->hasTagName(optionTag)) {
- QString itemText = static_cast<HTMLOptionElementImpl*>(listItems[listIndex])->text().string();
+ QString itemText = static_cast<HTMLOptionElementImpl*>(listItems[listIndex])->text().qstring();
itemText.replace(QChar('\\'), backslashAsCurrencySymbol());
// In WinIE, leading and trailing whitespace is ignored in options. We match this behavior.
@@ -1537,7 +1537,7 @@
e->updateValue();
if (!e->valueMatchesRenderer()) {
QString widgetText = text();
- QString text = e->value().string();
+ QString text = e->value().qstring();
text.replace(QChar('\\'), backslashAsCurrencySymbol());
if (widgetText != text) {
w->blockSignals(true);
@@ -1708,11 +1708,11 @@
const DOMString& max = element()->getAttribute(maxAttr);
const DOMString& precision = element()->getAttribute(precisionAttr);
- double minVal = min.isNull() ? 0.0 : min.string().toDouble();
- double maxVal = max.isNull() ? 100.0 : max.string().toDouble();
+ double minVal = min.isNull() ? 0.0 : min.qstring().toDouble();
+ double maxVal = max.isNull() ? 100.0 : max.qstring().toDouble();
minVal = kMin(minVal, maxVal); // Make sure the range is sane.
- double val = value.isNull() ? (maxVal + minVal)/2.0 : value.string().toDouble();
+ double val = value.isNull() ? (maxVal + minVal)/2.0 : value.qstring().toDouble();
val = kMax(minVal, kMin(val, maxVal)); // Make sure val is within min/max.
// Force integer value if not float (strcasecmp returns confusingly backward boolean).
1.74 +14 -14 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- render_frames.cpp 30 Jul 2005 02:33:23 -0000 1.73
+++ render_frames.cpp 25 Aug 2005 17:47:15 -0000 1.74
@@ -720,12 +720,12 @@
while (child && (url.isEmpty() || serviceType.isEmpty() || !embed)) {
if (child->hasTagName(paramTag)) {
HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child );
- QString name = p->name().string().lower();
+ QString name = p->name().qstring().lower();
if (url.isEmpty() && (name == "src" || name == "movie" || name == "code" || name == "url")) {
- url = p->value().string();
+ url = p->value().qstring();
}
if (serviceType.isEmpty() && name == "type") {
- serviceType = p->value().string();
+ serviceType = p->value().qstring();
int pos = serviceType.find( ";" );
if (pos != -1) {
serviceType = serviceType.left(pos);
@@ -733,9 +733,9 @@
}
if (!embed) {
bool dummyValue = true;
- uniqueParamNames.insert(p->name().string(), &dummyValue);
- paramNames.append(p->name().string());
- paramValues.append(p->value().string());
+ uniqueParamNames.insert(p->name().qstring(), &dummyValue);
+ paramNames.append(p->name().qstring());
+ paramValues.append(p->value().qstring());
}
}
child = child->nextSibling();
@@ -756,10 +756,10 @@
if (attributes) {
for (unsigned long i = 0; i < attributes->length(); ++i) {
AttributeImpl* it = attributes->attributeItem(i);
- QString name = it->name().localName().string();
+ QString name = it->name().localName().qstring();
if (embed || uniqueParamNames.find(name) == 0) {
paramNames.append(name);
- paramValues.append(it->value().string());
+ paramValues.append(it->value().qstring());
}
}
}
@@ -803,7 +803,7 @@
#if !APPLE_CHANGES
params.append( QString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( o->classId ) );
- params.append( QString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( o->getAttribute(codebaseAttr).string() ) );
+ params.append( QString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( o->getAttribute(codebaseAttr).qstring() ) );
#endif
// Find out if we support fallback content.
@@ -837,22 +837,22 @@
if (a) {
for (unsigned long i = 0; i < a->length(); ++i) {
AttributeImpl* it = a->attributeItem(i);
- paramNames.append(it->name().localName().string());
- paramValues.append(it->value().string());
+ paramNames.append(it->name().localName().qstring());
+ paramValues.append(it->value().qstring());
}
}
part->requestObject( this, url, serviceType, paramNames, paramValues );
} else {
assert(element()->hasTagName(iframeTag));
HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(element());
- url = o->m_URL.string();
+ url = o->m_URL.qstring();
if (url.isEmpty()) {
url = "about:blank";
}
KHTMLView *v = static_cast<KHTMLView *>(m_view);
- bool requestSucceeded = v->part()->requestFrame( this, url, o->m_name.string(), QStringList(), QStringList(), true );
+ bool requestSucceeded = v->part()->requestFrame( this, url, o->m_name.qstring(), QStringList(), QStringList(), true );
if (requestSucceeded && url == "about:blank") {
- KHTMLPart *newPart = v->part()->findFrame( o->m_name.string() );
+ KHTMLPart *newPart = v->part()->findFrame( o->m_name.qstring() );
if (newPart && newPart->xmlDocImpl()) {
newPart->xmlDocImpl()->setBaseURL( v->part()->baseURL().url() );
}
1.85 +3 -3 WebCore/khtml/rendering/render_image.cpp
Index: render_image.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_image.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- render_image.cpp 30 Jul 2005 02:33:23 -0000 1.84
+++ render_image.cpp 25 Aug 2005 17:47:15 -0000 1.85
@@ -117,7 +117,7 @@
// we have an alt and the user meant it (its not a text we invented)
if (!alt.isEmpty()) {
const QFontMetrics &fm = style()->fontMetrics();
- QRect br = fm.boundingRect ( 0, 0, 1024, 256, Qt::AlignAuto|Qt::WordBreak, alt.string(), 0, 0); // FIX: correct tabwidth?
+ QRect br = fm.boundingRect ( 0, 0, 1024, 256, Qt::AlignAuto|Qt::WordBreak, alt.qstring(), 0, 0); // FIX: correct tabwidth?
if ( br.width() > iw )
iw = br.width();
if ( br.height() > ih )
@@ -302,7 +302,7 @@
}
if (!alt.isEmpty()) {
- QString text = alt.string();
+ QString text = alt.qstring();
text.replace(QChar('\\'), backslashAsCurrencySymbol());
p->setFont (style()->font());
p->setPen (style()->color());
@@ -333,7 +333,7 @@
p->drawPixmap( QPoint( _tx + leftBorder + leftPad+2, _ty + topBorder + topPad+2), pix, r );
}
if(!alt.isEmpty()) {
- QString text = alt.string();
+ QString text = alt.qstring();
text.replace('\\', backslashAsCurrencySymbol());
p->setFont(style()->font());
p->setPen( style()->color() );
1.47 +1 -1 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- render_line.cpp 15 Aug 2005 04:31:06 -0000 1.46
+++ render_line.cpp 25 Aug 2005 17:47:15 -0000 1.47
@@ -1044,7 +1044,7 @@
setShadow = true;
}
- const DOMString& str = m_str.string();
+ const DOMString& str = m_str.qstring();
font->drawText(p, m_x + _tx,
m_y + _ty + m_baseline,
0, 0,
1.67 +2 -2 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- render_list.cpp 30 Jul 2005 02:33:23 -0000 1.66
+++ render_list.cpp 25 Aug 2005 17:47:15 -0000 1.67
@@ -279,7 +279,7 @@
return;
#ifdef DEBUG_LAYOUT
- kdDebug( 6040 ) << nodeName().string() << "(LI)::paint()" << endl;
+ kdDebug( 6040 ) << nodeName().qstring() << "(LI)::paint()" << endl;
#endif
RenderBlock::paint(i, _tx, _ty);
}
@@ -370,7 +370,7 @@
paintBoxDecorations(i, _tx, _ty);
#ifdef DEBUG_LAYOUT
- kdDebug( 6040 ) << nodeName().string() << "(ListMarker)::paintObject(" << _tx << ", " << _ty << ")" << endl;
+ kdDebug( 6040 ) << nodeName().qstring() << "(ListMarker)::paintObject(" << _tx << ", " << _ty << ")" << endl;
#endif
QPainter* p = i.p;
1.206 +1 -1 WebCore/khtml/rendering/render_object.cpp
Index: render_object.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- render_object.cpp 25 Aug 2005 00:41:54 -0000 1.205
+++ render_object.cpp 25 Aug 2005 17:47:15 -0000 1.206
@@ -1330,7 +1330,7 @@
if (element() && element()->active()) ts << "act ";
if (element() && element()->isLink()) ts << "anchor ";
if (element() && element()->focused()) ts << "focus ";
- if (element()) ts << " <" << element()->localName().string() << ">";
+ if (element()) ts << " <" << element()->localName().qstring() << ">";
ts << " (" << xPos() << "," << yPos() << "," << width() << "," << height() << ")"
<< (isTableCell() ?
( QString::fromLatin1(" [r=") +
1.190 +12 -12 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- render_text.cpp 15 Aug 2005 04:31:06 -0000 1.189
+++ render_text.cpp 25 Aug 2005 17:47:16 -0000 1.190
@@ -384,7 +384,7 @@
if (m_truncation != cNoTruncation)
endPoint = m_truncation - m_start;
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->string()->s, textObject()->string()->l, m_start, endPoint,
+ textObject()->qstring()->s, textObject()->qstring()->l, m_start, endPoint,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered());
} else {
int sPos, ePos;
@@ -393,17 +393,17 @@
// paint only the text that is not selected
if (sPos >= ePos) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->string()->s, textObject()->string()->l, m_start, m_len,
+ textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered());
} else {
if (sPos - 1 >= 0) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->string()->s, textObject()->string()->l, m_start, m_len,
+ textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), 0, sPos);
}
if (ePos < m_start + m_len) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->string()->s, textObject()->string()->l, m_start, m_len,
+ textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), ePos, -1);
}
}
@@ -420,7 +420,7 @@
selectionTextShadow->blur,
selectionTextShadow->color);
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->string()->s, textObject()->string()->l, m_start, m_len,
+ textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), sPos, ePos);
if (selectionTextShadow)
i.p->clearShadow();
@@ -489,11 +489,11 @@
int startPos, endPos;
if (object()->selectionState() == RenderObject::SelectionInside) {
startPos = 0;
- endPos = textObject()->string()->l;
+ endPos = textObject()->qstring()->l;
} else {
textObject()->selectionStartEnd(startPos, endPos);
if (object()->selectionState() == RenderObject::SelectionStart)
- endPos = textObject()->string()->l;
+ endPos = textObject()->qstring()->l;
else if (object()->selectionState() == RenderObject::SelectionEnd)
startPos = 0;
}
@@ -791,7 +791,7 @@
#ifdef DEBUG_LAYOUT
QConstString cstr(str->s, str->l);
- kdDebug( 6040 ) << "RenderText ctr( "<< cstr.string().length() << " ) '" << cstr.string() << "'" << endl;
+ kdDebug( 6040 ) << "RenderText ctr( "<< cstr.qstring().length() << " ) '" << cstr.qstring() << "'" << endl;
#endif
}
@@ -901,7 +901,7 @@
DOM::DOMStringImpl* RenderText::originalString() const
{
- return element() ? element()->string() : 0;
+ return element() ? element()->qstring() : 0;
}
void RenderText::absoluteRects(QValueList<QRect>& rects, int _tx, int _ty)
@@ -1625,7 +1625,7 @@
#ifdef BIDI_DEBUG
QConstString cstr(str->s, str->l);
- kdDebug( 6040 ) << "RenderText::setText( " << cstr.string().length() << " ) '" << cstr.string() << "'" << endl;
+ kdDebug( 6040 ) << "RenderText::setText( " << cstr.qstring().length() << " ) '" << cstr.qstring() << "'" << endl;
#endif
}
@@ -1695,7 +1695,7 @@
#ifdef DEBUG_LAYOUT
QChar *ch = str->s+from;
QConstString cstr(ch, len);
- qDebug("setting run text to *%s*, len=%d, w)=%d" , cstr.string().latin1(), len, width );//" << y << ")" << " height=" << lineHeight(false) << " fontHeight=" << metrics(false).height() << " ascent =" << metrics(false).ascent() << endl;
+ qDebug("setting run text to *%s*, len=%d, w)=%d" , cstr.qstring().latin1(), len, width );//" << y << ")" << " height=" << lineHeight(false) << " fontHeight=" << metrics(false).height() << " ascent =" << metrics(false).ascent() << endl;
#endif
s->m_reversed = reverse;
@@ -1892,7 +1892,7 @@
{
DOM::DOMStringImpl* result = 0;
if (element())
- result = element()->string();
+ result = element()->qstring();
else
result = contentString();
if (result && (start() > 0 || start() < result->l))
1.84 +1 -1 WebCore/khtml/rendering/render_text.h
Index: render_text.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- render_text.h 15 Aug 2005 04:31:07 -0000 1.83
+++ render_text.h 25 Aug 2005 17:47:16 -0000 1.84
@@ -178,7 +178,7 @@
virtual void detach();
DOM::DOMString data() const { return str; }
- DOM::DOMStringImpl *string() const { return str; }
+ DOM::DOMStringImpl *qstring() const { return str; }
virtual InlineBox* createInlineBox(bool,bool, bool isOnlyRun = false);
virtual void dirtyLineBoxes(bool fullLayout, bool isRootInlineBox = false);
1.3 +2 -2 WebCore/khtml/xbl/xbl_binding.cpp
Index: xbl_binding.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xbl/xbl_binding.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbl_binding.cpp 30 Jan 2004 09:06:44 -0000 1.2
+++ xbl_binding.cpp 25 Aug 2005 17:47:19 -0000 1.3
@@ -106,7 +106,7 @@
DOMString docURL = uri;
int hashIndex = uri.find('#');
if (hashIndex != -1) {
- QString url = uri.string();
+ QString url = uri.qstring();
docURL = url.left(hashIndex);
if (int(url.length()) > hashIndex+1)
m_id = url.right(url.length()-hashIndex-1);
@@ -164,7 +164,7 @@
// FIXME: Add support for : extension for built-in types, e.g., "html:img".
// Resolve to an absolute URL.
new XBLBinding(chain(),
- KURL(m_prototype->document()->baseURL(), extends.string()).url(),
+ KURL(m_prototype->document()->baseURL(), extends.qstring()).url(),
this);
return;
}
1.4 +2 -2 WebCore/khtml/xbl/xbl_docimpl.cpp
Index: xbl_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xbl/xbl_docimpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xbl_docimpl.cpp 7 Feb 2004 01:19:44 -0000 1.3
+++ xbl_docimpl.cpp 25 Aug 2005 17:47:19 -0000 1.4
@@ -26,7 +26,7 @@
void XBLDocumentImpl::setPrototypeBinding(const DOM::DOMString& id, XBLPrototypeBinding* binding)
{
- m_prototypeBindingTable.replace(id.string(), binding);
+ m_prototypeBindingTable.replace(id.qstring(), binding);
}
XBLPrototypeBinding* XBLDocumentImpl::prototypeBinding(const DOM::DOMString& id)
@@ -34,7 +34,7 @@
if (id.length() == 0)
return 0;
- return m_prototypeBindingTable.find(id.string());
+ return m_prototypeBindingTable.find(id.qstring());
}
}
1.3 +1 -1 WebCore/khtml/xbl/xbl_protohandler.cpp
Index: xbl_protohandler.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xbl/xbl_protohandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbl_protohandler.cpp 30 Jan 2004 09:06:44 -0000 1.2
+++ xbl_protohandler.cpp 25 Aug 2005 17:47:19 -0000 1.3
@@ -43,7 +43,7 @@
m_handlerText = action;
if (!modifiers.isEmpty()) {
- QStringList result = QStringList::split(",", modifiers.string());
+ QStringList result = QStringList::split(",", modifiers.qstring());
for (QStringList::Iterator it = result.begin(); it != result.end(); ++it) {
QString modifier = (*it).stripWhiteSpace();
if (modifier == "shift")
1.42 +2 -2 WebCore/khtml/xml/dom2_rangeimpl.cpp
Index: dom2_rangeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_rangeimpl.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dom2_rangeimpl.cpp 9 Jul 2005 20:19:21 -0000 1.41
+++ dom2_rangeimpl.cpp 25 Aug 2005 17:47:20 -0000 1.42
@@ -857,7 +857,7 @@
return plainText(const_cast<RangeImpl *>(this));
}
-DocumentFragmentImpl *RangeImpl::createContextualFragment ( DOMString &html, int &exceptioncode ) const
+DocumentFragmentImpl *RangeImpl::createContextualFragment(const DOMString &html, int &exceptioncode) const
{
if (m_detached) {
exceptioncode = DOMException::INVALID_STATE_ERR;
@@ -1363,7 +1363,7 @@
result += s;
}
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#undef FormatBufferSize
#endif
1.26 +1 -1 WebCore/khtml/xml/dom2_rangeimpl.h
Index: dom2_rangeimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_rangeimpl.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dom2_rangeimpl.h 18 May 2005 21:10:24 -0000 1.25
+++ dom2_rangeimpl.h 25 Aug 2005 17:47:20 -0000 1.26
@@ -75,7 +75,7 @@
DOMString toHTML() const;
DOMString text() const;
- DocumentFragmentImpl *createContextualFragment ( DOMString &html, int &exceptioncode ) const;
+ DocumentFragmentImpl *createContextualFragment(const DOMString &html, int &exceptioncode) const;
void detach ( int &exceptioncode );
bool isDetached() const;
1.7 +1 -3 WebCore/khtml/xml/dom_atomicstring.h
Index: dom_atomicstring.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_atomicstring.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dom_atomicstring.h 19 Jul 2005 23:44:07 -0000 1.6
+++ dom_atomicstring.h 25 Aug 2005 17:47:20 -0000 1.7
@@ -40,15 +40,13 @@
operator const DOMString&() const { return m_string; }
const DOMString& domString() const { return m_string; };
- QString string() const { return m_string.string(); };
+ QString qstring() const { return m_string.qstring(); };
DOMStringImpl* implementation() const { return m_string.implementation(); }
const QChar *unicode() const { return m_string.unicode(); }
int length() const { return m_string.length(); }
- const char *ascii() const { return m_string.string().ascii(); }
-
int find(const QChar c, int start = 0) const { return m_string.find(c, start); }
int toInt() const { return m_string.toInt(); }
1.2 +1 -1 WebCore/khtml/xml/dom_atomicstringlist.h
Index: dom_atomicstringlist.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_atomicstringlist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dom_atomicstringlist.h 30 Jan 2004 07:44:44 -0000 1.1
+++ dom_atomicstringlist.h 25 Aug 2005 17:47:20 -0000 1.2
@@ -35,7 +35,7 @@
AtomicStringList* next() const { return m_next; }
void setNext(AtomicStringList* n) { m_next = n; }
- const AtomicString& string() const { return m_string; }
+ const AtomicString& qstring() const { return m_string; }
void setString(const AtomicString& str) { m_string = str; }
AtomicStringList* clone() { return new AtomicStringList(m_string, m_next ? m_next->clone() : 0); }
1.248 +23 -23 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- dom_docimpl.cpp 25 Aug 2005 17:12:12 -0000 1.247
+++ dom_docimpl.cpp 25 Aug 2005 17:47:20 -0000 1.248
@@ -114,7 +114,7 @@
bool DOMImplementationImpl::hasFeature ( const DOMString &feature, const DOMString &version )
{
- QString lower = feature.string().lower();
+ QString lower = feature.qstring().lower();
if (lower == "core" || lower == "html" || lower == "xml" || lower == "xhtml")
return version.isEmpty() || version == "1.0" || version == "2.0";
if (lower == "css"
@@ -263,7 +263,7 @@
HTMLDocumentImpl *d = createHTMLDocument( 0 /* ### create a view otherwise it doesn't work */);
d->open();
// FIXME: Need to escape special characters in the title?
- d->write("<html><head><title>" + title.string() + "</title></head>");
+ d->write("<html><head><title>" + title.qstring() + "</title></head>");
return d;
}
@@ -667,7 +667,7 @@
ElementImpl *DocumentImpl::getElementById( const DOMString &elementId ) const
{
ElementImpl *element;
- QString qId = elementId.string();
+ QString qId = elementId.qstring();
if (elementId.length() == 0) {
return 0;
@@ -716,7 +716,7 @@
void DocumentImpl::addElementById(const DOMString &elementId, ElementImpl *element)
{
- QString qId = elementId.string();
+ QString qId = elementId.qstring();
if (m_elementsById.find(qId) == NULL) {
m_elementsById.insert(qId, element);
@@ -729,7 +729,7 @@
void DocumentImpl::removeElementById(const DOMString &elementId, ElementImpl *element)
{
- QString qId = elementId.string();
+ QString qId = elementId.qstring();
if (m_elementsById.find(qId) == element) {
m_elementsById.remove(qId);
@@ -749,7 +749,7 @@
if (key.length() == 0)
return 0;
- QString k(key.string());
+ QString k(key.qstring());
if (!m_accessKeyDictValid) {
m_elementsByAccessKey.clear();
@@ -760,7 +760,7 @@
const ElementImpl *elementImpl = static_cast<const ElementImpl *>(n);
DOMString accessKey(elementImpl->getAttribute(accesskeyAttr));;
if (!accessKey.isEmpty()) {
- QString ak = accessKey.string().lower();
+ QString ak = accessKey.qstring().lower();
if (m_elementsByAccessKey.find(ak) == NULL)
m_elementsByAccessKey.insert(ak, elementImpl);
}
@@ -779,7 +779,7 @@
#if APPLE_CHANGES
KWQ(p)->setTitle(m_title);
#else
- QString titleStr = m_title.string();
+ QString titleStr = m_title.qstring();
for (int i = 0; i < titleStr.length(); ++i)
if (titleStr[i] < ' ')
titleStr[i] = ' ';
@@ -1448,7 +1448,7 @@
void DocumentImpl::write( const DOMString &text )
{
- write(text.string());
+ write(text.qstring());
}
void DocumentImpl::write( const QString &text )
@@ -1775,14 +1775,14 @@
// For more info, see the test at:
// http://www.hixie.ch/tests/evil/css/import/main/preferred.html
// -dwh
- part->d->m_sheetUsed = content.string();
+ part->d->m_sheetUsed = content.qstring();
m_preferredStylesheetSet = content;
updateStyleSelector();
}
else if(strcasecmp(equiv, "refresh") == 0 && part->metaRefreshEnabled())
{
// get delay and url
- QString str = content.string().stripWhiteSpace();
+ QString str = content.qstring().stripWhiteSpace();
int pos = str.find(QRegExp("[;,]"));
if ( pos == -1 )
pos = str.find(QRegExp("[ \t]"));
@@ -1809,7 +1809,7 @@
if(str.find("url", 0, false ) == 0) str = str.mid(3);
str = str.stripWhiteSpace();
if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
- str = parseURL( DOMString(str) ).string();
+ str = parseURL( DOMString(str) ).qstring();
if ( ok && part )
#if APPLE_CHANGES
// We want a new history item if the refresh timeout > 1 second
@@ -1821,14 +1821,14 @@
}
else if(strcasecmp(equiv, "expires") == 0)
{
- QString str = content.string().stripWhiteSpace();
+ QString str = content.qstring().stripWhiteSpace();
time_t expire_date = str.toLong();
if (m_docLoader)
m_docLoader->setExpireDate(expire_date);
}
else if(strcasecmp(equiv, "pragma") == 0 || strcasecmp(equiv, "cache-control") == 0 && part)
{
- QString str = content.string().lower().stripWhiteSpace();
+ QString str = content.qstring().lower().stripWhiteSpace();
KURL url = part->url();
if ((str == "no-cache") && url.protocol().startsWith("http"))
{
@@ -1868,7 +1868,7 @@
}
else
ev->url = href;
-// qDebug("url: *%s*", ev->url.string().latin1());
+// qDebug("url: *%s*", ev->url.qstring().latin1());
}
if (!readonly)
@@ -1944,7 +1944,7 @@
DocumentImpl::setSelectedStylesheetSet(const DOMString& aString)
{
if (view()) {
- view()->part()->d->m_sheetUsed = aString.string();
+ view()->part()->d->m_sheetUsed = aString.qstring();
updateStyleSelector();
if (renderer())
renderer()->repaint();
@@ -2050,7 +2050,7 @@
}
else if (n->isHTMLElement() && (n->hasTagName(linkTag) || n->hasTagName(styleTag))) {
HTMLElementImpl *e = static_cast<HTMLElementImpl *>(n);
- QString title = e->getAttribute(titleAttr).string();
+ QString title = e->getAttribute(titleAttr).qstring();
bool enabledViaScript = false;
if (e->hasLocalName(linkTag)) {
// <LINK> element
@@ -2080,7 +2080,7 @@
// we are NOT an alternate sheet, then establish
// us as the preferred set. Otherwise, just ignore
// this sheet.
- QString rel = e->getAttribute(relAttr).string();
+ QString rel = e->getAttribute(relAttr).qstring();
if (e->hasLocalName(styleTag) || !rel.contains("alternate"))
m_preferredStylesheetSet = view()->part()->d->m_sheetUsed = title;
}
@@ -2371,7 +2371,7 @@
KeyboardEventImpl *kevt = static_cast<KeyboardEventImpl *>(evt);
if (kevt->ctrlKey()) {
QKeyEvent *qevt = kevt->qKeyEvent();
- QString key = (qevt ? qevt->unmodifiedText() : kevt->keyIdentifier().string()).lower();
+ QString key = (qevt ? qevt->unmodifiedText() : kevt->keyIdentifier().qstring()).lower();
ElementImpl *elem = getElementByAccessKey(key);
if (elem) {
elem->accessKeyAction(false);
@@ -2612,7 +2612,7 @@
{
// Add the image map, unless there's already another with that name.
// "First map wins" is the rule other browsers seem to implement.
- QString name = imageMap->getName().string();
+ QString name = imageMap->getName().qstring();
if (!m_imageMapsByName.contains(name))
m_imageMapsByName.insert(name, imageMap);
}
@@ -2621,7 +2621,7 @@
{
// Remove the image map by name.
// But don't remove some other image map that just happens to have the same name.
- QString name = imageMap->getName().string();
+ QString name = imageMap->getName().qstring();
QMapIterator<QString, HTMLMapElementImpl *> it = m_imageMapsByName.find(name);
if (it != m_imageMapsByName.end() && *it == imageMap)
m_imageMapsByName.remove(it);
@@ -2633,7 +2633,7 @@
return 0;
}
- QString s = URL.string();
+ QString s = URL.qstring();
int hashPos = s.find('#');
if (hashPos >= 0)
s = s.mid(hashPos + 1);
@@ -2664,7 +2664,7 @@
{
if (URL.isNull())
return URL;
- return completeURL(URL.string());
+ return completeURL(URL.qstring());
}
bool DocumentImpl::inPageCache()
1.75 +7 -7 WebCore/khtml/xml/dom_elementimpl.cpp
Index: dom_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dom_elementimpl.cpp 25 Aug 2005 17:12:31 -0000 1.74
+++ dom_elementimpl.cpp 25 Aug 2005 17:47:20 -0000 1.75
@@ -515,7 +515,7 @@
case Force: debug = "Force";
break;
}
- qDebug("recalcStyle(%d: %s)[%p: %s]", change, debug, this, tagName().string().latin1());
+ qDebug("recalcStyle(%d: %s)[%p: %s]", change, debug, this, tagName().qstring().latin1());
#endif
if ( hasParentRenderer && (change >= Inherit || changed()) ) {
RenderStyle *newStyle = getDocument()->styleSelector()->styleForElement(this);
@@ -557,7 +557,7 @@
NodeImpl *n;
for (n = _first; n; n = n->nextSibling()) {
- //qDebug(" (%p) calling recalcStyle on child %s/%p, change=%d", this, n, n->isElementNode() ? ((ElementImpl *)n)->tagName().string().latin1() : n->isTextNode() ? "text" : "unknown", change );
+ //qDebug(" (%p) calling recalcStyle on child %s/%p, change=%d", this, n, n->isElementNode() ? ((ElementImpl *)n)->tagName().qstring().latin1() : n->isTextNode() ? "text" : "unknown", change );
if ( change >= Inherit || n->isTextNode() ||
n->hasChangedChild() || n->changed() )
n->recalcStyle( change );
@@ -669,8 +669,8 @@
if (namedAttrMap) {
for (uint i = 0; i < namedAttrMap->length(); i++) {
AttributeImpl *attr = namedAttrMap->attributeItem(i);
- *stream << " " << attr->name().localName().string().ascii()
- << "=\"" << attr->value().string().ascii() << "\"";
+ *stream << " " << attr->name().localName().qstring().ascii()
+ << "=\"" << attr->value().qstring().ascii() << "\"";
}
}
@@ -705,7 +705,7 @@
result += s;
}
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#endif
@@ -1256,7 +1256,7 @@
if (classAttr.find(' ') == -1 && classAttr.find('\n') == -1)
m_classList.setString(AtomicString(classAttr));
else {
- QString val = classAttr.string();
+ QString val = classAttr.qstring();
val.replace('\n', ' ');
QStringList list = QStringList::split(' ', val);
@@ -1506,7 +1506,7 @@
if (attr->decl()->setProperty(id, c, false) )
return;
- QString color = c.string();
+ QString color = c.qstring();
// not something that fits the specs.
// we're emulating IEs color parser here. It maps transparent to black, otherwise it tries to build a rgb value
1.176 +6 -6 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- dom_nodeimpl.cpp 19 Aug 2005 23:09:18 -0000 1.175
+++ dom_nodeimpl.cpp 25 Aug 2005 17:47:20 -0000 1.176
@@ -1231,7 +1231,7 @@
NodeImpl *child = firstChild();
while( child != 0 )
{
- *stream << ind << child->nodeName().string().ascii() << ": ";
+ *stream << ind << child->nodeName().qstring().ascii() << ": ";
child->dump(stream,ind+" ");
child = child->nextSibling();
}
@@ -1673,7 +1673,7 @@
DOMString attr = static_cast<const ElementImpl *>(node)->getAttribute(name);
if (!attr.isEmpty()) {
string += attrDesc;
- string += attr.string();
+ string += attr.qstring();
}
}
}
@@ -1683,15 +1683,15 @@
if (!prefix)
prefix = "";
if (isTextNode()) {
- QString value = nodeValue().string();
+ QString value = nodeValue().qstring();
value.replace('\\', "\\\\");
value.replace('\n', "\\n");
- fprintf(stderr, "%s%s\t%p \"%s\"\n", prefix, nodeName().string().local8Bit().data(), this, value.local8Bit().data());
+ fprintf(stderr, "%s%s\t%p \"%s\"\n", prefix, nodeName().qstring().local8Bit().data(), this, value.local8Bit().data());
} else {
QString attrs = "";
appendAttributeDesc(this, attrs, classAttr, " CLASS=");
appendAttributeDesc(this, attrs, styleAttr, " STYLE=");
- fprintf(stderr, "%s%s\t%p%s\n", prefix, nodeName().string().local8Bit().data(), this, attrs.ascii());
+ fprintf(stderr, "%s%s\t%p%s\n", prefix, nodeName().qstring().local8Bit().data(), this, attrs.ascii());
}
}
@@ -1733,7 +1733,7 @@
else
result += s;
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#endif
1.76 +2 -2 WebCore/khtml/xml/dom_position.cpp
Index: dom_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_position.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- dom_position.cpp 16 Aug 2005 21:53:53 -0000 1.75
+++ dom_position.cpp 25 Aug 2005 17:47:21 -0000 1.76
@@ -808,7 +808,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, node()->nodeName().string().latin1(), node(), offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, node()->nodeName().qstring().latin1(), node(), offset());
}
#ifndef NDEBUG
@@ -830,7 +830,7 @@
result += s;
}
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#undef FormatBufferSize
1.30 +2 -2 WebCore/khtml/xml/dom_stringimpl.cpp
Index: dom_stringimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_stringimpl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dom_stringimpl.cpp 27 Jul 2005 23:41:40 -0000 1.29
+++ dom_stringimpl.cpp 25 Aug 2005 17:47:21 -0000 1.30
@@ -235,7 +235,7 @@
++i;
bool ok;
- int r = QConstString(s, i).string().toInt(&ok);
+ int r = QConstString(s, i).qstring().toInt(&ok);
/* Skip over any remaining digits, we are not that accurate (5.5% => 5%) */
while (i < l && (s[i].isDigit() || s[i] == '.'))
@@ -424,7 +424,7 @@
}
}
- return QConstString(s, i).string().toInt(ok);
+ return QConstString(s, i).qstring().toInt(ok);
}
DOMStringImpl *DOMStringImpl::replace(QChar oldC, QChar newC)
1.27 +4 -4 WebCore/khtml/xml/dom_textimpl.cpp
Index: dom_textimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dom_textimpl.cpp 25 Aug 2005 17:12:13 -0000 1.26
+++ dom_textimpl.cpp 25 Aug 2005 17:47:21 -0000 1.27
@@ -281,7 +281,7 @@
#ifndef NDEBUG
void CharacterDataImpl::dump(QTextStream *stream, QString ind) const
{
- *stream << " str=\"" << DOMString(str).string().ascii() << "\"";
+ *stream << " str=\"" << DOMString(str).qstring().ascii() << "\"";
NodeImpl::dump(stream,ind);
}
@@ -310,7 +310,7 @@
DOMString CommentImpl::nodeName() const
{
- return commentAtom.string();
+ return commentAtom.qstring();
}
unsigned short CommentImpl::nodeType() const
@@ -400,7 +400,7 @@
DOMString TextImpl::nodeName() const
{
- return textAtom.string();
+ return textAtom.qstring();
}
unsigned short TextImpl::nodeType() const
@@ -515,7 +515,7 @@
result += s;
}
- strncpy(buffer, result.string().latin1(), length - 1);
+ strncpy(buffer, result.qstring().latin1(), length - 1);
}
#endif
1.18 +1 -1 WebCore/khtml/xml/dom_textimpl.h
Index: dom_textimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dom_textimpl.h 9 Jul 2005 20:19:22 -0000 1.17
+++ dom_textimpl.h 25 Aug 2005 17:47:21 -0000 1.18
@@ -63,7 +63,7 @@
// Other methods (not part of DOM)
- DOMStringImpl *string() { return str; }
+ DOMStringImpl *qstring() { return str; }
virtual void checkCharDataOperation( const unsigned long offset, int &exceptioncode );
virtual long maxOffset() const;
1.39 +7 -7 WebCore/khtml/xml/xml_tokenizer.cpp
Index: xml_tokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xml_tokenizer.cpp 25 Aug 2005 17:12:13 -0000 1.38
+++ xml_tokenizer.cpp 25 Aug 2005 17:47:21 -0000 1.39
@@ -692,7 +692,7 @@
// inside the tag
while (m_scriptsIt->current()) {
DOMString scriptSrc = m_scriptsIt->current()->getAttribute(srcAttr);
- QString charset = m_scriptsIt->current()->getAttribute(charsetAttr).string();
+ QString charset = m_scriptsIt->current()->getAttribute(charsetAttr).qstring();
// don't load external scripts for standalone documents (for now)
if (scriptSrc != "" && m_doc->document()->part()) {
@@ -708,7 +708,7 @@
NodeImpl *child;
for (child = m_scriptsIt->current()->firstChild(); child; child = child->nextSibling()) {
if (child->nodeType() == Node::TEXT_NODE || child->nodeType() == Node::CDATA_SECTION_NODE) {
- scriptCode += static_cast<TextImpl*>(child)->data().string();
+ scriptCode += static_cast<TextImpl*>(child)->data().qstring();
}
}
// the script cannot do document.write until we support incremental parsing
@@ -736,7 +736,7 @@
DOMString scriptSource = m_cachedScript->script();
m_cachedScript->deref(this);
m_cachedScript = 0;
- m_view->part()->executeScript(scriptSource.string());
+ m_view->part()->executeScript(scriptSource.qstring());
executeScripts();
}
}
@@ -814,7 +814,7 @@
}
int result = xmlParseBalancedChunkMemory(0, &sax, &tokenizer, 0,
- (const xmlChar*)(const char*)(string.string().utf8()), 0);
+ (const xmlChar*)(const char*)(string.qstring().utf8()), 0);
return result == 0;
}
@@ -889,9 +889,9 @@
AttributeImpl *attr = attrs->attributeItem(i);
if (attr->localName() == "xmlns")
- ns = new XMLNamespace(QString::null, attr->value().string(), ns);
+ ns = new XMLNamespace(QString::null, attr->value().qstring(), ns);
else if (attr->prefix() == "xmlns")
- ns = new XMLNamespace(attr->localName().string(), attr->value().string(), ns);
+ ns = new XMLNamespace(attr->localName().qstring(), attr->value().qstring(), ns);
}
m_namespaceStack.push(ns);
@@ -954,7 +954,7 @@
memset(&sax, 0, sizeof(sax));
sax.startElement = attributesStartElementHandler;
xmlParserCtxtPtr parser = createQStringParser(&sax, &state);
- parseQString(parser, "<?xml version=\"1.0\"?><attrs " + string.string() + " />");
+ parseQString(parser, "<?xml version=\"1.0\"?><attrs " + string.qstring() + " />");
xmlFreeParserCtxt(parser);
attrsOK = state.gotAttributes;
1.3 +3 -3 WebCore/khtml/xsl/xsl_stylesheetimpl.cpp
Index: xsl_stylesheetimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xsl/xsl_stylesheetimpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsl_stylesheetimpl.cpp 19 Aug 2004 22:50:30 -0000 1.2
+++ xsl_stylesheetimpl.cpp 25 Aug 2005 17:47:24 -0000 1.3
@@ -129,7 +129,7 @@
if (m_embedded) {
// We have to locate (by ID) the appropriate embedded stylesheet element, so that we can walk the
// import/include list.
- xmlAttrPtr idNode = xmlGetID(m_stylesheetDoc, (const xmlChar*)(const char*)(href().string().utf8()));
+ xmlAttrPtr idNode = xmlGetID(m_stylesheetDoc, (const xmlChar*)(const char*)(href().qstring().utf8()));
if (idNode == NULL)
return;
stylesheetRoot = idNode->parent;
@@ -204,7 +204,7 @@
// In order to ensure that libxml canonicalized both URLs, we get the original href
// string from the import rule and canonicalize it using libxml before comparing it
// with the URI argument.
- QCString importHref = import->href().string().utf8();
+ QCString importHref = import->href().qstring().utf8();
xmlChar* base = xmlNodeGetBase(parentDoc, (xmlNodePtr)parentDoc);
xmlChar* childURI = xmlBuildURI((const xmlChar*)(const char*)importHref, base);
if (xmlStrEqual(uri, childURI)) {
@@ -283,7 +283,7 @@
XSLStyleSheetImpl* parentSheet = parentStyleSheet();
if (!parentSheet->href().isNull())
// use parent styleheet's URL as the base URL
- absHref = KURL(parentSheet->href().string(),m_strHref.string()).url();
+ absHref = KURL(parentSheet->href().qstring(),m_strHref.qstring()).url();
// Check for a cycle in our import chain. If we encounter a stylesheet
// in our parent chain with the same URL, then just bail.
1.42 +2 -2 WebCore/kwq/DOM.mm
Index: DOM.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DOM.mm 25 Aug 2005 17:12:14 -0000 1.41
+++ DOM.mm 25 Aug 2005 17:47:24 -0000 1.42
@@ -1415,7 +1415,7 @@
ASSERT(name);
ElementImpl *e = [self _elementImpl];
ASSERT(e);
- return KURL(e->getDocument()->completeURL(khtml::parseURL(e->getAttribute(name)).string())).getNSURL();
+ return KURL(e->getDocument()->completeURL(khtml::parseURL(e->getAttribute(name)).qstring())).getNSURL();
}
@end
@@ -1835,7 +1835,7 @@
- (NSString *)_text
{
- return [self _rangeImpl]->text().string().getNSString();
+ return [self _rangeImpl]->text().qstring().getNSString();
}
@end
1.77 +6 -6 WebCore/kwq/KWQAccObject.mm
Index: KWQAccObject.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQAccObject.mm,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- KWQAccObject.mm 16 Aug 2005 19:03:18 -0000 1.76
+++ KWQAccObject.mm 25 Aug 2005 17:47:24 -0000 1.77
@@ -456,20 +456,20 @@
return nil;
if (m_areaElement) {
- QString summary = static_cast<ElementImpl*>(m_areaElement)->getAttribute(summaryAttr).string();
+ QString summary = static_cast<ElementImpl*>(m_areaElement)->getAttribute(summaryAttr).qstring();
if (!summary.isEmpty())
return summary.getNSString();
- QString title = static_cast<ElementImpl*>(m_areaElement)->getAttribute(titleAttr).string();
+ QString title = static_cast<ElementImpl*>(m_areaElement)->getAttribute(titleAttr).qstring();
if (!title.isEmpty())
return title.getNSString();
}
for (RenderObject* curr = m_renderer; curr; curr = curr->parent()) {
if (curr->element() && curr->element()->isHTMLElement()) {
- QString summary = static_cast<ElementImpl*>(curr->element())->getAttribute(summaryAttr).string();
+ QString summary = static_cast<ElementImpl*>(curr->element())->getAttribute(summaryAttr).qstring();
if (!summary.isEmpty())
return summary.getNSString();
- QString title = static_cast<ElementImpl*>(curr->element())->getAttribute(titleAttr).string();
+ QString title = static_cast<ElementImpl*>(curr->element())->getAttribute(titleAttr).qstring();
if (!title.isEmpty())
return title.getNSString();
}
@@ -566,7 +566,7 @@
if (m_renderer->isImage()) {
if (m_renderer->element() && m_renderer->element()->isHTMLElement()) {
- QString alt = static_cast<ElementImpl*>(m_renderer->element())->getAttribute(altAttr).string();
+ QString alt = static_cast<ElementImpl*>(m_renderer->element())->getAttribute(altAttr).qstring();
return !alt.isEmpty() ? alt.getNSString() : nil;
}
} else if ([self isAttachment])
@@ -876,7 +876,7 @@
(m_areaElement || (!m_renderer->isImage() && m_renderer->element() && m_renderer->element()->isLink()))) {
HTMLAnchorElementImpl* anchor = [self anchorElement];
if (anchor) {
- QString s = anchor->getAttribute(hrefAttr).string();
+ QString s = anchor->getAttribute(hrefAttr).qstring();
if (!s.isNull()) {
s = anchor->getDocument()->completeURL(s);
return s.getNSString();
1.17 +2 -2 WebCore/kwq/KWQClipboard.mm
Index: KWQClipboard.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQClipboard.mm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- KWQClipboard.mm 14 Jul 2005 02:22:12 -0000 1.16
+++ KWQClipboard.mm 25 Aug 2005 17:47:25 -0000 1.17
@@ -67,7 +67,7 @@
static NSString *cocoaTypeFromMIMEType(const DOMString &type)
{
- QString qType = type.string().stripWhiteSpace();
+ QString qType = type.qstring().stripWhiteSpace();
// two special cases for IE compatibility
if (qType == "Text") {
@@ -221,7 +221,7 @@
// note NSPasteboard enforces changeCount itself on writing - can't write if not the owner
NSString *cocoaType = cocoaTypeFromMIMEType(type);
- NSString *cocoaData = data.string().getNSString();
+ NSString *cocoaData = data.qstring().getNSString();
if ([cocoaType isEqualToString:NSURLPboardType]) {
[m_pasteboard addTypes:[NSArray arrayWithObject:NSURLPboardType] owner:nil];
1.48 +1 -1 WebCore/kwq/KWQFont.mm
Index: KWQFont.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFont.mm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- KWQFont.mm 15 Aug 2005 04:36:51 -0000 1.47
+++ KWQFont.mm 25 Aug 2005 17:47:25 -0000 1.48
@@ -69,7 +69,7 @@
QString QFont::family() const
{
- return _family.family().string();
+ return _family.family().qstring();
}
void QFont::setFamily(const QString &qfamilyName)
1.663 +7 -7 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -r1.662 -r1.663
--- KWQKHTMLPart.mm 23 Aug 2005 18:32:50 -0000 1.662
+++ KWQKHTMLPart.mm 25 Aug 2005 17:47:25 -0000 1.663
@@ -499,7 +499,7 @@
if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
{
// For each text chunk, run the regexp
- QString nodeString = n->nodeValue().string();
+ QString nodeString = n->nodeValue().qstring();
int pos = regExp->searchRev(nodeString);
if (pos >= 0) {
return nodeString.mid(pos, regExp->matchedLength()).getNSString();
@@ -549,7 +549,7 @@
} else if (n->isTextNode() && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
{
// For each text chunk, run the regexp
- QString nodeString = n->nodeValue().string();
+ QString nodeString = n->nodeValue().qstring();
// add 100 for slop, to make it more likely that we'll search whole nodes
if (lengthSearched + nodeString.length() > maxCharsSearched) {
nodeString = nodeString.right(charsSearchedThreshold - lengthSearched);
@@ -574,7 +574,7 @@
NSString *KWQKHTMLPart::matchLabelsAgainstElement(NSArray *labels, ElementImpl *element)
{
- QString name = element->getAttribute(nameAttr).string();
+ QString name = element->getAttribute(nameAttr).qstring();
// Make numbers and _'s in field names behave like word boundaries, e.g., "address2"
name.replace(QRegExp("[[:digit:]]"), " ");
name.replace('_', ' ');
@@ -894,7 +894,7 @@
void KWQKHTMLPart::setTitle(const DOMString &title)
{
- QString text = title.string();
+ QString text = title.qstring();
text.replace(QChar('\\'), backslashAsCurrencySymbol());
KWQ_BLOCK_EXCEPTIONS;
@@ -2866,7 +2866,7 @@
AtomicString attr = e->getAttribute(srcAttr);
if (!attr.isEmpty()) {
- NSURL *URL = completeURL(attr.string()).getNSURL();
+ NSURL *URL = completeURL(attr.qstring()).getNSURL();
wrapper = [_bridge fileWrapperForURL:URL];
}
if (!wrapper) {
@@ -2966,7 +2966,7 @@
hasNewLine = false;
}
QString text;
- QString str = n->nodeValue().string();
+ QString str = n->nodeValue().qstring();
int start = (n == _startNode) ? startOffset : -1;
int end = (n == endNode) ? endOffset : -1;
if (renderer->isText()) {
@@ -3203,7 +3203,7 @@
// will have corrected any illegally nested <a> elements.
if (linkStartNode && n == linkStartNode) {
DOMString href = parseURL(linkStartNode->getAttribute(hrefAttr));
- KURL kURL = KWQ(linkStartNode->getDocument()->part())->completeURL(href.string());
+ KURL kURL = KWQ(linkStartNode->getDocument()->part())->completeURL(href.qstring());
NSURL *URL = kURL.getNSURL();
NSRange tempRange = { linkStartLocation, [result length]-linkStartLocation }; // workaround for 4213314
1.121 +3 -3 WebCore/kwq/KWQLoader.mm
Index: KWQLoader.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLoader.mm,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- KWQLoader.mm 2 Mar 2005 02:17:59 -0000 1.120
+++ KWQLoader.mm 25 Aug 2005 17:47:25 -0000 1.121
@@ -49,7 +49,7 @@
{
LOG(Loading, "Serving request for base %s, url %s",
request->m_docLoader->part()->baseURL().url().latin1(),
- request->object->url().string().latin1());
+ request->object->url().qstring().latin1());
return KWQServeRequest(loader, request->m_docLoader, job);
}
@@ -244,13 +244,13 @@
// Notify the caller that we "loaded".
KWQKHTMLPart *part = static_cast<KWQKHTMLPart *>(loader->part());
- QString urlString = cachedObject->url().string();
+ QString urlString = cachedObject->url().qstring();
if (!part->haveToldBridgeAboutLoad(urlString)) {
WebCoreBridge *bridge = part->bridge();
KWQ_BLOCK_EXCEPTIONS;
- [bridge objectLoadedFromCacheWithURL:KURL(cachedObject->url().string()).getNSURL()
+ [bridge objectLoadedFromCacheWithURL:KURL(cachedObject->url().qstring()).getNSURL()
response:(NSURLResponse *)cachedObject->response()
data:(NSData *)cachedObject->allData()];
KWQ_UNBLOCK_EXCEPTIONS;
1.44 +3 -3 WebCore/kwq/KWQRenderTreeDebug.cpp
Index: KWQRenderTreeDebug.cpp
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQRenderTreeDebug.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- KWQRenderTreeDebug.cpp 18 Aug 2005 04:22:46 -0000 1.43
+++ KWQRenderTreeDebug.cpp 25 Aug 2005 17:47:25 -0000 1.44
@@ -120,8 +120,8 @@
if (n->isCommentNode())
return "COMMENT";
if (n->isHTMLElement())
- return n->nodeName().upper().string(); // FIXME: We want to dump the real DOM name, not an uppercase name.
- return n->nodeName().string();
+ return n->nodeName().upper().qstring(); // FIXME: We want to dump the real DOM name, not an uppercase name.
+ return n->nodeName().qstring();
}
static QTextStream &operator<<(QTextStream &ts, const RenderObject &o)
@@ -256,7 +256,7 @@
static void writeTextRun(QTextStream &ts, const RenderText &o, const InlineTextBox &run)
{
ts << "text run at (" << run.m_x << "," << run.m_y << ") width " << run.m_width << ": "
- << quoteAndEscapeNonPrintables(o.data().string().mid(run.m_start, run.m_len))
+ << quoteAndEscapeNonPrintables(o.data().qstring().mid(run.m_start, run.m_len))
<< "\n";
}
1.115 +1 -1 WebCore/kwq/KWQString.h
Index: KWQString.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- KWQString.h 16 Aug 2005 19:03:19 -0000 1.114
+++ KWQString.h 25 Aug 2005 17:47:26 -0000 1.115
@@ -752,7 +752,7 @@
public:
QConstString(const QChar *, uint);
~QConstString();
- const QString &string() const { return *this; }
+ const QString &qstring() const { return *this; }
};
#endif
1.409 +11 -11 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- WebCoreBridge.mm 8 Aug 2005 04:07:46 -0000 1.408
+++ WebCoreBridge.mm 25 Aug 2005 17:47:26 -0000 1.409
@@ -556,7 +556,7 @@
if (doc) {
DocumentTypeImpl *doctype = doc->realDocType();
if (doctype) {
- documentTypeString = doctype->toString().string().getNSString();
+ documentTypeString = doctype->toString().qstring().getNSString();
}
}
return documentTypeString;
@@ -777,8 +777,8 @@
for (NodeImpl *child = node->firstChild(); child; child = child->nextSibling()) {
[children addObject:[self copyDOMNode:child copier:copier]];
}
- NSObject *copiedNode = [copier nodeWithName:node->nodeName().string().getNSString()
- value:node->nodeValue().string().getNSString()
+ NSObject *copiedNode = [copier nodeWithName:node->nodeName().qstring().getNSString()
+ value:node->nodeValue().qstring().getNSString()
source:createMarkup(node, ChildrenOnly).getNSString()
children:children];
[children release];
@@ -1016,7 +1016,7 @@
const AtomicString& title = static_cast<ElementImpl *>(titleNode)->getAttribute(titleAttr);
if (!title.isNull()) {
// We found a node with a title.
- QString titleText = title.string();
+ QString titleText = title.qstring();
titleText.replace(QChar('\\'), _part->backslashAsCurrencySymbol());
[element setObject:titleText.getNSString() forKey:WebCoreElementTitleKey];
break;
@@ -1032,7 +1032,7 @@
const AtomicString& title = e->getAttribute(titleAttr);
if (!title.isEmpty()) {
- QString titleText = title.string();
+ QString titleText = title.qstring();
titleText.replace(QChar('\\'), _part->backslashAsCurrencySymbol());
[element setObject:titleText.getNSString() forKey:WebCoreElementLinkTitleKey];
}
@@ -1043,7 +1043,7 @@
if (!t.isEmpty()) {
[element setObject:t.getNSString() forKey:WebCoreElementLinkLabelKey];
}
- QString URLString = parseURL(link).string();
+ QString URLString = parseURL(link).qstring();
[element setObject:doc->completeURL(URLString).getNSString() forKey:WebCoreElementLinkURLKey];
}
@@ -1052,7 +1052,7 @@
target = doc->baseTarget();
}
if (!target.isEmpty()) {
- [element setObject:target.string().getNSString() forKey:WebCoreElementLinkTargetFrameKey];
+ [element setObject:target.qstring().getNSString() forKey:WebCoreElementLinkTargetFrameKey];
}
}
@@ -1084,7 +1084,7 @@
attr = i->getAttribute(srcAttr);
}
if (!attr.isEmpty()) {
- QString URLString = parseURL(attr).string();
+ QString URLString = parseURL(attr).qstring();
[element setObject:i->getDocument()->completeURL(URLString).getNSString() forKey:WebCoreElementImageURLKey];
}
@@ -1095,7 +1095,7 @@
else if (i->hasTagName(imgTag))
alt = static_cast<HTMLImageElementImpl *>(i)->altText();
if (!alt.isNull()) {
- QString altText = alt.string();
+ QString altText = alt.qstring();
altText.replace(QChar('\\'), _part->backslashAsCurrencySymbol());
[element setObject:altText.getNSString() forKey:WebCoreElementImageAltStringKey];
}
@@ -1111,7 +1111,7 @@
if (!doc) {
return nil;
}
- QString rel = parseURL(QString::fromNSString(string)).string();
+ QString rel = parseURL(QString::fromNSString(string)).qstring();
return KURL(doc->baseURL(), rel, doc->decoder() ? doc->decoder()->codec() : 0).getNSURL();
}
@@ -1314,7 +1314,7 @@
{
DocumentImpl *doc = _part->xmlDocImpl();
if (doc && doc->isHTMLDocument()) {
- return doc->domain().string().getNSString();
+ return doc->domain().qstring().getNSString();
}
return nil;
}
More information about the webkit-changes
mailing list