[webkit-changes] cvs commit: WebCore/kwq KWQKHTMLPart.h
KWQKHTMLPart.mm KWQKStandardDirs.h KWQLineEdit.h
KWQLineEdit.mm KWQPainter.mm KWQSignal.h KWQSignal.mm
KWQSlot.h KWQSlot.mm KWQString.h KWQString.mm KWQTextEdit.h
KWQTextEdit.mm KWQKGlobal.h KWQKGlobal.mm KWQLabel.h KWQLabel.mm
Eric
eseidel at opensource.apple.com
Fri Dec 23 10:44:45 PST 2005
eseidel 05/12/23 10:44:44
Modified: . ChangeLog
WebCore.xcodeproj project.pbxproj
khtml khtml_part.cpp
khtml/css css_base.cpp css_stylesheetimpl.cpp
cssstyleselector.cpp
khtml/dom dom_string.h
khtml/ecma kjs_css.cpp kjs_dom.cpp kjs_events.cpp
kjs_html.cpp kjs_proxy.cpp kjs_window.cpp
xmlhttprequest.cpp xmlhttprequest.h
khtml/editing jsediting.cpp markup.cpp
khtml/html html_baseimpl.cpp html_elementimpl.cpp
html_formimpl.cpp html_headimpl.cpp
html_imageimpl.cpp html_objectimpl.cpp
html_objectimpl.h html_tableimpl.cpp
htmltokenizer.cpp
khtml/misc loader.cpp
khtml/rendering render_applet.cpp render_block.cpp
render_box.cpp render_form.cpp render_form.h
render_frames.cpp render_line.cpp render_list.cpp
render_text.cpp
khtml/xml dom_docimpl.cpp dom_elementimpl.cpp
dom_nodeimpl.cpp dom_stringimpl.cpp
xml_tokenizer.cpp
khtml/xsl xsl_stylesheetimpl.cpp
ksvg2/scripts cssmakeprops cssmakevalues
ksvg2/svg SVGTestsImpl.cpp
kwq KWQKHTMLPart.h KWQKHTMLPart.mm KWQKStandardDirs.h
KWQLineEdit.h KWQLineEdit.mm KWQPainter.mm
KWQSignal.h KWQSignal.mm KWQSlot.h KWQSlot.mm
KWQString.h KWQString.mm KWQTextEdit.h
KWQTextEdit.mm
Removed: ForwardingHeaders kglobal.h qlabel.h
kwq KWQKGlobal.h KWQKGlobal.mm KWQLabel.h KWQLabel.mm
Log:
Bug #: 6138
Submitted by: eseidel
Reviewed by: mjs
Remove many use of .qstring()
Convert several instances of QStrings to DOMStrings
Add DOMString::replace(QChar, QChar)
Remove (unused) KWQLabel, KWQKGlobal
Slight performance improvement.
Also fixed ChangeLog line endings from previous commit.
http://bugzilla.opendarwin.org/show_bug.cgi?id=6138
No tests needed, no functionality changes.
* ChangeLog: Fixed line endings
* ForwardingHeaders/kglobal.h: Removed.
* ForwardingHeaders/qlabel.h: Removed.
* WebCore.xcodeproj/project.pbxproj: removed KWQLabel
* khtml/css/css_base.cpp:
(CSSSelector::selectorText):
* khtml/css/css_stylesheetimpl.cpp:
(MediaListImpl::setMediaText):
* khtml/css/cssstyleselector.cpp:
(khtml::checkPseudoState):
* khtml/dom/dom_string.h:
(DOM::DOMString::replace):
* khtml/ecma/kjs_css.cpp:
(KJS::DOMCSSStyleDeclaration::put):
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNode::put):
(KJS::DOMAttr::put):
(KJS::DOMDocument::put):
* khtml/ecma/kjs_events.cpp:
(KJS::JSAbstractEventListener::handleEvent):
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::HTMLDocument::put):
(KJS::KJS::HTMLElementFunction::callAsFunction):
(KJS::KJS::HTMLElement::put):
(KJS::KJS::Context2DFunction::callAsFunction):
(KJS::Context2D::putValueProperty):
* khtml/ecma/kjs_proxy.cpp:
(KJSProxyImpl::evaluate):
* khtml/ecma/kjs_window.cpp:
(KJS::Window::isSafeScript):
(KJS::WindowFunc::callAsFunction):
(KJS::ScheduledAction::execute):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::send):
(KJS::XMLHttpRequestProtoFunc::callAsFunction):
* khtml/ecma/xmlhttprequest.h:
* khtml/editing/jsediting.cpp:
(DOM::JSEditor::queryCommandSupported):
* khtml/editing/markup.cpp:
(khtml::stringValueForRange):
(khtml::startMarkup):
* khtml/html/html_baseimpl.cpp:
(HTMLBodyElementImpl::parseMappedAttribute):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::addHTMLAlignment):
* khtml/html/html_formimpl.cpp:
(DOM::HTMLFormElementImpl::formData):
(DOM::HTMLInputElementImpl::appendFormData):
(DOM::HTMLTextAreaElementImpl::updateValue):
* khtml/html/html_headimpl.cpp:
(HTMLLinkElementImpl::parseMappedAttribute):
* khtml/html/html_imageimpl.cpp:
(DOM::HTMLImageElementImpl::parseMappedAttribute):
* khtml/html/html_objectimpl.cpp:
(DOM::HTMLObjectElementImpl::parseMappedAttribute):
(DOM::HTMLParamElementImpl::isURLAttribute):
* khtml/html/html_objectimpl.h:
* khtml/html/html_tableimpl.cpp:
(DOM::HTMLTableElementImpl::addChild):
(DOM::HTMLTableElementImpl::parseMappedAttribute):
(DOM::HTMLTablePartElementImpl::parseMappedAttribute):
(DOM::HTMLTableSectionElementImpl::addChild):
(DOM::HTMLTableRowElementImpl::addChild):
* khtml/html/htmltokenizer.cpp:
(khtml::HTMLTokenizer::parseTag):
* khtml/khtml_part.cpp:
(KHTMLPart::executeScript):
(KHTMLPart::checkEmitLoadEvent):
* khtml/misc/loader.cpp:
(CachedObject::finish):
(CachedCSSStyleSheet::checkNotify):
(CachedXSLStyleSheet::checkNotify):
(CachedXBLDocument::checkNotify):
(DocLoader::requestImage):
(DocLoader::requestStyleSheet):
(DocLoader::requestScript):
(Loader::servePendingRequests):
(Loader::cancelRequests):
* khtml/rendering/render_applet.cpp:
* khtml/rendering/render_block.cpp:
(khtml::RenderBlock::updateFirstLetter):
* khtml/rendering/render_box.cpp:
(RenderBox::~RenderBox):
* khtml/rendering/render_form.cpp:
(RenderFormElement::slotTextChanged):
(RenderLineEdit::updateFromElement):
(RenderTextArea::updateFromElement):
(RenderTextArea::text):
* khtml/rendering/render_form.h:
* khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* khtml/rendering/render_line.cpp:
(khtml::EllipsisBox::paint):
* khtml/rendering/render_list.cpp:
(RenderListItem::paint):
(RenderListMarker::paint):
* khtml/rendering/render_text.cpp:
(khtml::RenderText::RenderText):
(khtml::RenderText::position):
* khtml/xml/dom_docimpl.cpp:
(DOMImplementationImpl::hasFeature):
(DocumentImpl::getElementByAccessKey):
(DocumentImpl::recalcStyleSelector):
(DocumentImpl::defaultEventHandler):
* khtml/xml/dom_elementimpl.cpp:
(ElementImpl::recalcStyle):
* khtml/xml/dom_nodeimpl.cpp:
(DOM::NodeImpl::dump):
(DOM::appendAttributeDesc):
(DOM::NodeImpl::showNode):
* khtml/xml/dom_stringimpl.cpp:
(DOM::DOMStringImpl::lower):
* khtml/xml/xml_tokenizer.cpp:
(khtml::XMLTokenizer::executeScripts):
* khtml/xsl/xsl_stylesheetimpl.cpp:
(DOM::XSLStyleSheetImpl::loadChildSheets):
* kwq/KWQKHTMLPart.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::documentViewForNode):
(KWQKHTMLPart::runJavaScriptAlert):
(KWQKHTMLPart::runJavaScriptConfirm):
(KWQKHTMLPart::runJavaScriptPrompt):
(KWQKHTMLPart::addMessageToConsole):
(KWQKHTMLPart::passWheelEventToChildWidget):
(KWQKHTMLPart::shouldDragAutoNode):
(KWQKHTMLPart::snapshotDragImage):
(convertAttributesToUnderlines):
(KWQKHTMLPart::setMarkedTextRange):
(KWQKHTMLPart::mousePressNode):
* kwq/KWQKGlobal.h: Removed.
* kwq/KWQKGlobal.mm: Removed.
* kwq/KWQLabel.h: Removed.
* kwq/KWQLabel.mm: Removed.
* kwq/KWQLineEdit.h:
* kwq/KWQLineEdit.mm:
(QLineEdit::setText):
(QLineEdit::text):
(QLineEdit::setAutoSaveName):
(QLineEdit::setPlaceholderString):
* kwq/KWQPainter.mm:
(QPainter::compositeOperatorFromString):
* kwq/KWQSignal.h:
* kwq/KWQSignal.mm:
(KWQSignal::call):
* kwq/KWQSlot.h:
* kwq/KWQSlot.mm:
(KWQSlot::call):
* kwq/KWQString.h:
* kwq/KWQString.mm:
* kwq/KWQTextEdit.h:
* kwq/KWQTextEdit.mm:
(QTextEdit::setText):
(QTextEdit::text):
(QTextEdit::textWithHardLineBreaks):
* ksvg2/scripts/cssmakeprops: removed kglobal.h
* ksvg2/scripts/cssmakevalues: removed kglobal.h
Revision Changes Path
1.35 +197 -2 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 23 Dec 2005 08:55:01 -0000 1.34
+++ ChangeLog 23 Dec 2005 18:43:59 -0000 1.35
@@ -1,5 +1,200 @@
-2005-12-23 Alexey Proskuryakov <ap at nypop.com>
Reviewed by Eric Seidel.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5924
Zero-length responses to XMLHTTPRequest mishandled
* khtml/ecma/xmlhttprequest.cpp (KJS::XMLHttpRequest::slotFinished):
Make sure to fetch response headers and set the state to Loaded, if
this hasn't been done already.
-2005-12-23 Alexey Proskuryakov <ap at nypop.com>
Reviewed by Eric Seidel.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3565
Posting data via XML HTTP Request doesnt work
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::send): Set application/xml as a default Content-Type;
use a proper codec for request body if a charset is specified.
(KJS::XMLHttpRequest::getRequestHeader): Use getSpecificHeader.
(KJS::XMLHttpRequest::getResponseHeader): Ditto.
(KJS::XMLHttpRequest::getSpecificHeader): Factored out code from getResponseHeader.
(KJS::XMLHttpRequestProtoFunc::callAsFunction): Removed a FIXME (this is done in send() now).
* khtml/ecma/xmlhttprequest.h:
+2005-12-23 Eric Seidel <eseidel at apple.com>
+
+ Reviewed by mjs.
+
+ Remove many use of .qstring()
+ Convert several instances of QStrings to DOMStrings
+ Add DOMString::replace(QChar, QChar)
+ Remove (unused) KWQLabel, KWQKGlobal
+ Slight performance improvement.
+ Also fixed ChangeLog line endings from previous commit.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=6138
+
+ No tests needed, no functionality changes.
+
+ * ChangeLog: Fixed line endings
+ * ForwardingHeaders/kglobal.h: Removed.
+ * ForwardingHeaders/qlabel.h: Removed.
+ * WebCore.xcodeproj/project.pbxproj: removed KWQLabel
+ * khtml/css/css_base.cpp:
+ (CSSSelector::selectorText):
+ * khtml/css/css_stylesheetimpl.cpp:
+ (MediaListImpl::setMediaText):
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::checkPseudoState):
+ * khtml/dom/dom_string.h:
+ (DOM::DOMString::replace):
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::DOMCSSStyleDeclaration::put):
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::put):
+ (KJS::DOMAttr::put):
+ (KJS::DOMDocument::put):
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::JSAbstractEventListener::handleEvent):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::KJS::HTMLDocument::put):
+ (KJS::KJS::HTMLElementFunction::callAsFunction):
+ (KJS::KJS::HTMLElement::put):
+ (KJS::KJS::Context2DFunction::callAsFunction):
+ (KJS::Context2D::putValueProperty):
+ * khtml/ecma/kjs_proxy.cpp:
+ (KJSProxyImpl::evaluate):
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::Window::isSafeScript):
+ (KJS::WindowFunc::callAsFunction):
+ (KJS::ScheduledAction::execute):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::send):
+ (KJS::XMLHttpRequestProtoFunc::callAsFunction):
+ * khtml/ecma/xmlhttprequest.h:
+ * khtml/editing/jsediting.cpp:
+ (DOM::JSEditor::queryCommandSupported):
+ * khtml/editing/markup.cpp:
+ (khtml::stringValueForRange):
+ (khtml::startMarkup):
+ * khtml/html/html_baseimpl.cpp:
+ (HTMLBodyElementImpl::parseMappedAttribute):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::addHTMLAlignment):
+ * khtml/html/html_formimpl.cpp:
+ (DOM::HTMLFormElementImpl::formData):
+ (DOM::HTMLInputElementImpl::appendFormData):
+ (DOM::HTMLTextAreaElementImpl::updateValue):
+ * khtml/html/html_headimpl.cpp:
+ (HTMLLinkElementImpl::parseMappedAttribute):
+ * khtml/html/html_imageimpl.cpp:
+ (DOM::HTMLImageElementImpl::parseMappedAttribute):
+ * khtml/html/html_objectimpl.cpp:
+ (DOM::HTMLObjectElementImpl::parseMappedAttribute):
+ (DOM::HTMLParamElementImpl::isURLAttribute):
+ * khtml/html/html_objectimpl.h:
+ * khtml/html/html_tableimpl.cpp:
+ (DOM::HTMLTableElementImpl::addChild):
+ (DOM::HTMLTableElementImpl::parseMappedAttribute):
+ (DOM::HTMLTablePartElementImpl::parseMappedAttribute):
+ (DOM::HTMLTableSectionElementImpl::addChild):
+ (DOM::HTMLTableRowElementImpl::addChild):
+ * khtml/html/htmltokenizer.cpp:
+ (khtml::HTMLTokenizer::parseTag):
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::executeScript):
+ (KHTMLPart::checkEmitLoadEvent):
+ * khtml/misc/loader.cpp:
+ (CachedObject::finish):
+ (CachedCSSStyleSheet::checkNotify):
+ (CachedXSLStyleSheet::checkNotify):
+ (CachedXBLDocument::checkNotify):
+ (DocLoader::requestImage):
+ (DocLoader::requestStyleSheet):
+ (DocLoader::requestScript):
+ (Loader::servePendingRequests):
+ (Loader::cancelRequests):
+ * khtml/rendering/render_applet.cpp:
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::updateFirstLetter):
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::~RenderBox):
+ * khtml/rendering/render_form.cpp:
+ (RenderFormElement::slotTextChanged):
+ (RenderLineEdit::updateFromElement):
+ (RenderTextArea::updateFromElement):
+ (RenderTextArea::text):
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * khtml/rendering/render_line.cpp:
+ (khtml::EllipsisBox::paint):
+ * khtml/rendering/render_list.cpp:
+ (RenderListItem::paint):
+ (RenderListMarker::paint):
+ * khtml/rendering/render_text.cpp:
+ (khtml::RenderText::RenderText):
+ (khtml::RenderText::position):
+ * khtml/xml/dom_docimpl.cpp:
+ (DOMImplementationImpl::hasFeature):
+ (DocumentImpl::getElementByAccessKey):
+ (DocumentImpl::recalcStyleSelector):
+ (DocumentImpl::defaultEventHandler):
+ * khtml/xml/dom_elementimpl.cpp:
+ (ElementImpl::recalcStyle):
+ * khtml/xml/dom_nodeimpl.cpp:
+ (DOM::NodeImpl::dump):
+ (DOM::appendAttributeDesc):
+ (DOM::NodeImpl::showNode):
+ * khtml/xml/dom_stringimpl.cpp:
+ (DOM::DOMStringImpl::lower):
+ * khtml/xml/xml_tokenizer.cpp:
+ (khtml::XMLTokenizer::executeScripts):
+ * khtml/xsl/xsl_stylesheetimpl.cpp:
+ (DOM::XSLStyleSheetImpl::loadChildSheets):
+ * kwq/KWQKHTMLPart.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::documentViewForNode):
+ (KWQKHTMLPart::runJavaScriptAlert):
+ (KWQKHTMLPart::runJavaScriptConfirm):
+ (KWQKHTMLPart::runJavaScriptPrompt):
+ (KWQKHTMLPart::addMessageToConsole):
+ (KWQKHTMLPart::passWheelEventToChildWidget):
+ (KWQKHTMLPart::shouldDragAutoNode):
+ (KWQKHTMLPart::snapshotDragImage):
+ (convertAttributesToUnderlines):
+ (KWQKHTMLPart::setMarkedTextRange):
+ (KWQKHTMLPart::mousePressNode):
+ * kwq/KWQKGlobal.h: Removed.
+ * kwq/KWQKGlobal.mm: Removed.
+ * kwq/KWQLabel.h: Removed.
+ * kwq/KWQLabel.mm: Removed.
+ * kwq/KWQLineEdit.h:
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::setText):
+ (QLineEdit::text):
+ (QLineEdit::setAutoSaveName):
+ (QLineEdit::setPlaceholderString):
+ * kwq/KWQPainter.mm:
+ (QPainter::compositeOperatorFromString):
+ * kwq/KWQSignal.h:
+ * kwq/KWQSignal.mm:
+ (KWQSignal::call):
+ * kwq/KWQSlot.h:
+ * kwq/KWQSlot.mm:
+ (KWQSlot::call):
+ * kwq/KWQString.h:
+ * kwq/KWQString.mm:
+ * kwq/KWQTextEdit.h:
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::setText):
+ (QTextEdit::text):
+ (QTextEdit::textWithHardLineBreaks):
+ * ksvg2/scripts/cssmakeprops: removed kglobal.h
+ * ksvg2/scripts/cssmakevalues: removed kglobal.h
+
+2005-12-23 Alexey Proskuryakov <ap at nypop.com>
+
+ Reviewed by Eric Seidel.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5924
+ Zero-length responses to XMLHTTPRequest mishandled
+
+ * khtml/ecma/xmlhttprequest.cpp (KJS::XMLHttpRequest::slotFinished):
+ Make sure to fetch response headers and set the state to Loaded, if
+ this hasn't been done already.
+
+2005-12-23 Alexey Proskuryakov <ap at nypop.com>
+
+ Reviewed by Eric Seidel.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3565
+ Posting data via XML HTTP Request doesnt work
+
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::send): Set application/xml as a default Content-Type;
+ use a proper codec for request body if a charset is specified.
+ (KJS::XMLHttpRequest::getRequestHeader): Use getSpecificHeader.
+ (KJS::XMLHttpRequest::getResponseHeader): Ditto.
+ (KJS::XMLHttpRequest::getSpecificHeader): Factored out code from getResponseHeader.
+ (KJS::XMLHttpRequestProtoFunc::callAsFunction): Removed a FIXME (this is done in send() now).
+ * khtml/ecma/xmlhttprequest.h:
2005-12-22 Alexey Proskuryakov <ap at nypop.com>
1.62 +0 -24 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- project.pbxproj 22 Dec 2005 16:53:53 -0000 1.61
+++ project.pbxproj 23 Dec 2005 18:44:00 -0000 1.62
@@ -190,7 +190,6 @@
93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784EE02DE375901EA4122 /* KWQKCookieJar.h */; };
93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862002DE398401EA4122 /* KWQKCursor.h */; };
93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F402DE382001EA4122 /* KWQKDebug.h */; };
- 93F1994808245E59001E9ABC /* KWQKGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F502DE382001EA4122 /* KWQKGlobal.h */; };
93F1994908245E59001E9ABC /* KWQKGlobalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */; };
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */; };
93F1994B08245E59001E9ABC /* KWQKHTMLFind.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */; };
@@ -218,7 +217,6 @@
93F1996708245E59001E9ABC /* KWQKURL.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860202DE382001EA4122 /* KWQKURL.h */; };
93F1996808245E59001E9ABC /* KWQKWin.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860402DE382001EA4122 /* KWQKWin.h */; };
93F1996908245E59001E9ABC /* KWQKWinModule.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860502DE382001EA4122 /* KWQKWinModule.h */; };
- 93F1996A08245E59001E9ABC /* KWQLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869702DE3B8601EA4122 /* KWQLabel.h */; };
93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* KWQLineEdit.h */; };
93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* KWQListBox.h */; };
93F1996D08245E59001E9ABC /* KWQListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* KWQListImpl.h */; };
@@ -389,7 +387,6 @@
93F19A2408245E59001E9ABC /* KWQKConfigBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784ED02DE375901EA4122 /* KWQKConfigBase.mm */; };
93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */; };
93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* KWQKCursor.mm */; };
- 93F19A2708245E59001E9ABC /* KWQKGlobal.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F402DE375901EA4122 /* KWQKGlobal.mm */; };
93F19A2808245E59001E9ABC /* KWQKGlobalSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */; };
93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */; };
93F19A2A08245E59001E9ABC /* KWQKHTMLFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F702DE375901EA4122 /* KWQKHTMLFactory.mm */; };
@@ -406,7 +403,6 @@
93F19A3608245E59001E9ABC /* KWQKURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850E02DE375901EA4122 /* KWQKURL.mm */; };
93F19A3708245E59001E9ABC /* KWQKWin.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850F02DE375901EA4122 /* KWQKWin.mm */; };
93F19A3808245E59001E9ABC /* KWQKWinModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851002DE375901EA4122 /* KWQKWinModule.mm */; };
- 93F19A3908245E59001E9ABC /* KWQLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851102DE375901EA4122 /* KWQLabel.mm */; };
93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* KWQLineEdit.mm */; };
93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
93F19A3C08245E59001E9ABC /* KWQListImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* KWQListImpl.mm */; };
@@ -712,7 +708,6 @@
A88AD18B0952480A001DD196 /* KWQKCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784EE02DE375901EA4122 /* KWQKCookieJar.h */; };
A88AD18C0952480A001DD196 /* KWQKCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862002DE398401EA4122 /* KWQKCursor.h */; };
A88AD18D0952480A001DD196 /* KWQKDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F402DE382001EA4122 /* KWQKDebug.h */; };
- A88AD18E0952480A001DD196 /* KWQKGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F502DE382001EA4122 /* KWQKGlobal.h */; };
A88AD18F0952480A001DD196 /* KWQKGlobalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */; };
A88AD1900952480A001DD196 /* KWQKHTMLFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */; };
A88AD1910952480A001DD196 /* KWQKHTMLFind.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */; };
@@ -740,7 +735,6 @@
A88AD1A90952480A001DD196 /* KWQKURL.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860202DE382001EA4122 /* KWQKURL.h */; };
A88AD1AA0952480A001DD196 /* KWQKWin.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860402DE382001EA4122 /* KWQKWin.h */; };
A88AD1AB0952480A001DD196 /* KWQKWinModule.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860502DE382001EA4122 /* KWQKWinModule.h */; };
- A88AD1AC0952480A001DD196 /* KWQLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869702DE3B8601EA4122 /* KWQLabel.h */; };
A88AD1AD0952480A001DD196 /* KWQLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* KWQLineEdit.h */; };
A88AD1AE0952480A001DD196 /* KWQListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* KWQListBox.h */; };
A88AD1AF0952480A001DD196 /* KWQListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* KWQListImpl.h */; };
@@ -953,7 +947,6 @@
A88AD2810952480A001DD196 /* KWQKConfigBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784ED02DE375901EA4122 /* KWQKConfigBase.mm */; };
A88AD2820952480A001DD196 /* KWQKCookieJar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */; };
A88AD2830952480A001DD196 /* KWQKCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* KWQKCursor.mm */; };
- A88AD2840952480A001DD196 /* KWQKGlobal.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F402DE375901EA4122 /* KWQKGlobal.mm */; };
A88AD2850952480A001DD196 /* KWQKGlobalSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */; };
A88AD2860952480A001DD196 /* KWQKHistoryProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */; };
A88AD2870952480A001DD196 /* KWQKHTMLFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F702DE375901EA4122 /* KWQKHTMLFactory.mm */; };
@@ -970,7 +963,6 @@
A88AD2930952480A001DD196 /* KWQKURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850E02DE375901EA4122 /* KWQKURL.mm */; };
A88AD2940952480A001DD196 /* KWQKWin.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850F02DE375901EA4122 /* KWQKWin.mm */; };
A88AD2950952480A001DD196 /* KWQKWinModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851002DE375901EA4122 /* KWQKWinModule.mm */; };
- A88AD2960952480A001DD196 /* KWQLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851102DE375901EA4122 /* KWQLabel.mm */; };
A88AD2970952480A001DD196 /* KWQLineEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* KWQLineEdit.mm */; };
A88AD2980952480A001DD196 /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
A88AD2990952480A001DD196 /* KWQListImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* KWQListImpl.mm */; };
@@ -2546,7 +2538,6 @@
F58784EE02DE375901EA4122 /* KWQKCookieJar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKCookieJar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCookieJar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F002DE375901EA4122 /* KWQKCursor.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCursor.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F58784F402DE375901EA4122 /* KWQKGlobal.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKGlobal.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKGlobalSettings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKHistoryProvider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58784F702DE375901EA4122 /* KWQKHTMLFactory.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKHTMLFactory.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2564,7 +2555,6 @@
F587850E02DE375901EA4122 /* KWQKURL.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKURL.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850F02DE375901EA4122 /* KWQKWin.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKWin.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851002DE375901EA4122 /* KWQKWinModule.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKWinModule.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587851102DE375901EA4122 /* KWQLabel.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLabel.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851202DE375901EA4122 /* KWQLineEdit.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLineEdit.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851302DE375901EA4122 /* KWQListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851402DE375901EA4122 /* KWQListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2625,7 +2615,6 @@
F58785F102DE382001EA4122 /* KWQKCharsets.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKCharsets.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785F302DE382001EA4122 /* KWQKConfigBase.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKConfigBase.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785F402DE382001EA4122 /* KWQKDebug.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKDebug.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F58785F502DE382001EA4122 /* KWQKGlobal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKGlobal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKGlobalSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785F802DE382001EA4122 /* KWQKInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKInstance.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2675,7 +2664,6 @@
F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQGuardedPtr.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869202DE3B8601EA4122 /* KWQImage.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQImage.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869602DE3B8601EA4122 /* KWQIODevice.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQIODevice.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587869702DE3B8601EA4122 /* KWQLabel.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLabel.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869802DE3B8601EA4122 /* KWQLineEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLineEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869902DE3B8601EA4122 /* KWQPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869A02DE3B8601EA4122 /* KWQMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQMap.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -4004,8 +3992,6 @@
F58785F302DE382001EA4122 /* KWQKConfigBase.h */,
F58784ED02DE375901EA4122 /* KWQKConfigBase.mm */,
F58785F402DE382001EA4122 /* KWQKDebug.h */,
- F58785F502DE382001EA4122 /* KWQKGlobal.h */,
- F58784F402DE375901EA4122 /* KWQKGlobal.mm */,
F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */,
F58784F502DE375901EA4122 /* KWQKGlobalSettings.mm */,
F58785F802DE382001EA4122 /* KWQKInstance.h */,
@@ -4127,8 +4113,6 @@
F58784E602DE375901EA4122 /* KWQGuardedPtr.mm */,
F587869202DE3B8601EA4122 /* KWQImage.h */,
F587869602DE3B8601EA4122 /* KWQIODevice.h */,
- F587869702DE3B8601EA4122 /* KWQLabel.h */,
- F587851102DE375901EA4122 /* KWQLabel.mm */,
F587869802DE3B8601EA4122 /* KWQLineEdit.h */,
F587851202DE375901EA4122 /* KWQLineEdit.mm */,
F587851302DE375901EA4122 /* KWQListBox.h */,
@@ -4338,7 +4322,6 @@
93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */,
93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */,
93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */,
- 93F1994808245E59001E9ABC /* KWQKGlobal.h in Headers */,
93F1994908245E59001E9ABC /* KWQKGlobalSettings.h in Headers */,
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */,
93F1994B08245E59001E9ABC /* KWQKHTMLFind.h in Headers */,
@@ -4366,7 +4349,6 @@
93F1996708245E59001E9ABC /* KWQKURL.h in Headers */,
93F1996808245E59001E9ABC /* KWQKWin.h in Headers */,
93F1996908245E59001E9ABC /* KWQKWinModule.h in Headers */,
- 93F1996A08245E59001E9ABC /* KWQLabel.h in Headers */,
93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */,
93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */,
93F1996D08245E59001E9ABC /* KWQListImpl.h in Headers */,
@@ -4840,7 +4822,6 @@
A88AD18B0952480A001DD196 /* KWQKCookieJar.h in Headers */,
A88AD18C0952480A001DD196 /* KWQKCursor.h in Headers */,
A88AD18D0952480A001DD196 /* KWQKDebug.h in Headers */,
- A88AD18E0952480A001DD196 /* KWQKGlobal.h in Headers */,
A88AD18F0952480A001DD196 /* KWQKGlobalSettings.h in Headers */,
A88AD1900952480A001DD196 /* KWQKHTMLFactory.h in Headers */,
A88AD1910952480A001DD196 /* KWQKHTMLFind.h in Headers */,
@@ -4868,7 +4849,6 @@
A88AD1A90952480A001DD196 /* KWQKURL.h in Headers */,
A88AD1AA0952480A001DD196 /* KWQKWin.h in Headers */,
A88AD1AB0952480A001DD196 /* KWQKWinModule.h in Headers */,
- A88AD1AC0952480A001DD196 /* KWQLabel.h in Headers */,
A88AD1AD0952480A001DD196 /* KWQLineEdit.h in Headers */,
A88AD1AE0952480A001DD196 /* KWQListBox.h in Headers */,
A88AD1AF0952480A001DD196 /* KWQListImpl.h in Headers */,
@@ -6158,7 +6138,6 @@
93F19A2408245E59001E9ABC /* KWQKConfigBase.mm in Sources */,
93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */,
93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */,
- 93F19A2708245E59001E9ABC /* KWQKGlobal.mm in Sources */,
93F19A2808245E59001E9ABC /* KWQKGlobalSettings.mm in Sources */,
93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */,
93F19A2A08245E59001E9ABC /* KWQKHTMLFactory.mm in Sources */,
@@ -6175,7 +6154,6 @@
93F19A3608245E59001E9ABC /* KWQKURL.mm in Sources */,
93F19A3708245E59001E9ABC /* KWQKWin.mm in Sources */,
93F19A3808245E59001E9ABC /* KWQKWinModule.mm in Sources */,
- 93F19A3908245E59001E9ABC /* KWQLabel.mm in Sources */,
93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */,
93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */,
93F19A3C08245E59001E9ABC /* KWQListImpl.mm in Sources */,
@@ -6589,7 +6567,6 @@
A88AD2810952480A001DD196 /* KWQKConfigBase.mm in Sources */,
A88AD2820952480A001DD196 /* KWQKCookieJar.mm in Sources */,
A88AD2830952480A001DD196 /* KWQKCursor.mm in Sources */,
- A88AD2840952480A001DD196 /* KWQKGlobal.mm in Sources */,
A88AD2850952480A001DD196 /* KWQKGlobalSettings.mm in Sources */,
A88AD2860952480A001DD196 /* KWQKHistoryProvider.mm in Sources */,
A88AD2870952480A001DD196 /* KWQKHTMLFactory.mm in Sources */,
@@ -6606,7 +6583,6 @@
A88AD2930952480A001DD196 /* KWQKURL.mm in Sources */,
A88AD2940952480A001DD196 /* KWQKWin.mm in Sources */,
A88AD2950952480A001DD196 /* KWQKWinModule.mm in Sources */,
- A88AD2960952480A001DD196 /* KWQLabel.mm in Sources */,
A88AD2970952480A001DD196 /* KWQLineEdit.mm in Sources */,
A88AD2980952480A001DD196 /* KWQListBox.mm in Sources */,
A88AD2990952480A001DD196 /* KWQListImpl.mm in Sources */,
1.373 +4 -19 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- khtml_part.cpp 23 Dec 2005 07:55:26 -0000 1.372
+++ khtml_part.cpp 23 Dec 2005 18:44:04 -0000 1.373
@@ -511,14 +511,8 @@
return executeScript( 0, script, forceUserGesture );
}
-//Enable this to see all JS scripts being executed
-//#define KJS_VERBOSE
-
QVariant KHTMLPart::executeScript( DOM::NodeImpl *n, const QString &script, bool forceUserGesture )
{
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "KHTMLPart::executeScript n=" << n.nodeName().qstring().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " << script << endl;
-#endif
KJSProxyImpl *proxy = jScript();
if (!proxy)
@@ -533,9 +527,6 @@
submitFormAgain();
DocumentImpl::updateDocumentsRendering();
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "KHTMLPart::executeScript - done" << endl;
-#endif
return ret;
}
@@ -1171,22 +1162,16 @@
// All frames completed -> set their domain to the frameset's domain
// This must only be done when loading the frameset initially (#22039),
// not when following a link in a frame (#44162).
- if ( d->m_doc )
- {
+ if (d->m_doc) {
DOMString domain = d->m_doc->domain();
ConstFrameIt it = d->m_frames.begin();
ConstFrameIt end = d->m_frames.end();
- for (; it != end; ++it )
- {
+ for (; it != end; ++it ) {
KParts::ReadOnlyPart *p = (*it).m_part;
- if ( p && p->inherits( "KHTMLPart" ))
- {
+ if (p && p->inherits("KHTMLPart")) {
KHTMLPart* htmlFrame = static_cast<KHTMLPart *>(p);
if (htmlFrame->d->m_doc)
- {
- kdDebug() << "KHTMLPart::checkCompleted setting frame domain to " << domain.qstring() << endl;
- htmlFrame->d->m_doc->setDomain( domain );
- }
+ htmlFrame->d->m_doc->setDomain(domain);
}
}
}
1.25 +5 -5 WebCore/khtml/css/css_base.cpp
Index: css_base.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_base.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- css_base.cpp 12 Dec 2005 22:22:21 -0000 1.24
+++ css_base.cpp 23 Dec 2005 18:44:05 -0000 1.25
@@ -268,16 +268,16 @@
str = localName;
if (cs->match == CSSSelector::Id) {
str += "#";
- str += cs->value.qstring();
+ str += cs->value;
} else if (cs->match == CSSSelector::Class) {
str += ".";
- str += cs->value.qstring();
+ str += cs->value;
} else if (cs->match == CSSSelector::PseudoClass) {
str += ":";
- str += cs->value.qstring();
+ str += cs->value;
} else if (cs->match == CSSSelector::PseudoElement) {
str += "::";
- str += cs->value.qstring();
+ str += cs->value;
} else if (cs->hasAttribute()) {
// FIXME: Add support for dumping namespaces.
DOMString attrName = cs->attr.localName();
@@ -311,7 +311,7 @@
}
if (cs->match != CSSSelector::Set) {
str += "\"";
- str += cs->value.qstring();
+ str += cs->value;
str += "\"]";
}
}
1.22 +1 -2 WebCore/khtml/css/css_stylesheetimpl.cpp
Index: css_stylesheetimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_stylesheetimpl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- css_stylesheetimpl.cpp 20 Dec 2005 09:16:44 -0000 1.21
+++ css_stylesheetimpl.cpp 23 Dec 2005 18:44:05 -0000 1.22
@@ -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.21 2005/12/20 09:16:44 eseidel Exp $
+ * $Id: css_stylesheetimpl.cpp,v 1.22 2005/12/23 18:44:05 eseidel Exp $
*/
//#define CSS_STYLESHEET_DEBUG
@@ -368,7 +368,6 @@
void MediaListImpl::setMediaText(const DOM::DOMString &value)
{
m_lstMedia.clear();
- QString val = value.qstring();
QStringList list = QStringList::split( ',', value.qstring() );
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
1.232 +0 -1 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- cssstyleselector.cpp 15 Dec 2005 22:31:33 -0000 1.231
+++ cssstyleselector.cpp 23 Dec 2005 18:44:06 -0000 1.232
@@ -602,7 +602,6 @@
u.prepend(currentEncodedURL->path);
cleanpath( u );
}
- //completeURL( attr.qstring() );
pseudoState = KHTMLFactory::vLinks()->contains( u ) ? PseudoVisited : PseudoLink;
}
1.17 +1 -0 WebCore/khtml/dom/dom_string.h
Index: dom_string.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dom_string.h 16 Dec 2005 22:26:12 -0000 1.16
+++ dom_string.h 23 Dec 2005 18:44:08 -0000 1.17
@@ -73,6 +73,7 @@
const QChar &operator [](unsigned int i) const;
int find(const QChar c, int start = 0) const;
+ DOMString &replace(QChar a, QChar b) { m_impl = m_impl->replace(a, b); return *this; }
uint length() const;
void truncate( unsigned int len );
1.46 +2 -2 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kjs_css.cpp 22 Dec 2005 21:10:50 -0000 1.45
+++ kjs_css.cpp 23 Dec 2005 18:44:08 -0000 1.46
@@ -217,7 +217,7 @@
if (isCSSPropertyName(propertyName)) {
bool pixelOrPos;
DOMString prop = cssPropertyName(propertyName, &pixelOrPos);
- QString propvalue = value->toString(exec).qstring();
+ DOMString propvalue = value->toString(exec).domString();
if (pixelOrPos)
propvalue += "px";
#ifdef KJS_VERBOSE
@@ -233,7 +233,7 @@
// It would be nice to fix this some day, perhaps with some kind of "quirks mode",
// but it's likely that the Dashboard widgets are already using a strict mode DOCTYPE.
int ignoreException = 0;
- styleDecl.setProperty(prop, DOMString(propvalue), "", ignoreException);
+ styleDecl.setProperty(prop, propvalue, "", ignoreException);
}
} else {
DOMObject::put(exec, propertyName, value, attr);
1.122 +3 -14 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kjs_dom.cpp 22 Dec 2005 21:10:51 -0000 1.121
+++ kjs_dom.cpp 23 Dec 2005 18:44:08 -0000 1.122
@@ -441,11 +441,7 @@
void DOMNode::put(ExecState *exec, const Identifier& propertyName, JSValue *value, int attr)
{
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMNode::put " << propertyName.qstring() << endl;
-#endif
- lookupPut<DOMNode,DOMObject>(exec, propertyName, value, attr,
- &DOMNodeTable, this );
+ lookupPut<DOMNode,DOMObject>(exec, propertyName, value, attr, &DOMNodeTable, this);
}
void DOMNode::putValueProperty(ExecState *exec, int token, JSValue *value, int /*attr*/)
@@ -850,11 +846,7 @@
void DOMAttr::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
{
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMAttr::put " << propertyName.qstring() << endl;
-#endif
- lookupPut<DOMAttr,DOMNode>(exec, propertyName, value, attr,
- &DOMAttrTable, this );
+ lookupPut<DOMAttr,DOMNode>(exec, propertyName, value, attr, &DOMAttrTable, this);
}
void DOMAttr::putValueProperty(ExecState *exec, int token, JSValue *value, int /*attr*/)
@@ -1002,10 +994,7 @@
void DOMDocument::put(ExecState *exec, const Identifier& propertyName, JSValue *value, int attr)
{
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "DOMDocument::put " << propertyName.qstring() << endl;
-#endif
- lookupPut<DOMDocument,DOMNode>(exec, propertyName, value, attr, &DOMDocumentTable, this );
+ lookupPut<DOMDocument,DOMNode>(exec, propertyName, value, attr, &DOMDocumentTable, this);
}
void DOMDocument::putValueProperty(ExecState *exec, int token, JSValue *value, int /*attr*/)
1.81 +3 -3 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kjs_events.cpp 22 Dec 2005 21:10:51 -0000 1.80
+++ kjs_events.cpp 23 Dec 2005 18:44:08 -0000 1.81
@@ -117,11 +117,11 @@
if (exec->hadException()) {
JSObject* exception = exec->exception()->toObject(exec);
- QString message = exception->get(exec, messagePropertyName)->toString(exec).qstring();
+ DOMString message = exception->get(exec, messagePropertyName)->toString(exec).domString();
int lineNumber = exception->get(exec, "line")->toInt32(exec);
- QString sourceURL = exception->get(exec, "sourceURL")->toString(exec).qstring();
+ DOMString sourceURL = exception->get(exec, "sourceURL")->toString(exec).domString();
if (Interpreter::shouldPrintExceptions())
- printf("(event handler):%s\n", message.local8Bit().data());
+ printf("(event handler):%s\n", message.qstring().utf8().data());
KWQ(part)->addMessageToConsole(message, lineNumber, sourceURL);
exec->clearException();
} else {
1.159 +7 -18 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kjs_html.cpp 22 Dec 2005 21:10:51 -0000 1.158
+++ kjs_html.cpp 23 Dec 2005 18:44:09 -0000 1.159
@@ -398,10 +398,7 @@
void KJS::HTMLDocument::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
{
-#ifdef KJS_VERBOSE
- kdDebug(6070) << "KJS::HTMLDocument::put " << propertyName.qstring() << endl;
-#endif
- lookupPut<HTMLDocument, DOMDocument>( exec, propertyName, value, attr, &HTMLDocumentTable, this );
+ lookupPut<HTMLDocument, DOMDocument>(exec, propertyName, value, attr, &HTMLDocumentTable, this);
}
void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, JSValue *value, int /*attr*/)
@@ -2505,7 +2502,7 @@
}
else if (element.hasLocalName(canvasTag)) {
if (id == KJS::HTMLElement::GetContext) {
- if (args.size() == 0 || (args.size() == 1 && args[0]->toString(exec).qstring().lower() == "2d")) {
+ if (args.size() == 0 || (args.size() == 1 && args[0]->toString(exec).domString().lower() == "2d")) {
return new Context2D(&element);
}
return jsUndefined();
@@ -2517,15 +2514,7 @@
void KJS::HTMLElement::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
{
-#ifdef KJS_VERBOSE
- 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().qstring()
- << " str=" << str.qstring() << endl;
-#endif
// First look at dynamic properties
if (element.hasLocalName(selectTag)) {
HTMLSelectElementImpl &select = static_cast<HTMLSelectElementImpl &>(element);
@@ -3925,7 +3914,7 @@
if (args.size() != 1)
return throwError(exec, SyntaxError);
CGLineCap cap = kCGLineCapButt;
- QString capString = args[0]->toString(exec).qstring().lower();
+ DOMString capString = args[0]->toString(exec).domString().lower();
if (capString == "round")
cap = kCGLineCapRound;
else if (capString == "square")
@@ -3937,7 +3926,7 @@
if (args.size() != 1)
return throwError(exec, SyntaxError);
CGLineJoin join = kCGLineJoinMiter;
- QString joinString = args[0]->toString(exec).qstring().lower();
+ DOMString joinString = args[0]->toString(exec).domString().lower();
if (joinString == "round")
join = kCGLineJoinRound;
else if (joinString == "bevel")
@@ -4454,7 +4443,7 @@
if (!o->isObject() || !o->inherits(&Image::info))
return throwError(exec, TypeError);
int repetitionType = ImagePattern::Repeat;
- QString repetitionString = args[1]->toString(exec).qstring().lower();
+ DOMString repetitionString = args[1]->toString(exec).domString().lower();
if (repetitionString == "repeat-x")
repetitionType = ImagePattern::RepeatX;
else if (repetitionString == "repeat-y")
@@ -4741,7 +4730,7 @@
_lineCap = value;
CGLineCap cap = kCGLineCapButt;
- QString capString = value->toString(exec).qstring().lower();
+ DOMString capString = value->toString(exec).domString().lower();
if (capString == "round")
cap = kCGLineCapRound;
else if (capString == "square")
@@ -4754,7 +4743,7 @@
_lineJoin = value;
CGLineJoin join = kCGLineJoinMiter;
- QString joinString = value->toString(exec).qstring().lower();
+ DOMString joinString = value->toString(exec).domString().lower();
if (joinString == "round")
join = kCGLineJoinRound;
else if (joinString == "bevel")
1.32 +1 -1 WebCore/khtml/ecma/kjs_proxy.cpp
Index: kjs_proxy.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kjs_proxy.cpp 16 Dec 2005 08:08:13 -0000 1.31
+++ kjs_proxy.cpp 23 Dec 2005 18:44:09 -0000 1.32
@@ -72,7 +72,7 @@
int lineNumber = comp.value()->toObject(m_script->globalExec())->get(m_script->globalExec(), "line")->toInt32(m_script->globalExec());
UString sourceURL = comp.value()->toObject(m_script->globalExec())->get(m_script->globalExec(), "sourceURL")->toString(m_script->globalExec());
- KWQ(m_part)->addMessageToConsole(errorMessage.qstring(), lineNumber, sourceURL.qstring());
+ KWQ(m_part)->addMessageToConsole(errorMessage.domString(), lineNumber, sourceURL.domString());
}
return QVariant();
}
1.206 +13 -15 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- kjs_window.cpp 22 Dec 2005 21:10:52 -0000 1.205
+++ kjs_window.cpp 23 Dec 2005 18:44:09 -0000 1.206
@@ -1319,8 +1319,7 @@
thisDomain = ancestorPart->xmlDocImpl()->domain();
}
- //kdDebug(6070) << "current domain:" << actDomain.qstring() << ", frame domain:" << thisDomain.qstring() << endl;
- if ( actDomain == thisDomain )
+ if (actDomain == thisDomain)
return true;
if (Interpreter::shouldPrintExceptions()) {
@@ -1330,9 +1329,8 @@
QString message;
message.sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n",
thisDocument->URL().latin1(), actDocument->URL().latin1());
- KWQ(m_part)->addMessageToConsole(message, 1, QString());
+ KWQ(m_part)->addMessageToConsole(DOMString(message), 1, DOMString());
- kdWarning(6070) << "Javascript: access denied for current frame '" << actDomain.qstring() << "' to frame '" << thisDomain.qstring() << "'" << endl;
return false;
}
@@ -1425,8 +1423,6 @@
if (!thisObj->inherits(&Window::info))
return throwError(exec, TypeError);
Window *window = static_cast<Window *>(thisObj);
- QString str, str2;
-
KHTMLPart *part = window->m_part;
if (!part)
return jsUndefined();
@@ -1434,7 +1430,8 @@
KHTMLView *widget = part->view();
JSValue *v = args[0];
UString s = v->toString(exec);
- str = s.qstring();
+ DOMString str = s.domString();
+ DOMString str2;
switch (id) {
case Window::Alert:
@@ -1447,14 +1444,16 @@
part->xmlDocImpl()->updateRendering();
return jsBoolean(KWQ(part)->runJavaScriptConfirm(str));
case Window::Prompt:
+ {
if (part && part->xmlDocImpl())
part->xmlDocImpl()->updateRendering();
- bool ok;
- ok = KWQ(part)->runJavaScriptPrompt(str, args.size() >= 2 ? args[1]->toString(exec).qstring() : QString::null, str2);
- if ( ok )
+ DOMString message = args.size() >= 2 ? args[1]->toString(exec).domString() : DOMString();
+ bool ok = KWQ(part)->runJavaScriptPrompt(str, message, str2);
+ if (ok)
return jsString(str2);
else
return jsNull();
+ }
case Window::Open:
{
KConfig *config = new KConfig("konquerorrc");
@@ -1582,10 +1581,9 @@
// prepare arguments
KURL url;
KHTMLPart* activePart = Window::retrieveActive(exec)->m_part;
- if (!str.isEmpty())
- {
+ if (!str.isEmpty()) {
if (activePart)
- url = activePart->xmlDocImpl()->completeURL(str);
+ url = activePart->xmlDocImpl()->completeURL(str.qstring());
}
KParts::URLArgs uargs;
@@ -1870,10 +1868,10 @@
if (exec->hadException()) {
JSObject* exception = exec->exception()->toObject(exec);
exec->clearException();
- QString message = exception->get(exec, messagePropertyName)->toString(exec).qstring();
+ DOMString message = exception->get(exec, messagePropertyName)->toString(exec).domString();
int lineNumber = exception->get(exec, "line")->toInt32(exec);
if (Interpreter::shouldPrintExceptions())
- printf("(timer):%s\n", message.local8Bit().data());
+ printf("(timer):%s\n", message.qstring().utf8().data());
KWQ(window->m_part)->addMessageToConsole(message, lineNumber, QString());
}
}
1.58 +6 -12 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xmlhttprequest.cpp 23 Dec 2005 08:55:02 -0000 1.57
+++ xmlhttprequest.cpp 23 Dec 2005 18:44:10 -0000 1.58
@@ -43,9 +43,7 @@
#include "xmlhttprequest.lut.h"
-using DOM::DocumentImpl;
-using DOM::DOMImplementationImpl;
-using DOM::EventImpl;
+using namespace DOM;
using namespace DOM::EventNames;
using khtml::Decoder;
@@ -342,7 +340,7 @@
changeState(Loading);
}
-void XMLHttpRequest::send(const QString& _body)
+void XMLHttpRequest::send(const DOMString& _body)
{
if (!doc)
return;
@@ -353,7 +351,6 @@
aborted = false;
-
if (method.lower() == "post" && (url.protocol().lower() == "http" || url.protocol().lower() == "https") ) {
QString contentType = getRequestHeader("Content-Type");
QString charset;
@@ -369,15 +366,12 @@
if (!codec) // FIXME: report an error?
codec = QTextCodec::codecForName("UTF-8");
- job = KIO::http_post(url, codec->fromUnicode(_body), false);
+ job = KIO::http_post(url, codec->fromUnicode(_body.qstring()), false);
}
else
- {
job = KIO::get( url, false, false );
- }
- if (requestHeaders.length() > 0) {
+ if (requestHeaders.length() > 0)
job->addMetaData("customHTTPHeader", requestHeaders);
- }
if (!async) {
QByteArray data;
@@ -751,7 +745,7 @@
return jsUndefined();
}
- QString body;
+ DOMString body;
if (args.size() >= 1) {
if (args[0]->toObject(exec)->inherits(&DOMDocument::info)) {
@@ -760,7 +754,7 @@
} else {
// converting certain values (like null) to object can set an exception
exec->clearException();
- body = args[0]->toString(exec).qstring();
+ body = args[0]->toString(exec).domString();
}
}
1.27 +1 -1 WebCore/khtml/ecma/xmlhttprequest.h
Index: xmlhttprequest.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xmlhttprequest.h 23 Dec 2005 08:50:13 -0000 1.26
+++ xmlhttprequest.h 23 Dec 2005 18:44:10 -0000 1.27
@@ -98,7 +98,7 @@
void processSyncLoadResults(const QByteArray &data, const KURL &finalURL, const QString &headers);
void open(const QString& _method, const KURL& _url, bool _async);
- void send(const QString& _body);
+ void send(const DOM::DOMString& _body);
void abort();
void setRequestHeader(const QString& name, const QString &value);
QString getRequestHeader(const QString& name) const;
1.37 +1 -1 WebCore/khtml/editing/jsediting.cpp
Index: jsediting.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/jsediting.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jsediting.cpp 22 Dec 2005 04:11:37 -0000 1.36
+++ jsediting.cpp 23 Dec 2005 18:44:14 -0000 1.37
@@ -115,7 +115,7 @@
bool JSEditor::queryCommandSupported(const DOMString &command)
{
- if (!supportsPasteCommand && command.qstring().lower() == "paste")
+ if (!supportsPasteCommand && command.lower() == "paste")
return false;
return commandImp(command) != 0;
}
1.44 +6 -8 WebCore/khtml/editing/markup.cpp
Index: markup.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- markup.cpp 22 Dec 2005 04:11:37 -0000 1.43
+++ markup.cpp 23 Dec 2005 18:44:14 -0000 1.44
@@ -91,19 +91,17 @@
return s;
}
-static QString stringValueForRange(const NodeImpl *node, const RangeImpl *range)
+static DOMString stringValueForRange(const NodeImpl *node, const RangeImpl *range)
{
DOMString str = node->nodeValue().copy();
if (range) {
int exceptionCode;
- if (node == range->endContainer(exceptionCode)) {
+ if (node == range->endContainer(exceptionCode))
str.truncate(range->endOffset(exceptionCode));
- }
- if (node == range->startContainer(exceptionCode)) {
+ if (node == range->startContainer(exceptionCode))
str.remove(0, range->startOffset(exceptionCode));
- }
}
- return str.qstring();
+ return str;
}
static QString renderedText(const NodeImpl *node, const RangeImpl *range)
@@ -178,9 +176,9 @@
node->parentNode()->hasTagName(scriptTag) ||
node->parentNode()->hasTagName(styleTag) ||
node->parentNode()->hasTagName(textareaTag))
- return stringValueForRange(node, range);
+ return stringValueForRange(node, range).qstring();
}
- QString markup = annotate ? escapeHTML(renderedText(node, range)) : escapeHTML(stringValueForRange(node, range));
+ QString markup = annotate ? escapeHTML(renderedText(node, range)) : escapeHTML(stringValueForRange(node, range).qstring());
if (defaultStyle) {
NodeImpl *element = node->parentNode();
if (element) {
1.87 +1 -1 WebCore/khtml/html/html_baseimpl.cpp
Index: html_baseimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- html_baseimpl.cpp 16 Dec 2005 08:08:16 -0000 1.86
+++ html_baseimpl.cpp 23 Dec 2005 18:44:15 -0000 1.87
@@ -98,7 +98,7 @@
void HTMLBodyElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
{
if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL(attr->value()).qstring();
+ DOMString url = khtml::parseURL(attr->value());
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == marginwidthAttr || attr->name() == leftmarginAttr) {
1.115 +0 -1 WebCore/khtml/html/html_elementimpl.cpp
Index: html_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- html_elementimpl.cpp 22 Dec 2005 04:11:39 -0000 1.114
+++ html_elementimpl.cpp 23 Dec 2005 18:44:15 -0000 1.115
@@ -425,7 +425,6 @@
void HTMLElementImpl::addHTMLAlignment(MappedAttributeImpl* attr)
{
- //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.216 +9 -15 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- html_formimpl.cpp 22 Dec 2005 23:06:20 -0000 1.215
+++ html_formimpl.cpp 23 Dec 2005 18:44:15 -0000 1.216
@@ -329,13 +329,9 @@
HTMLGenericFormElementImpl* current = formElements[i];
FormDataList lst(codec);
- if (!current->disabled() && current->appendFormData(lst, m_multipart))
- {
- //kdDebug(6030) << "adding name " << current->name().qstring() << endl;
- for(QValueListConstIterator<FormDataListItem> it = lst.begin(); it != lst.end(); ++it )
- {
- if (!m_multipart)
- {
+ if (!current->disabled() && current->appendFormData(lst, m_multipart)) {
+ for (QValueListConstIterator<FormDataListItem> it = lst.begin(); it != lst.end(); ++it) {
+ if (!m_multipart) {
// handle ISINDEX / <input name=isindex> special
// but only if its the first entry
if ( enc_string.isEmpty() && (*it).m_data == "isindex" ) {
@@ -1843,10 +1839,9 @@
return false;
case IMAGE:
- if (m_activeSubmit)
- {
- encoding.appendData(name().isEmpty() ? QString::fromLatin1("x") : (name().qstring() + ".x"), clickX());
- encoding.appendData(name().isEmpty() ? QString::fromLatin1("y") : (name().qstring() + ".y"), clickY());
+ if (m_activeSubmit) {
+ encoding.appendData(name().isEmpty() ? "x" : (name() + ".x"), clickX());
+ encoding.appendData(name().isEmpty() ? "y" : (name() + ".y"), clickY());
if (!name().isEmpty() && !value().isEmpty())
encoding.appendData(name(), value());
return true;
@@ -1854,9 +1849,8 @@
break;
case SUBMIT:
- if (m_activeSubmit)
- {
- QString enc_str = valueWithDefault().qstring();
+ if (m_activeSubmit) {
+ DOMString enc_str = valueWithDefault();
if (!enc_str.isEmpty()) {
encoding.appendData(name(), enc_str);
return true;
@@ -3380,7 +3374,7 @@
{
if ( !m_valueIsValid ) {
if ( m_render ) {
- m_value = static_cast<RenderTextArea*>( m_render )->text();
+ m_value = static_cast<RenderTextArea*>( m_render )->text().qstring();
m_valueMatchesRenderer = true;
} else {
m_value = defaultValue().qstring();
1.64 +1 -1 WebCore/khtml/html/html_headimpl.cpp
Index: html_headimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_headimpl.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- html_headimpl.cpp 16 Dec 2005 08:08:17 -0000 1.63
+++ html_headimpl.cpp 23 Dec 2005 18:44:16 -0000 1.64
@@ -170,7 +170,7 @@
tokenizeRelAttribute(attr->value());
process();
} else if (attr->name() == hrefAttr) {
- m_url = getDocument()->completeURL(parseURL(attr->value()).qstring());
+ m_url = getDocument()->completeURL(parseURL(attr->value()));
process();
} else if (attr->name() == typeAttr) {
m_type = attr->value();
1.63 +2 -6 WebCore/khtml/html/html_imageimpl.cpp
Index: html_imageimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- html_imageimpl.cpp 22 Dec 2005 16:53:55 -0000 1.62
+++ html_imageimpl.cpp 23 Dec 2005 18:44:16 -0000 1.63
@@ -198,12 +198,8 @@
} else if (attrName == usemapAttr) {
if (attr->value().domString()[0] == '#')
usemap = attr->value();
- else {
- 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;
- }
+ else
+ usemap = getDocument()->completeURL(khtml::parseURL(attr->value()));
m_isLink = !attr->isNull();
} else if (attrName == ismapAttr) {
ismap = true;
1.93 +5 -6 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- html_objectimpl.cpp 16 Dec 2005 08:08:18 -0000 1.92
+++ html_objectimpl.cpp 23 Dec 2005 18:44:16 -0000 1.93
@@ -593,10 +593,10 @@
void HTMLObjectElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
{
- QString val = attr->value().qstring();
+ DOMString val = attr->value();
int pos;
if (attr->name() == typeAttr) {
- serviceType = val.lower();
+ serviceType = val.qstring().lower();
pos = serviceType.find( ";" );
if ( pos!=-1 )
serviceType = serviceType.left( pos );
@@ -607,7 +607,7 @@
m_imageLoader = 0;
}
} else if (attr->name() == dataAttr) {
- url = khtml::parseURL( val ).qstring();
+ url = khtml::parseURL(val).qstring();
if (m_render)
needWidgetUpdate = true;
if (m_render && isImageType()) {
@@ -1054,10 +1054,9 @@
if (attr->name() == valueAttr) {
AttributeImpl *attr = attributes()->getAttributeItem(nameAttr);
if (attr) {
- DOMString value = attr->value().qstring().lower();
- if (value == "src" || value == "movie" || value == "data") {
+ DOMString value = attr->value().domString().lower();
+ if (value == "src" || value == "movie" || value == "data")
return true;
- }
}
}
return false;
1.42 +1 -1 WebCore/khtml/html/html_objectimpl.h
Index: html_objectimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- html_objectimpl.h 15 Dec 2005 22:31:40 -0000 1.41
+++ html_objectimpl.h 23 Dec 2005 18:44:17 -0000 1.42
@@ -232,7 +232,7 @@
QString serviceType;
QString url;
- QString classId;
+ DOM::DOMString classId;
bool needWidgetUpdate : 1;
bool m_useFallbackContent : 1;
HTMLImageLoader* m_imageLoader;
1.72 +2 -14 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- html_tableimpl.cpp 14 Dec 2005 23:31:51 -0000 1.71
+++ html_tableimpl.cpp 23 Dec 2005 18:44:17 -0000 1.72
@@ -317,10 +317,6 @@
NodeImpl *HTMLTableElementImpl::addChild(NodeImpl *child)
{
-#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().qstring() << "(Table)::addChild( " << child->nodeName().qstring() << " )" << endl;
-#endif
-
if (child->hasTagName(formTag)) {
// First add the child.
HTMLElementImpl::addChild(child);
@@ -457,7 +453,7 @@
m_solid = true;
}
} else if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL( attr->value() ).qstring();
+ DOMString url = khtml::parseURL(attr->value());
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == frameAttr) {
@@ -696,7 +692,7 @@
if (attr->name() == bgcolorAttr) {
addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
} else if (attr->name() == backgroundAttr) {
- QString url = khtml::parseURL( attr->value() ).qstring();
+ DOMString url = khtml::parseURL(attr->value());
if (!url.isEmpty())
addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
} else if (attr->name() == bordercolorAttr) {
@@ -745,10 +741,6 @@
NodeImpl *HTMLTableSectionElementImpl::addChild(NodeImpl *child)
{
-#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().qstring() << "(Tbody)::addChild( " << child->nodeName().qstring() << " )" << endl;
-#endif
-
if (child->hasTagName(formTag)) {
// First add the child.
HTMLElementImpl::addChild(child);
@@ -869,10 +861,6 @@
NodeImpl *HTMLTableRowElementImpl::addChild(NodeImpl *child)
{
-#ifdef DEBUG_LAYOUT
- kdDebug( 6030 ) << nodeName().qstring() << "(Trow)::addChild( " << child->nodeName().qstring() << " )" << endl;
-#endif
-
if (child->hasTagName(formTag)) {
// First add the child.
HTMLElementImpl::addChild(child);
1.129 +14 -15 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- htmltokenizer.cpp 22 Dec 2005 16:50:07 -0000 1.128
+++ htmltokenizer.cpp 23 Dec 2005 18:44:17 -0000 1.129
@@ -1216,13 +1216,13 @@
view /* are we a regular tokenizer or just for innerHTML ? */
) {
if ((a = currToken.attrs->getAttributeItem(srcAttr)))
- scriptSrc = parser->doc()->completeURL(parseURL( a->value() ).qstring() );
+ scriptSrc = parser->doc()->completeURL(parseURL(a->value()).qstring());
if ((a = currToken.attrs->getAttributeItem(charsetAttr)))
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().qstring().isEmpty())
+ if ((a = currToken.attrs->getAttributeItem(typeAttr)) != 0 && !a->value().isEmpty())
foundTypeAttribute = true;
else
a = currToken.attrs->getAttributeItem(languageAttr);
@@ -1261,19 +1261,18 @@
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().qstring();
- lang = lang.lower();
- if( lang.compare("") != 0 &&
- lang.compare("javascript") != 0 &&
- lang.compare("javascript1.0") != 0 &&
- lang.compare("javascript1.1") != 0 &&
- lang.compare("javascript1.2") != 0 &&
- lang.compare("javascript1.3") != 0 &&
- lang.compare("javascript1.4") != 0 &&
- lang.compare("javascript1.5") != 0 &&
- lang.compare("ecmascript") != 0 &&
- lang.compare("livescript") != 0 &&
- lang.compare("jscript") )
+ DOMString lang = a->value().domString().lower();
+ if( lang != "" &&
+ lang != "javascript" &&
+ lang != "javascript1.0" &&
+ lang != "javascript1.1" &&
+ lang != "javascript1.2" &&
+ lang != "javascript1.3" &&
+ lang != "javascript1.4" &&
+ lang != "javascript1.5" &&
+ lang != "ecmascript" &&
+ lang != "livescript" &&
+ lang != "jscript")
javascript = false;
}
}
1.84 +12 -47 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- loader.cpp 15 Dec 2005 22:31:43 -0000 1.83
+++ loader.cpp 23 Dec 2005 18:44:21 -0000 1.84
@@ -91,17 +91,10 @@
else
m_status = Cached;
KURL url(m_url.qstring());
- if (m_expireDateChanged && url.protocol().startsWith("http"))
- {
+ 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.qstring()<<" to " << m_expireDate << endl;
-#endif
}
-#ifdef CACHE_DEBUG
- else kdDebug(6060) << " No expire date for image "<<m_url.qstring()<<endl;
-#endif
}
void CachedObject::setExpireDate(time_t _expireDate, bool changeHttpCache)
@@ -232,11 +225,8 @@
void CachedCSSStyleSheet::checkNotify()
{
- if(m_loading) return;
-
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.qstring() << endl;
-#endif
+ if (m_loading)
+ return;
CachedObjectClientWalker w(m_clients);
while (CachedObjectClient *c = w.next()) {
@@ -683,10 +673,6 @@
if (m_loading)
return;
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedCSSStyleSheet:: finishedLoading " << m_url.qstring() << endl;
-#endif
-
CachedObjectClientWalker w(m_clients);
while (CachedObjectClient *c = w.next())
c->setStyleSheet(m_url, m_sheet);
@@ -764,11 +750,8 @@
void CachedXBLDocument::checkNotify()
{
- if(m_loading) return;
-
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "CachedXBLDocument:: finishedLoading " << m_url.qstring() << endl;
-#endif
+ if(m_loading)
+ return;
CachedObjectClientWalker w(m_clients);
while (CachedObjectClient *c = w.next())
@@ -859,7 +842,7 @@
CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
{
- KURL fullURL = m_doc->completeURL( url.qstring() );
+ KURL fullURL = m_doc->completeURL(url.qstring());
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
if (KWQCheckIfReloading(this)) {
@@ -875,7 +858,7 @@
CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, const QString& charset)
{
- KURL fullURL = m_doc->completeURL( url.qstring() );
+ KURL fullURL = m_doc->completeURL(url.qstring());
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
if (KWQCheckIfReloading(this)) {
@@ -891,7 +874,7 @@
CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString& charset)
{
- KURL fullURL = m_doc->completeURL( url.qstring() );
+ KURL fullURL = m_doc->completeURL(url.qstring());
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
if (KWQCheckIfReloading(this)) {
@@ -1027,10 +1010,6 @@
// get the first pending request
Request *req = m_requestsPending.take(0);
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "starting Loader url=" << req->object->url().qstring() << endl;
-#endif
-
KURL u(req->object->url().qstring());
KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/, true);
@@ -1192,15 +1171,10 @@
void Loader::cancelRequests( DocLoader* dl )
{
- //kdDebug( 6060 ) << "void Loader::cancelRequests()" << endl;
- //kdDebug( 6060 ) << "got " << m_requestsPending.count() << " pending requests" << endl;
QPtrListIterator<Request> pIt( m_requestsPending );
while ( pIt.current() )
{
- if ( pIt.current()->m_docLoader == dl )
- {
- kdDebug( 6060 ) << "cancelling pending request for " << pIt.current()->object->url().qstring() << endl;
- //emit requestFailed( dl, pIt.current()->object );
+ if (pIt.current()->m_docLoader == dl) {
Cache::removeCacheEntry( pIt.current()->object );
m_requestsPending.remove( pIt );
}
@@ -1208,31 +1182,22 @@
++pIt;
}
- //kdDebug( 6060 ) << "got " << m_requestsLoading.count() << "loading requests" << endl;
-
QPtrDictIterator<Request> lIt( m_requestsLoading );
while ( lIt.current() )
{
- if ( lIt.current()->m_docLoader == dl )
- {
- //kdDebug( 6060 ) << "cancelling loading request for " << lIt.current()->object->url().qstring() << endl;
+ if (lIt.current()->m_docLoader == dl) {
KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
Cache::removeCacheEntry( lIt.current()->object );
m_requestsLoading.remove( lIt.currentKey() );
job->kill();
- //emit requestFailed( dl, pIt.current()->object );
}
else
++lIt;
}
QPtrListIterator<Request> bdIt( m_requestsBackgroundDecoding );
- while ( bdIt.current() )
- {
- if ( bdIt.current()->m_docLoader == dl )
- {
- kdDebug( 6060 ) << "cancelling pending request for " << bdIt.current()->object->url().qstring() << endl;
- //emit requestFailed( dl, bdIt.current()->object );
+ while (bdIt.current()) {
+ if (bdIt.current()->m_docLoader == dl) {
Cache::removeCacheEntry( bdIt.current()->object );
m_requestsBackgroundDecoding.remove( bdIt );
}
1.37 +0 -2 WebCore/khtml/rendering/render_applet.cpp
Index: render_applet.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_applet.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- render_applet.cpp 21 Nov 2005 01:20:22 -0000 1.36
+++ render_applet.cpp 23 Dec 2005 18:44:22 -0000 1.37
@@ -31,8 +31,6 @@
#include "khtmlview.h"
#include "khtml_part.h"
-#include <qlabel.h>
-
#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
#include "java/kjavaappletwidget.h"
1.221 +0 -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.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- render_block.cpp 19 Dec 2005 19:41:38 -0000 1.220
+++ render_block.cpp 23 Dec 2005 18:44:22 -0000 1.221
@@ -3359,7 +3359,6 @@
// account for first letter
length++;
- //kdDebug( 6040 ) << "letter= '" << DOMString(oldText->substring(0,length)).qstring() << "'" << endl;
// construct text fragment for the text after the first letter
// NOTE: this might empty
1.180 +0 -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.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- render_box.cpp 21 Dec 2005 22:51:11 -0000 1.179
+++ render_box.cpp 23 Dec 2005 18:44:22 -0000 1.180
@@ -133,7 +133,6 @@
RenderBox::~RenderBox()
{
- //kdDebug( 6040 ) << "Element destructor: this=" << nodeName().qstring() << endl;
}
void RenderBox::destroy()
1.136 +10 -12 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- render_form.cpp 15 Dec 2005 22:31:45 -0000 1.135
+++ render_form.cpp 23 Dec 2005 18:44:23 -0000 1.136
@@ -159,7 +159,7 @@
}
}
-void RenderFormElement::slotTextChanged(const QString &)
+void RenderFormElement::slotTextChanged(const DOM::DOMString&)
{
// do nothing
}
@@ -292,8 +292,8 @@
w->setMaxLength( ml );
if (!e->valueMatchesRenderer()) {
- QString widgetText = w->text();
- QString newText = e->value().qstring();
+ DOMString widgetText = w->text();
+ DOMString newText = e->value();
newText.replace(QChar('\\'), backslashAsCurrencySymbol());
if (widgetText != newText) {
w->blockSignals(true);
@@ -317,7 +317,7 @@
w->setPlaceholderString(e->getAttribute(placeholderAttr).qstring());
if (w->type() == QLineEdit::Search) {
w->setLiveSearch(!e->getAttribute(incrementalAttr).isNull());
- w->setAutoSaveName(e->getAttribute(autosaveAttr).qstring());
+ w->setAutoSaveName(e->getAttribute(autosaveAttr));
w->setMaxResults(e->maxResults());
}
@@ -1057,8 +1057,8 @@
e->updateValue();
if (!e->valueMatchesRenderer()) {
- QString widgetText = text();
- QString text = e->value().qstring();
+ DOMString widgetText = text();
+ DOMString text = e->value();
text.replace(QChar('\\'), backslashAsCurrencySymbol());
if (widgetText != text) {
w->blockSignals(true);
@@ -1075,19 +1075,17 @@
RenderFormElement::updateFromElement();
}
-QString RenderTextArea::text()
+DOMString RenderTextArea::text()
{
- QString txt;
+ DOMString txt;
QTextEdit* w = static_cast<QTextEdit*>(m_widget);
- if (element()->wrap() == HTMLTextAreaElementImpl::ta_Physical) {
+ if (element()->wrap() == HTMLTextAreaElementImpl::ta_Physical)
txt = w->textWithHardLineBreaks();
- }
else
txt = w->text();
- txt.replace(backslashAsCurrencySymbol(), QChar('\\'));
- return txt;
+ return txt.replace(backslashAsCurrencySymbol(), QChar('\\'));
}
void RenderTextArea::slotTextChanged()
1.60 +2 -2 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- render_form.h 15 Dec 2005 22:31:46 -0000 1.59
+++ render_form.h 23 Dec 2005 18:44:23 -0000 1.60
@@ -101,7 +101,7 @@
virtual void slotSelectionChanged();
// Hack to make KWQSlot code work.
- virtual void slotTextChanged(const QString &string);
+ virtual void slotTextChanged(const DOM::DOMString &string);
protected:
virtual bool isEditable() const { return false; }
@@ -338,7 +338,7 @@
DOM::HTMLTextAreaElementImpl* element() const
{ return static_cast<DOM::HTMLTextAreaElementImpl*>(RenderObject::element()); }
- QString text();
+ DOM::DOMString text();
int selectionStart();
int selectionEnd();
1.90 +3 -4 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- render_frames.cpp 18 Dec 2005 23:40:12 -0000 1.89
+++ render_frames.cpp 23 Dec 2005 18:44:23 -0000 1.90
@@ -843,10 +843,9 @@
while (child && (url.isEmpty() || serviceType.isEmpty() || !embed)) {
if (child->hasTagName(paramTag)) {
HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child );
- QString name = p->name().qstring().lower();
- if (url.isEmpty() && (name == "src" || name == "movie" || name == "code" || name == "url")) {
+ DOMString name = p->name().lower();
+ if (url.isEmpty() && (name == "src" || name == "movie" || name == "code" || name == "url"))
url = p->value().qstring();
- }
if (serviceType.isEmpty() && name == "type") {
serviceType = p->value().qstring();
int pos = serviceType.find( ";" );
@@ -889,7 +888,7 @@
// If we still don't have a type, try to map from a specific CLASSID to a type.
if (serviceType.isEmpty() && !o->classId.isEmpty())
- mapClassIdToServiceType(o->classId, serviceType);
+ mapClassIdToServiceType(o->classId.qstring(), serviceType);
// If no URL and type, abort.
if (url.isEmpty() && serviceType.isEmpty())
1.61 +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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- render_line.cpp 18 Dec 2005 23:40:12 -0000 1.60
+++ render_line.cpp 23 Dec 2005 18:44:23 -0000 1.61
@@ -1079,7 +1079,7 @@
setShadow = true;
}
- const DOMString& str = m_str.qstring();
+ const DOMString& str = m_str;
font->drawText(p, m_x + _tx,
m_y + _ty + m_baseline,
0, 0,
1.75 +0 -7 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- render_list.cpp 21 Dec 2005 22:51:11 -0000 1.74
+++ render_list.cpp 23 Dec 2005 18:44:24 -0000 1.75
@@ -281,9 +281,6 @@
if (!m_height)
return;
-#ifdef DEBUG_LAYOUT
- kdDebug( 6040 ) << nodeName().qstring() << "(LI)::paint()" << endl;
-#endif
RenderBlock::paint(i, _tx, _ty);
}
@@ -374,10 +371,6 @@
if (shouldPaintBackgroundOrBorder())
paintBoxDecorations(i, _tx, _ty);
-#ifdef DEBUG_LAYOUT
- kdDebug( 6040 ) << nodeName().qstring() << "(ListMarker)::paintObject(" << _tx << ", " << _ty << ")" << endl;
-#endif
-
QPainter* p = i.p;
p->setFont(style()->font());
const QFontMetrics fm = p->fontMetrics();
1.214 +1 -7 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- render_text.cpp 19 Dec 2005 19:52:50 -0000 1.213
+++ render_text.cpp 23 Dec 2005 18:44:24 -0000 1.214
@@ -780,13 +780,7 @@
KHTMLAssert(!str || !str->l || str->s);
m_firstTextBox = m_lastTextBox = 0;
-
m_selectionState = SelectionNone;
-
-#ifdef DEBUG_LAYOUT
- QConstString cstr(str->s, str->l);
- kdDebug( 6040 ) << "RenderText ctr( "<< cstr.qstring().length() << " ) '" << cstr.qstring() << "'" << endl;
-#endif
}
void RenderText::setStyle(RenderStyle *_style)
@@ -1655,7 +1649,7 @@
#ifdef DEBUG_LAYOUT
QChar *ch = str->s+from;
QConstString cstr(ch, len);
- 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;
+ qDebug("setting run text to *%s*, len=%d, w)=%d" , cstr.qstring().latin1(), len, width );
#endif
s->m_reversed = reverse;
1.293 +5 -6 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- dom_docimpl.cpp 23 Dec 2005 01:13:50 -0000 1.292
+++ dom_docimpl.cpp 23 Dec 2005 18:44:28 -0000 1.293
@@ -209,7 +209,7 @@
bool DOMImplementationImpl::hasFeature (const DOMString &feature, const DOMString &version) const
{
- QString lower = feature.qstring().lower();
+ DOMString lower = feature.lower();
if (lower == "core" || lower == "html" || lower == "xml" || lower == "xhtml")
return version.isEmpty() || version == "1.0" || version == "2.0";
if (lower == "css"
@@ -877,10 +877,9 @@
ElementImpl *DocumentImpl::getElementByAccessKey( const DOMString &key )
{
- if (key.length() == 0)
+ if (!key.length())
return 0;
- QString k(key.qstring());
if (!m_accessKeyDictValid) {
m_elementsByAccessKey.clear();
@@ -898,7 +897,7 @@
}
m_accessKeyDictValid = true;
}
- return m_elementsByAccessKey.find(k);
+ return m_elementsByAccessKey.find(key.qstring());
}
void DocumentImpl::updateTitle()
@@ -2150,7 +2149,7 @@
if (!s->isLoading()) {
sheet = s->sheet();
if(sheet)
- title = DOM::DOMString(s->getAttribute(KSVG::SVGNames::titleAttr)).qstring();
+ title = s->getAttribute(KSVG::SVGNames::titleAttr).qstring();
}
if (!title.isEmpty() && m_preferredStylesheetSet.isEmpty())
@@ -2433,7 +2432,7 @@
KeyboardEventImpl *kevt = static_cast<KeyboardEventImpl *>(evt);
if (kevt->ctrlKey()) {
QKeyEvent *qevt = kevt->qKeyEvent();
- QString key = (qevt ? qevt->unmodifiedText() : kevt->keyIdentifier().qstring()).lower();
+ DOMString key = (qevt ? qevt->unmodifiedText() : kevt->keyIdentifier()).lower();
ElementImpl *elem = getElementByAccessKey(key);
if (elem) {
elem->accessKeyAction(false);
1.105 +3 -6 WebCore/khtml/xml/dom_elementimpl.cpp
Index: dom_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- dom_elementimpl.cpp 21 Dec 2005 16:51:03 -0000 1.104
+++ dom_elementimpl.cpp 23 Dec 2005 18:44:28 -0000 1.105
@@ -562,12 +562,9 @@
}
}
- 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().qstring().latin1() : n->isTextNode() ? "text" : "unknown", change );
- if ( change >= Inherit || n->isTextNode() ||
- n->hasChangedChild() || n->changed() )
- n->recalcStyle( change );
+ for (NodeImpl *n = _first; n; n = n->nextSibling()) {
+ if (change >= Inherit || n->isTextNode() || n->hasChangedChild() || n->changed())
+ n->recalcStyle(change);
}
setChanged( false );
1.226 +6 -7 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- dom_nodeimpl.cpp 19 Dec 2005 20:41:47 -0000 1.225
+++ dom_nodeimpl.cpp 23 Dec 2005 18:44:29 -0000 1.226
@@ -1215,8 +1215,7 @@
*stream << endl;
NodeImpl *child = firstChild();
- while( child != 0 )
- {
+ while(child) {
*stream << ind << child->nodeName().qstring().ascii() << ": ";
child->dump(stream,ind+" ");
child = child->nextSibling();
@@ -1958,13 +1957,13 @@
#ifndef NDEBUG
-static void appendAttributeDesc(const NodeImpl *node, QString &string, const QualifiedName& name, QString attrDesc)
+static void appendAttributeDesc(const NodeImpl *node, DOMString &string, const QualifiedName& name, QString attrDesc)
{
if (node->isElementNode()) {
DOMString attr = static_cast<const ElementImpl *>(node)->getAttribute(name);
if (!attr.isEmpty()) {
string += attrDesc;
- string += attr.qstring();
+ string += attr;
}
}
}
@@ -1977,12 +1976,12 @@
QString value = nodeValue().qstring();
value.replace('\\', "\\\\");
value.replace('\n', "\\n");
- fprintf(stderr, "%s%s\t%p \"%s\"\n", prefix, nodeName().qstring().local8Bit().data(), this, value.local8Bit().data());
+ fprintf(stderr, "%s%s\t%p \"%s\"\n", prefix, nodeName().qstring().utf8().data(), this, value.utf8().data());
} else {
- QString attrs = "";
+ DOMString attrs = "";
appendAttributeDesc(this, attrs, classAttr, " CLASS=");
appendAttributeDesc(this, attrs, styleAttr, " STYLE=");
- fprintf(stderr, "%s%s\t%p%s\n", prefix, nodeName().qstring().local8Bit().data(), this, attrs.ascii());
+ fprintf(stderr, "%s%s\t%p%s\n", prefix, nodeName().qstring().utf8().data(), this, attrs.qstring().ascii());
}
}
1.35 +2 -1 WebCore/khtml/xml/dom_stringimpl.cpp
Index: dom_stringimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_stringimpl.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dom_stringimpl.cpp 23 Dec 2005 03:57:25 -0000 1.34
+++ dom_stringimpl.cpp 23 Dec 2005 18:44:29 -0000 1.35
@@ -365,7 +365,8 @@
DOMStringImpl *DOMStringImpl::lower() const
{
DOMStringImpl *c = new DOMStringImpl;
- if(!l) return c;
+ if (!l)
+ return c;
c->s = QT_ALLOC_QCHAR_VEC(l);
c->l = l;
1.60 +1 -2 WebCore/khtml/xml/xml_tokenizer.cpp
Index: xml_tokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xml_tokenizer.cpp 16 Dec 2005 07:28:02 -0000 1.59
+++ xml_tokenizer.cpp 23 Dec 2005 18:44:29 -0000 1.60
@@ -771,11 +771,10 @@
if (scriptElement->hasTagName(KSVG::SVGNames::scriptTag))
scriptHref = scriptElement->getAttribute(XLinkNames::hrefAttr);
#endif
- QString charset = scriptElement->getAttribute(charsetAttr).qstring();
-
// don't load external scripts for standalone documents (for now)
if (!scriptHref.isEmpty() && m_doc->part()) {
// we have a src attribute
+ QString charset = scriptElement->getAttribute(charsetAttr).qstring();
m_cachedScript = m_doc->docLoader()->requestScript(scriptHref, charset);
m_cachedScript->ref(this); // will call executeScripts() again if already cached
return;
1.8 +1 -1 WebCore/khtml/xsl/xsl_stylesheetimpl.cpp
Index: xsl_stylesheetimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xsl/xsl_stylesheetimpl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xsl_stylesheetimpl.cpp 16 Dec 2005 21:43:48 -0000 1.7
+++ xsl_stylesheetimpl.cpp 23 Dec 2005 18:44:32 -0000 1.8
@@ -130,7 +130,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().qstring().utf8()));
+ xmlAttrPtr idNode = xmlGetID(m_stylesheetDoc, (const xmlChar*)(href().qstring().utf8().data()));
if (idNode == NULL)
return;
stylesheetRoot = idNode->parent;
1.2 +1 -1 WebCore/ksvg2/scripts/cssmakeprops
Index: cssmakeprops
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/scripts/cssmakeprops,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cssmakeprops 21 Nov 2005 08:29:32 -0000 1.1
+++ cssmakeprops 23 Dec 2005 18:44:32 -0000 1.2
@@ -43,7 +43,7 @@
print out "struct css_prop {\n int name;\n int id;\n};\n\n";
print out "static const struct css_prop *find${ns}Prop (register const char *str, register unsigned int len);\n\n%%\n";
-print header "/* This file is automatically generated from $filein by cssmakeprops, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef ${nsFull}_CSSPROPERTIES_H\n#define ${nsFull}_CSSPROPERTIES_H\n\n#include <kglobal.h>\n\n";
+print header "/* This file is automatically generated from $filein by cssmakeprops, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef ${nsFull}_CSSPROPERTIES_H\n#define ${nsFull}_CSSPROPERTIES_H\n\n";
my %amap = ();
1.2 +1 -1 WebCore/ksvg2/scripts/cssmakevalues
Index: cssmakevalues
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/scripts/cssmakevalues,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cssmakevalues 21 Nov 2005 08:29:32 -0000 1.1
+++ cssmakevalues 23 Dec 2005 18:44:32 -0000 1.2
@@ -43,7 +43,7 @@
print out "struct css_val {\n int name;\n int id;\n};\n\n";
print out "static const struct css_val *find${ns}Val (register const char *str, register unsigned int len);\n\n%%\n";
-print header "/* This file is automatically generated from $filein by cssmakevalues, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef ${nsFull}_CSSVALUES_H\n#define ${nsFull}_CSSVALUES_H\n\n#include <kglobal.h>\n\n";
+print header "/* This file is automatically generated from $filein by cssmakevalues, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef ${nsFull}_CSSVALUES_H\n#define ${nsFull}_CSSVALUES_H\n\n";
my %amap = ();
1.12 +0 -1 WebCore/ksvg2/svg/SVGTestsImpl.cpp
Index: SVGTestsImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGTestsImpl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGTestsImpl.cpp 14 Dec 2005 23:32:00 -0000 1.11
+++ SVGTestsImpl.cpp 23 Dec 2005 18:44:33 -0000 1.12
@@ -21,7 +21,6 @@
*/
#include "config.h"
-#include <kglobal.h>
#include <klocale.h>
#include <kdom/core/AttrImpl.h>
1.239 +4 -4 WebCore/kwq/KWQKHTMLPart.h
Index: KWQKHTMLPart.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.h,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- KWQKHTMLPart.h 19 Dec 2005 19:52:57 -0000 1.238
+++ KWQKHTMLPart.h 23 Dec 2005 18:44:34 -0000 1.239
@@ -194,9 +194,9 @@
static void setDocumentFocus(QWidget *);
static void clearDocumentFocus(QWidget *);
- void runJavaScriptAlert(const QString &message);
- bool runJavaScriptConfirm(const QString &message);
- bool runJavaScriptPrompt(const QString &message, const QString &defaultValue, QString &result);
+ void runJavaScriptAlert(const DOM::DOMString& message);
+ bool runJavaScriptConfirm(const DOM::DOMString& message);
+ bool runJavaScriptPrompt(const DOM::DOMString& message, const DOM::DOMString& defaultValue, DOM::DOMString& result);
bool locationbarVisible();
bool menubarVisible();
bool personalbarVisible();
@@ -206,7 +206,7 @@
bool shouldClose();
- void addMessageToConsole(const QString &message, unsigned int lineNumber, const QString &sourceID);
+ void addMessageToConsole(const DOM::DOMString& message, unsigned int lineNumber, const DOM::DOMString& sourceID);
khtml::RenderObject *renderer() const;
void forceLayout();
void forceLayoutWithPageWidthRange(float minPageWidth, float maxPageWidth);
1.711 +22 -22 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- KWQKHTMLPart.mm 21 Dec 2005 16:51:04 -0000 1.710
+++ KWQKHTMLPart.mm 23 Dec 2005 18:44:35 -0000 1.711
@@ -1616,7 +1616,7 @@
return KWQ(node->getDocument()->part());
}
-NSView *KWQKHTMLPart::documentViewForNode(DOM::NodeImpl *node)
+NSView *KWQKHTMLPart::documentViewForNode(NodeImpl *node)
{
WebCoreBridge *bridge = partForNode(node)->bridge();
return [bridge documentView];
@@ -1771,43 +1771,43 @@
}
}
-void KWQKHTMLPart::runJavaScriptAlert(const QString &message)
+void KWQKHTMLPart::runJavaScriptAlert(const DOMString& message)
{
- QString text = message;
+ DOMString text = message;
text.replace(QChar('\\'), backslashAsCurrencySymbol());
KWQ_BLOCK_EXCEPTIONS;
- [_bridge runJavaScriptAlertPanelWithMessage:text.getNSString()];
+ [_bridge runJavaScriptAlertPanelWithMessage:text];
KWQ_UNBLOCK_EXCEPTIONS;
}
-bool KWQKHTMLPart::runJavaScriptConfirm(const QString &message)
+bool KWQKHTMLPart::runJavaScriptConfirm(const DOMString& message)
{
- QString text = message;
+ DOMString text = message;
text.replace(QChar('\\'), backslashAsCurrencySymbol());
KWQ_BLOCK_EXCEPTIONS;
- return [_bridge runJavaScriptConfirmPanelWithMessage:text.getNSString()];
+ return [_bridge runJavaScriptConfirmPanelWithMessage:text];
KWQ_UNBLOCK_EXCEPTIONS;
return false;
}
-bool KWQKHTMLPart::runJavaScriptPrompt(const QString &prompt, const QString &defaultValue, QString &result)
+bool KWQKHTMLPart::runJavaScriptPrompt(const DOMString& prompt, const DOMString& defaultValue, DOMString& result)
{
- QString promptText = prompt;
+ DOMString promptText = prompt;
promptText.replace(QChar('\\'), backslashAsCurrencySymbol());
- QString defaultValueText = defaultValue;
+ DOMString defaultValueText = defaultValue;
defaultValueText.replace(QChar('\\'), backslashAsCurrencySymbol());
bool ok;
KWQ_BLOCK_EXCEPTIONS;
NSString *returnedText = nil;
- ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
- defaultText:defaultValue.getNSString() returningText:&returnedText];
+ ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt
+ defaultText:defaultValue returningText:&returnedText];
if (ok) {
- result = QString::fromNSString(returnedText);
+ result = DOMString(returnedText);
result.replace(backslashAsCurrencySymbol(), QChar('\\'));
}
@@ -1854,12 +1854,12 @@
return [_bridge areToolbarsVisible];
}
-void KWQKHTMLPart::addMessageToConsole(const QString &message, unsigned lineNumber, const QString &sourceURL)
+void KWQKHTMLPart::addMessageToConsole(const DOMString &message, unsigned lineNumber, const DOMString &sourceURL)
{
NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:
- message.getNSString(), @"message",
+ (NSString *)message, @"message",
[NSNumber numberWithInt: lineNumber], @"lineNumber",
- sourceURL.getNSString(), @"sourceURL",
+ (NSString *)sourceURL, @"sourceURL",
NULL];
[_bridge addMessageToConsole:dictionary];
}
@@ -2597,7 +2597,7 @@
return false;
}
-bool KWQKHTMLPart::passWheelEventToChildWidget(DOM::NodeImpl *node)
+bool KWQKHTMLPart::passWheelEventToChildWidget(NodeImpl *node)
{
KWQ_BLOCK_EXCEPTIONS;
@@ -2807,7 +2807,7 @@
}
// Called as we walk up the element chain for nodes with CSS property -khtml-user-drag == auto
-bool KWQKHTMLPart::shouldDragAutoNode(DOM::NodeImpl* node, int x, int y) const
+bool KWQKHTMLPart::shouldDragAutoNode(NodeImpl* node, int x, int y) const
{
// We assume that WebKit only cares about dragging things that can be leaf nodes (text, images, urls).
// This saves a bunch of expensive calls (creating WC and WK element dicts) as we walk farther up
@@ -3444,7 +3444,7 @@
return result;
}
-NSImage *KWQKHTMLPart::snapshotDragImage(DOM::NodeImpl *node, NSRect *imageRect, NSRect *elementRect) const
+NSImage *KWQKHTMLPart::snapshotDragImage(NodeImpl *node, NSRect *imageRect, NSRect *elementRect) const
{
RenderObject *renderer = node->renderer();
if (!renderer) {
@@ -4161,7 +4161,7 @@
return [_bridge shouldEndEditing:[DOMRange _rangeWithImpl:const_cast<RangeImpl *>(range)]];
}
-static QValueList<KWQKHTMLPart::MarkedTextUnderline> convertAttributesToUnderlines(const DOM::RangeImpl *markedTextRange, NSArray *attributes, NSArray *ranges)
+static QValueList<KWQKHTMLPart::MarkedTextUnderline> convertAttributesToUnderlines(const RangeImpl *markedTextRange, NSArray *attributes, NSArray *ranges)
{
QValueList<KWQKHTMLPart::MarkedTextUnderline> result;
@@ -4195,7 +4195,7 @@
return result;
}
-void KWQKHTMLPart::setMarkedTextRange(const DOM::RangeImpl *range, NSArray *attributes, NSArray *ranges)
+void KWQKHTMLPart::setMarkedTextRange(const RangeImpl *range, NSArray *attributes, NSArray *ranges)
{
int exception = 0;
@@ -4315,7 +4315,7 @@
return true;
}
-DOM::NodeImpl *KWQKHTMLPart::mousePressNode()
+NodeImpl *KWQKHTMLPart::mousePressNode()
{
return d->m_mousePressNode.get();
}
1.13 +0 -1 WebCore/kwq/KWQKStandardDirs.h
Index: KWQKStandardDirs.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKStandardDirs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KWQKStandardDirs.h 14 Dec 2005 23:32:02 -0000 1.12
+++ KWQKStandardDirs.h 23 Dec 2005 18:44:36 -0000 1.13
@@ -27,7 +27,6 @@
#define KSTDDIRS_H_
#include "KWQString.h"
-#include "KWQKGlobal.h"
QString locate(const char *type, const QString& filename);
1.36 +4 -4 WebCore/kwq/KWQLineEdit.h
Index: KWQLineEdit.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- KWQLineEdit.h 21 Oct 2005 21:27:51 -0000 1.35
+++ KWQLineEdit.h 23 Dec 2005 18:44:36 -0000 1.36
@@ -62,8 +62,8 @@
void setReadOnly(bool);
bool isReadOnly() const;
- void setText(const QString &);
- QString text() const;
+ void setText(const DOM::DOMString&);
+ DOM::DOMString text() const;
void setWritingDirection(QPainter::TextDirection);
@@ -90,9 +90,9 @@
Type type() const { return m_type; }
void setLiveSearch(bool liveSearch);
- void setAutoSaveName(const QString& name);
+ void setAutoSaveName(const DOM::DOMString& name);
void setMaxResults(int maxResults);
- void setPlaceholderString(const QString& placeholder);
+ void setPlaceholderString(const DOM::DOMString& placeholder);
void addSearchResult();
private:
1.77 +12 -10 WebCore/kwq/KWQLineEdit.mm
Index: KWQLineEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.mm,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- KWQLineEdit.mm 21 Dec 2005 00:00:21 -0000 1.76
+++ KWQLineEdit.mm 23 Dec 2005 18:44:36 -0000 1.77
@@ -36,6 +36,8 @@
#import "WebCoreTextRendererFactory.h"
#import "WebCoreViewFactory.h"
+using DOM::DOMString;
+
@interface NSSearchField (SearchFieldSecrets)
- (void)_addStringToRecentSearches:(NSString *)string;
@end
@@ -143,20 +145,20 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-void QLineEdit::setText(const QString &s)
+void QLineEdit::setText(const DOMString& s)
{
NSTextField *textField = (NSTextField *)getView();
KWQ_BLOCK_EXCEPTIONS;
- [textField setStringValue:s.getNSString()];
+ [textField setStringValue:s];
KWQ_UNBLOCK_EXCEPTIONS;
}
-QString QLineEdit::text() const
+DOMString QLineEdit::text() const
{
KWQ_BLOCK_EXCEPTIONS;
- return QString::fromNSString([m_controller string]);
+ return DOMString([m_controller string]);
KWQ_UNBLOCK_EXCEPTIONS;
- return QString();
+ return DOMString();
}
void QLineEdit::setMaxLength(int len)
@@ -359,17 +361,17 @@
[[searchField cell] setSendsWholeSearchString:!liveSearch];
}
-void QLineEdit::setAutoSaveName(const QString& name)
+void QLineEdit::setAutoSaveName(const DOMString& name)
{
if (m_type != Search)
return;
- QString autosave;
+ DOMString autosave;
if (!name.isEmpty())
autosave = "com.apple.WebKit.searchField:" + name;
NSSearchField *searchField = (NSSearchField *)getView();
- [searchField setRecentsAutosaveName:autosave.getNSString()];
+ [searchField setRecentsAutosaveName:autosave];
}
void QLineEdit::setMaxResults(int maxResults)
@@ -397,10 +399,10 @@
[searchCell setMaximumRecents:maxResults];
}
-void QLineEdit::setPlaceholderString(const QString& placeholder)
+void QLineEdit::setPlaceholderString(const DOM::DOMString& placeholder)
{
NSTextField *textField = (NSTextField *)getView();
- [[textField cell] setPlaceholderString:placeholder.getNSString()];
+ [[textField cell] setPlaceholderString:placeholder];
}
void QLineEdit::addSearchResult()
1.150 +1 -1 WebCore/kwq/KWQPainter.mm
Index: KWQPainter.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPainter.mm,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- KWQPainter.mm 8 Dec 2005 08:40:27 -0000 1.149
+++ KWQPainter.mm 23 Dec 2005 18:44:37 -0000 1.150
@@ -502,7 +502,7 @@
[[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperation:op inContext:context];
}
-int QPainter::compositeOperatorFromString (const QString &aString)
+int QPainter::compositeOperatorFromString(const QString &aString)
{
NSCompositingOperation op = NSCompositeSourceOver;
1.17 +1 -1 WebCore/kwq/KWQSignal.h
Index: KWQSignal.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSignal.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- KWQSignal.h 14 Jul 2005 02:32:33 -0000 1.16
+++ KWQSignal.h 23 Dec 2005 18:44:37 -0000 1.17
@@ -40,7 +40,7 @@
void call() const; // should be "emit"; can't be due to define in qobject.h
void call(bool) const;
void call(int) const;
- void call(const QString &) const;
+ void call(const DOM::DOMString&) const;
void call(KIO::Job *) const;
void call(khtml::DocLoader *, khtml::CachedObject *) const;
void call(KIO::Job *, const char *data, int size) const;
1.22 +1 -1 WebCore/kwq/KWQSignal.mm
Index: KWQSignal.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSignal.mm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- KWQSignal.mm 3 Oct 2005 21:13:08 -0000 1.21
+++ KWQSignal.mm 23 Dec 2005 18:44:37 -0000 1.22
@@ -114,7 +114,7 @@
}
}
-void KWQSignal::call(const QString &s) const
+void KWQSignal::call(const DOM::DOMString &s) const
{
if (!_object->_signalsBlocked) {
KWQObjectSenderScope senderScope(_object);
1.15 +5 -1 WebCore/kwq/KWQSlot.h
Index: KWQSlot.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSlot.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- KWQSlot.h 14 Jul 2005 02:32:33 -0000 1.14
+++ KWQSlot.h 23 Dec 2005 18:44:38 -0000 1.15
@@ -48,6 +48,10 @@
class DocLoader;
}
+namespace DOM {
+ class DOMString;
+}
+
// Like strcmp, but ignores spaces.
bool KWQNamesMatch(const char *a, const char *b);
@@ -62,7 +66,7 @@
void call() const;
void call(bool) const;
void call(int) const;
- void call(const QString &) const;
+ void call(const DOM::DOMString&) const;
void call(KIO::Job *) const;
void call(khtml::DocLoader *, khtml::CachedObject *) const;
void call(KIO::Job *, const char *, int) const;
1.37 +2 -3 WebCore/kwq/KWQSlot.mm
Index: KWQSlot.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSlot.mm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- KWQSlot.mm 11 Oct 2005 09:11:49 -0000 1.36
+++ KWQSlot.mm 23 Dec 2005 18:44:38 -0000 1.37
@@ -239,11 +239,10 @@
call();
}
-void KWQSlot::call(const QString &string) const
+void KWQSlot::call(const DOM::DOMString &string) const
{
- if (m_object.isNull()) {
+ if (m_object.isNull())
return;
- }
switch (m_function) {
case slotTextChangedWithString:
1.120 +0 -1 WebCore/kwq/KWQString.h
Index: KWQString.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- KWQString.h 3 Oct 2005 21:13:09 -0000 1.119
+++ KWQString.h 23 Dec 2005 18:44:38 -0000 1.120
@@ -441,7 +441,6 @@
void copyLatin1(char *buffer, uint position = 0, uint length = 0xffffffff) const;
QCString utf8() const { int length; return utf8(length); }
QCString utf8(int &length) const;
- QCString local8Bit() const;
bool isNull() const;
bool isEmpty() const;
1.144 +0 -5 WebCore/kwq/KWQString.mm
Index: KWQString.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.mm,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- KWQString.mm 19 Oct 2005 00:03:46 -0000 1.143
+++ KWQString.mm 23 Dec 2005 18:44:38 -0000 1.144
@@ -1155,11 +1155,6 @@
return qcs;
}
-QCString QString::local8Bit() const
-{
- return utf8();
-}
-
bool QString::isNull() const
{
return dataHandle == shared_null_handle;
1.29 +3 -3 WebCore/kwq/KWQTextEdit.h
Index: KWQTextEdit.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- KWQTextEdit.h 3 Oct 2005 20:55:04 -0000 1.28
+++ KWQTextEdit.h 23 Dec 2005 18:44:39 -0000 1.29
@@ -64,9 +64,9 @@
bool hasSelectedText() const;
- void setText(const QString &);
- QString text() const;
- QString textWithHardLineBreaks() const;
+ void setText(const DOM::DOMString&);
+ DOM::DOMString text() const;
+ DOM::DOMString textWithHardLineBreaks() const;
void setTextFormat(TextFormat) { }
1.56 +10 -8 WebCore/kwq/KWQTextEdit.mm
Index: KWQTextEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- KWQTextEdit.mm 3 Oct 2005 21:13:10 -0000 1.55
+++ KWQTextEdit.mm 23 Dec 2005 18:44:39 -0000 1.56
@@ -32,6 +32,8 @@
#import "KWQPalette.h"
#import "KWQTextArea.h"
+using DOM::DOMString;
+
QTextEdit::QTextEdit(QWidget *parent)
: _clicked(this, SIGNAL(clicked()))
, _textChanged(this, SIGNAL(textChanged()))
@@ -50,34 +52,34 @@
[textArea detachQTextEdit];
}
-void QTextEdit::setText(const QString &string)
+void QTextEdit::setText(const DOMString& string)
{
KWQTextArea *textView = (KWQTextArea *)getView();
KWQ_BLOCK_EXCEPTIONS;
- [textView setText:string.getNSString()];
+ [textView setText:string];
KWQ_UNBLOCK_EXCEPTIONS;
}
-QString QTextEdit::text() const
+DOMString QTextEdit::text() const
{
KWQTextArea *textView = (KWQTextArea *)getView();
KWQ_BLOCK_EXCEPTIONS;
- return QString::fromNSString([textView text]);
+ return DOMString([textView text]);
KWQ_UNBLOCK_EXCEPTIONS;
- return QString();
+ return DOMString();
}
-QString QTextEdit::textWithHardLineBreaks() const
+DOMString QTextEdit::textWithHardLineBreaks() const
{
KWQTextArea *textView = (KWQTextArea *)getView();
KWQ_BLOCK_EXCEPTIONS;
- return QString::fromNSString([textView textWithHardLineBreaks]);
+ return DOMString([textView textWithHardLineBreaks]);
KWQ_UNBLOCK_EXCEPTIONS;
- return QString();
+ return DOMString();
}
void QTextEdit::getCursorPosition(int *paragraph, int *index) const
More information about the webkit-changes
mailing list