[webkit-changes] cvs commit: JavaScriptCore/kjs identifier.h
internal.h property_slot.h regexp_object.cpp simple_number.h
string_object.cpp ustring.cpp ustring.h value.cpp value.h
Adele
adele at opensource.apple.com
Fri Sep 16 15:42:32 PDT 2005
adele 05/09/16 15:42:32
Modified: . ChangeLog
Plugins.subproj npapi.m
. ChangeLog
ForwardingHeaders khtml_pagecache.h
khtml khtml_events.cpp khtml_events.h khtml_part.cpp
khtml_part.h khtmlpart_p.h
khtml/css css_base.h css_computedstyle.cpp
css_computedstyle.h css_ruleimpl.cpp css_ruleimpl.h
css_stylesheetimpl.cpp css_stylesheetimpl.h
css_valueimpl.cpp css_valueimpl.h
khtml/dom css_rule.h css_stylesheet.h css_value.h
dom2_events.cpp dom2_events.h dom2_range.h
dom2_traversal.cpp dom2_traversal.h dom_node.h
khtml/ecma kjs_css.cpp kjs_dom.cpp kjs_events.cpp
kjs_html.cpp kjs_navigator.cpp
khtml/editing apply_style_command.cpp
break_blockquote_command.cpp
composite_edit_command.cpp composite_edit_command.h
delete_from_text_node_command.cpp
delete_from_text_node_command.h
insert_into_text_node_command.cpp
insert_into_text_node_command.h
insert_paragraph_separator_command.cpp
insert_text_command.cpp insert_text_command.h
join_text_nodes_command.h markup.cpp
move_selection_command.cpp
rebalance_whitespace_command.cpp
rebalance_whitespace_command.h
replace_selection_command.cpp
replace_selection_command.h selection.cpp
split_text_node_command.cpp
split_text_node_command.h
split_text_node_containing_element.cpp
split_text_node_containing_element_command.h
visible_position.cpp visible_position.h
visible_range.h visible_text.cpp visible_text.h
visible_units.cpp
khtml/html html_blockimpl.cpp html_blockimpl.h
html_formimpl.cpp html_formimpl.h
html_imageimpl.cpp html_imageimpl.h
html_inlineimpl.cpp html_inlineimpl.h
html_listimpl.cpp html_listimpl.h html_miscimpl.cpp
html_miscimpl.h html_objectimpl.cpp
html_objectimpl.h html_tableimpl.cpp
html_tableimpl.h htmlparser.cpp htmltokenizer.cpp
khtml/misc loader.h
khtml/rendering render_block.cpp render_br.cpp render_br.h
render_form.cpp render_form.h render_frames.cpp
render_line.cpp render_line.h render_list.cpp
render_list.h render_object.cpp render_object.h
render_replaced.cpp render_replaced.h
render_table.h render_text.cpp render_text.h
khtml/xml dom2_eventsimpl.cpp dom2_eventsimpl.h
dom2_rangeimpl.cpp dom2_rangeimpl.h
dom2_traversalimpl.cpp dom2_traversalimpl.h
dom_docimpl.cpp dom_docimpl.h dom_elementimpl.cpp
dom_elementimpl.h dom_nodeimpl.cpp dom_nodeimpl.h
dom_position.cpp dom_position.h dom_textimpl.cpp
dom_textimpl.h
kwq DOM-CSS.mm DOM.mm DOMCSS.h DOMCore.h DOMEvents.h
DOMEvents.mm DOMExtensions.h DOMHTML.h DOMHTML.mm
DOMRange.h DOMStylesheets.h DOMTraversal.h
KWQKHTMLPart.mm KWQString.h KWQString.mm
KWQTextEdit.h KWQTextEdit.mm WebCoreBridge.mm
. ChangeLog
bindings npapi.h runtime.h
bindings/c c_class.h c_runtime.h
bindings/jni jni_class.cpp jni_class.h jni_instance.cpp
jni_jsobject.cpp jni_runtime.cpp jni_runtime.h
bindings/objc WebScriptObject.mm objc_class.h
objc_instance.h objc_runtime.h objc_runtime.mm
kjs identifier.h internal.h property_slot.h
regexp_object.cpp simple_number.h string_object.cpp
ustring.cpp ustring.h value.cpp value.h
Log:
JavaScriptCore:
Change by Darin, reviewed by me and Maciej.
Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)
* bindings/c/c_class.h:
(KJS::Bindings::CClass::constructorAt):
(KJS::Bindings::CClass::numConstructors):
* bindings/c/c_runtime.h:
(KJS::Bindings::CMethod::numParameters):
* bindings/jni/jni_class.cpp:
(JavaClass::JavaClass):
* bindings/jni/jni_class.h:
(KJS::Bindings::JavaClass::constructorAt):
(KJS::Bindings::JavaClass::numConstructors):
* bindings/jni/jni_instance.cpp:
(JavaInstance::invokeMethod):
* bindings/jni/jni_jsobject.cpp:
(JSObject::convertJObjectToValue):
(JSObject::listFromJArray):
* bindings/jni/jni_runtime.cpp:
(JavaMethod::JavaMethod):
* bindings/jni/jni_runtime.h:
(KJS::Bindings::JavaConstructor::_commonCopy):
(KJS::Bindings::JavaConstructor::parameterAt):
(KJS::Bindings::JavaConstructor::numParameters):
(KJS::Bindings::JavaMethod::_commonCopy):
(KJS::Bindings::JavaMethod::parameterAt):
(KJS::Bindings::JavaMethod::numParameters):
* bindings/npapi.h:
* bindings/objc/WebScriptObject.mm:
(listFromNSArray):
* bindings/objc/objc_class.h:
(KJS::Bindings::ObjcClass::constructorAt):
(KJS::Bindings::ObjcClass::numConstructors):
* bindings/objc/objc_instance.h:
* bindings/objc/objc_runtime.h:
* bindings/objc/objc_runtime.mm:
(ObjcMethod::numParameters):
* bindings/runtime.h:
* kjs/identifier.h:
* kjs/internal.h:
* kjs/property_slot.h:
(KJS::PropertySlot::setCustomIndex):
(KJS::PropertySlot::index):
(KJS::PropertySlot::):
* kjs/regexp_object.cpp:
(RegExpObjectImp::backrefGetter):
(RegExpObjectImp::getOwnPropertySlot):
* kjs/simple_number.h:
(KJS::SimpleNumber::):
(KJS::SimpleNumber::value):
(KJS::SimpleNumber::fits):
(KJS::SimpleNumber::integerFits):
(KJS::SimpleNumber::make):
* kjs/string_object.cpp:
(substituteBackreferences):
* kjs/ustring.cpp:
(KJS::UString::from):
(KJS::UString::toUInt32):
(KJS::UString::find):
(KJS::UString::rfind):
* kjs/ustring.h:
* kjs/value.cpp:
(KJS::jsNumber):
* kjs/value.h:
WebCore:
Change by Darin, reviewed by me and Maciej.
Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)
Changed longs (which IDL files use as 32-bit) to ints
* ForwardingHeaders/khtml_pagecache.h:
* khtml/css/css_base.h:
(DOM::StyleListImpl::length):
(DOM::StyleListImpl::item):
* khtml/css/css_computedstyle.cpp:
(DOM::CSSComputedStyleDeclarationImpl::length):
(DOM::CSSComputedStyleDeclarationImpl::item):
* khtml/css/css_computedstyle.h:
* khtml/css/css_ruleimpl.cpp:
(CSSMediaRuleImpl::append):
(CSSMediaRuleImpl::insertRule):
(CSSMediaRuleImpl::cssText):
(CSSRuleListImpl::CSSRuleListImpl):
(CSSRuleListImpl::deleteRule):
(CSSRuleListImpl::insertRule):
* khtml/css/css_ruleimpl.h:
(DOM::CSSRuleListImpl::length):
(DOM::CSSRuleListImpl::item):
(DOM::CSSMediaRuleImpl::deleteRule):
* khtml/css/css_stylesheetimpl.cpp:
(CSSStyleSheetImpl::insertRule):
(CSSStyleSheetImpl::addRule):
(CSSStyleSheetImpl::deleteRule):
(StyleSheetListImpl::length):
(StyleSheetListImpl::item):
* khtml/css/css_stylesheetimpl.h:
(DOM::MediaListImpl::length):
(DOM::MediaListImpl::item):
* khtml/css/css_valueimpl.cpp:
(DOM::CSSMutableStyleDeclarationImpl::length):
(DOM::CSSMutableStyleDeclarationImpl::item):
* khtml/css/css_valueimpl.h:
(DOM::CSSValueListImpl::length):
(DOM::CSSValueListImpl::item):
* khtml/dom/css_rule.h:
* khtml/dom/css_stylesheet.h:
* khtml/dom/css_value.h:
* khtml/dom/dom2_events.cpp:
(DOM::UIEvent::detail):
(DOM::UIEvent::initUIEvent):
(DOM::MouseEvent::screenX):
(DOM::MouseEvent::screenY):
(DOM::MouseEvent::clientX):
(DOM::MouseEvent::clientY):
(DOM::MouseEvent::initMouseEvent):
(DOM::KeyboardEvent::keyLocation):
(DOM::KeyboardEvent::initKeyboardEvent):
* khtml/dom/dom2_events.h:
* khtml/dom/dom2_range.h:
* khtml/dom/dom2_traversal.cpp:
(DOM::NodeIterator::whatToShow):
(DOM::TreeWalker::whatToShow):
* khtml/dom/dom2_traversal.h:
* khtml/dom/dom_node.h:
* khtml/ecma/kjs_css.cpp:
(KJS::DOMCSSStyleDeclaration::getOwnPropertySlot):
(KJS::DOMStyleSheetList::getOwnPropertySlot):
(KJS::DOMMediaList::getOwnPropertySlot):
(KJS::DOMCSSStyleSheetProtoFunc::callAsFunction):
(KJS::DOMCSSRuleList::getOwnPropertySlot):
(KJS::DOMCSSValueList::getOwnPropertySlot):
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNodeList::getOwnPropertySlot):
(KJS::DOMNodeList::callAsFunction):
(KJS::DOMNamedNodeMap::getOwnPropertySlot):
(KJS::DOMNamedNodesCollection::getOwnPropertySlot):
* khtml/ecma/kjs_events.cpp:
(KJS::DOMEvent::getValueProperty):
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLElement::getOwnPropertySlot):
(KJS::KJS::HTMLElement::put):
(KJS::HTMLCollection::getOwnPropertySlot):
(KJS::KJS::HTMLCollection::callAsFunction):
(KJS::KJS::HTMLSelectCollection::put):
* khtml/ecma/kjs_navigator.cpp:
(KJS::Plugins::getOwnPropertySlot):
(KJS::MimeTypes::getOwnPropertySlot):
(KJS::Plugin::getOwnPropertySlot):
* khtml/editing/apply_style_command.cpp:
(khtml::ApplyStyleCommand::splitTextAtStartIfNeeded):
(khtml::ApplyStyleCommand::splitTextElementAtStartIfNeeded):
(khtml::ApplyStyleCommand::mergeStartWithPreviousIfIdentical):
* khtml/editing/break_blockquote_command.cpp:
(khtml::BreakBlockquoteCommand::doApply):
* khtml/editing/composite_edit_command.cpp:
(khtml::CompositeEditCommand::insertNodeAt):
(khtml::CompositeEditCommand::splitTextNode):
(khtml::CompositeEditCommand::splitTextNodeContainingElement):
(khtml::CompositeEditCommand::insertTextIntoNode):
(khtml::CompositeEditCommand::deleteTextFromNode):
(khtml::CompositeEditCommand::replaceTextInNode):
(khtml::CompositeEditCommand::deleteInsignificantText):
* khtml/editing/composite_edit_command.h:
* khtml/editing/delete_from_text_node_command.cpp:
(khtml::DeleteFromTextNodeCommand::DeleteFromTextNodeCommand):
* khtml/editing/delete_from_text_node_command.h:
(khtml::DeleteFromTextNodeCommand::offset):
(khtml::DeleteFromTextNodeCommand::count):
* khtml/editing/insert_into_text_node_command.cpp:
(khtml::InsertIntoTextNodeCommand::InsertIntoTextNodeCommand):
* khtml/editing/insert_into_text_node_command.h:
(khtml::InsertIntoTextNodeCommand::offset):
* khtml/editing/insert_paragraph_separator_command.cpp:
(khtml::InsertParagraphSeparatorCommand::doApply):
* khtml/editing/insert_text_command.cpp:
(khtml::InsertTextCommand::input):
(khtml::InsertTextCommand::insertSpace):
* khtml/editing/insert_text_command.h:
(khtml::InsertTextCommand::charactersAdded):
* khtml/editing/join_text_nodes_command.h:
* khtml/editing/markup.cpp:
(khtml::startMarkup):
(khtml::completeURLs):
* khtml/editing/move_selection_command.cpp:
(khtml::MoveSelectionCommand::doApply):
* khtml/editing/rebalance_whitespace_command.cpp:
(khtml::RebalanceWhitespaceCommand::doApply):
* khtml/editing/rebalance_whitespace_command.h:
* khtml/editing/replace_selection_command.cpp:
(khtml::ReplaceSelectionCommand::insertNodeAtAndUpdateNodesInserted):
* khtml/editing/replace_selection_command.h:
* khtml/editing/selection.cpp:
(khtml::Selection::debugPosition):
* khtml/editing/split_text_node_command.cpp:
(khtml::SplitTextNodeCommand::SplitTextNodeCommand):
* khtml/editing/split_text_node_command.h:
(khtml::SplitTextNodeCommand::offset):
* khtml/editing/split_text_node_containing_element.cpp:
(khtml::SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand):
* khtml/editing/split_text_node_containing_element_command.h:
* khtml/editing/visible_position.cpp:
(khtml::VisiblePosition::VisiblePosition):
(khtml::VisiblePosition::deepEquivalent):
(khtml::VisiblePosition::rangeCompliantEquivalent):
(khtml::VisiblePosition::maxOffset):
(khtml::VisiblePosition::character):
(khtml::VisiblePosition::debugPosition):
* khtml/editing/visible_position.h:
* khtml/editing/visible_range.h:
* khtml/editing/visible_text.cpp:
(khtml::CircularSearchBuffer::length):
(khtml::TextIterator::TextIterator):
(khtml::TextIterator::handleTextNode):
(khtml::TextIterator::handleTextBox):
(khtml::TextIterator::emitCharacter):
(khtml::TextIterator::range):
(khtml::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):
(khtml::SimplifiedBackwardsTextIterator::handleReplacedElement):
(khtml::SimplifiedBackwardsTextIterator::emitCharacter):
(khtml::SimplifiedBackwardsTextIterator::emitNewlineForBROrText):
(khtml::CharacterIterator::range):
(khtml::CharacterIterator::advance):
(khtml::CharacterIterator::string):
(khtml::WordAwareIterator::length):
(khtml::CircularSearchBuffer::append):
(khtml::CircularSearchBuffer::neededCharacters):
(khtml::CircularSearchBuffer::isMatch):
(khtml::TextIterator::rangeLength):
(khtml::TextIterator::rangeFromLocationAndLength):
(khtml::plainText):
(khtml::findPlainText):
* khtml/editing/visible_text.h:
(khtml::TextIterator::length):
(khtml::SimplifiedBackwardsTextIterator::length):
(khtml::CharacterIterator::length):
(khtml::CharacterIterator::characterOffset):
* khtml/editing/visible_units.cpp:
(khtml::startOfLine):
(khtml::endOfLine):
(khtml::startOfParagraph):
(khtml::endOfParagraph):
* khtml/html/html_blockimpl.cpp:
(HTMLPreElementImpl::width):
(HTMLPreElementImpl::setWidth):
* khtml/html/html_blockimpl.h:
* khtml/html/html_formimpl.cpp:
(DOM::HTMLFormElementImpl::length):
(DOM::HTMLGenericFormElementImpl::tabIndex):
(DOM::HTMLGenericFormElementImpl::setTabIndex):
(DOM::HTMLInputElementImpl::selectionStart):
(DOM::HTMLInputElementImpl::selectionEnd):
(DOM::HTMLInputElementImpl::setSelectionStart):
(DOM::HTMLInputElementImpl::setSelectionEnd):
(DOM::HTMLInputElementImpl::setSelectionRange):
(DOM::HTMLInputElementImpl::setMaxLength):
(DOM::HTMLInputElementImpl::setSize):
(DOM::HTMLSelectElementImpl::selectedIndex):
(DOM::HTMLSelectElementImpl::setSelectedIndex):
(DOM::HTMLSelectElementImpl::length):
(DOM::HTMLSelectElementImpl::remove):
(DOM::HTMLSelectElementImpl::setSize):
(DOM::HTMLOptionElementImpl::index):
(DOM::HTMLOptionElementImpl::setIndex):
(DOM::HTMLTextAreaElementImpl::selectionStart):
(DOM::HTMLTextAreaElementImpl::selectionEnd):
(DOM::HTMLTextAreaElementImpl::setSelectionStart):
(DOM::HTMLTextAreaElementImpl::setSelectionEnd):
(DOM::HTMLTextAreaElementImpl::setSelectionRange):
(DOM::HTMLTextAreaElementImpl::setCols):
(DOM::HTMLTextAreaElementImpl::setRows):
(DOM::HTMLOptionsCollectionImpl::length):
(DOM::HTMLOptionsCollectionImpl::setLength):
(DOM::HTMLOptionsCollectionImpl::item):
* khtml/html/html_formimpl.h:
(DOM::HTMLInputElementImpl::maxLength):
(DOM::HTMLInputElementImpl::maxResults):
(DOM::HTMLSelectElementImpl::minWidth):
(DOM::HTMLSelectElementImpl::size):
(DOM::HTMLTextAreaElementImpl::cols):
(DOM::HTMLTextAreaElementImpl::rows):
* khtml/html/html_imageimpl.cpp:
(HTMLImageElementImpl::width):
(HTMLImageElementImpl::height):
(HTMLImageElementImpl::border):
(HTMLImageElementImpl::setBorder):
(HTMLImageElementImpl::setHeight):
(HTMLImageElementImpl::hspace):
(HTMLImageElementImpl::setHspace):
(HTMLImageElementImpl::vspace):
(HTMLImageElementImpl::setVspace):
(HTMLImageElementImpl::setWidth):
(HTMLImageElementImpl::x):
(HTMLImageElementImpl::y):
(HTMLAreaElementImpl::tabIndex):
(HTMLAreaElementImpl::setTabIndex):
* khtml/html/html_imageimpl.h:
* khtml/html/html_inlineimpl.cpp:
(DOM::HTMLAnchorElementImpl::tabIndex):
(DOM::HTMLAnchorElementImpl::setTabIndex):
* khtml/html/html_inlineimpl.h:
* khtml/html/html_listimpl.cpp:
(DOM::HTMLOListElementImpl::setStart):
(DOM::HTMLLIElementImpl::value):
(DOM::HTMLLIElementImpl::setValue):
* khtml/html/html_listimpl.h:
(DOM::HTMLUListElementImpl::start):
(DOM::HTMLOListElementImpl::start):
* khtml/html/html_miscimpl.cpp:
(DOM::HTMLCollectionImpl::calcLength):
(DOM::HTMLCollectionImpl::length):
(DOM::HTMLCollectionImpl::item):
(DOM::HTMLFormCollectionImpl::calcLength):
(DOM::HTMLFormCollectionImpl::item):
* khtml/html/html_miscimpl.h:
* khtml/html/html_objectimpl.cpp:
(DOM::HTMLObjectElementImpl::tabIndex):
(DOM::HTMLObjectElementImpl::setTabIndex):
* khtml/html/html_objectimpl.h:
* khtml/html/html_tableimpl.cpp:
(DOM::HTMLTableElementImpl::insertRow):
(DOM::HTMLTableElementImpl::deleteRow):
(DOM::HTMLTableSectionElementImpl::insertRow):
(DOM::HTMLTableSectionElementImpl::deleteRow):
(DOM::HTMLTableRowElementImpl::rowIndex):
(DOM::HTMLTableRowElementImpl::sectionRowIndex):
(DOM::HTMLTableRowElementImpl::insertCell):
(DOM::HTMLTableRowElementImpl::deleteCell):
(DOM::HTMLTableCellElementImpl::cellIndex):
(DOM::HTMLTableCellElementImpl::setColSpan):
(DOM::HTMLTableCellElementImpl::setRowSpan):
(DOM::HTMLTableColElementImpl::setSpan):
* khtml/html/html_tableimpl.h:
(DOM::HTMLTableColElementImpl::span):
* khtml/html/htmlparser.cpp:
(HTMLParser::handleError):
* khtml/html/htmltokenizer.cpp:
(khtml::HTMLTokenizer::processToken):
* khtml/khtml_events.cpp:
(khtml::MouseEvent::offset):
* khtml/khtml_events.h:
(khtml::MouseReleaseEvent::MouseReleaseEvent):
* khtml/khtml_part.cpp:
(KHTMLPart::restoreURL):
(KHTMLPart::stopLoading):
(KHTMLPart::receivedFirstData):
(KHTMLPart::slotFinished):
(KHTMLPart::begin):
(KHTMLPart::slotViewFrameSource):
(KHTMLPart::selectFrameElementInParentIfFullySelected):
* khtml/khtml_part.h:
* khtml/khtmlpart_p.h:
(KHTMLPartPrivate::KHTMLPartPrivate):
* khtml/misc/loader.h:
* khtml/rendering/render_block.cpp:
(khtml::RenderBlock::positionForRenderer):
* khtml/rendering/render_br.cpp:
(RenderBR::caretMinOffset):
(RenderBR::caretMaxOffset):
(RenderBR::caretMaxRenderedOffset):
(RenderBR::inlineBox):
* khtml/rendering/render_br.h:
* khtml/rendering/render_form.cpp:
(RenderLineEdit::selectionStart):
(RenderLineEdit::selectionEnd):
(RenderLineEdit::setSelectionStart):
(RenderLineEdit::setSelectionEnd):
(RenderLineEdit::setSelectionRange):
(RenderTextArea::calcMinMaxWidth):
(RenderTextArea::selectionStart):
(RenderTextArea::selectionEnd):
(RenderTextArea::setSelectionStart):
(RenderTextArea::setSelectionEnd):
(RenderTextArea::setSelectionRange):
* khtml/rendering/render_form.h:
* khtml/rendering/render_frames.cpp:
(RenderPartObject::updateWidget):
* khtml/rendering/render_line.cpp:
(khtml::InlineBox::caretMinOffset):
(khtml::InlineBox::caretMaxOffset):
(khtml::InlineBox::caretMaxRenderedOffset):
* khtml/rendering/render_line.h:
* khtml/rendering/render_list.cpp:
(RenderListMarker::calcMinMaxWidth):
* khtml/rendering/render_list.h:
(khtml::RenderListItem::value):
(khtml::RenderListItem::setValue):
* khtml/rendering/render_object.cpp:
(RenderObject::caretMinOffset):
(RenderObject::caretMaxOffset):
(RenderObject::caretMaxRenderedOffset):
(RenderObject::previousOffset):
(RenderObject::nextOffset):
(RenderObject::inlineBox):
* khtml/rendering/render_object.h:
* khtml/rendering/render_replaced.cpp:
(RenderReplaced::caretMinOffset):
(RenderReplaced::caretMaxOffset):
(RenderReplaced::caretMaxRenderedOffset):
* khtml/rendering/render_replaced.h:
* khtml/rendering/render_table.h:
(khtml::RenderTableCell::cellIndex):
(khtml::RenderTableCell::setCellIndex):
* khtml/rendering/render_text.cpp:
(InlineTextBox::paintMarker):
(InlineTextBox::paintMarkedTextUnderline):
(InlineTextBox::caretMinOffset):
(InlineTextBox::caretMaxOffset):
(InlineTextBox::caretMaxRenderedOffset):
(RenderText::previousOffset):
(RenderText::nextOffset):
(InlineTextBox::positionForOffset):
(RenderText::caretMinOffset):
(RenderText::caretMaxOffset):
(RenderText::caretMaxRenderedOffset):
(RenderText::inlineBox):
* khtml/rendering/render_text.h:
* khtml/xml/dom2_eventsimpl.cpp:
(DOM::EventImpl::timeStamp):
(DOM::UIEventImpl::UIEventImpl):
(DOM::UIEventImpl::initUIEvent):
(DOM::UIEventImpl::layerX):
(DOM::UIEventImpl::layerY):
(DOM::UIEventImpl::pageX):
(DOM::UIEventImpl::pageY):
(DOM::UIEventImpl::which):
(DOM::MouseRelatedEventImpl::MouseRelatedEventImpl):
(DOM::MouseRelatedEventImpl::pageX):
(DOM::MouseRelatedEventImpl::pageY):
(DOM::MouseEventImpl::MouseEventImpl):
(DOM::MouseEventImpl::initMouseEvent):
(DOM::MouseEventImpl::which):
(DOM::KeyboardEventImpl::KeyboardEventImpl):
(DOM::KeyboardEventImpl::initKeyboardEvent):
(DOM::KeyboardEventImpl::which):
(DOM::WheelEventImpl::WheelEventImpl):
* khtml/xml/dom2_eventsimpl.h:
(DOM::UIEventImpl::detail):
(DOM::UIEventWithKeyStateImpl::UIEventWithKeyStateImpl):
(DOM::MouseRelatedEventImpl::screenX):
(DOM::MouseRelatedEventImpl::screenY):
(DOM::MouseRelatedEventImpl::clientX):
(DOM::MouseRelatedEventImpl::clientY):
(DOM::MouseRelatedEventImpl::layerX):
(DOM::MouseRelatedEventImpl::layerY):
(DOM::KeyboardEventImpl::keyLocation):
(DOM::WheelEventImpl::wheelDelta):
* khtml/xml/dom2_rangeimpl.cpp:
(DOM::RangeImpl::RangeImpl):
(DOM::RangeImpl::startOffset):
(DOM::RangeImpl::endOffset):
(DOM::RangeImpl::setStart):
(DOM::RangeImpl::setEnd):
(DOM::RangeImpl::compareBoundaryPoints):
(DOM::RangeImpl::processContents):
(DOM::RangeImpl::checkNodeWOffset):
* khtml/xml/dom2_rangeimpl.h:
* khtml/xml/dom2_traversalimpl.cpp:
(DOM::TraversalImpl::TraversalImpl):
(DOM::TreeWalkerImpl::TreeWalkerImpl):
* khtml/xml/dom2_traversalimpl.h:
(DOM::TraversalImpl::whatToShow):
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::createNodeIterator):
(DocumentImpl::createTreeWalker):
(DocumentImpl::processHttpEquiv):
(DocumentImpl::removeMarkers):
(DocumentImpl::copyMarkers):
(DocumentImpl::markersForNode):
(DocumentImpl::shiftMarkers):
* khtml/xml/dom_docimpl.h:
* khtml/xml/dom_elementimpl.cpp:
(ElementImpl::openTagStartToString):
(NamedAttrMapImpl::item):
(NamedAttrMapImpl::getAttributeItem):
(NamedAttrMapImpl::removeAttribute):
* khtml/xml/dom_elementimpl.h:
(DOM::NamedAttrMapImpl::length):
(DOM::NamedAttrMapImpl::attributeItem):
(DOM::NamedMappedAttrMapImpl::attributeItem):
* khtml/xml/dom_nodeimpl.cpp:
(DOM::NodeImpl::normalize):
(DOM::NodeImpl::nodeIndex):
(DOM::NodeImpl::childNodeCount):
(DOM::NodeImpl::childNode):
(DOM::NodeImpl::maxOffset):
(DOM::NodeImpl::maxDeepOffset):
(DOM::NodeImpl::caretMinOffset):
(DOM::NodeImpl::caretMaxOffset):
(DOM::NodeImpl::caretMaxRenderedOffset):
(DOM::NodeImpl::previousOffset):
(DOM::NodeImpl::nextOffset):
(DOM::ContainerNodeImpl::childNodeCount):
(DOM::ContainerNodeImpl::childNode):
(DOM::NodeListImpl::recursiveLength):
(DOM::NodeListImpl::recursiveItem):
(DOM::NodeListImpl::itemById):
(DOM::ChildNodeListImpl::length):
(DOM::ChildNodeListImpl::item):
(DOM::TagNodeListImpl::length):
(DOM::TagNodeListImpl::item):
(DOM::NameNodeListImpl::length):
(DOM::NameNodeListImpl::item):
* khtml/xml/dom_nodeimpl.h:
* khtml/xml/dom_position.cpp:
(DOM::Position::Position):
(DOM::Position::previous):
(DOM::Position::next):
(DOM::Position::renderedOffset):
(DOM::Position::equivalentRangeCompliantPosition):
(DOM::Position::rendersInDifferentPosition):
(DOM::Position::trailingWhitespacePosition):
(DOM::Position::debugPosition):
* khtml/xml/dom_position.h:
(DOM::Position::offset):
* khtml/xml/dom_textimpl.cpp:
(CharacterDataImpl::length):
(CharacterDataImpl::substringData):
(CharacterDataImpl::insertData):
(CharacterDataImpl::deleteData):
(CharacterDataImpl::replaceData):
(CharacterDataImpl::checkCharDataOperation):
(CharacterDataImpl::maxOffset):
(CharacterDataImpl::caretMinOffset):
(CharacterDataImpl::caretMaxOffset):
(CharacterDataImpl::caretMaxRenderedOffset):
(TextImpl::splitText):
* khtml/xml/dom_textimpl.h:
* kwq/DOM-CSS.mm:
(-[DOMStyleSheetList length]):
(-[DOMStyleSheetList item:]):
(-[DOMCSSStyleSheet insertRule::]):
(-[DOMCSSStyleSheet deleteRule:]):
(-[DOMMediaList length]):
(-[DOMMediaList item:]):
(-[DOMCSSRuleList length]):
(-[DOMCSSRuleList item:]):
(-[DOMCSSMediaRule insertRule::]):
(-[DOMCSSMediaRule deleteRule:]):
(-[DOMCSSStyleDeclaration length]):
(-[DOMCSSStyleDeclaration item:]):
(-[DOMCSSValueList length]):
(-[DOMCSSValueList item:]):
* kwq/DOM.mm:
(-[DOMNamedNodeMap item:]):
(-[DOMNamedNodeMap length]):
(-[DOMNodeList item:]):
(-[DOMNodeList length]):
(-[DOMCharacterData length]):
(-[DOMCharacterData substringData::]):
(-[DOMCharacterData insertData::]):
(-[DOMCharacterData deleteData::]):
(-[DOMCharacterData replaceData:::]):
(-[DOMText splitText:]):
(-[DOMRange description]):
(-[DOMRange startOffset]):
(-[DOMRange endOffset]):
(-[DOMRange setStart::]):
(-[DOMRange setEnd::]):
(-[DOMNodeIterator whatToShow]):
(-[DOMTreeWalker whatToShow]):
(-[DOMDocument createNodeIterator::::]):
(-[DOMDocument createTreeWalker::::]):
* kwq/DOMCSS.h:
* kwq/DOMCore.h:
* kwq/DOMEvents.h:
(-[DOMMouseEvent initMouseEvent:::::::::::::::]):
* kwq/DOMEvents.mm:
(-[DOMMouseEvent screenX]):
(-[DOMMouseEvent screenY]):
(-[DOMMouseEvent clientX]):
(-[DOMMouseEvent clientY]):
(-[DOMMouseEvent initMouseEvent:::::::::::::::]):
(-[DOMUIEvent detail]):
(-[DOMUIEvent initUIEvent:::::]):
* kwq/DOMExtensions.h:
* kwq/DOMHTML.h:
* kwq/DOMHTML.mm:
(-[DOMHTMLCollection length]):
(-[DOMHTMLCollection item:]):
(-[DOMHTMLOptionsCollection length]):
(-[DOMHTMLOptionsCollection setLength:]):
(-[DOMHTMLOptionsCollection item:]):
(-[DOMHTMLFormElement length]):
(-[DOMHTMLSelectElement selectedIndex]):
(-[DOMHTMLSelectElement setSelectedIndex:]):
(-[DOMHTMLSelectElement length]):
(-[DOMHTMLSelectElement setLength:]):
(-[DOMHTMLSelectElement size]):
(-[DOMHTMLSelectElement setSize:]):
(-[DOMHTMLSelectElement tabIndex]):
(-[DOMHTMLSelectElement setTabIndex:]):
(-[DOMHTMLSelectElement remove:]):
(-[DOMHTMLOptionElement index]):
(-[DOMHTMLInputElement maxLength]):
(-[DOMHTMLInputElement setMaxLength:]):
(-[DOMHTMLInputElement size]):
(-[DOMHTMLInputElement setSize:]):
(-[DOMHTMLInputElement tabIndex]):
(-[DOMHTMLInputElement setTabIndex:]):
(-[DOMHTMLTextAreaElement cols]):
(-[DOMHTMLTextAreaElement setCols:]):
(-[DOMHTMLTextAreaElement rows]):
(-[DOMHTMLTextAreaElement setRows:]):
(-[DOMHTMLTextAreaElement tabIndex]):
(-[DOMHTMLTextAreaElement setTabIndex:]):
(-[DOMHTMLButtonElement tabIndex]):
(-[DOMHTMLButtonElement setTabIndex:]):
(-[DOMHTMLOListElement start]):
(-[DOMHTMLOListElement setStart:]):
(-[DOMHTMLLIElement value]):
(-[DOMHTMLLIElement setValue:]):
(-[DOMHTMLPreElement width]):
(-[DOMHTMLPreElement setWidth:]):
(-[DOMHTMLAnchorElement tabIndex]):
(-[DOMHTMLAnchorElement setTabIndex:]):
(-[DOMHTMLImageElement height]):
(-[DOMHTMLImageElement setHeight:]):
(-[DOMHTMLImageElement hspace]):
(-[DOMHTMLImageElement setHspace:]):
(-[DOMHTMLImageElement vspace]):
(-[DOMHTMLImageElement setVspace:]):
(-[DOMHTMLImageElement width]):
(-[DOMHTMLImageElement setWidth:]):
(-[DOMHTMLObjectElement hspace]):
(-[DOMHTMLObjectElement setHspace:]):
(-[DOMHTMLObjectElement tabIndex]):
(-[DOMHTMLObjectElement setTabIndex:]):
(-[DOMHTMLObjectElement vspace]):
(-[DOMHTMLObjectElement setVspace:]):
(-[DOMHTMLAppletElement hspace]):
(-[DOMHTMLAppletElement setHspace:]):
(-[DOMHTMLAppletElement vspace]):
(-[DOMHTMLAppletElement setVspace:]):
(-[DOMHTMLAreaElement tabIndex]):
(-[DOMHTMLAreaElement setTabIndex:]):
(-[DOMHTMLTableSectionElement insertRow:]):
(-[DOMHTMLTableSectionElement deleteRow:]):
(-[DOMHTMLTableElement insertRow:]):
(-[DOMHTMLTableElement deleteRow:]):
(-[DOMHTMLTableColElement span]):
(-[DOMHTMLTableColElement setSpan:]):
(-[DOMHTMLTableRowElement rowIndex]):
(-[DOMHTMLTableRowElement sectionRowIndex]):
(-[DOMHTMLTableRowElement insertCell:]):
(-[DOMHTMLTableRowElement deleteCell:]):
(-[DOMHTMLTableCellElement cellIndex]):
(-[DOMHTMLTableCellElement colSpan]):
(-[DOMHTMLTableCellElement setColSpan:]):
(-[DOMHTMLTableCellElement rowSpan]):
(-[DOMHTMLTableCellElement setRowSpan:]):
(-[DOMHTMLEmbedElement height]):
(-[DOMHTMLEmbedElement setHeight:]):
(-[DOMHTMLEmbedElement width]):
(-[DOMHTMLEmbedElement setWidth:]):
* kwq/DOMRange.h:
* kwq/DOMStylesheets.h:
* kwq/DOMTraversal.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::advanceToNextMisspelling):
(KWQKHTMLPart::openURLFromPageCache):
(KWQKHTMLPart::markMisspellings):
* kwq/KWQString.h:
* kwq/KWQString.mm:
(QString::toShort):
(QString::toUShort):
(QString::toInt):
(QString::toUInt):
* kwq/KWQTextEdit.h:
* kwq/KWQTextEdit.mm:
(QTextEdit::selectionStart):
(QTextEdit::selectionEnd):
(QTextEdit::setSelectionStart):
(QTextEdit::setSelectionEnd):
(QTextEdit::setSelectionRange):
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge convertToNSRange:DOM::]):
WebKit:
Change by Darin, reviewed by me and Maciej.
Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
use int instead of long for 32-bit (to prepare for LP64 compiling)
* Plugins.subproj/npapi.m: changed types to match those defined in npapi.h
(NPN_MemAlloc):
(NPN_MemFlush):
(NPN_PostURLNotify):
(NPN_PostURL):
(NPN_Write):
Revision Changes Path
1.3322 +14 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3321
retrieving revision 1.3322
diff -u -r1.3321 -r1.3322
--- ChangeLog 15 Sep 2005 01:26:09 -0000 1.3321
+++ ChangeLog 16 Sep 2005 22:41:56 -0000 1.3322
@@ -1,3 +1,17 @@
+2005-09-16 Adele Peterson <adele at apple.com>
+
+ Change by Darin, reviewed by me and Maciej.
+
+ Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
+ use int instead of long for 32-bit (to prepare for LP64 compiling)
+
+ * Plugins.subproj/npapi.m: changed types to match those defined in npapi.h
+ (NPN_MemAlloc):
+ (NPN_MemFlush):
+ (NPN_PostURLNotify):
+ (NPN_PostURL):
+ (NPN_Write):
+
2005-09-14 Justin Garcia <justin.garcia at apple.com>
Reviewed by john
1.19 +5 -5 WebKit/Plugins.subproj/npapi.m
Index: npapi.m
===================================================================
RCS file: /cvs/root/WebKit/Plugins.subproj/npapi.m,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- npapi.m 13 Sep 2005 20:51:36 -0000 1.18
+++ npapi.m 16 Sep 2005 22:41:59 -0000 1.19
@@ -35,7 +35,7 @@
// general plug-in to browser functions
-void* NPN_MemAlloc(UInt32 size)
+void* NPN_MemAlloc(uint32 size)
{
//LOG(Plugins, "NPN_MemAlloc");
return malloc(size);
@@ -47,7 +47,7 @@
free(ptr);
}
-UInt32 NPN_MemFlush(UInt32 size)
+uint32 NPN_MemFlush(uint32 size)
{
LOG(Plugins, "NPN_MemFlush");
return size;
@@ -88,12 +88,12 @@
return [pluginViewForInstance(instance) getURL:URL target:target];
}
-NPError NPN_PostURLNotify(NPP instance, const char* URL, const char* target, UInt32 len, const char* buf, NPBool file, void* notifyData)
+NPError NPN_PostURLNotify(NPP instance, const char* URL, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData)
{
return [pluginViewForInstance(instance) postURLNotify:URL target:target len:len buf:buf file:file notifyData:notifyData];
}
-NPError NPN_PostURL(NPP instance, const char* URL, const char* target, UInt32 len, const char* buf, NPBool file)
+NPError NPN_PostURL(NPP instance, const char* URL, const char* target, uint32 len, const char* buf, NPBool file)
{
return [pluginViewForInstance(instance) postURL:URL target:target len:len buf:buf file:file];
}
@@ -103,7 +103,7 @@
return [pluginViewForInstance(instance) newStream:type target:target stream:stream];
}
-SInt32 NPN_Write(NPP instance, NPStream* stream, SInt32 len, void* buffer)
+int32 NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
{
return [pluginViewForInstance(instance) write:stream len:len buffer:buffer];
}
1.129 +616 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog 16 Sep 2005 18:55:09 -0000 1.128
+++ ChangeLog 16 Sep 2005 22:41:59 -0000 1.129
@@ -1,3 +1,619 @@
+2005-09-16 Adele Peterson <adele at apple.com>
+
+ Change by Darin, reviewed by me and Maciej.
+
+ Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
+ use int instead of long for 32-bit (to prepare for LP64 compiling)
+
+ Changed longs (which IDL files use as 32-bit) to ints
+
+ * ForwardingHeaders/khtml_pagecache.h:
+ * khtml/css/css_base.h:
+ (DOM::StyleListImpl::length):
+ (DOM::StyleListImpl::item):
+ * khtml/css/css_computedstyle.cpp:
+ (DOM::CSSComputedStyleDeclarationImpl::length):
+ (DOM::CSSComputedStyleDeclarationImpl::item):
+ * khtml/css/css_computedstyle.h:
+ * khtml/css/css_ruleimpl.cpp:
+ (CSSMediaRuleImpl::append):
+ (CSSMediaRuleImpl::insertRule):
+ (CSSMediaRuleImpl::cssText):
+ (CSSRuleListImpl::CSSRuleListImpl):
+ (CSSRuleListImpl::deleteRule):
+ (CSSRuleListImpl::insertRule):
+ * khtml/css/css_ruleimpl.h:
+ (DOM::CSSRuleListImpl::length):
+ (DOM::CSSRuleListImpl::item):
+ (DOM::CSSMediaRuleImpl::deleteRule):
+ * khtml/css/css_stylesheetimpl.cpp:
+ (CSSStyleSheetImpl::insertRule):
+ (CSSStyleSheetImpl::addRule):
+ (CSSStyleSheetImpl::deleteRule):
+ (StyleSheetListImpl::length):
+ (StyleSheetListImpl::item):
+ * khtml/css/css_stylesheetimpl.h:
+ (DOM::MediaListImpl::length):
+ (DOM::MediaListImpl::item):
+ * khtml/css/css_valueimpl.cpp:
+ (DOM::CSSMutableStyleDeclarationImpl::length):
+ (DOM::CSSMutableStyleDeclarationImpl::item):
+ * khtml/css/css_valueimpl.h:
+ (DOM::CSSValueListImpl::length):
+ (DOM::CSSValueListImpl::item):
+ * khtml/dom/css_rule.h:
+ * khtml/dom/css_stylesheet.h:
+ * khtml/dom/css_value.h:
+ * khtml/dom/dom2_events.cpp:
+ (DOM::UIEvent::detail):
+ (DOM::UIEvent::initUIEvent):
+ (DOM::MouseEvent::screenX):
+ (DOM::MouseEvent::screenY):
+ (DOM::MouseEvent::clientX):
+ (DOM::MouseEvent::clientY):
+ (DOM::MouseEvent::initMouseEvent):
+ (DOM::KeyboardEvent::keyLocation):
+ (DOM::KeyboardEvent::initKeyboardEvent):
+ * khtml/dom/dom2_events.h:
+ * khtml/dom/dom2_range.h:
+ * khtml/dom/dom2_traversal.cpp:
+ (DOM::NodeIterator::whatToShow):
+ (DOM::TreeWalker::whatToShow):
+ * khtml/dom/dom2_traversal.h:
+ * khtml/dom/dom_node.h:
+ * khtml/ecma/kjs_css.cpp:
+ (KJS::DOMCSSStyleDeclaration::getOwnPropertySlot):
+ (KJS::DOMStyleSheetList::getOwnPropertySlot):
+ (KJS::DOMMediaList::getOwnPropertySlot):
+ (KJS::DOMCSSStyleSheetProtoFunc::callAsFunction):
+ (KJS::DOMCSSRuleList::getOwnPropertySlot):
+ (KJS::DOMCSSValueList::getOwnPropertySlot):
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNodeList::getOwnPropertySlot):
+ (KJS::DOMNodeList::callAsFunction):
+ (KJS::DOMNamedNodeMap::getOwnPropertySlot):
+ (KJS::DOMNamedNodesCollection::getOwnPropertySlot):
+ * khtml/ecma/kjs_events.cpp:
+ (KJS::DOMEvent::getValueProperty):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::HTMLElement::getOwnPropertySlot):
+ (KJS::KJS::HTMLElement::put):
+ (KJS::HTMLCollection::getOwnPropertySlot):
+ (KJS::KJS::HTMLCollection::callAsFunction):
+ (KJS::KJS::HTMLSelectCollection::put):
+ * khtml/ecma/kjs_navigator.cpp:
+ (KJS::Plugins::getOwnPropertySlot):
+ (KJS::MimeTypes::getOwnPropertySlot):
+ (KJS::Plugin::getOwnPropertySlot):
+ * khtml/editing/apply_style_command.cpp:
+ (khtml::ApplyStyleCommand::splitTextAtStartIfNeeded):
+ (khtml::ApplyStyleCommand::splitTextElementAtStartIfNeeded):
+ (khtml::ApplyStyleCommand::mergeStartWithPreviousIfIdentical):
+ * khtml/editing/break_blockquote_command.cpp:
+ (khtml::BreakBlockquoteCommand::doApply):
+ * khtml/editing/composite_edit_command.cpp:
+ (khtml::CompositeEditCommand::insertNodeAt):
+ (khtml::CompositeEditCommand::splitTextNode):
+ (khtml::CompositeEditCommand::splitTextNodeContainingElement):
+ (khtml::CompositeEditCommand::insertTextIntoNode):
+ (khtml::CompositeEditCommand::deleteTextFromNode):
+ (khtml::CompositeEditCommand::replaceTextInNode):
+ (khtml::CompositeEditCommand::deleteInsignificantText):
+ * khtml/editing/composite_edit_command.h:
+ * khtml/editing/delete_from_text_node_command.cpp:
+ (khtml::DeleteFromTextNodeCommand::DeleteFromTextNodeCommand):
+ * khtml/editing/delete_from_text_node_command.h:
+ (khtml::DeleteFromTextNodeCommand::offset):
+ (khtml::DeleteFromTextNodeCommand::count):
+ * khtml/editing/insert_into_text_node_command.cpp:
+ (khtml::InsertIntoTextNodeCommand::InsertIntoTextNodeCommand):
+ * khtml/editing/insert_into_text_node_command.h:
+ (khtml::InsertIntoTextNodeCommand::offset):
+ * khtml/editing/insert_paragraph_separator_command.cpp:
+ (khtml::InsertParagraphSeparatorCommand::doApply):
+ * khtml/editing/insert_text_command.cpp:
+ (khtml::InsertTextCommand::input):
+ (khtml::InsertTextCommand::insertSpace):
+ * khtml/editing/insert_text_command.h:
+ (khtml::InsertTextCommand::charactersAdded):
+ * khtml/editing/join_text_nodes_command.h:
+ * khtml/editing/markup.cpp:
+ (khtml::startMarkup):
+ (khtml::completeURLs):
+ * khtml/editing/move_selection_command.cpp:
+ (khtml::MoveSelectionCommand::doApply):
+ * khtml/editing/rebalance_whitespace_command.cpp:
+ (khtml::RebalanceWhitespaceCommand::doApply):
+ * khtml/editing/rebalance_whitespace_command.h:
+ * khtml/editing/replace_selection_command.cpp:
+ (khtml::ReplaceSelectionCommand::insertNodeAtAndUpdateNodesInserted):
+ * khtml/editing/replace_selection_command.h:
+ * khtml/editing/selection.cpp:
+ (khtml::Selection::debugPosition):
+ * khtml/editing/split_text_node_command.cpp:
+ (khtml::SplitTextNodeCommand::SplitTextNodeCommand):
+ * khtml/editing/split_text_node_command.h:
+ (khtml::SplitTextNodeCommand::offset):
+ * khtml/editing/split_text_node_containing_element.cpp:
+ (khtml::SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand):
+ * khtml/editing/split_text_node_containing_element_command.h:
+ * khtml/editing/visible_position.cpp:
+ (khtml::VisiblePosition::VisiblePosition):
+ (khtml::VisiblePosition::deepEquivalent):
+ (khtml::VisiblePosition::rangeCompliantEquivalent):
+ (khtml::VisiblePosition::maxOffset):
+ (khtml::VisiblePosition::character):
+ (khtml::VisiblePosition::debugPosition):
+ * khtml/editing/visible_position.h:
+ * khtml/editing/visible_range.h:
+ * khtml/editing/visible_text.cpp:
+ (khtml::CircularSearchBuffer::length):
+ (khtml::TextIterator::TextIterator):
+ (khtml::TextIterator::handleTextNode):
+ (khtml::TextIterator::handleTextBox):
+ (khtml::TextIterator::emitCharacter):
+ (khtml::TextIterator::range):
+ (khtml::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):
+ (khtml::SimplifiedBackwardsTextIterator::handleReplacedElement):
+ (khtml::SimplifiedBackwardsTextIterator::emitCharacter):
+ (khtml::SimplifiedBackwardsTextIterator::emitNewlineForBROrText):
+ (khtml::CharacterIterator::range):
+ (khtml::CharacterIterator::advance):
+ (khtml::CharacterIterator::string):
+ (khtml::WordAwareIterator::length):
+ (khtml::CircularSearchBuffer::append):
+ (khtml::CircularSearchBuffer::neededCharacters):
+ (khtml::CircularSearchBuffer::isMatch):
+ (khtml::TextIterator::rangeLength):
+ (khtml::TextIterator::rangeFromLocationAndLength):
+ (khtml::plainText):
+ (khtml::findPlainText):
+ * khtml/editing/visible_text.h:
+ (khtml::TextIterator::length):
+ (khtml::SimplifiedBackwardsTextIterator::length):
+ (khtml::CharacterIterator::length):
+ (khtml::CharacterIterator::characterOffset):
+ * khtml/editing/visible_units.cpp:
+ (khtml::startOfLine):
+ (khtml::endOfLine):
+ (khtml::startOfParagraph):
+ (khtml::endOfParagraph):
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLPreElementImpl::width):
+ (HTMLPreElementImpl::setWidth):
+ * khtml/html/html_blockimpl.h:
+ * khtml/html/html_formimpl.cpp:
+ (DOM::HTMLFormElementImpl::length):
+ (DOM::HTMLGenericFormElementImpl::tabIndex):
+ (DOM::HTMLGenericFormElementImpl::setTabIndex):
+ (DOM::HTMLInputElementImpl::selectionStart):
+ (DOM::HTMLInputElementImpl::selectionEnd):
+ (DOM::HTMLInputElementImpl::setSelectionStart):
+ (DOM::HTMLInputElementImpl::setSelectionEnd):
+ (DOM::HTMLInputElementImpl::setSelectionRange):
+ (DOM::HTMLInputElementImpl::setMaxLength):
+ (DOM::HTMLInputElementImpl::setSize):
+ (DOM::HTMLSelectElementImpl::selectedIndex):
+ (DOM::HTMLSelectElementImpl::setSelectedIndex):
+ (DOM::HTMLSelectElementImpl::length):
+ (DOM::HTMLSelectElementImpl::remove):
+ (DOM::HTMLSelectElementImpl::setSize):
+ (DOM::HTMLOptionElementImpl::index):
+ (DOM::HTMLOptionElementImpl::setIndex):
+ (DOM::HTMLTextAreaElementImpl::selectionStart):
+ (DOM::HTMLTextAreaElementImpl::selectionEnd):
+ (DOM::HTMLTextAreaElementImpl::setSelectionStart):
+ (DOM::HTMLTextAreaElementImpl::setSelectionEnd):
+ (DOM::HTMLTextAreaElementImpl::setSelectionRange):
+ (DOM::HTMLTextAreaElementImpl::setCols):
+ (DOM::HTMLTextAreaElementImpl::setRows):
+ (DOM::HTMLOptionsCollectionImpl::length):
+ (DOM::HTMLOptionsCollectionImpl::setLength):
+ (DOM::HTMLOptionsCollectionImpl::item):
+ * khtml/html/html_formimpl.h:
+ (DOM::HTMLInputElementImpl::maxLength):
+ (DOM::HTMLInputElementImpl::maxResults):
+ (DOM::HTMLSelectElementImpl::minWidth):
+ (DOM::HTMLSelectElementImpl::size):
+ (DOM::HTMLTextAreaElementImpl::cols):
+ (DOM::HTMLTextAreaElementImpl::rows):
+ * khtml/html/html_imageimpl.cpp:
+ (HTMLImageElementImpl::width):
+ (HTMLImageElementImpl::height):
+ (HTMLImageElementImpl::border):
+ (HTMLImageElementImpl::setBorder):
+ (HTMLImageElementImpl::setHeight):
+ (HTMLImageElementImpl::hspace):
+ (HTMLImageElementImpl::setHspace):
+ (HTMLImageElementImpl::vspace):
+ (HTMLImageElementImpl::setVspace):
+ (HTMLImageElementImpl::setWidth):
+ (HTMLImageElementImpl::x):
+ (HTMLImageElementImpl::y):
+ (HTMLAreaElementImpl::tabIndex):
+ (HTMLAreaElementImpl::setTabIndex):
+ * khtml/html/html_imageimpl.h:
+ * khtml/html/html_inlineimpl.cpp:
+ (DOM::HTMLAnchorElementImpl::tabIndex):
+ (DOM::HTMLAnchorElementImpl::setTabIndex):
+ * khtml/html/html_inlineimpl.h:
+ * khtml/html/html_listimpl.cpp:
+ (DOM::HTMLOListElementImpl::setStart):
+ (DOM::HTMLLIElementImpl::value):
+ (DOM::HTMLLIElementImpl::setValue):
+ * khtml/html/html_listimpl.h:
+ (DOM::HTMLUListElementImpl::start):
+ (DOM::HTMLOListElementImpl::start):
+ * khtml/html/html_miscimpl.cpp:
+ (DOM::HTMLCollectionImpl::calcLength):
+ (DOM::HTMLCollectionImpl::length):
+ (DOM::HTMLCollectionImpl::item):
+ (DOM::HTMLFormCollectionImpl::calcLength):
+ (DOM::HTMLFormCollectionImpl::item):
+ * khtml/html/html_miscimpl.h:
+ * khtml/html/html_objectimpl.cpp:
+ (DOM::HTMLObjectElementImpl::tabIndex):
+ (DOM::HTMLObjectElementImpl::setTabIndex):
+ * khtml/html/html_objectimpl.h:
+ * khtml/html/html_tableimpl.cpp:
+ (DOM::HTMLTableElementImpl::insertRow):
+ (DOM::HTMLTableElementImpl::deleteRow):
+ (DOM::HTMLTableSectionElementImpl::insertRow):
+ (DOM::HTMLTableSectionElementImpl::deleteRow):
+ (DOM::HTMLTableRowElementImpl::rowIndex):
+ (DOM::HTMLTableRowElementImpl::sectionRowIndex):
+ (DOM::HTMLTableRowElementImpl::insertCell):
+ (DOM::HTMLTableRowElementImpl::deleteCell):
+ (DOM::HTMLTableCellElementImpl::cellIndex):
+ (DOM::HTMLTableCellElementImpl::setColSpan):
+ (DOM::HTMLTableCellElementImpl::setRowSpan):
+ (DOM::HTMLTableColElementImpl::setSpan):
+ * khtml/html/html_tableimpl.h:
+ (DOM::HTMLTableColElementImpl::span):
+ * khtml/html/htmlparser.cpp:
+ (HTMLParser::handleError):
+ * khtml/html/htmltokenizer.cpp:
+ (khtml::HTMLTokenizer::processToken):
+ * khtml/khtml_events.cpp:
+ (khtml::MouseEvent::offset):
+ * khtml/khtml_events.h:
+ (khtml::MouseReleaseEvent::MouseReleaseEvent):
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::restoreURL):
+ (KHTMLPart::stopLoading):
+ (KHTMLPart::receivedFirstData):
+ (KHTMLPart::slotFinished):
+ (KHTMLPart::begin):
+ (KHTMLPart::slotViewFrameSource):
+ (KHTMLPart::selectFrameElementInParentIfFullySelected):
+ * khtml/khtml_part.h:
+ * khtml/khtmlpart_p.h:
+ (KHTMLPartPrivate::KHTMLPartPrivate):
+ * khtml/misc/loader.h:
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::positionForRenderer):
+ * khtml/rendering/render_br.cpp:
+ (RenderBR::caretMinOffset):
+ (RenderBR::caretMaxOffset):
+ (RenderBR::caretMaxRenderedOffset):
+ (RenderBR::inlineBox):
+ * khtml/rendering/render_br.h:
+ * khtml/rendering/render_form.cpp:
+ (RenderLineEdit::selectionStart):
+ (RenderLineEdit::selectionEnd):
+ (RenderLineEdit::setSelectionStart):
+ (RenderLineEdit::setSelectionEnd):
+ (RenderLineEdit::setSelectionRange):
+ (RenderTextArea::calcMinMaxWidth):
+ (RenderTextArea::selectionStart):
+ (RenderTextArea::selectionEnd):
+ (RenderTextArea::setSelectionStart):
+ (RenderTextArea::setSelectionEnd):
+ (RenderTextArea::setSelectionRange):
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_frames.cpp:
+ (RenderPartObject::updateWidget):
+ * khtml/rendering/render_line.cpp:
+ (khtml::InlineBox::caretMinOffset):
+ (khtml::InlineBox::caretMaxOffset):
+ (khtml::InlineBox::caretMaxRenderedOffset):
+ * khtml/rendering/render_line.h:
+ * khtml/rendering/render_list.cpp:
+ (RenderListMarker::calcMinMaxWidth):
+ * khtml/rendering/render_list.h:
+ (khtml::RenderListItem::value):
+ (khtml::RenderListItem::setValue):
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::caretMinOffset):
+ (RenderObject::caretMaxOffset):
+ (RenderObject::caretMaxRenderedOffset):
+ (RenderObject::previousOffset):
+ (RenderObject::nextOffset):
+ (RenderObject::inlineBox):
+ * khtml/rendering/render_object.h:
+ * khtml/rendering/render_replaced.cpp:
+ (RenderReplaced::caretMinOffset):
+ (RenderReplaced::caretMaxOffset):
+ (RenderReplaced::caretMaxRenderedOffset):
+ * khtml/rendering/render_replaced.h:
+ * khtml/rendering/render_table.h:
+ (khtml::RenderTableCell::cellIndex):
+ (khtml::RenderTableCell::setCellIndex):
+ * khtml/rendering/render_text.cpp:
+ (InlineTextBox::paintMarker):
+ (InlineTextBox::paintMarkedTextUnderline):
+ (InlineTextBox::caretMinOffset):
+ (InlineTextBox::caretMaxOffset):
+ (InlineTextBox::caretMaxRenderedOffset):
+ (RenderText::previousOffset):
+ (RenderText::nextOffset):
+ (InlineTextBox::positionForOffset):
+ (RenderText::caretMinOffset):
+ (RenderText::caretMaxOffset):
+ (RenderText::caretMaxRenderedOffset):
+ (RenderText::inlineBox):
+ * khtml/rendering/render_text.h:
+ * khtml/xml/dom2_eventsimpl.cpp:
+ (DOM::EventImpl::timeStamp):
+ (DOM::UIEventImpl::UIEventImpl):
+ (DOM::UIEventImpl::initUIEvent):
+ (DOM::UIEventImpl::layerX):
+ (DOM::UIEventImpl::layerY):
+ (DOM::UIEventImpl::pageX):
+ (DOM::UIEventImpl::pageY):
+ (DOM::UIEventImpl::which):
+ (DOM::MouseRelatedEventImpl::MouseRelatedEventImpl):
+ (DOM::MouseRelatedEventImpl::pageX):
+ (DOM::MouseRelatedEventImpl::pageY):
+ (DOM::MouseEventImpl::MouseEventImpl):
+ (DOM::MouseEventImpl::initMouseEvent):
+ (DOM::MouseEventImpl::which):
+ (DOM::KeyboardEventImpl::KeyboardEventImpl):
+ (DOM::KeyboardEventImpl::initKeyboardEvent):
+ (DOM::KeyboardEventImpl::which):
+ (DOM::WheelEventImpl::WheelEventImpl):
+ * khtml/xml/dom2_eventsimpl.h:
+ (DOM::UIEventImpl::detail):
+ (DOM::UIEventWithKeyStateImpl::UIEventWithKeyStateImpl):
+ (DOM::MouseRelatedEventImpl::screenX):
+ (DOM::MouseRelatedEventImpl::screenY):
+ (DOM::MouseRelatedEventImpl::clientX):
+ (DOM::MouseRelatedEventImpl::clientY):
+ (DOM::MouseRelatedEventImpl::layerX):
+ (DOM::MouseRelatedEventImpl::layerY):
+ (DOM::KeyboardEventImpl::keyLocation):
+ (DOM::WheelEventImpl::wheelDelta):
+ * khtml/xml/dom2_rangeimpl.cpp:
+ (DOM::RangeImpl::RangeImpl):
+ (DOM::RangeImpl::startOffset):
+ (DOM::RangeImpl::endOffset):
+ (DOM::RangeImpl::setStart):
+ (DOM::RangeImpl::setEnd):
+ (DOM::RangeImpl::compareBoundaryPoints):
+ (DOM::RangeImpl::processContents):
+ (DOM::RangeImpl::checkNodeWOffset):
+ * khtml/xml/dom2_rangeimpl.h:
+ * khtml/xml/dom2_traversalimpl.cpp:
+ (DOM::TraversalImpl::TraversalImpl):
+ (DOM::TreeWalkerImpl::TreeWalkerImpl):
+ * khtml/xml/dom2_traversalimpl.h:
+ (DOM::TraversalImpl::whatToShow):
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentImpl::createNodeIterator):
+ (DocumentImpl::createTreeWalker):
+ (DocumentImpl::processHttpEquiv):
+ (DocumentImpl::removeMarkers):
+ (DocumentImpl::copyMarkers):
+ (DocumentImpl::markersForNode):
+ (DocumentImpl::shiftMarkers):
+ * khtml/xml/dom_docimpl.h:
+ * khtml/xml/dom_elementimpl.cpp:
+ (ElementImpl::openTagStartToString):
+ (NamedAttrMapImpl::item):
+ (NamedAttrMapImpl::getAttributeItem):
+ (NamedAttrMapImpl::removeAttribute):
+ * khtml/xml/dom_elementimpl.h:
+ (DOM::NamedAttrMapImpl::length):
+ (DOM::NamedAttrMapImpl::attributeItem):
+ (DOM::NamedMappedAttrMapImpl::attributeItem):
+ * khtml/xml/dom_nodeimpl.cpp:
+ (DOM::NodeImpl::normalize):
+ (DOM::NodeImpl::nodeIndex):
+ (DOM::NodeImpl::childNodeCount):
+ (DOM::NodeImpl::childNode):
+ (DOM::NodeImpl::maxOffset):
+ (DOM::NodeImpl::maxDeepOffset):
+ (DOM::NodeImpl::caretMinOffset):
+ (DOM::NodeImpl::caretMaxOffset):
+ (DOM::NodeImpl::caretMaxRenderedOffset):
+ (DOM::NodeImpl::previousOffset):
+ (DOM::NodeImpl::nextOffset):
+ (DOM::ContainerNodeImpl::childNodeCount):
+ (DOM::ContainerNodeImpl::childNode):
+ (DOM::NodeListImpl::recursiveLength):
+ (DOM::NodeListImpl::recursiveItem):
+ (DOM::NodeListImpl::itemById):
+ (DOM::ChildNodeListImpl::length):
+ (DOM::ChildNodeListImpl::item):
+ (DOM::TagNodeListImpl::length):
+ (DOM::TagNodeListImpl::item):
+ (DOM::NameNodeListImpl::length):
+ (DOM::NameNodeListImpl::item):
+ * khtml/xml/dom_nodeimpl.h:
+ * khtml/xml/dom_position.cpp:
+ (DOM::Position::Position):
+ (DOM::Position::previous):
+ (DOM::Position::next):
+ (DOM::Position::renderedOffset):
+ (DOM::Position::equivalentRangeCompliantPosition):
+ (DOM::Position::rendersInDifferentPosition):
+ (DOM::Position::trailingWhitespacePosition):
+ (DOM::Position::debugPosition):
+ * khtml/xml/dom_position.h:
+ (DOM::Position::offset):
+ * khtml/xml/dom_textimpl.cpp:
+ (CharacterDataImpl::length):
+ (CharacterDataImpl::substringData):
+ (CharacterDataImpl::insertData):
+ (CharacterDataImpl::deleteData):
+ (CharacterDataImpl::replaceData):
+ (CharacterDataImpl::checkCharDataOperation):
+ (CharacterDataImpl::maxOffset):
+ (CharacterDataImpl::caretMinOffset):
+ (CharacterDataImpl::caretMaxOffset):
+ (CharacterDataImpl::caretMaxRenderedOffset):
+ (TextImpl::splitText):
+ * khtml/xml/dom_textimpl.h:
+ * kwq/DOM-CSS.mm:
+ (-[DOMStyleSheetList length]):
+ (-[DOMStyleSheetList item:]):
+ (-[DOMCSSStyleSheet insertRule::]):
+ (-[DOMCSSStyleSheet deleteRule:]):
+ (-[DOMMediaList length]):
+ (-[DOMMediaList item:]):
+ (-[DOMCSSRuleList length]):
+ (-[DOMCSSRuleList item:]):
+ (-[DOMCSSMediaRule insertRule::]):
+ (-[DOMCSSMediaRule deleteRule:]):
+ (-[DOMCSSStyleDeclaration length]):
+ (-[DOMCSSStyleDeclaration item:]):
+ (-[DOMCSSValueList length]):
+ (-[DOMCSSValueList item:]):
+ * kwq/DOM.mm:
+ (-[DOMNamedNodeMap item:]):
+ (-[DOMNamedNodeMap length]):
+ (-[DOMNodeList item:]):
+ (-[DOMNodeList length]):
+ (-[DOMCharacterData length]):
+ (-[DOMCharacterData substringData::]):
+ (-[DOMCharacterData insertData::]):
+ (-[DOMCharacterData deleteData::]):
+ (-[DOMCharacterData replaceData:::]):
+ (-[DOMText splitText:]):
+ (-[DOMRange description]):
+ (-[DOMRange startOffset]):
+ (-[DOMRange endOffset]):
+ (-[DOMRange setStart::]):
+ (-[DOMRange setEnd::]):
+ (-[DOMNodeIterator whatToShow]):
+ (-[DOMTreeWalker whatToShow]):
+ (-[DOMDocument createNodeIterator::::]):
+ (-[DOMDocument createTreeWalker::::]):
+ * kwq/DOMCSS.h:
+ * kwq/DOMCore.h:
+ * kwq/DOMEvents.h:
+ (-[DOMMouseEvent initMouseEvent:::::::::::::::]):
+ * kwq/DOMEvents.mm:
+ (-[DOMMouseEvent screenX]):
+ (-[DOMMouseEvent screenY]):
+ (-[DOMMouseEvent clientX]):
+ (-[DOMMouseEvent clientY]):
+ (-[DOMMouseEvent initMouseEvent:::::::::::::::]):
+ (-[DOMUIEvent detail]):
+ (-[DOMUIEvent initUIEvent:::::]):
+ * kwq/DOMExtensions.h:
+ * kwq/DOMHTML.h:
+ * kwq/DOMHTML.mm:
+ (-[DOMHTMLCollection length]):
+ (-[DOMHTMLCollection item:]):
+ (-[DOMHTMLOptionsCollection length]):
+ (-[DOMHTMLOptionsCollection setLength:]):
+ (-[DOMHTMLOptionsCollection item:]):
+ (-[DOMHTMLFormElement length]):
+ (-[DOMHTMLSelectElement selectedIndex]):
+ (-[DOMHTMLSelectElement setSelectedIndex:]):
+ (-[DOMHTMLSelectElement length]):
+ (-[DOMHTMLSelectElement setLength:]):
+ (-[DOMHTMLSelectElement size]):
+ (-[DOMHTMLSelectElement setSize:]):
+ (-[DOMHTMLSelectElement tabIndex]):
+ (-[DOMHTMLSelectElement setTabIndex:]):
+ (-[DOMHTMLSelectElement remove:]):
+ (-[DOMHTMLOptionElement index]):
+ (-[DOMHTMLInputElement maxLength]):
+ (-[DOMHTMLInputElement setMaxLength:]):
+ (-[DOMHTMLInputElement size]):
+ (-[DOMHTMLInputElement setSize:]):
+ (-[DOMHTMLInputElement tabIndex]):
+ (-[DOMHTMLInputElement setTabIndex:]):
+ (-[DOMHTMLTextAreaElement cols]):
+ (-[DOMHTMLTextAreaElement setCols:]):
+ (-[DOMHTMLTextAreaElement rows]):
+ (-[DOMHTMLTextAreaElement setRows:]):
+ (-[DOMHTMLTextAreaElement tabIndex]):
+ (-[DOMHTMLTextAreaElement setTabIndex:]):
+ (-[DOMHTMLButtonElement tabIndex]):
+ (-[DOMHTMLButtonElement setTabIndex:]):
+ (-[DOMHTMLOListElement start]):
+ (-[DOMHTMLOListElement setStart:]):
+ (-[DOMHTMLLIElement value]):
+ (-[DOMHTMLLIElement setValue:]):
+ (-[DOMHTMLPreElement width]):
+ (-[DOMHTMLPreElement setWidth:]):
+ (-[DOMHTMLAnchorElement tabIndex]):
+ (-[DOMHTMLAnchorElement setTabIndex:]):
+ (-[DOMHTMLImageElement height]):
+ (-[DOMHTMLImageElement setHeight:]):
+ (-[DOMHTMLImageElement hspace]):
+ (-[DOMHTMLImageElement setHspace:]):
+ (-[DOMHTMLImageElement vspace]):
+ (-[DOMHTMLImageElement setVspace:]):
+ (-[DOMHTMLImageElement width]):
+ (-[DOMHTMLImageElement setWidth:]):
+ (-[DOMHTMLObjectElement hspace]):
+ (-[DOMHTMLObjectElement setHspace:]):
+ (-[DOMHTMLObjectElement tabIndex]):
+ (-[DOMHTMLObjectElement setTabIndex:]):
+ (-[DOMHTMLObjectElement vspace]):
+ (-[DOMHTMLObjectElement setVspace:]):
+ (-[DOMHTMLAppletElement hspace]):
+ (-[DOMHTMLAppletElement setHspace:]):
+ (-[DOMHTMLAppletElement vspace]):
+ (-[DOMHTMLAppletElement setVspace:]):
+ (-[DOMHTMLAreaElement tabIndex]):
+ (-[DOMHTMLAreaElement setTabIndex:]):
+ (-[DOMHTMLTableSectionElement insertRow:]):
+ (-[DOMHTMLTableSectionElement deleteRow:]):
+ (-[DOMHTMLTableElement insertRow:]):
+ (-[DOMHTMLTableElement deleteRow:]):
+ (-[DOMHTMLTableColElement span]):
+ (-[DOMHTMLTableColElement setSpan:]):
+ (-[DOMHTMLTableRowElement rowIndex]):
+ (-[DOMHTMLTableRowElement sectionRowIndex]):
+ (-[DOMHTMLTableRowElement insertCell:]):
+ (-[DOMHTMLTableRowElement deleteCell:]):
+ (-[DOMHTMLTableCellElement cellIndex]):
+ (-[DOMHTMLTableCellElement colSpan]):
+ (-[DOMHTMLTableCellElement setColSpan:]):
+ (-[DOMHTMLTableCellElement rowSpan]):
+ (-[DOMHTMLTableCellElement setRowSpan:]):
+ (-[DOMHTMLEmbedElement height]):
+ (-[DOMHTMLEmbedElement setHeight:]):
+ (-[DOMHTMLEmbedElement width]):
+ (-[DOMHTMLEmbedElement setWidth:]):
+ * kwq/DOMRange.h:
+ * kwq/DOMStylesheets.h:
+ * kwq/DOMTraversal.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::advanceToNextMisspelling):
+ (KWQKHTMLPart::openURLFromPageCache):
+ (KWQKHTMLPart::markMisspellings):
+ * kwq/KWQString.h:
+ * kwq/KWQString.mm:
+ (QString::toShort):
+ (QString::toUShort):
+ (QString::toInt):
+ (QString::toUInt):
+ * kwq/KWQTextEdit.h:
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::selectionStart):
+ (QTextEdit::selectionEnd):
+ (QTextEdit::setSelectionStart):
+ (QTextEdit::setSelectionEnd):
+ (QTextEdit::setSelectionRange):
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge convertToNSRange:DOM::]):
+
2005-09-16 Tim Omernick <tomernick at apple.com>
Reviewed by Dave Hyatt. Test case reviewed by Vicki Murley.
1.3 +0 -1 WebCore/ForwardingHeaders/khtml_pagecache.h
<<Binary file>>
1.15 +1 -1 WebCore/khtml/khtml_events.cpp
Index: khtml_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_events.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- khtml_events.cpp 11 May 2005 00:58:27 -0000 1.14
+++ khtml_events.cpp 16 Sep 2005 22:42:00 -0000 1.15
@@ -52,7 +52,7 @@
delete d;
}
-long MouseEvent::offset() const
+int MouseEvent::offset() const
{
Position pos;
if (NodeImpl *inner = m_innerNode.get()) {
1.8 +2 -2 WebCore/khtml/khtml_events.h
Index: khtml_events.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_events.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- khtml_events.h 11 May 2005 00:58:27 -0000 1.7
+++ khtml_events.h 16 Sep 2005 22:42:00 -0000 1.8
@@ -49,7 +49,7 @@
DOM::NodeImpl *innerNode() const { return m_innerNode.get(); }
// return the offset of innerNode
- long offset() const;
+ int offset() const;
private:
QMouseEvent *m_qmouseEvent;
@@ -116,7 +116,7 @@
public:
MouseReleaseEvent( QMouseEvent *mouseEvent, int x, int y,
const DOM::DOMString &url, const DOM::DOMString& target,
- DOM::NodeImpl *innerNode, long = 0 )
+ DOM::NodeImpl *innerNode, int = 0 )
: MouseEvent( s_strMouseReleaseEvent, mouseEvent, x, y, url, target, innerNode )
{}
1.340 +18 -4 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- khtml_part.cpp 1 Sep 2005 18:03:31 -0000 1.339
+++ khtml_part.cpp 16 Sep 2005 22:42:00 -0000 1.340
@@ -401,7 +401,9 @@
m_url = url;
+#if !APPLE_CHANGES
KHTMLPageCache::self()->fetchData( d->m_cacheId, this, SLOT(slotRestoreData(const QByteArray &)));
+#endif
emit started( 0L );
@@ -606,7 +608,9 @@
if ( d->m_job )
{
+#if !APPLE_CHANGES
KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
+#endif
d->m_job->kill();
d->m_job = 0;
}
@@ -632,7 +636,9 @@
d->m_bLoadEventEmitted = true; // don't want that one either
d->m_cachePolicy = KIO::CC_Verify; // Why here?
+#if !APPLE_CHANGES
KHTMLPageCache::self()->cancelFetch(this);
+#endif
if ( d->m_doc && d->m_doc->parsing() )
{
kdDebug( 6050 ) << " was still parsing... calling end " << endl;
@@ -1204,7 +1210,9 @@
d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy);
d->m_workingURL = KURL();
+#if !APPLE_CHANGES
d->m_cacheId = KHTMLPageCache::self()->createCacheEntry();
+#endif
// When the first data arrives, the metadata has just been made available
#if APPLE_CHANGES
@@ -1473,7 +1481,9 @@
{
if (job->error())
{
+#if !APPLE_CHANGES
KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
+#endif
d->m_job = 0L;
#if !APPLE_CHANGES
emit canceled( job->errorString() );
@@ -1487,7 +1497,9 @@
}
//kdDebug( 6050 ) << "slotFinished" << endl;
+#if !APPLE_CHANGES
KHTMLPageCache::self()->endData(d->m_cacheId);
+#endif
if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http"))
KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
@@ -1537,7 +1549,9 @@
#endif
d->m_bCleared = false;
+#if !APPLE_CHANGES
d->m_cacheId = 0;
+#endif
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
d->m_bLoadingMainResource = true;
@@ -2971,7 +2985,7 @@
KURL url = frame->url();
if (!(url.isLocalFile()) && frame->inherits("KHTMLPart"))
{
- long cacheId = static_cast<KHTMLPart *>(frame)->d->m_cacheId;
+ int cacheId = static_cast<KHTMLPart *>(frame)->d->m_cacheId;
if (KHTMLPageCache::self()->isValid(cacheId))
{
@@ -5452,13 +5466,13 @@
return id;
}
-#endif
-
long KHTMLPart::cacheId() const
{
return d->m_cacheId;
}
+#endif
+
bool KHTMLPart::restored() const
{
return d->m_restored;
@@ -5983,7 +5997,7 @@
return;
// Create compute positions before and after the element.
- unsigned long ownerElementNodeIndex = ownerElement->nodeIndex();
+ unsigned ownerElementNodeIndex = ownerElement->nodeIndex();
VisiblePosition beforeOwnerElement(VisiblePosition(ownerElementParent, ownerElementNodeIndex, khtml::SEL_DEFAULT_AFFINITY));
VisiblePosition afterOwnerElement(VisiblePosition(ownerElementParent, ownerElementNodeIndex + 1, khtml::VP_UPSTREAM_IF_POSSIBLE));
1.137 +2 -2 WebCore/khtml/khtml_part.h
Index: khtml_part.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- khtml_part.h 14 Aug 2005 09:12:43 -0000 1.136
+++ khtml_part.h 16 Sep 2005 22:42:00 -0000 1.137
@@ -360,7 +360,7 @@
/**
* Returns whether images contained in the document are loaded automatically
* or not.
- * @note that the returned information is unrelieable as long as no begin()
+ * @note that the returned information is unreliable as long as no begin()
* was called.
*/
bool autoloadImages() const;
@@ -1361,7 +1361,7 @@
#if APPLE_CHANGES
private:
#endif
- long cacheId() const;
+ int cacheId() const;
void checkEmitLoadEvent();
void emitLoadEvent();
1.58 +6 -2 WebCore/khtml/khtmlpart_p.h
Index: khtmlpart_p.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlpart_p.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- khtmlpart_p.h 1 Jun 2005 23:49:49 -0000 1.57
+++ khtmlpart_p.h 16 Sep 2005 22:42:00 -0000 1.58
@@ -146,7 +146,9 @@
#ifndef Q_WS_QWS
m_javaContext = 0;
#endif
+#if !APPLE_CHANGES
m_cacheId = 0;
+#endif
m_frameNameId = 1;
m_restored = false;
@@ -239,7 +241,9 @@
khtml::Decoder *m_decoder;
QString m_encoding;
QString m_sheetUsed;
+#if !APPLE_CANGES
long m_cacheId;
+#endif
QString scheduledScript;
khtml::SharedPtr<DOM::NodeImpl> scheduledScriptNode;
@@ -399,8 +403,8 @@
QCursor m_linkCursor;
QTimer m_scrollTimer;
- unsigned long m_loadedObjects;
- unsigned long m_totalObjectCount;
+ unsigned m_loadedObjects;
+ unsigned m_totalObjectCount;
unsigned int m_jobPercent;
KHTMLFind *m_findDialog;
1.16 +2 -2 WebCore/khtml/css/css_base.h
Index: css_base.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_base.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- css_base.h 28 Jul 2005 23:27:12 -0000 1.15
+++ css_base.h 16 Sep 2005 22:42:01 -0000 1.16
@@ -260,8 +260,8 @@
virtual ~StyleListImpl();
- unsigned long length() { return m_lstChildren->count(); }
- StyleBaseImpl *item(unsigned long num) { return m_lstChildren->at(num); }
+ unsigned length() { return m_lstChildren->count(); }
+ StyleBaseImpl *item(unsigned num) { return m_lstChildren->at(num); }
void append(StyleBaseImpl *item) { m_lstChildren->append(item); }
1.36 +2 -2 WebCore/khtml/css/css_computedstyle.cpp
Index: css_computedstyle.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_computedstyle.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- css_computedstyle.cpp 27 Aug 2005 00:14:18 -0000 1.35
+++ css_computedstyle.cpp 16 Sep 2005 22:42:01 -0000 1.36
@@ -1270,12 +1270,12 @@
exceptionCode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
}
-unsigned long CSSComputedStyleDeclarationImpl::length() const
+unsigned CSSComputedStyleDeclarationImpl::length() const
{
return numComputedProperties;
}
-DOMString CSSComputedStyleDeclarationImpl::item(unsigned long i) const
+DOMString CSSComputedStyleDeclarationImpl::item(unsigned i) const
{
if (i >= numComputedProperties)
return DOMString();
1.9 +2 -2 WebCore/khtml/css/css_computedstyle.h
Index: css_computedstyle.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_computedstyle.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- css_computedstyle.h 11 May 2005 00:58:27 -0000 1.8
+++ css_computedstyle.h 16 Sep 2005 22:42:01 -0000 1.9
@@ -44,8 +44,8 @@
virtual DOMString cssText() const;
- virtual unsigned long length() const;
- virtual DOMString item(unsigned long index) const;
+ virtual unsigned length() const;
+ virtual DOMString item(unsigned index) const;
virtual CSSValueImpl *getPropertyCSSValue(int propertyID) const;
virtual DOMString getPropertyValue(int propertyID) const;
1.23 +10 -10 WebCore/khtml/css/css_ruleimpl.cpp
Index: css_ruleimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_ruleimpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- css_ruleimpl.cpp 25 Aug 2005 17:46:57 -0000 1.22
+++ css_ruleimpl.cpp 16 Sep 2005 22:42:01 -0000 1.23
@@ -256,7 +256,7 @@
m_lstCSSRules->deref();
}
-unsigned long CSSMediaRuleImpl::append( CSSRuleImpl *rule )
+unsigned CSSMediaRuleImpl::append( CSSRuleImpl *rule )
{
if (!rule) {
return 0;
@@ -266,8 +266,8 @@
return m_lstCSSRules->insertRule( rule, m_lstCSSRules->length() );
}
-unsigned long CSSMediaRuleImpl::insertRule( const DOMString &rule,
- unsigned long index )
+unsigned CSSMediaRuleImpl::insertRule( const DOMString &rule,
+ unsigned index )
{
CSSParser p( strictParsing );
CSSRuleImpl *newRule = p.parseRule( parentStyleSheet(), rule );
@@ -290,8 +290,8 @@
result += "{ \n";
if (m_lstCSSRules) {
- unsigned long len = m_lstCSSRules->length();
- for (unsigned long i = 0; i < len; i++) {
+ unsigned len = m_lstCSSRules->length();
+ for (unsigned i = 0; i < len; i++) {
result += " ";
result += m_lstCSSRules->item(i)->cssText();
result += "\n";
@@ -307,8 +307,8 @@
CSSRuleListImpl::CSSRuleListImpl(StyleListImpl *lst)
{
if (lst) {
- unsigned long len = lst->length();
- for (unsigned long i = 0; i < len; ++i) {
+ unsigned len = lst->length();
+ for (unsigned i = 0; i < len; ++i) {
StyleBaseImpl *style = lst->item(i);
if (style->isRule())
append(static_cast<CSSRuleImpl *>(style));
@@ -408,7 +408,7 @@
}
}
-void CSSRuleListImpl::deleteRule ( unsigned long index )
+void CSSRuleListImpl::deleteRule ( unsigned index )
{
CSSRuleImpl *rule = m_lstCSSRules.take( index );
if( rule )
@@ -422,8 +422,8 @@
insertRule( rule, m_lstCSSRules.count() ) ;
}
-unsigned long CSSRuleListImpl::insertRule( CSSRuleImpl *rule,
- unsigned long index )
+unsigned CSSRuleListImpl::insertRule( CSSRuleImpl *rule,
+ unsigned index )
{
if( rule && m_lstCSSRules.insert( index, rule ) )
{
1.17 +8 -8 WebCore/khtml/css/css_ruleimpl.h
Index: css_ruleimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_ruleimpl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- css_ruleimpl.h 30 Jul 2005 21:19:45 -0000 1.16
+++ css_ruleimpl.h 16 Sep 2005 22:42:01 -0000 1.17
@@ -20,7 +20,7 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
- * $Id: css_ruleimpl.h,v 1.16 2005/07/30 21:19:45 darin Exp $
+ * $Id: css_ruleimpl.h,v 1.17 2005/09/16 22:42:01 adele Exp $
*/
#ifndef _CSS_css_ruleimpl_h_
#define _CSS_css_ruleimpl_h_
@@ -147,12 +147,12 @@
MAIN_THREAD_ALLOCATED;
- unsigned long length() const { return m_lstCSSRules.count(); }
- CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); }
+ unsigned length() const { return m_lstCSSRules.count(); }
+ CSSRuleImpl *item ( unsigned index ) { return m_lstCSSRules.at( index ); }
/* not part of the DOM */
- unsigned long insertRule ( CSSRuleImpl *rule, unsigned long index );
- void deleteRule ( unsigned long index );
+ unsigned insertRule ( CSSRuleImpl *rule, unsigned index );
+ void deleteRule ( unsigned index );
void append( CSSRuleImpl *rule );
protected:
@@ -172,14 +172,14 @@
MediaListImpl *media() const { return m_lstMedia; }
CSSRuleListImpl *cssRules() { return m_lstCSSRules; }
- unsigned long insertRule ( const DOM::DOMString &rule, unsigned long index );
- void deleteRule ( unsigned long index ) { m_lstCSSRules->deleteRule( index ); }
+ unsigned insertRule ( const DOM::DOMString &rule, unsigned index );
+ void deleteRule ( unsigned index ) { m_lstCSSRules->deleteRule( index ); }
virtual bool isMediaRule() { return true; }
virtual DOMString cssText() const;
/* Not part of the DOM */
- unsigned long append( CSSRuleImpl *rule );
+ unsigned append( CSSRuleImpl *rule );
protected:
MediaListImpl *m_lstMedia;
CSSRuleListImpl *m_lstCSSRules;
1.17 +8 -8 WebCore/khtml/css/css_stylesheetimpl.cpp
Index: css_stylesheetimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_stylesheetimpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- css_stylesheetimpl.cpp 25 Aug 2005 17:46:57 -0000 1.16
+++ css_stylesheetimpl.cpp 16 Sep 2005 22:42:01 -0000 1.17
@@ -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.16 2005/08/25 17:46:57 darin Exp $
+ * $Id: css_stylesheetimpl.cpp,v 1.17 2005/09/16 22:42:01 adele Exp $
*/
//#define CSS_STYLESHEET_DEBUG
@@ -164,7 +164,7 @@
return 0;
}
-unsigned long CSSStyleSheetImpl::insertRule( const DOMString &rule, unsigned long index, int &exceptioncode )
+unsigned CSSStyleSheetImpl::insertRule( const DOMString &rule, unsigned index, int &exceptioncode )
{
exceptioncode = 0;
if(index > m_lstChildren->count()) {
@@ -185,7 +185,7 @@
return index;
}
-unsigned long CSSStyleSheetImpl::addRule( const DOMString &selector, const DOMString &style, long index, int &exceptioncode )
+unsigned CSSStyleSheetImpl::addRule( const DOMString &selector, const DOMString &style, int index, int &exceptioncode )
{
if (index == -1)
index = m_lstChildren->count();
@@ -197,7 +197,7 @@
return new CSSRuleListImpl(this);
}
-void CSSStyleSheetImpl::deleteRule( unsigned long index, int &exceptioncode )
+void CSSStyleSheetImpl::deleteRule( unsigned index, int &exceptioncode )
{
exceptioncode = 0;
StyleBaseImpl *b = m_lstChildren->take(index);
@@ -309,10 +309,10 @@
s->deref();
}
-unsigned long StyleSheetListImpl::length() const
+unsigned StyleSheetListImpl::length() const
{
// hack so implicit BODY stylesheets don't get counted here
- unsigned long l = 0;
+ unsigned l = 0;
QPtrListIterator<StyleSheetImpl> it(styleSheets);
for (; it.current(); ++it) {
if (!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(it.current())->implicit())
@@ -321,9 +321,9 @@
return l;
}
-StyleSheetImpl *StyleSheetListImpl::item ( unsigned long index )
+StyleSheetImpl *StyleSheetListImpl::item ( unsigned index )
{
- unsigned long l = 0;
+ unsigned l = 0;
QPtrListIterator<StyleSheetImpl> it(styleSheets);
for (; it.current(); ++it) {
if (!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(it.current())->implicit()) {
1.13 +8 -8 WebCore/khtml/css/css_stylesheetimpl.h
Index: css_stylesheetimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_stylesheetimpl.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- css_stylesheetimpl.h 9 Jul 2005 20:19:00 -0000 1.12
+++ css_stylesheetimpl.h 16 Sep 2005 22:42:01 -0000 1.13
@@ -19,7 +19,7 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
- * $Id: css_stylesheetimpl.h,v 1.12 2005/07/09 20:19:00 hyatt Exp $
+ * $Id: css_stylesheetimpl.h,v 1.13 2005/09/16 22:42:01 adele Exp $
*/
#ifndef _CSS_css_stylesheetimpl_h_
#define _CSS_css_stylesheetimpl_h_
@@ -100,9 +100,9 @@
CSSRuleImpl *ownerRule() const;
CSSRuleListImpl *cssRules();
- unsigned long insertRule ( const DOM::DOMString &rule, unsigned long index, int &exceptioncode );
- void deleteRule ( unsigned long index, int &exceptioncode );
- unsigned long addRule ( const DOMString &selector, const DOMString &style, long index, int &exceptioncode );
+ unsigned insertRule ( const DOM::DOMString &rule, unsigned index, int &exceptioncode );
+ void deleteRule ( unsigned index, int &exceptioncode );
+ unsigned addRule ( const DOMString &selector, const DOMString &style, int index, int &exceptioncode );
void addNamespace(CSSParser* p, const AtomicString& prefix, const AtomicString& uri);
const AtomicString& determineNamespace(const AtomicString& prefix);
@@ -130,8 +130,8 @@
~StyleSheetListImpl();
// the following two ignore implicit stylesheets
- unsigned long length() const;
- StyleSheetImpl *item ( unsigned long index );
+ unsigned length() const;
+ StyleSheetImpl *item ( unsigned index );
void add(StyleSheetImpl* s);
void remove(StyleSheetImpl* s);
@@ -157,8 +157,8 @@
CSSStyleSheetImpl *parentStyleSheet() const;
CSSRuleImpl *parentRule() const;
- unsigned long length() const { return m_lstMedia.count(); }
- DOM::DOMString item ( unsigned long index ) const { return m_lstMedia[index]; }
+ unsigned length() const { return m_lstMedia.count(); }
+ DOM::DOMString item ( unsigned index ) const { return m_lstMedia[index]; }
void deleteMedium ( const DOM::DOMString &oldMedium );
void appendMedium ( const DOM::DOMString &newMedium ) { m_lstMedia.append(newMedium); }
1.77 +2 -2 WebCore/khtml/css/css_valueimpl.cpp
Index: css_valueimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_valueimpl.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- css_valueimpl.cpp 29 Aug 2005 21:29:09 -0000 1.76
+++ css_valueimpl.cpp 16 Sep 2005 22:42:02 -0000 1.77
@@ -508,12 +508,12 @@
multiLength = false;
}
-unsigned long CSSMutableStyleDeclarationImpl::length() const
+unsigned CSSMutableStyleDeclarationImpl::length() const
{
return m_values.count();
}
-DOMString CSSMutableStyleDeclarationImpl::item(unsigned long i) const
+DOMString CSSMutableStyleDeclarationImpl::item(unsigned i) const
{
if (i >= m_values.count())
return DOMString();
1.49 +6 -6 WebCore/khtml/css/css_valueimpl.h
Index: css_valueimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_valueimpl.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- css_valueimpl.h 27 Aug 2005 00:14:18 -0000 1.48
+++ css_valueimpl.h 16 Sep 2005 22:42:02 -0000 1.49
@@ -57,8 +57,8 @@
virtual DOMString cssText() const = 0;
virtual void setCssText(const DOMString &, int &exceptionCode) = 0;
- virtual unsigned long length() const = 0;
- virtual DOMString item(unsigned long index) const = 0;
+ virtual unsigned length() const = 0;
+ virtual DOMString item(unsigned index) const = 0;
CSSValueImpl *getPropertyCSSValue(const DOMString &propertyName);
DOMString getPropertyValue(const DOMString &propertyName);
@@ -120,8 +120,8 @@
virtual ~CSSValueListImpl();
- unsigned long length() const { return m_values.count(); }
- CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); }
+ unsigned length() const { return m_values.count(); }
+ CSSValueImpl *item ( unsigned index ) { return m_values.at(index); }
virtual bool isValueList() { return true; }
@@ -491,8 +491,8 @@
virtual DOMString cssText() const;
virtual void setCssText(const DOMString &, int &exceptionCode);
- virtual unsigned long length() const;
- virtual DOMString item(unsigned long index) const;
+ virtual unsigned length() const;
+ virtual DOMString item(unsigned index) const;
virtual CSSValueImpl *getPropertyCSSValue(int propertyID) const;
virtual DOMString getPropertyValue(int propertyID) const;
1.8 +4 -4 WebCore/khtml/dom/css_rule.h
Index: css_rule.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/css_rule.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- css_rule.h 11 May 2005 00:58:28 -0000 1.7
+++ css_rule.h 16 Sep 2005 22:42:03 -0000 1.8
@@ -350,7 +350,7 @@
* and is unparsable.
*
*/
- unsigned long insertRule ( const DOMString &rule, unsigned long index );
+ unsigned insertRule ( const DOMString &rule, unsigned index );
/**
* Used to delete a rule from the media block.
@@ -368,7 +368,7 @@
* readonly.
*
*/
- void deleteRule ( unsigned long index );
+ void deleteRule ( unsigned index );
};
@@ -522,7 +522,7 @@
* length-1 </code> inclusive.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* Used to retrieve a CSS rule by ordinal index. The order in this
@@ -536,7 +536,7 @@
* is not a valid index.
*
*/
- CSSRule item ( unsigned long index );
+ CSSRule item ( unsigned index );
/**
* @internal
1.10 +7 -7 WebCore/khtml/dom/css_stylesheet.h
Index: css_stylesheet.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/css_stylesheet.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- css_stylesheet.h 18 May 2005 21:10:24 -0000 1.9
+++ css_stylesheet.h 16 Sep 2005 22:42:03 -0000 1.10
@@ -293,7 +293,7 @@
* and is unparsable.
*
*/
- unsigned long insertRule ( const DOMString &rule, unsigned long index );
+ unsigned insertRule ( const DOMString &rule, unsigned index );
/**
* Used to delete a rule from the style sheet.
@@ -311,10 +311,10 @@
* readonly.
*
*/
- void deleteRule ( unsigned long index );
+ void deleteRule ( unsigned index );
/* Microsoft extension. */
- void addRule ( const DOMString &selector, const DOMString &style, long index );
+ void addRule ( const DOMString &selector, const DOMString &style, int index );
};
@@ -344,7 +344,7 @@
* length-1 </code> inclusive.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* Used to retrieve a style sheet by ordinal index.
@@ -356,7 +356,7 @@
* that is not a valid index.
*
*/
- StyleSheet item ( unsigned long index );
+ StyleSheet item ( unsigned index );
/**
* @internal
@@ -412,7 +412,7 @@
/**
* The number of media in the list. The range of valid media is 0 to length-1 inclusive.
*/
- unsigned long length() const;
+ unsigned length() const;
/**
@@ -424,7 +424,7 @@
* @return The medium at the indexth position in the MediaList, or null if
* that is not a valid index.
*/
- DOMString item(unsigned long index) const;
+ DOMString item(unsigned index) const;
/**
* Deletes the medium indicated by oldMedium from the list.
1.10 +4 -4 WebCore/khtml/dom/css_value.h
Index: css_value.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/css_value.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- css_value.h 27 Aug 2005 00:14:20 -0000 1.9
+++ css_value.h 16 Sep 2005 22:42:03 -0000 1.10
@@ -96,7 +96,7 @@
* declaration block.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* The CSS rule that contains this declaration block.
@@ -215,7 +215,7 @@
* empty string if no property exists at this position.
*
*/
- DOMString item ( unsigned long index );
+ DOMString item ( unsigned index );
/**
* @internal
@@ -346,7 +346,7 @@
* </code> inclusive.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* Used to retrieve a CSS rule by ordinal index. The order in this
@@ -360,7 +360,7 @@
* that is not valid index.
*
*/
- CSSValue item ( unsigned long index );
+ CSSValue item ( unsigned index );
protected:
CSSValueListImpl *vimpl;
1.25 +18 -18 WebCore/khtml/dom/dom2_events.cpp
Index: dom2_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_events.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dom2_events.cpp 24 May 2005 21:16:29 -0000 1.24
+++ dom2_events.cpp 16 Sep 2005 22:42:03 -0000 1.25
@@ -34,11 +34,11 @@
namespace DOM {
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_LEFT;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_UNKNOWN;
+const unsigned KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
+const unsigned KeyboardEvent::DOM_KEY_LOCATION_LEFT;
+const unsigned KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
+const unsigned KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
+const unsigned KeyboardEvent::DOM_KEY_LOCATION_UNKNOWN;
// -----------------------------------------------------------------------------
@@ -299,7 +299,7 @@
return static_cast<UIEventImpl*>(impl)->view();
}
-long UIEvent::detail() const
+int UIEvent::detail() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -399,7 +399,7 @@
bool canBubbleArg,
bool cancelableArg,
const AbstractView &viewArg,
- long detailArg)
+ int detailArg)
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -449,7 +449,7 @@
{
}
-long MouseEvent::screenX() const
+int MouseEvent::screenX() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -457,7 +457,7 @@
return static_cast<MouseEventImpl*>(impl)->screenX();
}
-long MouseEvent::screenY() const
+int MouseEvent::screenY() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -465,7 +465,7 @@
return static_cast<MouseEventImpl*>(impl)->screenY();
}
-long MouseEvent::clientX() const
+int MouseEvent::clientX() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -473,7 +473,7 @@
return static_cast<MouseEventImpl*>(impl)->clientX();
}
-long MouseEvent::clientY() const
+int MouseEvent::clientY() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -533,11 +533,11 @@
bool canBubbleArg,
bool cancelableArg,
const AbstractView &viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -703,7 +703,7 @@
return static_cast<KeyboardEventImpl*>(impl)->keyIdentifier();
}
-unsigned long KeyboardEvent::keyLocation() const
+unsigned KeyboardEvent::keyLocation() const
{
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
@@ -756,7 +756,7 @@
bool cancelableArg,
const AbstractView &viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool shiftKeyArg,
bool altKeyArg,
1.20 +18 -18 WebCore/khtml/dom/dom2_events.h
Index: dom2_events.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_events.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dom2_events.h 9 Aug 2005 21:29:41 -0000 1.19
+++ dom2_events.h 16 Sep 2005 22:42:03 -0000 1.20
@@ -369,7 +369,7 @@
* of event.
*
*/
- long detail() const;
+ int detail() const;
/**
* Non-standard extension to support IE-style keyCode event property.
@@ -427,7 +427,7 @@
bool canBubbleArg,
bool cancelableArg,
const AbstractView &viewArg,
- long detailArg);
+ int detailArg);
UIEvent(UIEventImpl *impl);
};
@@ -467,28 +467,28 @@
* origin of the screen coordinate system.
*
*/
- long screenX() const;
+ int screenX() const;
/**
* The vertical coordinate at which the event occurred relative to the
* origin of the screen coordinate system.
*
*/
- long screenY() const;
+ int screenY() const;
/**
* The horizontal coordinate at which the event occurred relative to the
* DOM implementation's client area.
*
*/
- long clientX() const;
+ int clientX() const;
/**
* The vertical coordinate at which the event occurred relative to the DOM
* implementation's client area.
*
*/
- long clientY() const;
+ int clientY() const;
/**
* Used to indicate whether the 'ctrl' key was depressed during the firing
@@ -583,11 +583,11 @@
bool canBubbleArg,
bool cancelableArg,
const AbstractView &viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -755,11 +755,11 @@
#endif
// KeyLocationCode
- static const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
- static const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
- static const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
- static const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
- static const unsigned long DOM_KEY_LOCATION_UNKNOWN = 0x04;
+ static const unsigned DOM_KEY_LOCATION_STANDARD = 0x00;
+ static const unsigned DOM_KEY_LOCATION_LEFT = 0x01;
+ static const unsigned DOM_KEY_LOCATION_RIGHT = 0x02;
+ static const unsigned DOM_KEY_LOCATION_NUMPAD = 0x03;
+ static const unsigned DOM_KEY_LOCATION_UNKNOWN = 0x04;
#if !KHTML_NO_CPLUSPLUS_DOM
@@ -773,7 +773,7 @@
* Contains an indication of the location of they key on the device.
*
*/
- unsigned long keyLocation() const;
+ unsigned keyLocation() const;
/**
* Used to indicate whether the 'ctrl' key was depressed during the firing
@@ -817,7 +817,7 @@
bool cancelableArg,
const AbstractView &viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool shiftKeyArg,
bool altKeyArg,
1.11 +5 -5 WebCore/khtml/dom/dom2_range.h
Index: dom2_range.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_range.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dom2_range.h 18 May 2005 21:10:24 -0000 1.10
+++ dom2_range.h 16 Sep 2005 22:42:03 -0000 1.11
@@ -106,7 +106,7 @@
Range();
Range(const Document rootContainer);
Range(const Range &other);
- Range(const Node startContainer, const long startOffset, const Node endContainer, const long endOffset);
+ Range(const Node startContainer, const int startOffset, const Node endContainer, const int endOffset);
Range & operator = (const Range &other);
@@ -122,7 +122,7 @@
* Offset within the starting node of the range.
*
*/
- long startOffset() const;
+ int startOffset() const;
/**
* Node within which the range ends
@@ -134,7 +134,7 @@
* Offset within the ending node of the range.
*
*/
- long endOffset() const;
+ int endOffset() const;
/**
* TRUE if the range is collapsed
@@ -172,7 +172,7 @@
* should an exception be raised.
*
*/
- void setStart ( const Node &refNode, long offset );
+ void setStart ( const Node &refNode, int offset );
/**
* Sets the attributes describing the end of a range.
@@ -193,7 +193,7 @@
* Notation, or DocumentType node.
*
*/
- void setEnd ( const Node &refNode, long offset );
+ void setEnd ( const Node &refNode, int offset );
/**
* Sets the start position to be before a node
1.6 +2 -2 WebCore/khtml/dom/dom2_traversal.cpp
Index: dom2_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_traversal.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dom2_traversal.cpp 18 May 2005 21:10:24 -0000 1.5
+++ dom2_traversal.cpp 16 Sep 2005 22:42:03 -0000 1.6
@@ -144,7 +144,7 @@
return 0;
}
-unsigned long NodeIterator::whatToShow() const
+unsigned NodeIterator::whatToShow() const
{
if (impl)
return impl->whatToShow();
@@ -265,7 +265,7 @@
return 0;
}
-unsigned long TreeWalker::whatToShow() const
+unsigned TreeWalker::whatToShow() const
{
if (impl)
return impl->whatToShow();
1.6 +4 -4 WebCore/khtml/dom/dom2_traversal.h
Index: dom2_traversal.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_traversal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dom2_traversal.h 11 May 2005 00:58:28 -0000 1.5
+++ dom2_traversal.h 16 Sep 2005 22:42:03 -0000 1.6
@@ -196,7 +196,7 @@
* children may still be considered. Note that this skip takes precedence
* over the filter, if any.
*/
- unsigned long whatToShow() const;
+ unsigned whatToShow() const;
/**
* The NodeFilter used to screen nodes.
@@ -318,7 +318,7 @@
* children may still be considered. Note that this skip takes precedence
* over the filter, if any.
*/
- unsigned long whatToShow() const;
+ unsigned whatToShow() const;
/**
* The filter used to screen nodes.
@@ -536,7 +536,7 @@
* @return The newly created NodeIterator .
*
*
- NodeIterator createNodeIterator ( const Node &root, long whatToShow,
+ NodeIterator createNodeIterator ( const Node &root, int whatToShow,
const NodeFilter &filter, bool expandEntityReferences );
**
@@ -569,7 +569,7 @@
* node is null.
*
*
- TreeWalker createTreeWalker ( const Node &root, long whatToShow,
+ TreeWalker createTreeWalker ( const Node &root, int whatToShow,
const NodeFilter &filter, bool expandEntityReferences );
};
*/
1.14 +6 -6 WebCore/khtml/dom/dom_node.h
Index: dom_node.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_node.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dom_node.h 9 Jul 2005 20:19:02 -0000 1.13
+++ dom_node.h 16 Sep 2005 22:42:03 -0000 1.14
@@ -75,7 +75,7 @@
* indices is 0 to <code> length-1 </code> inclusive.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* Retrieves a node specified by name.
@@ -152,7 +152,7 @@
* not a valid index.
*
*/
- Node item ( unsigned long index ) const;
+ Node item ( unsigned index ) const;
/**
* Introduced in DOM Level 2
@@ -876,7 +876,7 @@
/**
* @internal returns the index of a node
*/
- unsigned long index() const;
+ unsigned index() const;
QString toHTML();
void applyChanges();
/**
@@ -935,7 +935,7 @@
* indices is 0 to <code> length-1 </code> inclusive.
*
*/
- unsigned long length() const;
+ unsigned length() const;
/**
* Returns the <code> index </code> th item in the collection. If
@@ -949,7 +949,7 @@
* a valid index.
*
*/
- Node item ( unsigned long index ) const;
+ Node item ( unsigned index ) const;
/**
* @internal
@@ -972,7 +972,7 @@
* A DOMTimeStamp represents a number of milliseconds.
*
*/
-typedef unsigned long long DOMTimeStamp;
+typedef unsigned long DOMTimeStamp;
} //namespace
1.38 +6 -6 WebCore/khtml/ecma/kjs_css.cpp
Index: kjs_css.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_css.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kjs_css.cpp 25 Aug 2005 23:13:41 -0000 1.37
+++ kjs_css.cpp 16 Sep 2005 22:42:04 -0000 1.38
@@ -172,7 +172,7 @@
}
bool ok;
- long unsigned int u = propertyName.toULong(&ok);
+ unsigned u = propertyName.toUInt32(&ok);
if (ok) {
slot.setCustomIndex(this, u, indexGetter);
return true;
@@ -405,7 +405,7 @@
// Retrieve stylesheet by index
bool ok;
- long unsigned int u = propertyName.toULong(&ok);
+ unsigned u = propertyName.toUInt32(&ok);
if (ok && u < styleSheetList.length()) {
slot.setCustomIndex(this, u, indexGetter);
return true;
@@ -530,7 +530,7 @@
}
bool ok;
- long unsigned int u = propertyName.toULong(&ok);
+ unsigned u = propertyName.toUInt32(&ok);
if (ok && u < m_impl->length()) {
slot.setCustomIndex(this, u, indexGetter);
return true;
@@ -636,7 +636,7 @@
styleSheet.deleteRule(args[0]->toInt32(exec), exception);
return Undefined();
case DOMCSSStyleSheet::AddRule: {
- long index = args.size() >= 3 ? args[2]->toInt32(exec) : -1;
+ int index = args.size() >= 3 ? args[2]->toInt32(exec) : -1;
styleSheet.addRule(args[0]->toString(exec).domString(), args[1]->toString(exec).domString(), index, exception);
// As per Microsoft documentation, always return -1.
return Number(-1);
@@ -693,7 +693,7 @@
CSSRuleListImpl &cssRuleList = *m_impl;
bool ok;
- long unsigned int u = propertyName.toULong(&ok);
+ unsigned u = propertyName.toUInt32(&ok);
if (ok && u < cssRuleList.length()) {
slot.setCustomIndex(this, u, indexGetter);
return true;
@@ -1224,7 +1224,7 @@
}
bool ok;
- long unsigned int u = propertyName.toULong(&ok);
+ unsigned u = propertyName.toUInt32(&ok);
if (ok && u < valueList.length()) {
slot.setCustomIndex(this, u, indexGetter);
return true;
1.96 +4 -4 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kjs_dom.cpp 3 Sep 2005 23:09:58 -0000 1.95
+++ kjs_dom.cpp 16 Sep 2005 22:42:04 -0000 1.96
@@ -759,7 +759,7 @@
// array index ?
bool ok;
- long unsigned int idx = propertyName.toULong(&ok);
+ unsigned idx = propertyName.toUInt32(&ok);
if (ok && idx < list.length()) {
slot.setCustomIndex(this, idx, indexGetter);
return true;
@@ -779,7 +779,7 @@
// Do not use thisObj here. See HTMLCollection.
UString s = args[0]->toString(exec);
bool ok;
- unsigned int u = s.toULong(&ok);
+ unsigned int u = s.toUInt32(&ok);
if (ok)
return getDOMNode(exec, m_impl->item(u));
@@ -1441,7 +1441,7 @@
// array index ?
bool ok;
- long unsigned int idx = propertyName.toULong(&ok);
+ unsigned idx = propertyName.toUInt32(&ok);
if (ok && idx < map.length()) {
slot.setCustomIndex(this, idx, indexGetter);
return true;
@@ -1908,7 +1908,7 @@
// array index ?
bool ok;
- long unsigned int idx = propertyName.toULong(&ok);
+ unsigned idx = propertyName.toUInt32(&ok);
if (ok && idx < m_nodes.count()) {
slot.setCustomIndex(this, idx, indexGetter);
return true;
1.61 +1 -1 WebCore/khtml/ecma/kjs_events.cpp
Index: kjs_events.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kjs_events.cpp 31 Aug 2005 04:38:36 -0000 1.60
+++ kjs_events.cpp 16 Sep 2005 22:42:05 -0000 1.61
@@ -478,7 +478,7 @@
case Cancelable:
return Boolean(event.cancelable());
case TimeStamp:
- return Number((long unsigned int)event.timeStamp()); // ### long long ?
+ return Number(event.timeStamp());
case ClipboardData:
{
if (event.isClipboardEvent()) {
1.139 +9 -9 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- kjs_html.cpp 29 Aug 2005 21:29:12 -0000 1.138
+++ kjs_html.cpp 16 Sep 2005 22:42:05 -0000 1.139
@@ -1333,7 +1333,7 @@
HTMLFormElementImpl &form = static_cast<HTMLFormElementImpl &>(element);
// Check if we're retrieving an element (by index or by name)
bool ok;
- uint u = propertyName.toULong(&ok);
+ uint u = propertyName.toUInt32(&ok);
if (ok) {
slot.setCustomIndex(this, u, formIndexGetter);
return true;
@@ -1347,7 +1347,7 @@
}
} else if (element.hasLocalName(selectTag)) {
bool ok;
- uint u = propertyName.toULong(&ok);
+ uint u = propertyName.toUInt32(&ok);
if (ok) {
// not specified by DOM(?) but supported in netscape/IE
slot.setCustomIndex(this, u, selectIndexGetter);
@@ -2530,7 +2530,7 @@
if (element.hasLocalName(selectTag)) {
HTMLSelectElementImpl &select = static_cast<HTMLSelectElementImpl &>(element);
bool ok;
- /*uint u =*/ propertyName.toULong(&ok);
+ /*uint u =*/ propertyName.toUInt32(&ok);
if (ok) {
ObjectImp *coll = static_cast<ObjectImp *>(getSelectHTMLCollection(exec, select.optionsHTMLCollection().get(), &select));
coll->put(exec,propertyName,value);
@@ -3344,7 +3344,7 @@
// name or index ?
bool ok;
- unsigned int u = propertyName.toULong(&ok);
+ unsigned int u = propertyName.toUInt32(&ok);
if (ok) {
slot.setCustomIndex(this, u, indexGetter);
return true;
@@ -3372,7 +3372,7 @@
// support for document.all(<index>) etc.
bool ok;
UString s = args[0]->toString(exec);
- unsigned int u = s.toULong(&ok);
+ unsigned int u = s.toUInt32(&ok);
if (ok)
return getDOMNode(exec, collection.item(u));
// support for document.images('<name>') etc.
@@ -3382,7 +3382,7 @@
{
bool ok;
UString s = args[0]->toString(exec);
- unsigned int u = args[1]->toString(exec).toULong(&ok);
+ unsigned int u = args[1]->toString(exec).toUInt32(&ok);
if (ok)
{
DOM::DOMString pstr = s.domString();
@@ -3482,7 +3482,7 @@
return;
}
- long diff = m_element->length() - newLen;
+ int diff = m_element->length() - newLen;
if (diff < 0) { // add dummy elements
do {
@@ -3503,7 +3503,7 @@
}
// an index ?
bool ok;
- unsigned int u = propertyName.toULong(&ok);
+ unsigned int u = propertyName.toUInt32(&ok);
if (!ok)
return;
@@ -3519,7 +3519,7 @@
return;
int exception = 0;
- long diff = long(u) - m_element->length();
+ int diff = int(u) - m_element->length();
HTMLElementImpl *before = 0;
// out of array bounds ? first insert empty dummies
if (diff > 0) {
1.35 +3 -3 WebCore/khtml/ecma/kjs_navigator.cpp
Index: kjs_navigator.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_navigator.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kjs_navigator.cpp 16 Aug 2005 00:47:45 -0000 1.34
+++ kjs_navigator.cpp 16 Sep 2005 22:42:05 -0000 1.35
@@ -394,7 +394,7 @@
} else {
// plugins[#]
bool ok;
- unsigned int i = propertyName.toULong(&ok);
+ unsigned int i = propertyName.toUInt32(&ok);
if (ok && i < plugins->count()) {
slot.setCustomIndex(this, i, indexGetter);
return true;
@@ -449,7 +449,7 @@
} else {
// mimeTypes[#]
bool ok;
- unsigned int i = propertyName.toULong(&ok);
+ unsigned int i = propertyName.toUInt32(&ok);
if (ok && i < mimes->count()) {
slot.setCustomIndex(this, i, indexGetter);
return true;
@@ -522,7 +522,7 @@
} else {
// plugin[#]
bool ok;
- unsigned int i = propertyName.toULong(&ok);
+ unsigned int i = propertyName.toUInt32(&ok);
if (ok && i < m_info->mimes.count()) {
slot.setCustomIndex(this, i, indexGetter);
return true;
1.13 +5 -5 WebCore/khtml/editing/apply_style_command.cpp
Index: apply_style_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/apply_style_command.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apply_style_command.cpp 2 Sep 2005 16:45:38 -0000 1.12
+++ apply_style_command.cpp 16 Sep 2005 22:42:06 -0000 1.13
@@ -933,7 +933,7 @@
bool ApplyStyleCommand::splitTextAtStartIfNeeded(const Position &start, const Position &end)
{
if (start.node()->isTextNode() && start.offset() > start.node()->caretMinOffset() && start.offset() < start.node()->caretMaxOffset()) {
- long endOffsetAdjustment = start.node() == end.node() ? start.offset() : 0;
+ int endOffsetAdjustment = start.node() == end.node() ? start.offset() : 0;
TextImpl *text = static_cast<TextImpl *>(start.node());
splitTextNode(text, start.offset());
setEndingSelection(Selection(Position(start.node(), 0), SEL_DEFAULT_AFFINITY, Position(end.node(), end.offset() - endOffsetAdjustment), SEL_DEFAULT_AFFINITY));
@@ -961,7 +961,7 @@
bool ApplyStyleCommand::splitTextElementAtStartIfNeeded(const Position &start, const Position &end)
{
if (start.node()->isTextNode() && start.offset() > start.node()->caretMinOffset() && start.offset() < start.node()->caretMaxOffset()) {
- long endOffsetAdjustment = start.node() == end.node() ? start.offset() : 0;
+ int endOffsetAdjustment = start.node() == end.node() ? start.offset() : 0;
TextImpl *text = static_cast<TextImpl *>(start.node());
splitTextNodeContainingElement(text, start.offset());
@@ -1025,7 +1025,7 @@
bool ApplyStyleCommand::mergeStartWithPreviousIfIdentical(const Position &start, const Position &end)
{
NodeImpl *startNode = start.node();
- long startOffset = start.offset();
+ int startOffset = start.offset();
if (start.node()->isAtomicNode()) {
if (start.offset() != 0)
@@ -1053,8 +1053,8 @@
ASSERT(startChild);
mergeIdenticalElements(previousElement, element);
- long startOffsetAdjustment = startChild->nodeIndex();
- long endOffsetAdjustment = startNode == end.node() ? startOffsetAdjustment : 0;
+ int startOffsetAdjustment = startChild->nodeIndex();
+ int endOffsetAdjustment = startNode == end.node() ? startOffsetAdjustment : 0;
setEndingSelection(Selection(Position(startNode, startOffsetAdjustment), SEL_DEFAULT_AFFINITY,
Position(end.node(), end.offset() + endOffsetAdjustment), SEL_DEFAULT_AFFINITY));
1.6 +1 -1 WebCore/khtml/editing/break_blockquote_command.cpp
Index: break_blockquote_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/break_blockquote_command.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- break_blockquote_command.cpp 25 Aug 2005 23:13:43 -0000 1.5
+++ break_blockquote_command.cpp 16 Sep 2005 22:42:06 -0000 1.6
@@ -96,7 +96,7 @@
// Split at pos if in the middle of a text node.
if (startNode->isTextNode()) {
TextImpl *textNode = static_cast<TextImpl *>(startNode);
- bool atEnd = (unsigned long)pos.offset() >= textNode->length();
+ bool atEnd = (unsigned)pos.offset() >= textNode->length();
if (pos.offset() > 0 && !atEnd) {
splitTextNode(textNode, pos.offset());
pos = Position(startNode, 0);
1.11 +9 -9 WebCore/khtml/editing/composite_edit_command.cpp
Index: composite_edit_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- composite_edit_command.cpp 29 Aug 2005 18:00:43 -0000 1.10
+++ composite_edit_command.cpp 16 Sep 2005 22:42:06 -0000 1.11
@@ -146,11 +146,11 @@
}
}
-void CompositeEditCommand::insertNodeAt(NodeImpl *insertChild, NodeImpl *refChild, long offset)
+void CompositeEditCommand::insertNodeAt(NodeImpl *insertChild, NodeImpl *refChild, int offset)
{
if (refChild->hasChildNodes() || (refChild->renderer() && refChild->renderer()->isBlockFlow())) {
NodeImpl *child = refChild->firstChild();
- for (long i = 0; child && i < offset; i++)
+ for (int i = 0; child && i < offset; i++)
child = child->nextSibling();
if (child)
insertNodeBefore(insertChild, child);
@@ -215,7 +215,7 @@
applyCommandToComposite(cmd);
}
-void CompositeEditCommand::splitTextNode(TextImpl *text, long offset)
+void CompositeEditCommand::splitTextNode(TextImpl *text, int offset)
{
EditCommandPtr cmd(new SplitTextNodeCommand(document(), text, offset));
applyCommandToComposite(cmd);
@@ -239,7 +239,7 @@
applyCommandToComposite(cmd);
}
-void CompositeEditCommand::splitTextNodeContainingElement(DOM::TextImpl *text, long offset)
+void CompositeEditCommand::splitTextNodeContainingElement(DOM::TextImpl *text, int offset)
{
EditCommandPtr cmd(new SplitTextNodeContainingElementCommand(document(), text, offset));
applyCommandToComposite(cmd);
@@ -259,19 +259,19 @@
impl->input(text, selectInsertedText);
}
-void CompositeEditCommand::insertTextIntoNode(TextImpl *node, long offset, const DOMString &text)
+void CompositeEditCommand::insertTextIntoNode(TextImpl *node, int offset, const DOMString &text)
{
EditCommandPtr cmd(new InsertIntoTextNodeCommand(document(), node, offset, text));
applyCommandToComposite(cmd);
}
-void CompositeEditCommand::deleteTextFromNode(TextImpl *node, long offset, long count)
+void CompositeEditCommand::deleteTextFromNode(TextImpl *node, int offset, int count)
{
EditCommandPtr cmd(new DeleteFromTextNodeCommand(document(), node, offset, count));
applyCommandToComposite(cmd);
}
-void CompositeEditCommand::replaceTextInNode(TextImpl *node, long offset, long count, const DOMString &replacementText)
+void CompositeEditCommand::replaceTextInNode(TextImpl *node, int offset, int count, const DOMString &replacementText)
{
EditCommandPtr deleteCommand(new DeleteFromTextNodeCommand(document(), node, offset, count));
applyCommandToComposite(deleteCommand);
@@ -342,7 +342,7 @@
return;
}
- long length = textNode->length();
+ int length = textNode->length();
if (start >= length || end > length)
return;
@@ -387,7 +387,7 @@
// Assert that we are not going to delete all of the text in the node.
// If we were, that should have been done above with the call to
// removeNode and return.
- ASSERT(start > 0 || (unsigned long)end - start < textNode->length());
+ ASSERT(start > 0 || (unsigned)end - start < textNode->length());
deleteTextFromNode(textNode, start, end - start);
}
str->deref();
1.3 +6 -6 WebCore/khtml/editing/composite_edit_command.h
Index: composite_edit_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- composite_edit_command.h 18 Jul 2005 21:44:17 -0000 1.2
+++ composite_edit_command.h 16 Sep 2005 22:42:06 -0000 1.3
@@ -56,13 +56,13 @@
void deleteKeyPressed();
void deleteSelection(bool smartDelete=false, bool mergeBlocksAfterDelete=true);
void deleteSelection(const Selection &selection, bool smartDelete=false, bool mergeBlocksAfterDelete=true);
- void deleteTextFromNode(DOM::TextImpl *node, long offset, long count);
+ void deleteTextFromNode(DOM::TextImpl *node, int offset, int count);
void inputText(const DOM::DOMString &text, bool selectInsertedText = false);
void insertNodeAfter(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);
- void insertNodeAt(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild, long offset);
+ void insertNodeAt(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild, int offset);
void insertNodeBefore(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);
void insertParagraphSeparator();
- void insertTextIntoNode(DOM::TextImpl *node, long offset, const DOM::DOMString &text);
+ void insertTextIntoNode(DOM::TextImpl *node, int offset, const DOM::DOMString &text);
void joinTextNodes(DOM::TextImpl *text1, DOM::TextImpl *text2);
void rebalanceWhitespace();
void removeCSSProperty(DOM::CSSStyleDeclarationImpl *, int property);
@@ -71,13 +71,13 @@
void removeChildrenInRange(DOM::NodeImpl *node, int from, int to);
void removeNode(DOM::NodeImpl *removeChild);
void removeNodePreservingChildren(DOM::NodeImpl *node);
- void replaceTextInNode(DOM::TextImpl *node, long offset, long count, const DOM::DOMString &replacementText);
+ void replaceTextInNode(DOM::TextImpl *node, int offset, int count, const DOM::DOMString &replacementText);
void setNodeAttribute(DOM::ElementImpl *, const DOM::QualifiedName& attribute, const DOM::DOMString &);
- void splitTextNode(DOM::TextImpl *text, long offset);
+ void splitTextNode(DOM::TextImpl *text, int offset);
void splitElement(DOM::ElementImpl *element, DOM::NodeImpl *atChild);
void mergeIdenticalElements(DOM::ElementImpl *first, DOM::ElementImpl *second);
void wrapContentsInDummySpan(DOM::ElementImpl *element);
- void splitTextNodeContainingElement(DOM::TextImpl *text, long offset);
+ void splitTextNodeContainingElement(DOM::TextImpl *text, int offset);
void deleteInsignificantText(DOM::TextImpl *, int start, int end);
void deleteInsignificantText(const DOM::Position &start, const DOM::Position &end);
1.2 +2 -2 WebCore/khtml/editing/delete_from_text_node_command.cpp
Index: delete_from_text_node_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/delete_from_text_node_command.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_from_text_node_command.cpp 13 May 2005 08:37:15 -0000 1.1
+++ delete_from_text_node_command.cpp 16 Sep 2005 22:42:06 -0000 1.2
@@ -38,12 +38,12 @@
namespace khtml {
-DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(DocumentImpl *document, TextImpl *node, long offset, long count)
+DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(DocumentImpl *document, TextImpl *node, int offset, int count)
: EditCommand(document), m_node(node), m_offset(offset), m_count(count)
{
ASSERT(m_node);
ASSERT(m_offset >= 0);
- ASSERT(m_offset < (long)m_node->length());
+ ASSERT(m_offset < (int)m_node->length());
ASSERT(m_count >= 0);
m_node->ref();
1.2 +5 -5 WebCore/khtml/editing/delete_from_text_node_command.h
Index: delete_from_text_node_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/delete_from_text_node_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_from_text_node_command.h 13 May 2005 08:37:15 -0000 1.1
+++ delete_from_text_node_command.h 16 Sep 2005 22:42:06 -0000 1.2
@@ -39,20 +39,20 @@
class DeleteFromTextNodeCommand : public EditCommand
{
public:
- DeleteFromTextNodeCommand(DOM::DocumentImpl *document, DOM::TextImpl *node, long offset, long count);
+ DeleteFromTextNodeCommand(DOM::DocumentImpl *document, DOM::TextImpl *node, int offset, int count);
virtual ~DeleteFromTextNodeCommand();
virtual void doApply();
virtual void doUnapply();
DOM::TextImpl *node() const { return m_node; }
- long offset() const { return m_offset; }
- long count() const { return m_count; }
+ int offset() const { return m_offset; }
+ int count() const { return m_count; }
private:
DOM::TextImpl *m_node;
- long m_offset;
- long m_count;
+ int m_offset;
+ int m_count;
DOM::DOMString m_text;
};
1.2 +1 -1 WebCore/khtml/editing/insert_into_text_node_command.cpp
Index: insert_into_text_node_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_into_text_node_command.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insert_into_text_node_command.cpp 13 May 2005 08:37:15 -0000 1.1
+++ insert_into_text_node_command.cpp 16 Sep 2005 22:42:06 -0000 1.2
@@ -39,7 +39,7 @@
namespace khtml {
-InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(DocumentImpl *document, TextImpl *node, long offset, const DOMString &text)
+InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(DocumentImpl *document, TextImpl *node, int offset, const DOMString &text)
: EditCommand(document), m_node(node), m_offset(offset)
{
ASSERT(m_node);
1.2 +3 -3 WebCore/khtml/editing/insert_into_text_node_command.h
Index: insert_into_text_node_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_into_text_node_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insert_into_text_node_command.h 13 May 2005 08:37:15 -0000 1.1
+++ insert_into_text_node_command.h 16 Sep 2005 22:42:06 -0000 1.2
@@ -40,19 +40,19 @@
class InsertIntoTextNodeCommand : public EditCommand
{
public:
- InsertIntoTextNodeCommand(DOM::DocumentImpl *document, DOM::TextImpl *, long, const DOM::DOMString &);
+ InsertIntoTextNodeCommand(DOM::DocumentImpl *document, DOM::TextImpl *, int, const DOM::DOMString &);
virtual ~InsertIntoTextNodeCommand();
virtual void doApply();
virtual void doUnapply();
DOM::TextImpl *node() const { return m_node; }
- long offset() const { return m_offset; }
+ int offset() const { return m_offset; }
DOM::DOMString text() const { return m_text; }
private:
DOM::TextImpl *m_node;
- long m_offset;
+ int m_offset;
DOM::DOMString m_text;
};
1.6 +1 -1 WebCore/khtml/editing/insert_paragraph_separator_command.cpp
Index: insert_paragraph_separator_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_paragraph_separator_command.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- insert_paragraph_separator_command.cpp 25 Aug 2005 23:13:45 -0000 1.5
+++ insert_paragraph_separator_command.cpp 16 Sep 2005 22:42:06 -0000 1.6
@@ -241,7 +241,7 @@
// Split at pos if in the middle of a text node.
if (startNode->isTextNode()) {
TextImpl *textNode = static_cast<TextImpl *>(startNode);
- bool atEnd = (unsigned long)pos.offset() >= textNode->length();
+ bool atEnd = (unsigned)pos.offset() >= textNode->length();
if (pos.offset() > 0 && !atEnd) {
splitTextNode(textNode, pos.offset());
pos = Position(startNode, 0);
1.7 +3 -3 WebCore/khtml/editing/insert_text_command.cpp
Index: insert_text_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_text_command.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- insert_text_command.cpp 5 Aug 2005 18:22:43 -0000 1.6
+++ insert_text_command.cpp 16 Sep 2005 22:42:06 -0000 1.7
@@ -154,7 +154,7 @@
startPosition = prepareForTextInsertion(startPosition);
removeBlockPlaceholder(startPosition.node()->enclosingBlockFlowElement());
TextImpl *textNode = static_cast<TextImpl *>(startPosition.node());
- long offset = startPosition.offset();
+ int offset = startPosition.offset();
if (text == " ") {
insertSpace(textNode, offset);
@@ -257,7 +257,7 @@
return Position(spanNode->lastChild(), spanNode->lastChild()->caretMaxOffset());
}
-void InsertTextCommand::insertSpace(TextImpl *textNode, unsigned long offset)
+void InsertTextCommand::insertSpace(TextImpl *textNode, unsigned offset)
{
ASSERT(textNode);
@@ -278,7 +278,7 @@
// check if there is a rendered WS at the caret
Position pos(textNode, offset);
Position downstream = pos.downstream();
- if (downstream.offset() < (long)text.length() && isCollapsibleWhitespace(text[downstream.offset()]))
+ if (downstream.offset() < (int)text.length() && isCollapsibleWhitespace(text[downstream.offset()]))
count--; // leave this WS in
if (count > 0)
deleteTextFromNode(textNode, offset, count);
1.5 +3 -3 WebCore/khtml/editing/insert_text_command.h
Index: insert_text_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/insert_text_command.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- insert_text_command.h 29 Jul 2005 23:42:46 -0000 1.4
+++ insert_text_command.h 16 Sep 2005 22:42:07 -0000 1.5
@@ -40,16 +40,16 @@
void deleteCharacter();
void input(const DOM::DOMString &text, bool selectInsertedText = false);
- unsigned long charactersAdded() const { return m_charactersAdded; }
+ unsigned charactersAdded() const { return m_charactersAdded; }
private:
virtual bool isInsertTextCommand() const;
DOM::Position prepareForTextInsertion(const DOM::Position& pos);
- void insertSpace(DOM::TextImpl *textNode, unsigned long offset);
+ void insertSpace(DOM::TextImpl *textNode, unsigned offset);
DOM::Position insertTab(DOM::Position pos);
- unsigned long m_charactersAdded;
+ unsigned m_charactersAdded;
};
} // namespace khtml
1.2 +1 -1 WebCore/khtml/editing/join_text_nodes_command.h
Index: join_text_nodes_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/join_text_nodes_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- join_text_nodes_command.h 24 May 2005 07:21:47 -0000 1.1
+++ join_text_nodes_command.h 16 Sep 2005 22:42:07 -0000 1.2
@@ -49,7 +49,7 @@
private:
DOM::TextImpl *m_text1;
DOM::TextImpl *m_text2;
- unsigned long m_offset;
+ unsigned m_offset;
};
} // namespace khtml
1.34 +3 -3 WebCore/khtml/editing/markup.cpp
Index: markup.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- markup.cpp 29 Aug 2005 21:10:38 -0000 1.33
+++ markup.cpp 16 Sep 2005 22:42:07 -0000 1.34
@@ -227,7 +227,7 @@
style->deref();
}
NamedAttrMapImpl *attrs = el->attributes();
- unsigned long length = attrs->length();
+ unsigned length = attrs->length();
if (length == 0 && additionalStyle.length() > 0) {
// FIXME: Handle case where additionalStyle has illegal characters in it, like "
markup += " " + styleAttr.localName().qstring() + "=\"" + additionalStyle.qstring() + "\"";
@@ -301,8 +301,8 @@
if (n->nodeType() == Node::ELEMENT_NODE) {
ElementImpl *e = static_cast<ElementImpl *>(n);
NamedAttrMapImpl *attrs = e->attributes();
- unsigned long length = attrs->length();
- for (unsigned long i = 0; i < length; i++) {
+ unsigned length = attrs->length();
+ for (unsigned i = 0; i < length; i++) {
AttributeImpl *attr = attrs->attributeItem(i);
if (e->isURLAttribute(attr))
e->setAttribute(attr->name(), KURL(baseURL, attr->value().qstring()).url());
1.2 +2 -2 WebCore/khtml/editing/move_selection_command.cpp
Index: move_selection_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/move_selection_command.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- move_selection_command.cpp 24 May 2005 07:21:47 -0000 1.1
+++ move_selection_command.cpp 16 Sep 2005 22:42:07 -0000 1.2
@@ -65,9 +65,9 @@
// Update the position otherwise it may become invalid after the selection is deleted.
NodeImpl *positionNode = m_position.node();
- long positionOffset = m_position.offset();
+ int positionOffset = m_position.offset();
Position selectionEnd = selection.end();
- long selectionEndOffset = selectionEnd.offset();
+ int selectionEndOffset = selectionEnd.offset();
if (selectionEnd.node() == positionNode && selectionEndOffset < positionOffset) {
positionOffset -= selectionEndOffset;
Position selectionStart = selection.start();
1.2 +5 -5 WebCore/khtml/editing/rebalance_whitespace_command.cpp
Index: rebalance_whitespace_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/rebalance_whitespace_command.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rebalance_whitespace_command.cpp 24 May 2005 07:21:47 -0000 1.1
+++ rebalance_whitespace_command.cpp 16 Sep 2005 22:42:07 -0000 1.2
@@ -70,14 +70,14 @@
return;
// find upstream offset
- long upstream = m_position.offset();
+ int upstream = m_position.offset();
while (upstream > 0 && isCollapsibleWhitespace(text[upstream - 1]) || isNBSP(text[upstream - 1])) {
upstream--;
m_upstreamOffset = upstream;
}
// find downstream offset
- long downstream = m_position.offset();
+ int downstream = m_position.offset();
while ((unsigned)downstream < text.length() && isCollapsibleWhitespace(text[downstream]) || isNBSP(text[downstream])) {
downstream++;
m_downstreamOffset = downstream;
@@ -88,16 +88,16 @@
m_upstreamOffset = upstream;
m_downstreamOffset = downstream;
- long length = m_downstreamOffset - m_upstreamOffset;
+ int length = m_downstreamOffset - m_upstreamOffset;
m_beforeString = text.substring(m_upstreamOffset, length);
// The following loop figures out a "rebalanced" whitespace string for any length
// string, and takes into account the special cases that need to handled for the
// start and end of strings (i.e. first and last character must be an nbsp.
- long i = m_upstreamOffset;
+ int i = m_upstreamOffset;
while (i < m_downstreamOffset) {
- long add = (m_downstreamOffset - i) % 3;
+ int add = (m_downstreamOffset - i) % 3;
switch (add) {
case 0:
m_afterString += nonBreakingSpaceString();
1.2 +2 -2 WebCore/khtml/editing/rebalance_whitespace_command.h
Index: rebalance_whitespace_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/rebalance_whitespace_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rebalance_whitespace_command.h 24 May 2005 07:21:47 -0000 1.1
+++ rebalance_whitespace_command.h 16 Sep 2005 22:42:07 -0000 1.2
@@ -48,8 +48,8 @@
DOM::DOMString m_beforeString;
DOM::DOMString m_afterString;
DOM::Position m_position;
- long m_upstreamOffset;
- long m_downstreamOffset;
+ int m_upstreamOffset;
+ int m_downstreamOffset;
};
} // namespace khtml
1.14 +1 -1 WebCore/khtml/editing/replace_selection_command.cpp
Index: replace_selection_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/replace_selection_command.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- replace_selection_command.cpp 6 Sep 2005 23:53:09 -0000 1.13
+++ replace_selection_command.cpp 16 Sep 2005 22:42:07 -0000 1.14
@@ -1045,7 +1045,7 @@
updateNodesInserted(insertChild);
}
-void ReplaceSelectionCommand::insertNodeAtAndUpdateNodesInserted(NodeImpl *insertChild, NodeImpl *refChild, long offset)
+void ReplaceSelectionCommand::insertNodeAtAndUpdateNodesInserted(NodeImpl *insertChild, NodeImpl *refChild, int offset)
{
insertNodeAt(insertChild, refChild, offset);
updateNodesInserted(insertChild);
1.2 +1 -1 WebCore/khtml/editing/replace_selection_command.h
Index: replace_selection_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/replace_selection_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- replace_selection_command.h 24 May 2005 07:21:47 -0000 1.1
+++ replace_selection_command.h 16 Sep 2005 22:42:07 -0000 1.2
@@ -124,7 +124,7 @@
void completeHTMLReplacement(const DOM::Position &lastPositionToSelect);
void insertNodeAfterAndUpdateNodesInserted(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);
- void insertNodeAtAndUpdateNodesInserted(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild, long offset);
+ void insertNodeAtAndUpdateNodesInserted(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild, int offset);
void insertNodeBeforeAndUpdateNodesInserted(DOM::NodeImpl *insertChild, DOM::NodeImpl *refChild);
void updateNodesInserted(DOM::NodeImpl *);
1.93 +3 -3 WebCore/khtml/editing/selection.cpp
Index: selection.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/selection.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- selection.cpp 29 Aug 2005 18:00:43 -0000 1.92
+++ selection.cpp 16 Sep 2005 22:42:07 -0000 1.93
@@ -1019,14 +1019,14 @@
if (m_start == m_end) {
Position pos = m_start;
- fprintf(stderr, "pos: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "pos: %s %p:%d\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
}
else {
Position pos = m_start;
- fprintf(stderr, "start: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "start: %s %p:%d\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
fprintf(stderr, "-----------------------------------\n");
pos = m_end;
- fprintf(stderr, "end: %s %p:%ld\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
+ fprintf(stderr, "end: %s %p:%d\n", pos.node()->nodeName().qstring().latin1(), pos.node(), pos.offset());
fprintf(stderr, "-----------------------------------\n");
}
1.3 +1 -1 WebCore/khtml/editing/split_text_node_command.cpp
Index: split_text_node_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/split_text_node_command.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- split_text_node_command.cpp 14 Sep 2005 03:43:01 -0000 1.2
+++ split_text_node_command.cpp 16 Sep 2005 22:42:07 -0000 1.3
@@ -40,7 +40,7 @@
namespace khtml {
-SplitTextNodeCommand::SplitTextNodeCommand(DocumentImpl *document, TextImpl *text, long offset)
+SplitTextNodeCommand::SplitTextNodeCommand(DocumentImpl *document, TextImpl *text, int offset)
: EditCommand(document), m_text1(0), m_text2(text), m_offset(offset)
{
ASSERT(m_text2);
1.2 +3 -3 WebCore/khtml/editing/split_text_node_command.h
Index: split_text_node_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/split_text_node_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- split_text_node_command.h 24 May 2005 07:21:47 -0000 1.1
+++ split_text_node_command.h 16 Sep 2005 22:42:07 -0000 1.2
@@ -37,19 +37,19 @@
class SplitTextNodeCommand : public EditCommand
{
public:
- SplitTextNodeCommand(DOM::DocumentImpl *, DOM::TextImpl *, long);
+ SplitTextNodeCommand(DOM::DocumentImpl *, DOM::TextImpl *, int);
virtual ~SplitTextNodeCommand();
virtual void doApply();
virtual void doUnapply();
DOM::TextImpl *node() const { return m_text2; }
- long offset() const { return m_offset; }
+ int offset() const { return m_offset; }
private:
DOM::TextImpl *m_text1;
DOM::TextImpl *m_text2;
- unsigned long m_offset;
+ unsigned m_offset;
};
} // namespace khtml
1.2 +1 -1 WebCore/khtml/editing/split_text_node_containing_element.cpp
Index: split_text_node_containing_element.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/split_text_node_containing_element.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- split_text_node_containing_element.cpp 24 May 2005 17:37:22 -0000 1.1
+++ split_text_node_containing_element.cpp 16 Sep 2005 22:42:07 -0000 1.2
@@ -42,7 +42,7 @@
namespace khtml {
-SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand(DocumentImpl *document, TextImpl *text, long offset)
+SplitTextNodeContainingElementCommand::SplitTextNodeContainingElementCommand(DocumentImpl *document, TextImpl *text, int offset)
: CompositeEditCommand(document), m_text(text), m_offset(offset)
{
ASSERT(m_text);
1.2 +2 -2 WebCore/khtml/editing/split_text_node_containing_element_command.h
Index: split_text_node_containing_element_command.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/split_text_node_containing_element_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- split_text_node_containing_element_command.h 24 May 2005 07:21:47 -0000 1.1
+++ split_text_node_containing_element_command.h 16 Sep 2005 22:42:07 -0000 1.2
@@ -33,14 +33,14 @@
class SplitTextNodeContainingElementCommand : public CompositeEditCommand
{
public:
- SplitTextNodeContainingElementCommand(DOM::DocumentImpl *, DOM::TextImpl *, long);
+ SplitTextNodeContainingElementCommand(DOM::DocumentImpl *, DOM::TextImpl *, int);
virtual ~SplitTextNodeContainingElementCommand();
virtual void doApply();
private:
DOM::TextImpl *m_text;
- long m_offset;
+ int m_offset;
};
} // namespace khtml
1.58 +9 -9 WebCore/khtml/editing/visible_position.cpp
Index: visible_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_position.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- visible_position.cpp 1 Sep 2005 18:03:32 -0000 1.57
+++ visible_position.cpp 16 Sep 2005 22:42:07 -0000 1.58
@@ -60,7 +60,7 @@
init(pos, affinity);
}
-VisiblePosition::VisiblePosition(NodeImpl *node, long offset, EAffinity affinity)
+VisiblePosition::VisiblePosition(NodeImpl *node, int offset, EAffinity affinity)
{
init(Position(node, offset), affinity);
}
@@ -289,7 +289,7 @@
Position VisiblePosition::deepEquivalent(const Position &pos)
{
NodeImpl *node = pos.node();
- long offset = pos.offset();
+ int offset = pos.offset();
if (!node)
return Position();
@@ -297,7 +297,7 @@
if (isAtomicNode(node))
return pos;
- if (offset >= (long)node->childNodeCount()) {
+ if (offset >= (int)node->childNodeCount()) {
do {
NodeImpl *child = node->lastChild();
if (!child)
@@ -349,16 +349,16 @@
// FIXME: This clamps out-of-range values.
// Instead we should probably assert, and not use such values.
- long offset = pos.offset();
+ int offset = pos.offset();
if (!offsetInCharacters(node->nodeType()) && isAtomicNode(node) && offset > 0)
return Position(node->parentNode(), node->nodeIndex() + 1);
- return Position(node, kMax(0L, kMin(offset, maxOffset(node))));
+ return Position(node, kMax(0, kMin(offset, maxOffset(node))));
}
-long VisiblePosition::maxOffset(const NodeImpl *node)
+int VisiblePosition::maxOffset(const NodeImpl *node)
{
- return offsetInCharacters(node->nodeType()) ? (long)static_cast<const CharacterDataImpl *>(node)->length() : (long)node->childNodeCount();
+ return offsetInCharacters(node->nodeType()) ? (int)static_cast<const CharacterDataImpl *>(node)->length() : (int)node->childNodeCount();
}
bool VisiblePosition::isAtomicNode(const NodeImpl *node)
@@ -374,7 +374,7 @@
return QChar();
}
TextImpl *textNode = static_cast<TextImpl *>(pos.node());
- long offset = pos.offset();
+ int offset = pos.offset();
if ((unsigned)offset >= textNode->length()) {
return QChar();
}
@@ -404,7 +404,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, m_deepPosition.node()->nodeName().qstring().latin1(), m_deepPosition.node(), m_deepPosition.offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, m_deepPosition.node()->nodeName().qstring().latin1(), m_deepPosition.node(), m_deepPosition.offset());
}
#ifndef NDEBUG
1.31 +2 -2 WebCore/khtml/editing/visible_position.h
Index: visible_position.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_position.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- visible_position.h 1 Sep 2005 18:03:33 -0000 1.30
+++ visible_position.h 16 Sep 2005 22:42:07 -0000 1.31
@@ -61,7 +61,7 @@
// NOTE: UPSTREAM affinity will be used only if pos is at end of a wrapped line,
// otherwise it will be converted to DOWNSTREAM
VisiblePosition() { m_affinity = VP_DEFAULT_AFFINITY; };
- VisiblePosition(NodeImpl *, long offset, EAffinity);
+ VisiblePosition(NodeImpl *, int offset, EAffinity);
VisiblePosition(const Position &, EAffinity);
VisiblePosition(const VisiblePosition &);
@@ -106,7 +106,7 @@
static Position deepEquivalent(const Position &);
static Position rangeCompliantEquivalent(const Position &);
- static long maxOffset(const NodeImpl *);
+ static int maxOffset(const NodeImpl *);
static bool isAtomicNode(const NodeImpl *);
static Position previousVisiblePosition(const Position &);
1.4 +1 -1 WebCore/khtml/editing/visible_range.h
Index: visible_range.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_range.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- visible_range.h 13 May 2005 16:48:51 -0000 1.3
+++ visible_range.h 16 Sep 2005 22:42:07 -0000 1.4
@@ -38,7 +38,7 @@
typedef DOM::RangeImpl RangeImpl;
VisibleRange() { }
- VisibleRange(NodeImpl *startContainer, long startOffset, NodeImpl *endContainer, long endOffset);
+ VisibleRange(NodeImpl *startContainer, int startOffset, NodeImpl *endContainer, int endOffset);
VisibleRange(const VisiblePosition &);
VisibleRange(const VisiblePosition &, const VisiblePosition &);
VisibleRange(const RangeImpl *);
1.37 +52 -52 WebCore/khtml/editing/visible_text.cpp
Index: visible_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_text.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- visible_text.cpp 29 Aug 2005 18:00:43 -0000 1.36
+++ visible_text.cpp 16 Sep 2005 22:42:07 -0000 1.37
@@ -58,12 +58,12 @@
~CircularSearchBuffer() { free(m_buffer); }
void clear() { m_cursor = m_buffer; m_bufferFull = false; }
- void append(long length, const QChar *characters);
+ void append(int length, const QChar *characters);
void append(const QChar &);
- long neededCharacters() const;
+ int neededCharacters() const;
bool isMatch() const;
- long length() const { return m_target.length(); }
+ int length() const { return m_target.length(); }
private:
QString m_target;
@@ -90,9 +90,9 @@
// get and validate the range endpoints
NodeImpl *startContainer = r->startContainer(exceptionCode);
- long startOffset = r->startOffset(exceptionCode);
+ int startOffset = r->startOffset(exceptionCode);
NodeImpl *endContainer = r->endContainer(exceptionCode);
- long endOffset = r->endOffset(exceptionCode);
+ int endOffset = r->endOffset(exceptionCode);
if (exceptionCode != 0)
return;
@@ -221,14 +221,14 @@
// handle pre-formatted text
if (renderer->style()->whiteSpace() == khtml::PRE) {
- long runStart = m_offset;
+ int runStart = m_offset;
if (m_lastTextNodeEndedWithCollapsedSpace) {
emitCharacter(' ', m_node, 0, runStart, runStart);
return false;
}
- long strLength = str.length();
- long end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
- long runEnd = kMin(strLength, end);
+ int strLength = str.length();
+ int end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
+ int runEnd = kMin(strLength, end);
if (runStart >= runEnd)
return true;
@@ -268,11 +268,11 @@
{
RenderText *renderer = static_cast<RenderText *>(m_node->renderer());
DOMString str = renderer->string();
- long start = m_offset;
- long end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
+ int start = m_offset;
+ int end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
while (m_textBox) {
- long textBoxStart = m_textBox->m_start;
- long runStart = kMax(textBoxStart, start);
+ int textBoxStart = m_textBox->m_start;
+ int runStart = kMax(textBoxStart, start);
// Check for collapsed space at the start of this run.
InlineTextBox *firstTextBox = renderer->containsReversedText() ? m_sortedTextBoxes.getFirst() : renderer->firstTextBox();
@@ -282,8 +282,8 @@
emitCharacter(' ', m_node, 0, runStart, runStart);
return;
}
- long textBoxEnd = textBoxStart + m_textBox->m_len;
- long runEnd = kMin(textBoxEnd, end);
+ int textBoxEnd = textBoxStart + m_textBox->m_len;
+ int runEnd = kMin(textBoxEnd, end);
// Determine what the next text box will be, but don't advance yet
InlineTextBox *nextTextBox = renderer->containsReversedText() ? m_sortedTextBoxes.next() : m_textBox->nextTextBox();
@@ -296,7 +296,7 @@
emitCharacter(' ', m_node, 0, runStart, runStart + 1);
m_offset = runStart + 1;
} else {
- long subrunEnd = str.find('\n', runStart);
+ int subrunEnd = str.find('\n', runStart);
if (subrunEnd == -1 || subrunEnd > runEnd) {
subrunEnd = runEnd;
}
@@ -321,7 +321,7 @@
}
// Advance and return
- long nextRunStart = nextTextBox ? nextTextBox->m_start : str.length();
+ int nextRunStart = nextTextBox ? nextTextBox->m_start : str.length();
if (nextRunStart > runEnd) {
m_lastTextNodeEndedWithCollapsedSpace = true; // collapsed space between runs or at the end
}
@@ -434,7 +434,7 @@
}
}
-void TextIterator::emitCharacter(QChar c, NodeImpl *textNode, NodeImpl *offsetBaseNode, long textStartOffset, long textEndOffset)
+void TextIterator::emitCharacter(QChar c, NodeImpl *textNode, NodeImpl *offsetBaseNode, int textStartOffset, int textEndOffset)
{
// remember information with which to construct the TextIterator::range()
// NOTE: textNode is often not a text node, so the range will specify child nodes of positionNode
@@ -458,7 +458,7 @@
// use the current run information, if we have it
if (m_positionNode) {
if (m_positionOffsetBaseNode) {
- long index = m_positionOffsetBaseNode->nodeIndex();
+ int index = m_positionOffsetBaseNode->nodeIndex();
m_positionStartOffset += index;
m_positionEndOffset += index;
m_positionOffsetBaseNode = 0;
@@ -493,21 +493,21 @@
NodeImpl *endNode = r->endContainer(exception);
if (exception)
return;
- long startOffset = r->startOffset(exception);
+ int startOffset = r->startOffset(exception);
if (exception)
return;
- long endOffset = r->endOffset(exception);
+ int endOffset = r->endOffset(exception);
if (exception)
return;
if (!offsetInCharacters(startNode->nodeType())) {
- if (startOffset >= 0 && startOffset < static_cast<long>(startNode->childNodeCount())) {
+ if (startOffset >= 0 && startOffset < static_cast<int>(startNode->childNodeCount())) {
startNode = startNode->childNode(startOffset);
startOffset = 0;
}
}
if (!offsetInCharacters(endNode->nodeType())) {
- if (endOffset > 0 && endOffset <= static_cast<long>(endNode->childNodeCount())) {
+ if (endOffset > 0 && endOffset <= static_cast<int>(endNode->childNodeCount())) {
endNode = endNode->childNode(endOffset - 1);
endOffset = endNode->hasChildNodes() ? endNode->childNodeCount() : endNode->maxOffset();
}
@@ -635,7 +635,7 @@
bool SimplifiedBackwardsTextIterator::handleReplacedElement()
{
- long offset = m_node->nodeIndex();
+ int offset = m_node->nodeIndex();
m_positionNode = m_node->parentNode();
m_positionStartOffset = offset;
@@ -682,7 +682,7 @@
handleNonTextNode();
}
-void SimplifiedBackwardsTextIterator::emitCharacter(QChar c, NodeImpl *node, long startOffset, long endOffset)
+void SimplifiedBackwardsTextIterator::emitCharacter(QChar c, NodeImpl *node, int startOffset, int endOffset)
{
m_singleCharacterBuffer = c;
m_positionNode = node;
@@ -695,7 +695,7 @@
void SimplifiedBackwardsTextIterator::emitNewlineForBROrText()
{
- long offset;
+ int offset;
if (m_lastTextNode) {
offset = m_lastTextNode->nodeIndex();
@@ -738,7 +738,7 @@
int exception = 0;
NodeImpl *n = r->startContainer(exception);
assert(n == r->endContainer(exception));
- long offset = r->startOffset(exception) + m_runOffset;
+ int offset = r->startOffset(exception) + m_runOffset;
r->setStart(n, offset, exception);
r->setEnd(n, offset + 1, exception);
}
@@ -746,14 +746,14 @@
return r;
}
-void CharacterIterator::advance(long count)
+void CharacterIterator::advance(int count)
{
assert(!atEnd());
m_atBreak = false;
// easy if there is enough left in the current m_textIterator run
- long remaining = m_textIterator.length() - m_runOffset;
+ int remaining = m_textIterator.length() - m_runOffset;
if (count < remaining) {
m_runOffset += count;
m_offset += count;
@@ -766,7 +766,7 @@
// move to a subsequent m_textIterator run
for (m_textIterator.advance(); !atEnd(); m_textIterator.advance()) {
- long runLength = m_textIterator.length();
+ int runLength = m_textIterator.length();
if (runLength == 0) {
m_atBreak = true;
} else {
@@ -788,12 +788,12 @@
m_runOffset = 0;
}
-QString CharacterIterator::string(long numChars)
+QString CharacterIterator::string(int numChars)
{
QString result;
result.reserve(numChars);
while (numChars > 0 && !atEnd()) {
- long runSize = kMin(numChars, length());
+ int runSize = kMin(numChars, length());
result.append(characters(), runSize);
numChars -= runSize;
advance(runSize);
@@ -875,7 +875,7 @@
}
}
-long WordAwareIterator::length() const
+int WordAwareIterator::length() const
{
if (!m_buffer.isEmpty()) {
return m_buffer.length();
@@ -929,20 +929,20 @@
// This function can only be used when the buffer is not yet full,
// and when then count is small enough to fit in the buffer.
// No need for a more general version for the search algorithm.
-void CircularSearchBuffer::append(long count, const QChar *characters)
+void CircularSearchBuffer::append(int count, const QChar *characters)
{
- long tailSpace = m_buffer + length() - m_cursor;
+ int tailSpace = m_buffer + length() - m_cursor;
assert(!m_bufferFull);
assert(count <= tailSpace);
if (m_isCaseSensitive) {
- for (long i = 0; i != count; ++i) {
+ for (int i = 0; i != count; ++i) {
QChar c = characters[i];
m_cursor[i] = c.unicode() == nonBreakingSpace ? ' ' : c.unicode();
}
} else {
- for (long i = 0; i != count; ++i) {
+ for (int i = 0; i != count; ++i) {
QChar c = characters[i];
m_cursor[i] = c.unicode() == nonBreakingSpace ? ' ' : c.lower().unicode();
}
@@ -955,7 +955,7 @@
}
}
-long CircularSearchBuffer::neededCharacters() const
+int CircularSearchBuffer::neededCharacters() const
{
return m_bufferFull ? 0 : m_buffer + length() - m_cursor;
}
@@ -964,36 +964,36 @@
{
assert(m_bufferFull);
- long headSpace = m_cursor - m_buffer;
- long tailSpace = length() - headSpace;
+ int headSpace = m_cursor - m_buffer;
+ int tailSpace = length() - headSpace;
return memcmp(m_cursor, m_target.unicode(), tailSpace * sizeof(QChar)) == 0
&& memcmp(m_buffer, m_target.unicode() + tailSpace, headSpace * sizeof(QChar)) == 0;
}
-long TextIterator::rangeLength(const RangeImpl *r)
+int TextIterator::rangeLength(const RangeImpl *r)
{
// Allocate string at the right size, rather than building it up by successive append calls.
- long length = 0;
+ int length = 0;
for (TextIterator it(r); !it.atEnd(); it.advance()) {
length += it.length();
}
return length;
}
-RangeImpl *TextIterator::rangeFromLocationAndLength(DocumentImpl *doc, long rangeLocation, long rangeLength)
+RangeImpl *TextIterator::rangeFromLocationAndLength(DocumentImpl *doc, int rangeLocation, int rangeLength)
{
RangeImpl *resultRange = doc->createRange();
- long docTextPosition = 0;
- long rangeEnd = rangeLocation + rangeLength;
+ int docTextPosition = 0;
+ int rangeEnd = rangeLocation + rangeLength;
for (TextIterator it(rangeOfContents(doc).get()); !it.atEnd(); it.advance()) {
- long len = it.length();
+ int len = it.length();
if (rangeLocation >= docTextPosition && rangeLocation <= docTextPosition + len) {
SharedPtr<RangeImpl> textRunRange = it.range();
int exception = 0;
if (textRunRange->startContainer(exception)->isTextNode()) {
- long offset = rangeLocation - docTextPosition;
+ int offset = rangeLocation - docTextPosition;
resultRange->setStart(textRunRange->startContainer(exception), offset + textRunRange->startOffset(exception), exception);
} else {
if (rangeLocation == docTextPosition) {
@@ -1007,7 +1007,7 @@
SharedPtr<RangeImpl> textRunRange = it.range();
int exception = 0;
if (textRunRange->startContainer(exception)->isTextNode()) {
- long offset = rangeEnd - docTextPosition;
+ int offset = rangeEnd - docTextPosition;
resultRange->setEnd(textRunRange->startContainer(exception), offset + textRunRange->startOffset(exception), exception);
} else {
if (rangeEnd == docTextPosition) {
@@ -1029,7 +1029,7 @@
QString plainText(const RangeImpl *r)
{
// Allocate string at the right size, rather than building it up by successive append calls.
- long length = 0;
+ int length = 0;
for (TextIterator it(r); !it.atEnd(); it.advance()) {
length += it.length();
}
@@ -1063,15 +1063,15 @@
CharacterIterator it(r);
while (1) {
// Fill the buffer.
- while (long needed = buffer.neededCharacters()) {
+ while (int needed = buffer.neededCharacters()) {
if (it.atBreak()) {
if (it.atEnd()) {
goto done;
}
buffer.clear();
}
- long available = it.length();
- long runLength = kMin(needed, available);
+ int available = it.length();
+ int runLength = kMin(needed, available);
buffer.append(runLength, it.characters());
it.advance(runLength);
}
1.17 +24 -24 WebCore/khtml/editing/visible_text.h
Index: visible_text.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_text.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- visible_text.h 14 Jul 2005 20:51:55 -0000 1.16
+++ visible_text.h 16 Sep 2005 22:42:07 -0000 1.17
@@ -68,13 +68,13 @@
bool atEnd() const { return !m_positionNode; }
void advance();
- long length() const { return m_textLength; }
+ int length() const { return m_textLength; }
const QChar *characters() const { return m_textCharacters; }
SharedPtr<DOM::RangeImpl> range() const;
- static long TextIterator::rangeLength(const DOM::RangeImpl *r);
- static DOM::RangeImpl *TextIterator::rangeFromLocationAndLength(DOM::DocumentImpl *doc, long rangeLocation, long rangeLength);
+ static int TextIterator::rangeLength(const DOM::RangeImpl *r);
+ static DOM::RangeImpl *TextIterator::rangeFromLocationAndLength(DOM::DocumentImpl *doc, int rangeLocation, int rangeLength);
private:
void exitNode();
@@ -82,27 +82,27 @@
bool handleReplacedElement();
bool handleNonTextNode();
void handleTextBox();
- void emitCharacter(QChar, DOM::NodeImpl *textNode, DOM::NodeImpl *offsetBaseNode, long textStartOffset, long textEndOffset);
+ void emitCharacter(QChar, DOM::NodeImpl *textNode, DOM::NodeImpl *offsetBaseNode, int textStartOffset, int textEndOffset);
// Current position, not necessarily of the text being returned, but position
// as we walk through the DOM tree.
DOM::NodeImpl *m_node;
- long m_offset;
+ int m_offset;
bool m_handledNode;
bool m_handledChildren;
// End of the range.
DOM::NodeImpl *m_endContainer;
- long m_endOffset;
+ int m_endOffset;
DOM::NodeImpl *m_pastEndNode;
// The current text and its position, in the form to be returned from the iterator.
DOM::NodeImpl *m_positionNode;
mutable DOM::NodeImpl *m_positionOffsetBaseNode;
- mutable long m_positionStartOffset;
- mutable long m_positionEndOffset;
+ mutable int m_positionStartOffset;
+ mutable int m_positionEndOffset;
const QChar *m_textCharacters;
- long m_textLength;
+ int m_textLength;
// Used when there is still some pending text from the current node; when these
// are false and 0, we go back to normal iterating.
@@ -133,7 +133,7 @@
bool atEnd() const { return !m_positionNode; }
void advance();
- long length() const { return m_textLength; }
+ int length() const { return m_textLength; }
const QChar *characters() const { return m_textCharacters; }
SharedPtr<DOM::RangeImpl> range() const;
@@ -143,26 +143,26 @@
bool handleTextNode();
bool handleReplacedElement();
bool handleNonTextNode();
- void emitCharacter(QChar, DOM::NodeImpl *Node, long startOffset, long endOffset);
+ void emitCharacter(QChar, DOM::NodeImpl *Node, int startOffset, int endOffset);
void emitNewlineForBROrText();
// Current position, not necessarily of the text being returned, but position
// as we walk through the DOM tree.
DOM::NodeImpl *m_node;
- long m_offset;
+ int m_offset;
bool m_handledNode;
bool m_handledChildren;
// End of the range.
DOM::NodeImpl *m_startNode;
- long m_startOffset;
+ int m_startOffset;
// The current text and its position, in the form to be returned from the iterator.
DOM::NodeImpl *m_positionNode;
- long m_positionStartOffset;
- long m_positionEndOffset;
+ int m_positionStartOffset;
+ int m_positionEndOffset;
const QChar *m_textCharacters;
- long m_textLength;
+ int m_textLength;
// Used to do the whitespace logic.
DOM::NodeImpl *m_lastTextNode;
@@ -179,21 +179,21 @@
CharacterIterator();
explicit CharacterIterator(const DOM::RangeImpl *r);
- void advance(long numCharacters);
+ void advance(int numCharacters);
bool atBreak() const { return m_atBreak; }
bool atEnd() const { return m_textIterator.atEnd(); }
- long length() const { return m_textIterator.length() - m_runOffset; }
+ int length() const { return m_textIterator.length() - m_runOffset; }
const QChar *characters() const { return m_textIterator.characters() + m_runOffset; }
- QString string(long numChars);
+ QString string(int numChars);
- long characterOffset() const { return m_offset; }
+ int characterOffset() const { return m_offset; }
SharedPtr<DOM::RangeImpl> range() const;
private:
- long m_offset;
- long m_runOffset;
+ int m_offset;
+ int m_runOffset;
bool m_atBreak;
TextIterator m_textIterator;
@@ -209,7 +209,7 @@
bool atEnd() const { return !m_didLookAhead && m_textIterator.atEnd(); }
void advance();
- long length() const;
+ int length() const;
const QChar *characters() const;
// Range of the text we're currently returning
@@ -218,7 +218,7 @@
private:
// text from the previous chunk from the textIterator
const QChar *m_previousText;
- long m_previousLength;
+ int m_previousLength;
// many chunks from textIterator concatenated
QString m_buffer;
1.40 +10 -10 WebCore/khtml/editing/visible_units.cpp
Index: visible_units.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_units.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- visible_units.cpp 1 Sep 2005 18:03:33 -0000 1.39
+++ visible_units.cpp 16 Sep 2005 22:42:07 -0000 1.40
@@ -305,7 +305,7 @@
if (!startNode)
return VisiblePosition();
- long startOffset = 0;
+ int startOffset = 0;
if (startBox->isInlineTextBox()) {
InlineTextBox *startTextBox = static_cast<InlineTextBox *>(startBox);
startOffset = startTextBox->m_start;
@@ -335,7 +335,7 @@
if (!endNode)
return VisiblePosition();
- long endOffset = 1;
+ int endOffset = 1;
if (endNode->hasTagName(brTag)) {
endOffset = 0;
} else if (endBox->isInlineTextBox()) {
@@ -552,7 +552,7 @@
NodeImpl *startBlock = startNode->enclosingBlockFlowElement();
NodeImpl *node = startNode;
- long offset = p.offset();
+ int offset = p.offset();
for (NodeImpl *n = startNode; n; n = n->traversePreviousNodePostOrder(startBlock)) {
RenderObject *r = n->renderer();
@@ -566,10 +566,10 @@
if (r->isText()) {
if (style->whiteSpace() == PRE) {
QChar *text = static_cast<RenderText *>(r)->text();
- long i = static_cast<RenderText *>(r)->length();
- long o = offset;
+ int i = static_cast<RenderText *>(r)->length();
+ int o = offset;
if (n == startNode && o < i)
- i = kMax(0L, o);
+ i = kMax(0, o);
while (--i >= 0)
if (text[i] == '\n')
return VisiblePosition(n, i + 1, DOWNSTREAM);
@@ -597,7 +597,7 @@
NodeImpl *stayInsideBlock = includeLineBreak ? 0 : startBlock;
NodeImpl *node = startNode;
- long offset = p.offset();
+ int offset = p.offset();
for (NodeImpl *n = startNode; n; n = n->traverseNextNode(stayInsideBlock)) {
if (n->isContentEditable() != startNode->isContentEditable())
@@ -623,13 +623,13 @@
if (r->isText() && r->caretMaxRenderedOffset() > 0) {
if (includeLineBreak && !n->isAncestor(startBlock))
return VisiblePosition(n, 0, DOWNSTREAM);
- long length = static_cast<RenderText *>(r)->length();
+ int length = static_cast<RenderText *>(r)->length();
if (style->whiteSpace() == PRE) {
QChar *text = static_cast<RenderText *>(r)->text();
- long o = 0;
+ int o = 0;
if (n == startNode && offset < length)
o = offset;
- for (long i = o; i < length; ++i)
+ for (int i = o; i < length; ++i)
if (text[i] == '\n')
return VisiblePosition(n, i + includeLineBreak, DOWNSTREAM);
}
1.25 +2 -2 WebCore/khtml/html/html_blockimpl.cpp
Index: html_blockimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_blockimpl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- html_blockimpl.cpp 29 Aug 2005 21:29:16 -0000 1.24
+++ html_blockimpl.cpp 16 Sep 2005 22:42:11 -0000 1.25
@@ -293,12 +293,12 @@
{
}
-long HTMLPreElementImpl::width() const
+int HTMLPreElementImpl::width() const
{
return getAttribute(widthAttr).toInt();
}
-void HTMLPreElementImpl::setWidth(long width)
+void HTMLPreElementImpl::setWidth(int width)
{
setAttribute(widthAttr, QString::number(width));
}
1.12 +2 -2 WebCore/khtml/html/html_blockimpl.h
Index: html_blockimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_blockimpl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- html_blockimpl.h 18 Jul 2005 21:44:20 -0000 1.11
+++ html_blockimpl.h 16 Sep 2005 22:42:11 -0000 1.12
@@ -136,8 +136,8 @@
virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
virtual int tagPriority() const { return 5; }
- long width() const;
- void setWidth(long w);
+ int width() const;
+ void setWidth(int w);
};
// -------------------------------------------------------------------------
1.193 +28 -28 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- html_formimpl.cpp 3 Sep 2005 23:09:59 -0000 1.192
+++ html_formimpl.cpp 16 Sep 2005 22:42:11 -0000 1.193
@@ -179,7 +179,7 @@
HTMLElementImpl::removedFromDocument();
}
-long HTMLFormElementImpl::length() const
+int HTMLFormElementImpl::length() const
{
int len = 0;
for (unsigned i = 0; i < formElements.count(); ++i)
@@ -1182,12 +1182,12 @@
return QString::null;
}
-long HTMLGenericFormElementImpl::tabIndex() const
+int HTMLGenericFormElementImpl::tabIndex() const
{
return getAttribute(tabindexAttr).toInt();
}
-void HTMLGenericFormElementImpl::setTabIndex(long value)
+void HTMLGenericFormElementImpl::setTabIndex(int value)
{
setAttribute(tabindexAttr, QString::number(value));
}
@@ -1572,7 +1572,7 @@
return false;
}
-long HTMLInputElementImpl::selectionStart()
+int HTMLInputElementImpl::selectionStart()
{
if (!m_render) return 0;
@@ -1589,7 +1589,7 @@
return 0;
}
-long HTMLInputElementImpl::selectionEnd()
+int HTMLInputElementImpl::selectionEnd()
{
if (!m_render) return 0;
@@ -1606,7 +1606,7 @@
return 0;
}
-void HTMLInputElementImpl::setSelectionStart(long start)
+void HTMLInputElementImpl::setSelectionStart(int start)
{
if (!m_render) return;
@@ -1623,7 +1623,7 @@
}
}
-void HTMLInputElementImpl::setSelectionEnd(long end)
+void HTMLInputElementImpl::setSelectionEnd(int end)
{
if (!m_render) return;
@@ -1670,7 +1670,7 @@
}
}
-void HTMLInputElementImpl::setSelectionRange(long start, long end)
+void HTMLInputElementImpl::setSelectionRange(int start, int end)
{
if (!m_render) return;
@@ -2500,12 +2500,12 @@
setAttribute(altAttr, value);
}
-void HTMLInputElementImpl::setMaxLength(long _maxLength)
+void HTMLInputElementImpl::setMaxLength(int _maxLength)
{
setAttribute(maxlengthAttr, QString::number(_maxLength));
}
-void HTMLInputElementImpl::setSize(unsigned long _size)
+void HTMLInputElementImpl::setSize(unsigned _size)
{
setAttribute(sizeAttr, QString::number(_size));
}
@@ -2756,7 +2756,7 @@
return (m_multiple ? "select-multiple" : "select-one");
}
-long HTMLSelectElementImpl::selectedIndex() const
+int HTMLSelectElementImpl::selectedIndex() const
{
// return the number of the first option selected
uint o = 0;
@@ -2772,7 +2772,7 @@
return -1;
}
-void HTMLSelectElementImpl::setSelectedIndex( long index )
+void HTMLSelectElementImpl::setSelectedIndex( int index )
{
// deselect all other options and select only the new one
QMemArray<HTMLElementImpl*> items = listItems();
@@ -2788,7 +2788,7 @@
setChanged(true);
}
-long HTMLSelectElementImpl::length() const
+int HTMLSelectElementImpl::length() const
{
int len = 0;
uint i;
@@ -2812,7 +2812,7 @@
setRecalcListItems();
}
-void HTMLSelectElementImpl::remove( long index )
+void HTMLSelectElementImpl::remove( int index )
{
int exceptioncode = 0;
int listIndex = optionToListIndex(index);
@@ -3187,7 +3187,7 @@
setAttribute(multipleAttr, multiple ? "" : 0);
}
-void HTMLSelectElementImpl::setSize(long size)
+void HTMLSelectElementImpl::setSize(int size)
{
setAttribute(sizeAttr, QString::number(size));
}
@@ -3387,7 +3387,7 @@
appendChild(new TextImpl(docPtr(), text), exception);
}
-long HTMLOptionElementImpl::index() const
+int HTMLOptionElementImpl::index() const
{
// Let's do this dynamically. Might be a bit slow, but we're sure
// we won't forget to update a member variable in some cases...
@@ -3405,10 +3405,10 @@
return 0;
}
-void HTMLOptionElementImpl::setIndex(long, int &exception)
+void HTMLOptionElementImpl::setIndex(int, int &exception)
{
exception = DOMException::NO_MODIFICATION_ALLOWED_ERR;
- kdWarning() << "Unimplemented HTMLOptionElementImpl::setIndex(long) called" << endl;
+ kdWarning() << "Unimplemented HTMLOptionElementImpl::setIndex(int) called" << endl;
// ###
}
@@ -3515,27 +3515,27 @@
// the close() in the rendertree will take care of transferring defaultvalue to 'value'
}
-long HTMLTextAreaElementImpl::selectionStart()
+int HTMLTextAreaElementImpl::selectionStart()
{
if (m_render)
return static_cast<RenderTextArea *>(m_render)->selectionStart();
return 0;
}
-long HTMLTextAreaElementImpl::selectionEnd()
+int HTMLTextAreaElementImpl::selectionEnd()
{
if (m_render)
return static_cast<RenderTextArea *>(m_render)->selectionEnd();
return 0;
}
-void HTMLTextAreaElementImpl::setSelectionStart(long start)
+void HTMLTextAreaElementImpl::setSelectionStart(int start)
{
if (m_render)
static_cast<RenderTextArea *>(m_render)->setSelectionStart(start);
}
-void HTMLTextAreaElementImpl::setSelectionEnd(long end)
+void HTMLTextAreaElementImpl::setSelectionEnd(int end)
{
if (m_render)
static_cast<RenderTextArea *>(m_render)->setSelectionEnd(end);
@@ -3547,7 +3547,7 @@
static_cast<RenderTextArea*>(m_render)->select();
}
-void HTMLTextAreaElementImpl::setSelectionRange(long start, long end)
+void HTMLTextAreaElementImpl::setSelectionRange(int start, int end)
{
if (m_render)
static_cast<RenderTextArea *>(m_render)->setSelectionRange(start, end);
@@ -3731,12 +3731,12 @@
setAttribute(accesskeyAttr, value);
}
-void HTMLTextAreaElementImpl::setCols(long cols)
+void HTMLTextAreaElementImpl::setCols(int cols)
{
setAttribute(colsAttr, QString::number(cols));
}
-void HTMLTextAreaElementImpl::setRows(long rows)
+void HTMLTextAreaElementImpl::setRows(int rows)
{
setAttribute(rowsAttr, QString::number(rows));
}
@@ -3772,18 +3772,18 @@
// -------------------------------------------------------------------------
-unsigned long HTMLOptionsCollectionImpl::length() const
+unsigned HTMLOptionsCollectionImpl::length() const
{
// Not yet implemented.
return 0;
}
-void HTMLOptionsCollectionImpl::setLength(unsigned long length)
+void HTMLOptionsCollectionImpl::setLength(unsigned length)
{
// Not yet implemented.
}
-NodeImpl *HTMLOptionsCollectionImpl::item(unsigned long index) const
+NodeImpl *HTMLOptionsCollectionImpl::item(unsigned index) const
{
// Not yet implemented.
return 0;
1.88 +33 -33 WebCore/khtml/html/html_formimpl.h
Index: html_formimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- html_formimpl.h 1 Sep 2005 17:40:12 -0000 1.87
+++ html_formimpl.h 16 Sep 2005 22:42:11 -0000 1.88
@@ -77,7 +77,7 @@
virtual void removedFromDocument();
SharedPtr<HTMLCollectionImpl> elements();
- long length() const;
+ int length() const;
DOMString enctype() const { return m_enctype; }
void setEnctype(const DOMString &);
@@ -226,8 +226,8 @@
virtual bool isActivatedSubmit() const { return false; }
virtual void setActivatedSubmit(bool flag) { }
- long tabIndex() const;
- void setTabIndex(long);
+ int tabIndex() const;
+ void setTabIndex(int);
protected:
HTMLFormElementImpl *getForm() const;
@@ -349,7 +349,7 @@
bool checked() const { return m_checked; }
void setChecked(bool);
- long maxLength() const { return m_maxLen; }
+ int maxLength() const { return m_maxLen; }
int size() const { return m_size; }
DOMString type() const;
void setType(const DOMString& t);
@@ -372,13 +372,13 @@
bool canHaveSelection();
- long selectionStart();
- long selectionEnd();
- void setSelectionStart(long);
- void setSelectionEnd(long);
+ int selectionStart();
+ int selectionEnd();
+ void setSelectionStart(int);
+ void setSelectionEnd(int);
void select();
- void setSelectionRange(long, long);
+ void setSelectionRange(int, int);
virtual void click(bool sendMouseEvents = false, bool showPressedLook = true);
virtual void accessKeyAction(bool sendToAnyElement);
@@ -413,7 +413,7 @@
virtual bool isURLAttribute(AttributeImpl *attr) const;
- long maxResults() const { return m_maxResults; }
+ int maxResults() const { return m_maxResults; }
DOMString defaultValue() const;
void setDefaultValue(const DOMString &);
@@ -433,12 +433,12 @@
DOMString alt() const;
void setAlt(const DOMString &);
- void setSize(unsigned long);
+ void setSize(unsigned);
DOMString src() const;
void setSrc(const DOMString &);
- void setMaxLength(long);
+ void setMaxLength(int);
DOMString useMap() const;
void setUseMap(const DOMString &);
@@ -550,21 +550,21 @@
virtual void recalcStyle( StyleChange );
- long selectedIndex() const;
- void setSelectedIndex( long index );
+ int selectedIndex() const;
+ void setSelectedIndex( int index );
virtual bool isEnumeratable() const { return true; }
- long length() const;
+ int length() const;
- long minWidth() const { return m_minwidth; }
+ int minWidth() const { return m_minwidth; }
- long size() const { return m_size; }
+ int size() const { return m_size; }
bool multiple() const { return m_multiple; }
void add ( HTMLElementImpl *element, HTMLElementImpl *before, int &exceptioncode );
- void remove ( long index );
+ void remove ( int index );
void blur();
void focus();
@@ -611,7 +611,7 @@
void setMultiple(bool);
- void setSize(long);
+ void setSize(int);
private:
void recalcListItems();
@@ -694,8 +694,8 @@
DOMString text() const;
void setText(const DOMString &, int &exception);
- long index() const;
- void setIndex(long, int &exception);
+ int index() const;
+ void setIndex(int, int &exception);
virtual void parseMappedAttribute(MappedAttributeImpl *attr);
DOMString value() const;
@@ -738,8 +738,8 @@
virtual bool checkDTD(const NodeImpl* newChild) { return newChild->isTextNode(); }
- long cols() const { return m_cols; }
- long rows() const { return m_rows; }
+ int cols() const { return m_cols; }
+ int rows() const { return m_rows; }
WrapMethod wrap() const { return m_wrap; }
@@ -751,14 +751,14 @@
virtual QString state();
virtual void restoreState(QStringList &);
- long selectionStart();
- long selectionEnd();
+ int selectionStart();
+ int selectionEnd();
- void setSelectionStart(long);
- void setSelectionEnd(long);
+ void setSelectionStart(int);
+ void setSelectionEnd(int);
void select ( );
- void setSelectionRange(long, long);
+ void setSelectionRange(int, int);
virtual void childrenChanged();
virtual void parseMappedAttribute(MappedAttributeImpl *attr);
@@ -787,9 +787,9 @@
DOMString accessKey() const;
void setAccessKey(const DOMString &);
- void setCols(long);
+ void setCols(int);
- void setRows(long);
+ void setRows(int);
protected:
int m_rows;
@@ -826,9 +826,9 @@
public:
HTMLOptionsCollectionImpl(HTMLSelectElementImpl *impl) : m_select(impl) { }
- unsigned long length() const;
- void setLength(unsigned long);
- NodeImpl *item(unsigned long index) const;
+ unsigned length() const;
+ void setLength(unsigned);
+ NodeImpl *item(unsigned index) const;
NodeImpl *namedItem(const DOMString &name) const;
void detach() { m_select = 0; }
1.51 +16 -16 WebCore/khtml/html/html_imageimpl.cpp
Index: html_imageimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- html_imageimpl.cpp 31 Aug 2005 04:38:38 -0000 1.50
+++ html_imageimpl.cpp 16 Sep 2005 22:42:11 -0000 1.51
@@ -290,13 +290,13 @@
HTMLElementImpl::removedFromDocument();
}
-long HTMLImageElementImpl::width(bool ignorePendingStylesheets) const
+int HTMLImageElementImpl::width(bool ignorePendingStylesheets) const
{
if (!m_render) {
// check the attribute first for an explicit pixel value
DOM::DOMString attrWidth = getAttribute(widthAttr);
bool ok;
- long width = attrWidth.qstring().toLong(&ok);
+ int width = attrWidth.qstring().toInt(&ok);
if (ok) {
return width;
}
@@ -317,13 +317,13 @@
return m_render->contentWidth();
}
-long HTMLImageElementImpl::height(bool ignorePendingStylesheets) const
+int HTMLImageElementImpl::height(bool ignorePendingStylesheets) const
{
if (!m_render) {
// check the attribute first for an explicit pixel value
DOM::DOMString attrHeight = getAttribute(heightAttr);
bool ok;
- long height = attrHeight.qstring().toLong(&ok);
+ int height = attrHeight.qstring().toInt(&ok);
if (ok) {
return height;
}
@@ -387,29 +387,29 @@
setAttribute(altAttr, value);
}
-long HTMLImageElementImpl::border() const
+int HTMLImageElementImpl::border() const
{
// ### return value in pixels
return getAttribute(borderAttr).toInt();
}
-void HTMLImageElementImpl::setBorder(long value)
+void HTMLImageElementImpl::setBorder(int value)
{
setAttribute(borderAttr, QString::number(value));
}
-void HTMLImageElementImpl::setHeight(long value)
+void HTMLImageElementImpl::setHeight(int value)
{
setAttribute(heightAttr, QString::number(value));
}
-long HTMLImageElementImpl::hspace() const
+int HTMLImageElementImpl::hspace() const
{
// ### return actual value
return getAttribute(hspaceAttr).toInt();
}
-void HTMLImageElementImpl::setHspace(long value)
+void HTMLImageElementImpl::setHspace(int value)
{
setAttribute(hspaceAttr, QString::number(value));
}
@@ -454,23 +454,23 @@
setAttribute(usemapAttr, value);
}
-long HTMLImageElementImpl::vspace() const
+int HTMLImageElementImpl::vspace() const
{
// ### return actual vspace
return getAttribute(vspaceAttr).toInt();
}
-void HTMLImageElementImpl::setVspace(long value)
+void HTMLImageElementImpl::setVspace(int value)
{
setAttribute(vspaceAttr, QString::number(value));
}
-void HTMLImageElementImpl::setWidth(long value)
+void HTMLImageElementImpl::setWidth(int value)
{
setAttribute(widthAttr, QString::number(value));
}
-long HTMLImageElementImpl::x() const
+int HTMLImageElementImpl::x() const
{
RenderObject *r = renderer();
if (!r)
@@ -480,7 +480,7 @@
return x;
}
-long HTMLImageElementImpl::y() const
+int HTMLImageElementImpl::y() const
{
RenderObject *r = renderer();
if (!r)
@@ -746,12 +746,12 @@
setAttribute(shapeAttr, value);
}
-long HTMLAreaElementImpl::tabIndex() const
+int HTMLAreaElementImpl::tabIndex() const
{
return getAttribute(tabindexAttr).toInt();
}
-void HTMLAreaElementImpl::setTabIndex(long tabIndex)
+void HTMLAreaElementImpl::setTabIndex(int tabIndex)
{
setAttribute(tabindexAttr, QString::number(tabIndex));
}
1.25 +14 -14 WebCore/khtml/html/html_imageimpl.h
Index: html_imageimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- html_imageimpl.h 20 Jul 2005 02:35:31 -0000 1.24
+++ html_imageimpl.h 16 Sep 2005 22:42:11 -0000 1.25
@@ -89,8 +89,8 @@
virtual void insertedIntoDocument();
virtual void removedFromDocument();
- long width(bool ignorePendingStylesheets = false) const;
- long height(bool ignorePendingStylesheets = false) const;
+ int width(bool ignorePendingStylesheets = false) const;
+ int height(bool ignorePendingStylesheets = false) const;
bool isServerMap() const { return ( ismap && !usemap.length() ); }
QImage currentImage() const;
@@ -114,13 +114,13 @@
DOMString alt() const;
void setAlt( const DOMString & );
- long border() const;
- void setBorder( long );
+ int border() const;
+ void setBorder( int );
- void setHeight( long );
+ void setHeight( int );
- long hspace() const;
- void setHspace( long );
+ int hspace() const;
+ void setHspace( int );
bool isMap() const;
void setIsMap( bool );
@@ -134,13 +134,13 @@
DOMString useMap() const;
void setUseMap( const DOMString & );
- long vspace() const;
- void setVspace( long );
+ int vspace() const;
+ void setVspace( int );
- void setWidth( long );
+ void setWidth( int );
- long x() const;
- long y() const;
+ int x() const;
+ int y() const;
protected:
HTMLImageLoader m_imageLoader;
@@ -193,8 +193,8 @@
DOMString shape() const;
void setShape( const DOMString & );
- long tabIndex() const;
- void setTabIndex( long );
+ int tabIndex() const;
+ void setTabIndex( int );
DOMString target() const;
void setTarget( const DOMString & );
1.51 +2 -2 WebCore/khtml/html/html_inlineimpl.cpp
Index: html_inlineimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- html_inlineimpl.cpp 3 Sep 2005 23:09:59 -0000 1.50
+++ html_inlineimpl.cpp 16 Sep 2005 22:42:11 -0000 1.51
@@ -337,12 +337,12 @@
setAttribute(shapeAttr, value);
}
-long HTMLAnchorElementImpl::tabIndex() const
+int HTMLAnchorElementImpl::tabIndex() const
{
return getAttribute(tabindexAttr).toInt();
}
-void HTMLAnchorElementImpl::setTabIndex(long tabIndex)
+void HTMLAnchorElementImpl::setTabIndex(int tabIndex)
{
setAttribute(tabindexAttr, QString::number(tabIndex));
}
1.22 +2 -2 WebCore/khtml/html/html_inlineimpl.h
Index: html_inlineimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_inlineimpl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- html_inlineimpl.h 18 Jul 2005 21:44:20 -0000 1.21
+++ html_inlineimpl.h 16 Sep 2005 22:42:11 -0000 1.22
@@ -75,8 +75,8 @@
DOMString shape() const;
void setShape(const DOMString &);
- long tabIndex() const;
- void setTabIndex(long);
+ int tabIndex() const;
+ void setTabIndex(int);
DOMString target() const;
void setTarget(const DOMString &);
1.15 +3 -3 WebCore/khtml/html/html_listimpl.cpp
Index: html_listimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- html_listimpl.cpp 25 Aug 2005 23:13:49 -0000 1.14
+++ html_listimpl.cpp 16 Sep 2005 22:42:12 -0000 1.15
@@ -136,7 +136,7 @@
setAttribute(compactAttr, b ? "" : 0);
}
-void HTMLOListElementImpl::setStart(long start)
+void HTMLOListElementImpl::setStart(int start)
{
setAttribute(startAttr, QString::number(start));
}
@@ -237,12 +237,12 @@
setAttribute(typeAttr, value);
}
-long HTMLLIElementImpl::value() const
+int HTMLLIElementImpl::value() const
{
return getAttribute(valueAttr).toInt();
}
-void HTMLLIElementImpl::setValue(long value)
+void HTMLLIElementImpl::setValue(int value)
{
setAttribute(valueAttr, QString::number(value));
}
1.13 +6 -6 WebCore/khtml/html/html_listimpl.h
Index: html_listimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_listimpl.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- html_listimpl.h 25 Aug 2005 23:13:49 -0000 1.12
+++ html_listimpl.h 16 Sep 2005 22:42:12 -0000 1.13
@@ -45,7 +45,7 @@
virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
virtual void parseMappedAttribute(MappedAttributeImpl *);
- virtual long start() const { return 1; }
+ virtual int start() const { return 1; }
bool compact() const;
void setCompact(bool);
@@ -99,8 +99,8 @@
bool compact() const;
void setCompact(bool);
- long start() const { return _start; }
- void setStart(long);
+ int start() const { return _start; }
+ void setStart(int);
DOMString type() const;
void setType(const DOMString &);
@@ -129,12 +129,12 @@
DOMString type() const;
void setType(const DOMString &);
- long value() const;
- void setValue(long);
+ int value() const;
+ void setValue(int);
private:
bool isValued;
- long requestedValue;
+ int requestedValue;
};
// -------------------------------------------------------------------------
1.36 +6 -6 WebCore/khtml/html/html_miscimpl.cpp
Index: html_miscimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- html_miscimpl.cpp 25 Aug 2005 23:13:49 -0000 1.35
+++ html_miscimpl.cpp 16 Sep 2005 22:42:12 -0000 1.36
@@ -223,9 +223,9 @@
}
-unsigned long HTMLCollectionImpl::calcLength() const
+unsigned HTMLCollectionImpl::calcLength() const
{
- unsigned long len = 0;
+ unsigned len = 0;
for (NodeImpl *current = traverseNextItem(m_base.get()); current; current = traverseNextItem(current)) {
len++;
@@ -236,7 +236,7 @@
// since the collections are to be "live", we have to do the
// calculation every time if anything has changed
-unsigned long HTMLCollectionImpl::length() const
+unsigned HTMLCollectionImpl::length() const
{
resetCollectionInfo();
if (!info->haslength) {
@@ -246,7 +246,7 @@
return info->length;
}
-NodeImpl *HTMLCollectionImpl::item( unsigned long index ) const
+NodeImpl *HTMLCollectionImpl::item( unsigned index ) const
{
resetCollectionInfo();
if (info->current && info->position == index) {
@@ -524,7 +524,7 @@
{
}
-unsigned long HTMLFormCollectionImpl::calcLength() const
+unsigned HTMLFormCollectionImpl::calcLength() const
{
QPtrVector<HTMLGenericFormElementImpl> &l = static_cast<HTMLFormElementImpl*>(m_base.get())->formElements;
@@ -536,7 +536,7 @@
return len;
}
-NodeImpl *HTMLFormCollectionImpl::item(unsigned long index) const
+NodeImpl *HTMLFormCollectionImpl::item(unsigned index) const
{
resetCollectionInfo();
1.22 +5 -5 WebCore/khtml/html/html_miscimpl.h
Index: html_miscimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_miscimpl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- html_miscimpl.h 16 Aug 2005 23:57:07 -0000 1.21
+++ html_miscimpl.h 16 Sep 2005 22:42:12 -0000 1.22
@@ -89,9 +89,9 @@
HTMLCollectionImpl(NodeImpl *_base, int _type);
virtual ~HTMLCollectionImpl();
- unsigned long length() const;
+ unsigned length() const;
- virtual NodeImpl *item(unsigned long index) const;
+ virtual NodeImpl *item(unsigned index) const;
virtual NodeImpl *firstItem() const;
virtual NodeImpl *nextItem() const;
@@ -122,7 +122,7 @@
virtual NodeImpl *traverseNextItem(NodeImpl *start) const;
bool checkForNameMatch(NodeImpl *node, bool checkName, const DOMString &name, bool caseSensitive) const;
- virtual unsigned long calcLength() const;
+ virtual unsigned calcLength() const;
virtual void resetCollectionInfo() const;
// the base node, the collection refers to
SharedPtr<NodeImpl> m_base;
@@ -156,7 +156,7 @@
HTMLFormCollectionImpl(NodeImpl* _base);
~HTMLFormCollectionImpl();
- virtual NodeImpl *item ( unsigned long index ) const;
+ virtual NodeImpl *item ( unsigned index ) const;
virtual NodeImpl *firstItem() const;
virtual NodeImpl *nextItem() const;
@@ -165,7 +165,7 @@
protected:
virtual void updateNameCache() const;
- virtual unsigned long calcLength() const;
+ virtual unsigned calcLength() const;
virtual NodeImpl *getNamedItem(NodeImpl* current, const QualifiedName& attrName, const DOMString& name, bool caseSensitive) const;
virtual NodeImpl *nextNamedItemInternal( const DOMString &name ) const;
private:
1.79 +2 -2 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- html_objectimpl.cpp 16 Sep 2005 18:55:10 -0000 1.78
+++ html_objectimpl.cpp 16 Sep 2005 22:42:12 -0000 1.79
@@ -976,12 +976,12 @@
setAttribute(standbyAttr, value);
}
-long HTMLObjectElementImpl::tabIndex() const
+int HTMLObjectElementImpl::tabIndex() const
{
return getAttribute(tabindexAttr).toInt();
}
-void HTMLObjectElementImpl::setTabIndex(long tabIndex)
+void HTMLObjectElementImpl::setTabIndex(int tabIndex)
{
setAttribute(tabindexAttr, QString::number(tabIndex));
}
1.36 +2 -2 WebCore/khtml/html/html_objectimpl.h
Index: html_objectimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- html_objectimpl.h 21 Jul 2005 04:10:53 -0000 1.35
+++ html_objectimpl.h 16 Sep 2005 22:42:12 -0000 1.36
@@ -221,8 +221,8 @@
DOMString standby() const;
void setStandby(const DOMString &);
- long tabIndex() const;
- void setTabIndex(long);
+ int tabIndex() const;
+ void setTabIndex(int);
DOMString type() const;
void setType(const DOMString &);
1.64 +12 -12 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- html_tableimpl.cpp 7 Sep 2005 02:38:35 -0000 1.63
+++ html_tableimpl.cpp 16 Sep 2005 22:42:12 -0000 1.64
@@ -225,7 +225,7 @@
tCaption = 0;
}
-HTMLElementImpl *HTMLTableElementImpl::insertRow( long index, int &exceptioncode )
+HTMLElementImpl *HTMLTableElementImpl::insertRow( int index, int &exceptioncode )
{
// The DOM requires that we create a tbody if the table is empty
// (cf DOM2TS HTMLTableElement31 test)
@@ -284,7 +284,7 @@
}
}
-void HTMLTableElementImpl::deleteRow( long index, int &exceptioncode )
+void HTMLTableElementImpl::deleteRow( int index, int &exceptioncode )
{
HTMLTableSectionElementImpl* section = 0L;
NodeImpl *node = firstChild();
@@ -810,7 +810,7 @@
// these functions are rather slow, since we need to get the row at
// the index... but they aren't used during usual HTML parsing anyway
-HTMLElementImpl *HTMLTableSectionElementImpl::insertRow( long index, int& exceptioncode )
+HTMLElementImpl *HTMLTableSectionElementImpl::insertRow( int index, int& exceptioncode )
{
HTMLTableRowElementImpl *r = 0L;
SharedPtr<NodeListImpl> children = childNodes();
@@ -836,7 +836,7 @@
return r;
}
-void HTMLTableSectionElementImpl::deleteRow( long index, int &exceptioncode )
+void HTMLTableSectionElementImpl::deleteRow( int index, int &exceptioncode )
{
SharedPtr<NodeListImpl> children = childNodes();
int numRows = children.notNull() ? (int)children->length() : 0;
@@ -932,7 +932,7 @@
return HTMLTablePartElementImpl::addChild(child);
}
-long HTMLTableRowElementImpl::rowIndex() const
+int HTMLTableRowElementImpl::rowIndex() const
{
int rIndex = 0;
@@ -969,7 +969,7 @@
return -1;
}
-long HTMLTableRowElementImpl::sectionRowIndex() const
+int HTMLTableRowElementImpl::sectionRowIndex() const
{
int rIndex = 0;
const NodeImpl *n = this;
@@ -983,7 +983,7 @@
return rIndex;
}
-HTMLElementImpl *HTMLTableRowElementImpl::insertCell( long index, int &exceptioncode )
+HTMLElementImpl *HTMLTableRowElementImpl::insertCell( int index, int &exceptioncode )
{
HTMLTableCellElementImpl *c = 0L;
SharedPtr<NodeListImpl> children = childNodes();
@@ -1007,7 +1007,7 @@
return c;
}
-void HTMLTableRowElementImpl::deleteCell( long index, int &exceptioncode )
+void HTMLTableRowElementImpl::deleteCell( int index, int &exceptioncode )
{
SharedPtr<NodeListImpl> children = childNodes();
int numCells = children.notNull() ? children->length() : 0;
@@ -1097,7 +1097,7 @@
{
}
-long HTMLTableCellElementImpl::cellIndex() const
+int HTMLTableCellElementImpl::cellIndex() const
{
int index = 0;
for (const NodeImpl * node = previousSibling(); node; node = node->previousSibling()) {
@@ -1235,7 +1235,7 @@
setAttribute(charoffAttr, value);
}
-void HTMLTableCellElementImpl::setColSpan(long n)
+void HTMLTableCellElementImpl::setColSpan(int n)
{
setAttribute(colspanAttr, QString::number(n));
}
@@ -1270,7 +1270,7 @@
setAttribute(nowrapAttr, b ? "" : 0);
}
-void HTMLTableCellElementImpl::setRowSpan(long n)
+void HTMLTableCellElementImpl::setRowSpan(int n)
{
setAttribute(rowspanAttr, QString::number(n));
}
@@ -1366,7 +1366,7 @@
setAttribute(charoffAttr, value);
}
-void HTMLTableColElementImpl::setSpan(long n)
+void HTMLTableColElementImpl::setSpan(int n)
{
setAttribute(spanAttr, QString::number(n));
}
1.27 +16 -16 WebCore/khtml/html/html_tableimpl.h
Index: html_tableimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- html_tableimpl.h 30 Jul 2005 02:33:18 -0000 1.26
+++ html_tableimpl.h 16 Sep 2005 22:42:12 -0000 1.27
@@ -83,8 +83,8 @@
void deleteTFoot ( );
HTMLElementImpl *createCaption ( );
void deleteCaption ( );
- HTMLElementImpl *insertRow ( long index, int &exceptioncode );
- void deleteRow ( long index, int &exceptioncode );
+ HTMLElementImpl *insertRow ( int index, int &exceptioncode );
+ void deleteRow ( int index, int &exceptioncode );
khtml::SharedPtr<HTMLCollectionImpl> rows();
khtml::SharedPtr<HTMLCollectionImpl> tBodies();
@@ -171,8 +171,8 @@
virtual NodeImpl *addChild(NodeImpl *child);
- HTMLElementImpl *insertRow ( long index, int& exceptioncode );
- void deleteRow ( long index, int& exceptioncode );
+ HTMLElementImpl *insertRow ( int index, int& exceptioncode );
+ void deleteRow ( int index, int& exceptioncode );
int numRows() const;
@@ -205,15 +205,15 @@
virtual NodeImpl *addChild(NodeImpl *child);
- long rowIndex() const;
- long sectionRowIndex() const;
+ int rowIndex() const;
+ int sectionRowIndex() const;
- HTMLElementImpl *insertCell ( long index, int &exceptioncode );
- void deleteCell ( long index, int &exceptioncode );
+ HTMLElementImpl *insertCell ( int index, int &exceptioncode );
+ void deleteCell ( int index, int &exceptioncode );
- void setRowIndex( long );
+ void setRowIndex( int );
- void setSectionRowIndex( long );
+ void setSectionRowIndex( int );
khtml::SharedPtr<HTMLCollectionImpl> cells();
void setCells(HTMLCollectionImpl *, int &exception);
@@ -248,7 +248,7 @@
virtual HTMLTagStatus endTagRequirement() const { return TagStatusOptional; }
virtual int tagPriority() const { return 6; }
- long cellIndex() const;
+ int cellIndex() const;
int col() const { return _col; }
void setCol(int col) { _col = col; }
@@ -266,7 +266,7 @@
virtual bool isURLAttribute(AttributeImpl *attr) const;
- void setCellIndex( long );
+ void setCellIndex( int );
DOMString abbr() const;
void setAbbr( const DOMString & );
@@ -286,7 +286,7 @@
DOMString chOff() const;
void setChOff( const DOMString & );
- void setColSpan( long );
+ void setColSpan( int );
DOMString headers() const;
void setHeaders( const DOMString & );
@@ -297,7 +297,7 @@
bool noWrap() const;
void setNoWrap( bool );
- void setRowSpan( long );
+ void setRowSpan( int );
DOMString scope() const;
void setScope( const DOMString & );
@@ -333,7 +333,7 @@
virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
virtual void parseMappedAttribute(MappedAttributeImpl *attr);
- long span() const { return _span; }
+ int span() const { return _span; }
DOMString align() const;
void setAlign( const DOMString & );
@@ -344,7 +344,7 @@
DOMString chOff() const;
void setChOff( const DOMString & );
- void setSpan( long );
+ void setSpan( int );
DOMString vAlign() const;
void setVAlign( const DOMString & );
1.112 +2 -2 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- htmlparser.cpp 10 Sep 2005 21:03:44 -0000 1.111
+++ htmlparser.cpp 16 Sep 2005 22:42:12 -0000 1.112
@@ -347,7 +347,7 @@
NamedAttrMapImpl *map = static_cast<ElementImpl*>(n)->attributes(true);
NamedAttrMapImpl *bmap = static_cast<ElementImpl*>(doc()->firstChild())->attributes(false);
bool changed = false;
- for (unsigned long l = 0; map && l < map->length(); ++l) {
+ for (unsigned l = 0; map && l < map->length(); ++l) {
AttributeImpl* it = map->attributeItem(l);
changed = !bmap->getAttributeItem(it->name());
bmap->insertAttribute(it->clone(false));
@@ -384,7 +384,7 @@
NamedAttrMapImpl *map = static_cast<ElementImpl*>(n)->attributes(true);
NamedAttrMapImpl *bmap = doc()->body()->attributes(false);
bool changed = false;
- for (unsigned long l = 0; map && l < map->length(); ++l) {
+ for (unsigned l = 0; map && l < map->length(); ++l) {
AttributeImpl* it = map->attributeItem(l);
changed = !bmap->getAttributeItem(it->name());
bmap->insertAttribute(it->clone(false));
1.112 +2 -2 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- htmltokenizer.cpp 12 Sep 2005 03:40:38 -0000 1.111
+++ htmltokenizer.cpp 16 Sep 2005 22:42:12 -0000 1.112
@@ -1860,10 +1860,10 @@
kdDebug( 6036 ) << "Token is FLAT!" << endl;
if(!text.isNull())
kdDebug( 6036 ) << "text: \"" << text << "\"" << endl;
- unsigned long l = currToken.attrs ? currToken.attrs->length() : 0;
+ unsigned l = currToken.attrs ? currToken.attrs->length() : 0;
if(l) {
kdDebug( 6036 ) << "Attributes: " << l << endl;
- for (unsigned long i = 0; i < l; ++i) {
+ for (unsigned i = 0; i < l; ++i) {
AttributeImpl* c = currToken.attrs->attributeItem(i);
kdDebug( 6036 ) << " " << c->name().qstring()
<< "=\"" << c->value().qstring() << "\"" << endl;
1.43 +0 -2 WebCore/khtml/misc/loader.h
Index: loader.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- loader.h 8 Sep 2005 21:35:29 -0000 1.42
+++ loader.h 16 Sep 2005 22:42:15 -0000 1.43
@@ -731,8 +731,6 @@
static Loader *m_loader;
- static unsigned long s_ulRefCnt;
-
static void moveToHeadOfLRUList(CachedObject *);
static LRUList *m_LRULists;
1.203 +1 -1 WebCore/khtml/rendering/render_block.cpp
Index: render_block.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- render_block.cpp 15 Sep 2005 23:50:17 -0000 1.202
+++ render_block.cpp 16 Sep 2005 22:42:15 -0000 1.203
@@ -2565,7 +2565,7 @@
if (!node)
return Position();
- long offset = start ? node->caretMinOffset() : node->caretMaxOffset();
+ int offset = start ? node->caretMinOffset() : node->caretMaxOffset();
return Position(node, offset);
}
1.28 +4 -4 WebCore/khtml/rendering/render_br.cpp
Index: render_br.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_br.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- render_br.cpp 14 Feb 2005 18:19:18 -0000 1.27
+++ render_br.cpp 16 Sep 2005 22:42:15 -0000 1.28
@@ -86,17 +86,17 @@
m_lineHeight = -1;
}
-long RenderBR::caretMinOffset() const
+int RenderBR::caretMinOffset() const
{
return 0;
}
-long RenderBR::caretMaxOffset() const
+int RenderBR::caretMaxOffset() const
{
return 1;
}
-unsigned long RenderBR::caretMaxRenderedOffset() const
+unsigned RenderBR::caretMaxRenderedOffset() const
{
return 1;
}
@@ -122,7 +122,7 @@
return QRect(xPos() + absx, yPos() + absy, 1, lineHeight(false));
}
-InlineBox *RenderBR::inlineBox(long offset, EAffinity affinity)
+InlineBox *RenderBR::inlineBox(int offset, EAffinity affinity)
{
return firstTextBox();
}
1.32 +4 -4 WebCore/khtml/rendering/render_br.h
Index: render_br.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_br.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- render_br.h 29 Jul 2005 23:42:49 -0000 1.31
+++ render_br.h 16 Sep 2005 22:42:15 -0000 1.32
@@ -59,14 +59,14 @@
virtual bool isBR() const { return true; }
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
virtual VisiblePosition positionForCoordinates(int x, int y);
virtual QRect caretRect(int offset, EAffinity affinity = UPSTREAM, int *extraWidthToEndOfLine = 0);
- virtual InlineBox *inlineBox(long offset, EAffinity affinity = UPSTREAM);
+ virtual InlineBox *inlineBox(int offset, EAffinity affinity = UPSTREAM);
private:
mutable short m_lineHeight;
1.122 +16 -16 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- render_form.cpp 3 Sep 2005 23:10:00 -0000 1.121
+++ render_form.cpp 16 Sep 2005 22:42:15 -0000 1.122
@@ -616,7 +616,7 @@
element()->setValueFromRenderer(newText);
}
-long RenderLineEdit::selectionStart()
+int RenderLineEdit::selectionStart()
{
KLineEdit *lineEdit = static_cast<KLineEdit *>(m_widget);
int start = lineEdit->selectionStart();
@@ -625,7 +625,7 @@
return start;
}
-long RenderLineEdit::selectionEnd()
+int RenderLineEdit::selectionEnd()
{
KLineEdit *lineEdit = static_cast<KLineEdit *>(m_widget);
int start = lineEdit->selectionStart();
@@ -634,17 +634,17 @@
return start + (int)lineEdit->selectedText().length();
}
-void RenderLineEdit::setSelectionStart(long start)
+void RenderLineEdit::setSelectionStart(int start)
{
- int realStart = kMax(start, 0L);
- int length = kMax(selectionEnd() - realStart, 0L);
+ int realStart = kMax(start, 0);
+ int length = kMax(selectionEnd() - realStart, 0);
static_cast<KLineEdit *>(m_widget)->setSelection(realStart, length);
}
-void RenderLineEdit::setSelectionEnd(long end)
+void RenderLineEdit::setSelectionEnd(int end)
{
int start = selectionStart();
- int realEnd = kMax(end, 0L);
+ int realEnd = kMax(end, 0);
int length = realEnd - start;
if (length < 0) {
start = realEnd;
@@ -658,10 +658,10 @@
static_cast<KLineEdit*>(m_widget)->selectAll();
}
-void RenderLineEdit::setSelectionRange(long start, long end)
+void RenderLineEdit::setSelectionRange(int start, int end)
{
- int realStart = kMax(start, 0L);
- int length = kMax(end - realStart, 0L);
+ int realStart = kMax(start, 0);
+ int length = kMax(end - realStart, 0);
static_cast<KLineEdit *>(m_widget)->setSelection(realStart, length);
}
@@ -1472,7 +1472,7 @@
QTextEdit* w = static_cast<QTextEdit*>(m_widget);
#if APPLE_CHANGES
- QSize size(w->sizeWithColumnsAndRows(kMax(element()->cols(), 1L), kMax(element()->rows(), 1L)));
+ QSize size(w->sizeWithColumnsAndRows(kMax(element()->cols(), 1), kMax(element()->rows(), 1)));
#else
const QFontMetrics &m = style()->fontMetrics();
w->setTabStopWidth(8 * m.width(" "));
@@ -1596,7 +1596,7 @@
m_dirty = true;
}
-long RenderTextArea::selectionStart()
+int RenderTextArea::selectionStart()
{
QTextEdit *textEdit = static_cast<QTextEdit *>(m_widget);
#if APPLE_CHANGES
@@ -1608,7 +1608,7 @@
#endif
}
-long RenderTextArea::selectionEnd()
+int RenderTextArea::selectionEnd()
{
QTextEdit *textEdit = static_cast<QTextEdit *>(m_widget);
#if APPLE_CHANGES
@@ -1620,7 +1620,7 @@
#endif
}
-void RenderTextArea::setSelectionStart(long start)
+void RenderTextArea::setSelectionStart(int start)
{
QTextEdit *textEdit = static_cast<QTextEdit *>(m_widget);
#if APPLE_CHANGES
@@ -1632,7 +1632,7 @@
#endif
}
-void RenderTextArea::setSelectionEnd(long end)
+void RenderTextArea::setSelectionEnd(int end)
{
QTextEdit *textEdit = static_cast<QTextEdit *>(m_widget);
#if APPLE_CHANGES
@@ -1649,7 +1649,7 @@
static_cast<QTextEdit *>(m_widget)->selectAll();
}
-void RenderTextArea::setSelectionRange(long start, long end)
+void RenderTextArea::setSelectionRange(int start, int end)
{
QTextEdit *textEdit = static_cast<QTextEdit *>(m_widget);
#if APPLE_CHANGES
1.55 +10 -10 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- render_form.h 8 Aug 2005 21:11:59 -0000 1.54
+++ render_form.h 16 Sep 2005 22:42:16 -0000 1.55
@@ -209,13 +209,13 @@
virtual void updateFromElement();
virtual void setStyle(RenderStyle *);
- long selectionStart();
- long selectionEnd();
- void setSelectionStart(long);
- void setSelectionEnd(long);
+ int selectionStart();
+ int selectionEnd();
+ void setSelectionStart(int);
+ void setSelectionEnd(int);
void select();
- void setSelectionRange(long, long);
+ void setSelectionRange(int, int);
KLineEdit *widget() const { return static_cast<KLineEdit*>(m_widget); }
DOM::HTMLInputElementImpl* element() const
@@ -436,13 +436,13 @@
QString text();
- long selectionStart();
- long selectionEnd();
- void setSelectionStart(long);
- void setSelectionEnd(long);
+ int selectionStart();
+ int selectionEnd();
+ void setSelectionStart(int);
+ void setSelectionEnd(int);
void select();
- void setSelectionRange(long, long);
+ void setSelectionRange(int, int);
#if APPLE_CHANGES
virtual bool canHaveIntrinsicMargins() const { return true; }
1.77 +2 -2 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- render_frames.cpp 31 Aug 2005 04:38:40 -0000 1.76
+++ render_frames.cpp 16 Sep 2005 22:42:16 -0000 1.77
@@ -756,7 +756,7 @@
// Turn the attributes of either the EMBED tag or OBJECT tag into arrays, but don't override PARAM values.
NamedAttrMapImpl* attributes = embedOrObject->attributes();
if (attributes) {
- for (unsigned long i = 0; i < attributes->length(); ++i) {
+ for (unsigned i = 0; i < attributes->length(); ++i) {
AttributeImpl* it = attributes->attributeItem(i);
QString name = it->name().localName().qstring();
if (embed || uniqueParamNames.find(name) == 0) {
@@ -837,7 +837,7 @@
// add all attributes set on the embed object
NamedAttrMapImpl* a = o->attributes();
if (a) {
- for (unsigned long i = 0; i < a->length(); ++i) {
+ for (unsigned i = 0; i < a->length(); ++i) {
AttributeImpl* it = a->attributeItem(i);
paramNames.append(it->name().localName().qstring());
paramValues.append(it->value().qstring());
1.51 +3 -3 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- render_line.cpp 30 Aug 2005 09:30:20 -0000 1.50
+++ render_line.cpp 16 Sep 2005 22:42:16 -0000 1.51
@@ -113,17 +113,17 @@
}
#endif
-long InlineBox::caretMinOffset() const
+int InlineBox::caretMinOffset() const
{
return 0;
}
-long InlineBox::caretMaxOffset() const
+int InlineBox::caretMaxOffset() const
{
return 1;
}
-unsigned long InlineBox::caretMaxRenderedOffset() const
+unsigned InlineBox::caretMaxRenderedOffset() const
{
return 1;
}
1.31 +3 -3 WebCore/khtml/rendering/render_line.h
Index: render_line.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- render_line.h 15 Aug 2005 04:31:06 -0000 1.30
+++ render_line.h 16 Sep 2005 22:42:16 -0000 1.31
@@ -139,9 +139,9 @@
virtual int leftOverflow() { return xPos(); }
virtual int rightOverflow() { return xPos()+width(); }
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
virtual void clearTruncation() {};
1.70 +1 -1 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- render_list.cpp 30 Aug 2005 09:30:21 -0000 1.69
+++ render_list.cpp 16 Sep 2005 22:42:16 -0000 1.70
@@ -569,7 +569,7 @@
case DECIMAL_LEADING_ZERO:
// ### unsupported, we use decimal instead
case LDECIMAL:
- m_item.sprintf( "%ld", m_value );
+ m_item.sprintf( "%d", m_value );
break;
case LOWER_ROMAN:
m_item = toRoman( m_value, false );
1.25 +4 -4 WebCore/khtml/rendering/render_list.h
Index: render_list.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- render_list.h 25 Feb 2005 00:25:12 -0000 1.24
+++ render_list.h 16 Sep 2005 22:42:16 -0000 1.25
@@ -78,7 +78,7 @@
QString m_item;
CachedImage *m_listImage;
QPixmap m_listPixmap;
- long m_value;
+ int m_value;
RenderListItem* m_listItem;
};
@@ -103,8 +103,8 @@
virtual bool isListItem() const { return true; }
- long value() const { return m_marker->m_value; }
- void setValue( long v ) { predefVal = v; }
+ int value() const { return m_marker->m_value; }
+ void setValue( int v ) { predefVal = v; }
void calcListValue();
virtual void paint(PaintInfo& i, int xoff, int yoff);
@@ -124,7 +124,7 @@
#endif
protected:
- long int predefVal;
+ int predefVal;
RenderListMarker *m_marker;
bool _notInList;
};
1.214 +8 -8 WebCore/khtml/rendering/render_object.cpp
Index: render_object.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- render_object.cpp 14 Sep 2005 16:21:26 -0000 1.213
+++ render_object.cpp 16 Sep 2005 22:42:16 -0000 1.214
@@ -2540,34 +2540,34 @@
return static_cast<RenderCanvas*>(document()->renderer())->maximalOutlineSize();
}
-long RenderObject::caretMinOffset() const
+int RenderObject::caretMinOffset() const
{
return 0;
}
-long RenderObject::caretMaxOffset() const
+int RenderObject::caretMaxOffset() const
{
return 0;
}
-unsigned long RenderObject::caretMaxRenderedOffset() const
+unsigned RenderObject::caretMaxRenderedOffset() const
{
return 0;
}
-long RenderObject::previousOffset (long current) const
+int RenderObject::previousOffset (int current) const
{
- long previousOffset = current - 1;
+ int previousOffset = current - 1;
return previousOffset;
}
-long RenderObject::nextOffset (long current) const
+int RenderObject::nextOffset (int current) const
{
- long nextOffset = current + 1;
+ int nextOffset = current + 1;
return nextOffset;
}
-InlineBox *RenderObject::inlineBox(long offset, EAffinity affinity)
+InlineBox *RenderObject::inlineBox(int offset, EAffinity affinity)
{
return inlineBoxWrapper();
}
1.156 +6 -6 WebCore/khtml/rendering/render_object.h
Index: render_object.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.h,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- render_object.h 27 Aug 2005 00:14:21 -0000 1.155
+++ render_object.h 16 Sep 2005 22:42:16 -0000 1.156
@@ -377,7 +377,7 @@
virtual void setInlineBoxWrapper(InlineBox* b);
void deleteLineBoxWrapper();
- virtual InlineBox *inlineBox(long offset=0, EAffinity affinity = UPSTREAM);
+ virtual InlineBox *inlineBox(int offset=0, EAffinity affinity = UPSTREAM);
// for discussion of lineHeight see CSS2 spec
virtual short lineHeight( bool firstLine, bool isRootLineBox=false ) const;
@@ -838,12 +838,12 @@
// Convenience, to avoid repeating the code to dig down to get this.
QChar backslashAsCurrencySymbol() const;
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
- virtual long previousOffset (long current) const;
- virtual long nextOffset (long current) const;
+ virtual int previousOffset (int current) const;
+ virtual int nextOffset (int current) const;
virtual void setPixmap(const QPixmap&, const QRect&, CachedImage *);
1.85 +3 -3 WebCore/khtml/rendering/render_replaced.cpp
Index: render_replaced.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- render_replaced.cpp 3 Sep 2005 23:10:00 -0000 1.84
+++ render_replaced.cpp 16 Sep 2005 22:42:16 -0000 1.85
@@ -119,7 +119,7 @@
return height()+marginTop()+marginBottom();
}
-long RenderReplaced::caretMinOffset() const
+int RenderReplaced::caretMinOffset() const
{
return 0;
}
@@ -128,12 +128,12 @@
// at its beginning (0), or at its end (1).
// NOTE: Yet, "select" elements can have any number of "option" elements
// as children, so this "0 or 1" idea does not really hold up.
-long RenderReplaced::caretMaxOffset() const
+int RenderReplaced::caretMaxOffset() const
{
return 1;
}
-unsigned long RenderReplaced::caretMaxRenderedOffset() const
+unsigned RenderReplaced::caretMaxRenderedOffset() const
{
return 1;
}
1.32 +3 -3 WebCore/khtml/rendering/render_replaced.h
Index: render_replaced.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- render_replaced.h 3 Sep 2005 23:10:00 -0000 1.31
+++ render_replaced.h 16 Sep 2005 22:42:16 -0000 1.32
@@ -54,9 +54,9 @@
void setIntrinsicWidth(int w) { m_intrinsicWidth = w; }
void setIntrinsicHeight(int h) { m_intrinsicHeight = h; }
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
virtual VisiblePosition positionForCoordinates(int x, int y);
virtual bool canBeSelectionLeaf() const { return true; }
1.46 +2 -2 WebCore/khtml/rendering/render_table.h
Index: render_table.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- render_table.h 15 Dec 2004 02:41:38 -0000 1.45
+++ render_table.h 16 Sep 2005 22:42:16 -0000 1.46
@@ -319,8 +319,8 @@
virtual bool requiresLayer();
// ### FIX these two...
- long cellIndex() const { return 0; }
- void setCellIndex( long ) { }
+ int cellIndex() const { return 0; }
+ void setCellIndex( int ) { }
int colSpan() const { return cSpan; }
void setColSpan(int c) { cSpan = c; }
1.198 +18 -18 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- render_text.cpp 15 Sep 2005 23:50:18 -0000 1.197
+++ render_text.cpp 16 Sep 2005 22:42:16 -0000 1.198
@@ -595,8 +595,8 @@
int start = 0; // start of line to draw, relative to _tx
int width = m_width; // how much line to draw
bool useWholeWidth = true;
- ulong paintStart = m_start;
- ulong paintEnd = end()+1; // end points at the last char, not past it
+ unsigned paintStart = m_start;
+ unsigned paintEnd = end()+1; // end points at the last char, not past it
if (paintStart <= marker.startOffset) {
paintStart = marker.startOffset;
useWholeWidth = false;
@@ -607,7 +607,7 @@
useWholeWidth = false;
}
if (m_truncation != cNoTruncation) {
- paintEnd = kMin(paintEnd, (ulong)m_truncation);
+ paintEnd = kMin(paintEnd, (unsigned)m_truncation);
useWholeWidth = false;
}
if (!useWholeWidth) {
@@ -644,19 +644,19 @@
int start = 0; // start of line to draw, relative to _tx
int width = m_width; // how much line to draw
bool useWholeWidth = true;
- ulong paintStart = m_start;
- ulong paintEnd = end()+1; // end points at the last char, not past it
+ unsigned paintStart = m_start;
+ unsigned paintEnd = end()+1; // end points at the last char, not past it
if (paintStart <= underline.startOffset) {
paintStart = underline.startOffset;
useWholeWidth = false;
start = static_cast<RenderText*>(m_object)->width(m_start, paintStart - m_start, m_firstLine);
}
if (paintEnd != underline.endOffset) { // end points at the last char, not past it
- paintEnd = kMin(paintEnd, (ulong)underline.endOffset);
+ paintEnd = kMin(paintEnd, (unsigned)underline.endOffset);
useWholeWidth = false;
}
if (m_truncation != cNoTruncation) {
- paintEnd = kMin(paintEnd, (ulong)m_truncation);
+ paintEnd = kMin(paintEnd, (unsigned)m_truncation);
useWholeWidth = false;
}
if (!useWholeWidth) {
@@ -668,17 +668,17 @@
pt->drawLineForText(_tx + start, _ty, underlineOffset, width);
}
-long InlineTextBox::caretMinOffset() const
+int InlineTextBox::caretMinOffset() const
{
return m_start;
}
-long InlineTextBox::caretMaxOffset() const
+int InlineTextBox::caretMaxOffset() const
{
return m_start + m_len;
}
-unsigned long InlineTextBox::caretMaxRenderedOffset() const
+unsigned InlineTextBox::caretMaxRenderedOffset() const
{
return m_start + m_len;
}
@@ -706,7 +706,7 @@
return iterator;
}
-long RenderText::previousOffset (long current) const
+int RenderText::previousOffset (int current) const
{
UBreakIterator *iterator = getCharacterBreakIterator(str);
if (!iterator)
@@ -719,7 +719,7 @@
return result;
}
-long RenderText::nextOffset (long current) const
+int RenderText::nextOffset (int current) const
{
UBreakIterator *iterator = getCharacterBreakIterator(str);
if (!iterator)
@@ -756,11 +756,11 @@
int left;
if (m_reversed) {
- long len = m_start + m_len - offset;
+ int len = m_start + m_len - offset;
QString string(text->str->s + offset, len);
left = m_x + fm.boundingRect(string, text->tabWidth(), textPos(), len).right();
} else {
- long len = offset - m_start;
+ int len = offset - m_start;
QString string(text->str->s + m_start, len);
left = m_x + fm.boundingRect(string, text->tabWidth(), textPos(), len).right();
}
@@ -1818,7 +1818,7 @@
return &style(firstLine)->htmlFont();
}
-long RenderText::caretMinOffset() const
+int RenderText::caretMinOffset() const
{
InlineTextBox *box = firstTextBox();
if (!box)
@@ -1829,7 +1829,7 @@
return minOffset;
}
-long RenderText::caretMaxOffset() const
+int RenderText::caretMaxOffset() const
{
InlineTextBox* box = lastTextBox();
if (!box)
@@ -1840,7 +1840,7 @@
return maxOffset;
}
-unsigned long RenderText::caretMaxRenderedOffset() const
+unsigned RenderText::caretMaxRenderedOffset() const
{
int l = 0;
for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
@@ -1848,7 +1848,7 @@
return l;
}
-InlineBox *RenderText::inlineBox(long offset, EAffinity affinity)
+InlineBox *RenderText::inlineBox(int offset, EAffinity affinity)
{
for (InlineTextBox *box = firstTextBox(); box; box = box->nextTextBox()) {
if (offset >= box->m_start && offset <= box->m_start + box->m_len) {
1.89 +9 -9 WebCore/khtml/rendering/render_text.h
Index: render_text.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- render_text.h 15 Sep 2005 23:50:19 -0000 1.88
+++ render_text.h 16 Sep 2005 22:42:16 -0000 1.89
@@ -127,9 +127,9 @@
void paintMarkedTextBackground(QPainter* p, int tx, int ty, RenderStyle* style, const Font* font, int startPos, int endPos);
void paintMarker(QPainter* p, int _tx, int _ty, DOM::DocumentMarker marker);
void paintMarkedTextUnderline(QPainter *pt, int _tx, int _ty, KWQKHTMLPart::MarkedTextUnderline underline);
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
int textPos() const;
int offsetForPosition(int _x, bool includePartialGlyphs = true) const;
@@ -257,7 +257,7 @@
InlineTextBox* firstTextBox() const { return m_firstTextBox; }
InlineTextBox* lastTextBox() const { return m_lastTextBox; }
- virtual InlineBox *inlineBox(long offset, EAffinity affinity = UPSTREAM);
+ virtual InlineBox *inlineBox(int offset, EAffinity affinity = UPSTREAM);
#if APPLE_CHANGES
int widthFromCache(const Font *, int start, int len, int tabWidth, int xpos) const;
@@ -266,12 +266,12 @@
bool allAscii() const;
#endif
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
- virtual long previousOffset (long current) const;
- virtual long nextOffset (long current) const;
+ virtual int previousOffset (int current) const;
+ virtual int nextOffset (int current) const;
bool containsReversedText() { return m_containsReversedText; }
1.38 +32 -33 WebCore/khtml/xml/dom2_eventsimpl.cpp
Index: dom2_eventsimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_eventsimpl.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dom2_eventsimpl.cpp 31 Aug 2005 04:38:41 -0000 1.37
+++ dom2_eventsimpl.cpp 16 Sep 2005 22:42:19 -0000 1.38
@@ -88,9 +88,8 @@
DOMTimeStamp EventImpl::timeStamp()
{
- QDateTime epoch(QDate(1970,1,1),QTime(0,0));
- // ### kjs does not yet support long long (?) so the value wraps around
- return epoch.secsTo(m_createTime)*1000+m_createTime.time().msec();
+ QDateTime epoch(QDate(1970, 1, 1), QTime(0, 0));
+ return static_cast<DOMTimeStamp>(epoch.secsTo(m_createTime)) * 1000 + m_createTime.time().msec();
}
void EventImpl::preventDefault()
@@ -151,7 +150,7 @@
m_detail = 0;
}
-UIEventImpl::UIEventImpl(const AtomicString &eventType, bool canBubbleArg, bool cancelableArg, AbstractViewImpl *viewArg, long detailArg)
+UIEventImpl::UIEventImpl(const AtomicString &eventType, bool canBubbleArg, bool cancelableArg, AbstractViewImpl *viewArg, int detailArg)
: EventImpl(eventType, canBubbleArg, cancelableArg)
{
m_view = viewArg;
@@ -170,7 +169,7 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg)
+ int detailArg)
{
EventImpl::initEvent(typeArg,canBubbleArg,cancelableArg);
@@ -198,27 +197,27 @@
return 0;
}
-long UIEventImpl::layerX() const
+int UIEventImpl::layerX() const
{
return 0;
}
-long UIEventImpl::layerY() const
+int UIEventImpl::layerY() const
{
return 0;
}
-long UIEventImpl::pageX() const
+int UIEventImpl::pageX() const
{
return 0;
}
-long UIEventImpl::pageY() const
+int UIEventImpl::pageY() const
{
return 0;
}
-long UIEventImpl::which() const
+int UIEventImpl::which() const
{
return 0;
}
@@ -234,11 +233,11 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -288,12 +287,12 @@
}
}
-long MouseRelatedEventImpl::pageX() const
+int MouseRelatedEventImpl::pageX() const
{
return m_clientX;
}
-long MouseRelatedEventImpl::pageY() const
+int MouseRelatedEventImpl::pageY() const
{
return m_clientY;
}
@@ -311,11 +310,11 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -348,11 +347,11 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -393,7 +392,7 @@
|| m_type == dragendEvent);
}
-long MouseEventImpl::which() const
+int MouseEventImpl::which() const
{
// For KHTML, the return values for left, middle and right mouse buttons are 0, 1, 2, respectively.
// For the Netscape "which" property, the return values for left, middle and right mouse buttons are 1, 2, 3, respectively.
@@ -447,7 +446,7 @@
bool cancelableArg,
AbstractViewImpl *viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -475,7 +474,7 @@
bool cancelableArg,
AbstractViewImpl *viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -523,7 +522,7 @@
return true;
}
-long KeyboardEventImpl::which() const
+int KeyboardEventImpl::which() const
{
// Netscape's "which" returns a virtual key code for keydown and keyup, and a character code for keypress.
// That's exactly what IE's "keyCode" returns. So they are the same for keyboard events.
@@ -649,8 +648,8 @@
{
}
-WheelEventImpl::WheelEventImpl(bool h, long d, AbstractViewImpl *v,
- long sx, long sy, long cx, long cy, bool ctrl, bool alt, bool shift, bool meta)
+WheelEventImpl::WheelEventImpl(bool h, int d, AbstractViewImpl *v,
+ int sx, int sy, int cx, int cy, bool ctrl, bool alt, bool shift, bool meta)
: MouseRelatedEventImpl(h ? khtmlHorizontalmousewheelEvent : mousewheelEvent,
true, true, v, 0, sx, sy, cx, cy, ctrl, alt, shift, meta)
, m_horizontal(h), m_wheelDelta(d)
1.30 +50 -50 WebCore/khtml/xml/dom2_eventsimpl.h
Index: dom2_eventsimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_eventsimpl.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dom2_eventsimpl.h 31 Aug 2005 04:38:41 -0000 1.29
+++ dom2_eventsimpl.h 16 Sep 2005 22:42:19 -0000 1.30
@@ -111,31 +111,31 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg);
+ int detailArg);
virtual ~UIEventImpl();
AbstractViewImpl *view() const { return m_view; }
- long detail() const { return m_detail; }
+ int detail() const { return m_detail; }
void initUIEvent(const AtomicString &typeArg,
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg);
+ int detailArg);
virtual bool isUIEvent() const;
virtual int keyCode() const;
virtual int charCode() const;
- virtual long layerX() const;
- virtual long layerY() const;
+ virtual int layerX() const;
+ virtual int layerY() const;
- virtual long pageX() const;
- virtual long pageY() const;
+ virtual int pageX() const;
+ virtual int pageY() const;
- virtual long which() const;
+ virtual int which() const;
protected:
AbstractViewImpl *m_view;
- long m_detail;
+ int m_detail;
};
@@ -143,7 +143,7 @@
public:
UIEventWithKeyStateImpl() : m_ctrlKey(false), m_altKey(false), m_shiftKey(false), m_metaKey(false) { }
UIEventWithKeyStateImpl(const AtomicString &type, bool canBubbleArg, bool cancelableArg, AbstractViewImpl *viewArg,
- long detailArg, bool ctrlKeyArg, bool altKeyArg, bool shiftKeyArg, bool metaKeyArg)
+ int detailArg, bool ctrlKeyArg, bool altKeyArg, bool shiftKeyArg, bool metaKeyArg)
: UIEventImpl(type, canBubbleArg, cancelableArg, viewArg, detailArg)
, m_ctrlKey(ctrlKeyArg), m_altKey(altKeyArg), m_shiftKey(shiftKeyArg), m_metaKey(metaKeyArg) { }
@@ -167,32 +167,32 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
bool metaKeyArg);
- long screenX() const { return m_screenX; }
- long screenY() const { return m_screenY; }
- long clientX() const { return m_clientX; }
- long clientY() const { return m_clientY; }
- long layerX() const { return m_layerX; }
- long layerY() const { return m_layerY; }
- virtual long pageX() const;
- virtual long pageY() const;
+ int screenX() const { return m_screenX; }
+ int screenY() const { return m_screenY; }
+ int clientX() const { return m_clientX; }
+ int clientY() const { return m_clientY; }
+ int layerX() const { return m_layerX; }
+ int layerY() const { return m_layerY; }
+ virtual int pageX() const;
+ virtual int pageY() const;
protected: // expose these so MouseEventImpl::initMouseEvent can set them
- long m_screenX;
- long m_screenY;
- long m_clientX;
- long m_clientY;
+ int m_screenX;
+ int m_screenY;
+ int m_clientX;
+ int m_clientY;
void computeLayerPos();
private:
- long m_layerX;
- long m_layerY;
+ int m_layerX;
+ int m_layerY;
};
// Introduced in DOM Level 2
@@ -203,11 +203,11 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -223,11 +223,11 @@
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- long detailArg,
- long screenXArg,
- long screenYArg,
- long clientXArg,
- long clientYArg,
+ int detailArg,
+ int screenXArg,
+ int screenYArg,
+ int clientXArg,
+ int clientYArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -236,7 +236,7 @@
NodeImpl *relatedTargetArg);
virtual bool isMouseEvent() const;
virtual bool isDragEvent() const;
- virtual long which() const;
+ virtual int which() const;
private:
unsigned short m_button;
NodeImpl *m_relatedTarget;
@@ -254,7 +254,7 @@
bool cancelableArg,
AbstractViewImpl *viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -267,7 +267,7 @@
bool cancelableArg,
AbstractViewImpl *viewArg,
const DOMString &keyIdentifierArg,
- unsigned long keyLocationArg,
+ unsigned keyLocationArg,
bool ctrlKeyArg,
bool altKeyArg,
bool shiftKeyArg,
@@ -275,7 +275,7 @@
bool altGraphKeyArg);
DOMString keyIdentifier() const { return m_keyIdentifier; }
- unsigned long keyLocation() const { return m_keyLocation; }
+ unsigned keyLocation() const { return m_keyLocation; }
bool altGraphKey() const { return m_altGraphKey; }
@@ -285,12 +285,12 @@
int charCode() const;
virtual bool isKeyboardEvent() const;
- virtual long which() const;
+ virtual int which() const;
private:
QKeyEvent *m_keyEvent;
DOMStringImpl *m_keyIdentifier;
- unsigned long m_keyLocation;
+ unsigned m_keyLocation;
bool m_altGraphKey : 1;
};
@@ -347,18 +347,18 @@
{
public:
WheelEventImpl();
- WheelEventImpl(bool horizontal, long wheelDelta, AbstractViewImpl *,
- long screenXArg, long screenYArg,
- long clientXArg, long clientYArg,
+ WheelEventImpl(bool horizontal, int wheelDelta, AbstractViewImpl *,
+ int screenXArg, int screenYArg,
+ int clientXArg, int clientYArg,
bool ctrlKeyArg, bool altKeyArg, bool shiftKeyArg, bool metaKeyArg);
bool isHorizontal() const { return m_horizontal; }
- long wheelDelta() const { return m_wheelDelta; }
+ int wheelDelta() const { return m_wheelDelta; }
private:
virtual bool isWheelEvent() const;
bool m_horizontal;
- long m_wheelDelta;
+ int m_wheelDelta;
};
class RegisteredEventListener {
1.44 +15 -15 WebCore/khtml/xml/dom2_rangeimpl.cpp
Index: dom2_rangeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_rangeimpl.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- dom2_rangeimpl.cpp 31 Aug 2005 15:36:13 -0000 1.43
+++ dom2_rangeimpl.cpp 16 Sep 2005 22:42:19 -0000 1.44
@@ -60,8 +60,8 @@
}
RangeImpl::RangeImpl(DocumentPtr *_ownerDocument,
- NodeImpl *_startContainer, long _startOffset,
- NodeImpl *_endContainer, long _endOffset)
+ NodeImpl *_startContainer, int _startOffset,
+ NodeImpl *_endContainer, int _endOffset)
{
m_ownerDocument = _ownerDocument;
m_ownerDocument->ref();
@@ -92,7 +92,7 @@
return m_startContainer;
}
-long RangeImpl::startOffset(int &exceptioncode) const
+int RangeImpl::startOffset(int &exceptioncode) const
{
if (m_detached) {
exceptioncode = DOMException::INVALID_STATE_ERR;
@@ -112,7 +112,7 @@
return m_endContainer;
}
-long RangeImpl::endOffset(int &exceptioncode) const
+int RangeImpl::endOffset(int &exceptioncode) const
{
if (m_detached) {
exceptioncode = DOMException::INVALID_STATE_ERR;
@@ -163,7 +163,7 @@
return (m_startContainer == m_endContainer && m_startOffset == m_endOffset);
}
-void RangeImpl::setStart( NodeImpl *refNode, long offset, int &exceptioncode )
+void RangeImpl::setStart( NodeImpl *refNode, int offset, int &exceptioncode )
{
if (m_detached) {
exceptioncode = DOMException::INVALID_STATE_ERR;
@@ -201,7 +201,7 @@
collapse(true,exceptioncode);
}
-void RangeImpl::setEnd( NodeImpl *refNode, long offset, int &exceptioncode )
+void RangeImpl::setEnd( NodeImpl *refNode, int offset, int &exceptioncode )
{
if (m_detached) {
exceptioncode = DOMException::INVALID_STATE_ERR;
@@ -315,7 +315,7 @@
}
}
-short RangeImpl::compareBoundaryPoints( NodeImpl *containerA, long offsetA, NodeImpl *containerB, long offsetB )
+short RangeImpl::compareBoundaryPoints( NodeImpl *containerA, int offsetA, NodeImpl *containerB, int offsetB )
{
// see DOM2 traversal & range section 2.5
@@ -470,7 +470,7 @@
}
else {
NodeImpl *n = m_startContainer->firstChild();
- unsigned long i;
+ unsigned i;
for (i = 0; n && i < m_startOffset; i++) // skip until m_startOffset
n = n->nextSibling();
while (n && i < m_endOffset) { // delete until m_endOffset
@@ -535,7 +535,7 @@
if (action == EXTRACT_CONTENTS || action == CLONE_CONTENTS)
leftContents = m_startContainer->cloneNode(false);
NodeImpl *n = m_startContainer->firstChild();
- for (unsigned long i = 0; n && i < m_startOffset; i++) // skip until m_startOffset
+ for (unsigned i = 0; n && i < m_startOffset; i++) // skip until m_startOffset
n = n->nextSibling();
while (n) { // process until end
NodeImpl *next = n->nextSibling();
@@ -603,7 +603,7 @@
rightContents = m_endContainer->cloneNode(false);
NodeImpl *n = m_endContainer->firstChild();
if (n && m_endOffset) {
- for (unsigned long i = 0; i+1 < m_endOffset; i++) { // skip to m_endOffset
+ for (unsigned i = 0; i+1 < m_endOffset; i++) { // skip to m_endOffset
NodeImpl *next = n->nextSibling();
if (!next)
break;
@@ -656,7 +656,7 @@
NodeImpl *processStart; // child of cmnRooot
if (m_startContainer == cmnRoot) {
- unsigned long i;
+ unsigned i;
processStart = m_startContainer->firstChild();
for (i = 0; i < m_startOffset; i++)
processStart = processStart->nextSibling();
@@ -669,7 +669,7 @@
}
NodeImpl *processEnd; // child of cmnRooot
if (m_endContainer == cmnRoot) {
- unsigned long i;
+ unsigned i;
processEnd = m_endContainer->firstChild();
for (i = 0; i < m_endOffset; i++)
processEnd = processEnd->nextSibling();
@@ -934,16 +934,16 @@
case Node::TEXT_NODE:
case Node::COMMENT_NODE:
case Node::CDATA_SECTION_NODE:
- if ( (unsigned long)offset > static_cast<CharacterDataImpl*>(n)->length() )
+ if ( (unsigned)offset > static_cast<CharacterDataImpl*>(n)->length() )
exceptioncode = DOMException::INDEX_SIZE_ERR;
break;
case Node::PROCESSING_INSTRUCTION_NODE:
// ### are we supposed to check with just data or the whole contents?
- if ( (unsigned long)offset > static_cast<ProcessingInstructionImpl*>(n)->data().length() )
+ if ( (unsigned)offset > static_cast<ProcessingInstructionImpl*>(n)->data().length() )
exceptioncode = DOMException::INDEX_SIZE_ERR;
break;
default:
- if ( (unsigned long)offset > n->childNodeCount() )
+ if ( (unsigned)offset > n->childNodeCount() )
exceptioncode = DOMException::INDEX_SIZE_ERR;
break;
}
1.27 +9 -9 WebCore/khtml/xml/dom2_rangeimpl.h
Index: dom2_rangeimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_rangeimpl.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dom2_rangeimpl.h 25 Aug 2005 17:47:20 -0000 1.26
+++ dom2_rangeimpl.h 16 Sep 2005 22:42:19 -0000 1.27
@@ -45,26 +45,26 @@
public:
RangeImpl(DocumentPtr *_ownerDocument);
RangeImpl(DocumentPtr *_ownerDocument,
- NodeImpl *_startContainer, long _startOffset,
- NodeImpl *_endContainer, long _endOffset);
+ NodeImpl *_startContainer, int _startOffset,
+ NodeImpl *_endContainer, int _endOffset);
~RangeImpl();
MAIN_THREAD_ALLOCATED;
NodeImpl *startContainer(int &exceptioncode) const;
- long startOffset(int &exceptioncode) const;
+ int startOffset(int &exceptioncode) const;
NodeImpl *endContainer(int &exceptioncode) const;
- long endOffset(int &exceptioncode) const;
+ int endOffset(int &exceptioncode) const;
bool collapsed(int &exceptioncode) const;
NodeImpl *commonAncestorContainer(int &exceptioncode) const;
static NodeImpl *commonAncestorContainer(NodeImpl *containerA, NodeImpl *containerB);
- void setStart ( NodeImpl *refNode, long offset, int &exceptioncode );
- void setEnd ( NodeImpl *refNode, long offset, int &exceptioncode );
+ void setStart ( NodeImpl *refNode, int offset, int &exceptioncode );
+ void setEnd ( NodeImpl *refNode, int offset, int &exceptioncode );
void collapse ( bool toStart, int &exceptioncode );
short compareBoundaryPoints ( Range::CompareHow how, const RangeImpl *sourceRange, int &exceptioncode ) const;
- static short compareBoundaryPoints ( NodeImpl *containerA, long offsetA, NodeImpl *containerB, long offsetB );
+ static short compareBoundaryPoints ( NodeImpl *containerA, int offsetA, NodeImpl *containerB, int offsetB );
static short compareBoundaryPoints ( const Position &a, const Position &b );
bool boundaryPointsValid ( ) const;
void deleteContents ( int &exceptioncode );
@@ -111,9 +111,9 @@
protected:
DocumentPtr *m_ownerDocument;
NodeImpl *m_startContainer;
- unsigned long m_startOffset;
+ unsigned m_startOffset;
NodeImpl *m_endContainer;
- unsigned long m_endOffset;
+ unsigned m_endOffset;
bool m_detached;
private:
1.12 +3 -3 WebCore/khtml/xml/dom2_traversalimpl.cpp
Index: dom2_traversalimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_traversalimpl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dom2_traversalimpl.cpp 9 Jul 2005 20:19:21 -0000 1.11
+++ dom2_traversalimpl.cpp 16 Sep 2005 22:42:19 -0000 1.12
@@ -49,7 +49,7 @@
// --------------------------------------------------------------
-TraversalImpl::TraversalImpl(NodeImpl *rootNode, long whatToShow, NodeFilterImpl *nodeFilter, bool expandEntityReferences)
+TraversalImpl::TraversalImpl(NodeImpl *rootNode, int whatToShow, NodeFilterImpl *nodeFilter, bool expandEntityReferences)
: m_root(rootNode), m_whatToShow(whatToShow), m_filter(nodeFilter), m_expandEntityReferences(expandEntityReferences)
{
if (root())
@@ -79,7 +79,7 @@
// --------------------------------------------------------------
-NodeIteratorImpl::NodeIteratorImpl(NodeImpl *rootNode, long whatToShow, NodeFilterImpl *filter, bool expandEntityReferences)
+NodeIteratorImpl::NodeIteratorImpl(NodeImpl *rootNode, int whatToShow, NodeFilterImpl *filter, bool expandEntityReferences)
:TraversalImpl(rootNode, whatToShow, filter, expandEntityReferences), m_referenceNode(0), m_beforeReferenceNode(true), m_detached(false), m_doc(0)
{
if (root()) {
@@ -255,7 +255,7 @@
// --------------------------------------------------------------
-TreeWalkerImpl::TreeWalkerImpl(NodeImpl *rootNode, long whatToShow, NodeFilterImpl *filter, bool expandEntityReferences)
+TreeWalkerImpl::TreeWalkerImpl(NodeImpl *rootNode, int whatToShow, NodeFilterImpl *filter, bool expandEntityReferences)
: TraversalImpl(rootNode, whatToShow, filter, expandEntityReferences), m_current(rootNode)
{
if (currentNode())
1.11 +5 -5 WebCore/khtml/xml/dom2_traversalimpl.h
Index: dom2_traversalimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_traversalimpl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dom2_traversalimpl.h 10 May 2005 21:59:14 -0000 1.10
+++ dom2_traversalimpl.h 16 Sep 2005 22:42:19 -0000 1.11
@@ -55,13 +55,13 @@
class TraversalImpl : public khtml::Shared<TraversalImpl>
{
public:
- TraversalImpl(NodeImpl *, long whatToShow, NodeFilterImpl *, bool expandEntityReferences);
+ TraversalImpl(NodeImpl *, int whatToShow, NodeFilterImpl *, bool expandEntityReferences);
~TraversalImpl();
MAIN_THREAD_ALLOCATED;
NodeImpl *root() const { return m_root; }
- unsigned long whatToShow() const { return m_whatToShow; }
+ unsigned whatToShow() const { return m_whatToShow; }
NodeFilterImpl *filter() const { return m_filter; }
bool expandEntityReferences() const { return m_expandEntityReferences; }
@@ -72,7 +72,7 @@
TraversalImpl &operator=(const TraversalImpl &);
NodeImpl *m_root;
- long m_whatToShow;
+ int m_whatToShow;
NodeFilterImpl *m_filter;
bool m_expandEntityReferences;
};
@@ -80,7 +80,7 @@
class NodeIteratorImpl : public TraversalImpl
{
public:
- NodeIteratorImpl(NodeImpl *, long whatToShow, NodeFilterImpl *, bool expandEntityReferences);
+ NodeIteratorImpl(NodeImpl *, int whatToShow, NodeFilterImpl *, bool expandEntityReferences);
~NodeIteratorImpl();
NodeImpl *nextNode(int &exceptioncode);
@@ -119,7 +119,7 @@
class TreeWalkerImpl : public TraversalImpl
{
public:
- TreeWalkerImpl(NodeImpl *, long whatToShow, NodeFilterImpl *, bool expandEntityReferences);
+ TreeWalkerImpl(NodeImpl *, int whatToShow, NodeFilterImpl *, bool expandEntityReferences);
~TreeWalkerImpl();
NodeImpl *currentNode() const { return m_current; }
1.255 +10 -11 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- dom_docimpl.cpp 14 Sep 2005 03:43:01 -0000 1.254
+++ dom_docimpl.cpp 16 Sep 2005 22:42:19 -0000 1.255
@@ -888,7 +888,7 @@
return new RangeImpl( docPtr() );
}
-NodeIteratorImpl *DocumentImpl::createNodeIterator(NodeImpl *root, unsigned long whatToShow,
+NodeIteratorImpl *DocumentImpl::createNodeIterator(NodeImpl *root, unsigned whatToShow,
NodeFilterImpl *filter, bool expandEntityReferences, int &exceptioncode)
{
if (!root) {
@@ -898,7 +898,7 @@
return new NodeIteratorImpl(root, whatToShow, filter, expandEntityReferences);
}
-TreeWalkerImpl *DocumentImpl::createTreeWalker(NodeImpl *root, unsigned long whatToShow,
+TreeWalkerImpl *DocumentImpl::createTreeWalker(NodeImpl *root, unsigned whatToShow,
NodeFilterImpl *filter, bool expandEntityReferences, int &exceptioncode)
{
if (!root) {
@@ -1810,7 +1810,7 @@
else if(strcasecmp(equiv, "expires") == 0)
{
QString str = content.qstring().stripWhiteSpace();
- time_t expire_date = str.toLong();
+ time_t expire_date = str.toInt();
if (m_docLoader)
m_docLoader->setExpireDate(expire_date);
}
@@ -2782,8 +2782,8 @@
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
SharedPtr<RangeImpl> textPiece = markedText.range();
int exception = 0;
- long startOffset = textPiece->startOffset(exception);
- long length = textPiece->endOffset(exception) - startOffset + 1;
+ unsigned startOffset = textPiece->startOffset(exception);
+ unsigned length = textPiece->endOffset(exception) - startOffset + 1;
removeMarkers(textPiece->startContainer(exception), startOffset, length, markerType);
}
}
@@ -2837,7 +2837,7 @@
// copies markers from srcNode to dstNode, applying the specified shift delta to the copies. The shift is
// useful if, e.g., the caller has created the dstNode from a non-prefix substring of the srcNode.
-void DocumentImpl::copyMarkers(NodeImpl *srcNode, ulong startOffset, long length, NodeImpl *dstNode, long delta, DocumentMarker::MarkerType markerType)
+void DocumentImpl::copyMarkers(NodeImpl *srcNode, unsigned startOffset, int length, NodeImpl *dstNode, int delta, DocumentMarker::MarkerType markerType)
{
if (length <= 0)
return;
@@ -2847,7 +2847,7 @@
return;
bool docDirty = false;
- ulong endOffset = startOffset + length - 1;
+ unsigned endOffset = startOffset + length - 1;
QValueListIterator<DocumentMarker> it;
for (it = markers->begin(); it != markers->end(); ++it) {
DocumentMarker marker = *it;
@@ -2877,7 +2877,7 @@
dstNode->renderer()->repaint();
}
-void DocumentImpl::removeMarkers(NodeImpl *node, ulong startOffset, long length, DocumentMarker::MarkerType markerType)
+void DocumentImpl::removeMarkers(NodeImpl *node, unsigned startOffset, int length, DocumentMarker::MarkerType markerType)
{
if (length <= 0)
return;
@@ -2887,7 +2887,7 @@
return;
bool docDirty = false;
- ulong endOffset = startOffset + length - 1;
+ unsigned endOffset = startOffset + length - 1;
QValueListIterator<DocumentMarker> it;
for (it = markers->begin(); it != markers->end(); ) {
DocumentMarker marker = *it;
@@ -2937,7 +2937,6 @@
QValueList <DocumentMarker> *markers = m_markers.find(node);
if (markers)
return *markers;
-
return QValueList <DocumentMarker> ();
}
@@ -2985,7 +2984,7 @@
}
}
-void DocumentImpl::shiftMarkers(NodeImpl *node, ulong startOffset, long delta, DocumentMarker::MarkerType markerType)
+void DocumentImpl::shiftMarkers(NodeImpl *node, unsigned startOffset, int delta, DocumentMarker::MarkerType markerType)
{
QValueList <DocumentMarker> *markers = m_markers.find(node);
if (!markers)
1.126 +6 -6 WebCore/khtml/xml/dom_docimpl.h
Index: dom_docimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- dom_docimpl.h 14 Sep 2005 03:43:01 -0000 1.125
+++ dom_docimpl.h 16 Sep 2005 22:42:19 -0000 1.126
@@ -115,7 +115,7 @@
};
enum MarkerType type;
- ulong startOffset, endOffset;
+ unsigned startOffset, endOffset;
bool operator == (const DocumentMarker &o) const {
return type == o.type && startOffset == o.startOffset && endOffset == o.endOffset;
@@ -274,10 +274,10 @@
RangeImpl *createRange();
- NodeIteratorImpl *createNodeIterator(NodeImpl *root, unsigned long whatToShow,
+ NodeIteratorImpl *createNodeIterator(NodeImpl *root, unsigned whatToShow,
NodeFilterImpl *filter, bool expandEntityReferences, int &exceptioncode);
- TreeWalkerImpl *createTreeWalker(NodeImpl *root, unsigned long whatToShow,
+ TreeWalkerImpl *createTreeWalker(NodeImpl *root, unsigned whatToShow,
NodeFilterImpl *filter, bool expandEntityReferences, int &exceptioncode);
// Special support for editing
@@ -536,12 +536,12 @@
void addMarker(RangeImpl *range, DocumentMarker::MarkerType type);
void addMarker(NodeImpl *node, DocumentMarker marker);
- void copyMarkers(NodeImpl *srcNode, ulong startOffset, long length, NodeImpl *dstNode, long delta, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
+ void copyMarkers(NodeImpl *srcNode, unsigned startOffset, int length, NodeImpl *dstNode, int delta, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
void removeMarkers(RangeImpl *range, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
- void removeMarkers(NodeImpl *node, ulong startOffset, long length, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
+ void removeMarkers(NodeImpl *node, unsigned startOffset, int length, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
void removeMarkers(DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
void removeMarkers(NodeImpl *node);
- void shiftMarkers(NodeImpl *node, ulong startOffset, long delta, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
+ void shiftMarkers(NodeImpl *node, unsigned startOffset, int delta, DocumentMarker::MarkerType markerType=DocumentMarker::AllMarkers);
QValueList<DocumentMarker> markersForNode(NodeImpl *node);
1.82 +6 -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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- dom_elementimpl.cpp 12 Sep 2005 03:40:37 -0000 1.81
+++ dom_elementimpl.cpp 16 Sep 2005 22:42:20 -0000 1.82
@@ -624,8 +624,8 @@
NamedAttrMapImpl *attrMap = attributes(true);
if (attrMap) {
- unsigned long numAttrs = attrMap->length();
- for (unsigned long i = 0; i < numAttrs; i++) {
+ unsigned numAttrs = attrMap->length();
+ for (unsigned i = 0; i < numAttrs; i++) {
result += " ";
AttributeImpl *attribute = attrMap->attributeItem(i);
@@ -936,7 +936,7 @@
return r;
}
-AttrImpl *NamedAttrMapImpl::item ( unsigned long index ) const
+AttrImpl *NamedAttrMapImpl::item ( unsigned index ) const
{
if (index >= len)
return 0;
@@ -949,7 +949,7 @@
AttributeImpl* NamedAttrMapImpl::getAttributeItem(const QualifiedName& name) const
{
- for (unsigned long i = 0; i < len; ++i) {
+ for (unsigned i = 0; i < len; ++i) {
if (attrs[i]->name().matches(name))
return attrs[i];
}
@@ -1043,8 +1043,8 @@
void NamedAttrMapImpl::removeAttribute(const QualifiedName& name)
{
- unsigned long index = len+1;
- for (unsigned long i = 0; i < len; ++i)
+ unsigned index = len+1;
+ for (unsigned i = 0; i < len; ++i)
if (attrs[i]->name().matches(name)) {
index = i;
break;
1.52 +4 -4 WebCore/khtml/xml/dom_elementimpl.h
Index: dom_elementimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dom_elementimpl.h 19 Aug 2005 23:09:18 -0000 1.51
+++ dom_elementimpl.h 16 Sep 2005 22:42:20 -0000 1.52
@@ -294,11 +294,11 @@
virtual SharedPtr<NodeImpl> removeNamedItem(const QualifiedName& name, int &exceptioncode);
virtual SharedPtr<NodeImpl> setNamedItem(NodeImpl* arg, int &exceptioncode);
- virtual AttrImpl *item ( unsigned long index ) const;
- unsigned long length() const { return len; }
+ virtual AttrImpl *item ( unsigned index ) const;
+ unsigned length() const { return len; }
// Other methods (not part of DOM)
- AttributeImpl* attributeItem(unsigned long index) const { return attrs ? attrs[index] : 0; }
+ AttributeImpl* attributeItem(unsigned index) const { return attrs ? attrs[index] : 0; }
AttributeImpl* getAttributeItem(const QualifiedName& name) const;
virtual bool isReadOnly() { return element ? element->isReadOnly() : false; }
@@ -409,7 +409,7 @@
bool mapsEquivalent(const NamedMappedAttrMapImpl* otherMap) const;
int declCount() const;
- MappedAttributeImpl* attributeItem(unsigned long index) const
+ MappedAttributeImpl* attributeItem(unsigned index) const
{ return attrs ? static_cast<MappedAttributeImpl*>(attrs[index]) : 0; }
private:
1.189 +31 -31 WebCore/khtml/xml/dom_nodeimpl.cpp
Index: dom_nodeimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- dom_nodeimpl.cpp 15 Sep 2005 00:20:57 -0000 1.188
+++ dom_nodeimpl.cpp 16 Sep 2005 22:42:20 -0000 1.189
@@ -81,8 +81,8 @@
TagNodeListImpl(NodeImpl *n, const AtomicString& namespaceURI, const AtomicString& localName);
// DOM methods overridden from parent classes
- virtual unsigned long length() const;
- virtual NodeImpl *item (unsigned long index) const;
+ virtual unsigned length() const;
+ virtual NodeImpl *item (unsigned index) const;
// Other methods (not part of DOM)
@@ -260,9 +260,9 @@
NamedAttrMapImpl *attrMap = element->attributes();
if (attrMap) {
- unsigned long numAttrs = attrMap->length();
+ unsigned numAttrs = attrMap->length();
- for (unsigned long i = 0; i < numAttrs; i++) {
+ for (unsigned i = 0; i < numAttrs; i++) {
AttributeImpl *attribute = attrMap->attributeItem(i);
AttrImpl *attr = attribute->attrImpl();
@@ -387,10 +387,10 @@
return isFocusable();
}
-unsigned long NodeImpl::nodeIndex() const
+unsigned NodeImpl::nodeIndex() const
{
NodeImpl *_tempNode = previousSibling();
- unsigned long count=0;
+ unsigned count=0;
for( count=0; _tempNode; count++ )
_tempNode = _tempNode->previousSibling();
return count;
@@ -973,12 +973,12 @@
{
}
-unsigned long NodeImpl::childNodeCount() const
+unsigned NodeImpl::childNodeCount() const
{
return 0;
}
-NodeImpl *NodeImpl::childNode(unsigned long /*index*/)
+NodeImpl *NodeImpl::childNode(unsigned /*index*/)
{
return 0;
}
@@ -1448,7 +1448,7 @@
return 0;
}
-long NodeImpl::maxOffset() const
+int NodeImpl::maxOffset() const
{
return 1;
}
@@ -1456,7 +1456,7 @@
// FIXME: Shouldn't these functions be in the editing code? Code that asks questions about HTML in the core DOM class
// is obviously misplaced.
// method for editing madness, which allows BR,1 as a position, though that is incorrect
-long NodeImpl::maxDeepOffset() const
+int NodeImpl::maxDeepOffset() const
{
if (isTextNode())
return static_cast<const TextImpl*>(this)->length();
@@ -1467,27 +1467,27 @@
return childNodeCount();
}
-long NodeImpl::caretMinOffset() const
+int NodeImpl::caretMinOffset() const
{
return renderer() ? renderer()->caretMinOffset() : 0;
}
-long NodeImpl::caretMaxOffset() const
+int NodeImpl::caretMaxOffset() const
{
return renderer() ? renderer()->caretMaxOffset() : 1;
}
-unsigned long NodeImpl::caretMaxRenderedOffset() const
+unsigned NodeImpl::caretMaxRenderedOffset() const
{
return renderer() ? renderer()->caretMaxRenderedOffset() : 1;
}
-long NodeImpl::previousOffset (long current) const
+int NodeImpl::previousOffset (int current) const
{
return renderer() ? renderer()->previousOffset(current) : current - 1;
}
-long NodeImpl::nextOffset (long current) const
+int NodeImpl::nextOffset (int current) const
{
return renderer() ? renderer()->nextOffset(current) : current + 1;
}
@@ -2399,18 +2399,18 @@
}
}
-unsigned long ContainerNodeImpl::childNodeCount() const
+unsigned ContainerNodeImpl::childNodeCount() const
{
- unsigned long count = 0;
+ unsigned count = 0;
NodeImpl *n;
for (n = firstChild(); n; n = n->nextSibling())
count++;
return count;
}
-NodeImpl *ContainerNodeImpl::childNode(unsigned long index)
+NodeImpl *ContainerNodeImpl::childNode(unsigned index)
{
- unsigned long i;
+ unsigned i;
NodeImpl *n = firstChild();
for (i = 0; n != 0 && i < index; i++)
n = n->nextSibling();
@@ -2489,7 +2489,7 @@
rootNode->deref();
}
-unsigned long NodeListImpl::recursiveLength( NodeImpl *start ) const
+unsigned NodeListImpl::recursiveLength( NodeImpl *start ) const
{
if (!start)
start = rootNode;
@@ -2498,7 +2498,7 @@
return cachedLength;
}
- unsigned long len = 0;
+ unsigned len = 0;
for(NodeImpl *n = start->firstChild(); n != 0; n = n->nextSibling()) {
if ( n->nodeType() == Node::ELEMENT_NODE ) {
@@ -2516,7 +2516,7 @@
return len;
}
-NodeImpl *NodeListImpl::recursiveItem ( unsigned long offset, NodeImpl *start) const
+NodeImpl *NodeListImpl::recursiveItem ( unsigned offset, NodeImpl *start) const
{
int remainingOffset = offset;
if (!start) {
@@ -2568,9 +2568,9 @@
return 0;
}
- unsigned long l = length();
+ unsigned l = length();
- for ( unsigned long i = 0; i < l; i++ ) {
+ for ( unsigned i = 0; i < l; i++ ) {
NodeImpl *node = item(i);
if ( static_cast<ElementImpl *>(node)->getIDAttribute() == elementId ) {
@@ -2593,9 +2593,9 @@
{
}
-unsigned long ChildNodeListImpl::length() const
+unsigned ChildNodeListImpl::length() const
{
- unsigned long len = 0;
+ unsigned len = 0;
NodeImpl *n;
for(n = rootNode->firstChild(); n != 0; n = n->nextSibling())
len++;
@@ -2603,7 +2603,7 @@
return len;
}
-NodeImpl *ChildNodeListImpl::item ( unsigned long index ) const
+NodeImpl *ChildNodeListImpl::item ( unsigned index ) const
{
unsigned int pos = 0;
NodeImpl *n = rootNode->firstChild();
@@ -2629,12 +2629,12 @@
{
}
-unsigned long TagNodeListImpl::length() const
+unsigned TagNodeListImpl::length() const
{
return recursiveLength();
}
-NodeImpl *TagNodeListImpl::item(unsigned long index) const
+NodeImpl *TagNodeListImpl::item(unsigned index) const
{
return recursiveItem(index);
}
@@ -2655,12 +2655,12 @@
{
}
-unsigned long NameNodeListImpl::length() const
+unsigned NameNodeListImpl::length() const
{
return recursiveLength();
}
-NodeImpl *NameNodeListImpl::item ( unsigned long index ) const
+NodeImpl *NameNodeListImpl::item ( unsigned index ) const
{
return recursiveItem( index );
}
1.101 +23 -23 WebCore/khtml/xml/dom_nodeimpl.h
Index: dom_nodeimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- dom_nodeimpl.h 3 Sep 2005 23:10:01 -0000 1.100
+++ dom_nodeimpl.h 16 Sep 2005 22:42:20 -0000 1.101
@@ -260,7 +260,7 @@
virtual void recalcStyle( StyleChange = NoChange ) {}
StyleChange diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 ) const;
- unsigned long nodeIndex() const;
+ unsigned nodeIndex() const;
// Returns the document that this node is associated with. This is guaranteed to always be non-null, as opposed to
// DOM's ownerDocument() which is null for Document nodes (and sometimes DocumentType nodes).
DocumentImpl* getDocument() const { return document->document(); }
@@ -306,8 +306,8 @@
virtual bool isReadOnly();
virtual bool childTypeAllowed( unsigned short /*type*/ ) { return false; }
- virtual unsigned long childNodeCount() const;
- virtual NodeImpl *childNode(unsigned long index);
+ virtual unsigned childNodeCount() const;
+ virtual NodeImpl *childNode(unsigned index);
/**
* Does a pre-order traversal of the tree to find the node next node after this one. This uses the same order that
@@ -355,14 +355,14 @@
void checkAddChild(NodeImpl *newChild, int &exceptioncode); // Error-checking when adding via the DOM API
virtual bool childAllowed(NodeImpl *newChild); // Error-checking during parsing that checks the DTD
- virtual long maxOffset() const;
- long maxDeepOffset() const;
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int maxOffset() const;
+ int maxDeepOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
- virtual long previousOffset (long current) const;
- virtual long nextOffset (long current) const;
+ virtual int previousOffset (int current) const;
+ virtual int nextOffset (int current) const;
#ifndef NDEBUG
virtual void dump(QTextStream *stream, QString ind = "") const;
@@ -537,8 +537,8 @@
virtual void setFocus(bool=true);
virtual void setActive(bool active = true, bool pause = false);
virtual void setHovered(bool=true);
- virtual unsigned long childNodeCount() const;
- virtual NodeImpl *childNode(unsigned long index);
+ virtual unsigned childNodeCount() const;
+ virtual NodeImpl *childNode(unsigned index);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
@@ -576,8 +576,8 @@
MAIN_THREAD_ALLOCATED;
// DOM methods & attributes for NodeList
- virtual unsigned long length() const = 0;
- virtual NodeImpl *item ( unsigned long index ) const = 0;
+ virtual unsigned length() const = 0;
+ virtual NodeImpl *item ( unsigned index ) const = 0;
virtual NodeImpl *itemById ( const DOMString & elementId ) const;
// Other methods (not part of DOM)
@@ -587,14 +587,14 @@
protected:
// helper functions for searching all ElementImpls in a tree
- unsigned long recursiveLength(NodeImpl *start = 0) const;
- NodeImpl *recursiveItem ( unsigned long offset, NodeImpl *start = 0 ) const;
+ unsigned recursiveLength(NodeImpl *start = 0) const;
+ NodeImpl *recursiveItem ( unsigned offset, NodeImpl *start = 0 ) const;
virtual bool nodeMatches( NodeImpl *testNode ) const = 0;
NodeImpl *rootNode;
mutable int cachedLength;
mutable NodeImpl *lastItem;
- mutable unsigned long lastItemOffset;
+ mutable unsigned lastItemOffset;
mutable bool isLengthCacheValid : 1;
mutable bool isItemCacheValid : 1;
};
@@ -606,8 +606,8 @@
// DOM methods overridden from parent classes
- virtual unsigned long length() const;
- virtual NodeImpl *item ( unsigned long index ) const;
+ virtual unsigned length() const;
+ virtual NodeImpl *item ( unsigned index ) const;
protected:
virtual bool nodeMatches( NodeImpl *testNode ) const;
@@ -623,8 +623,8 @@
// DOM methods overridden from parent classes
- virtual unsigned long length() const;
- virtual NodeImpl *item ( unsigned long index ) const;
+ virtual unsigned length() const;
+ virtual NodeImpl *item ( unsigned index ) const;
// Other methods (not part of DOM)
virtual void rootNodeChildrenChanged() {};
@@ -660,8 +660,8 @@
virtual SharedPtr<NodeImpl> removeNamedItem (const QualifiedName& attrName, int &exceptioncode) = 0;
virtual SharedPtr<NodeImpl> setNamedItem (NodeImpl* arg, int &exceptioncode) = 0;
- virtual NodeImpl *item ( unsigned long index ) const = 0;
- virtual unsigned long length( ) const = 0;
+ virtual NodeImpl *item ( unsigned index ) const = 0;
+ virtual unsigned length( ) const = 0;
// Other methods (not part of DOM)
virtual bool isReadOnly() { return false; }
1.78 +16 -16 WebCore/khtml/xml/dom_position.cpp
Index: dom_position.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_position.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- dom_position.cpp 25 Aug 2005 23:13:56 -0000 1.77
+++ dom_position.cpp 16 Sep 2005 22:42:20 -0000 1.78
@@ -99,7 +99,7 @@
}
-Position::Position(NodeImpl *node, long offset)
+Position::Position(NodeImpl *node, int offset)
: m_node(node), m_offset(offset)
{
if (node) {
@@ -168,7 +168,7 @@
if (!n)
return *this;
- long o = offset();
+ int o = offset();
assert(o >= 0);
if (o > 0) {
@@ -197,7 +197,7 @@
if (!n)
return *this;
- long o = offset();
+ int o = offset();
assert(o >= 0);
if (o < n->maxDeepOffset()) {
@@ -238,7 +238,7 @@
return offset() >= n->maxDeepOffset() && n->parent() == 0;
}
-long Position::renderedOffset() const
+int Position::renderedOffset() const
{
if (!node()->isTextNode())
return offset();
@@ -246,11 +246,11 @@
if (!node()->renderer())
return offset();
- long result = 0;
+ int result = 0;
RenderText *textRenderer = static_cast<RenderText *>(node()->renderer());
for (InlineTextBox *box = textRenderer->firstTextBox(); box; box = box->nextTextBox()) {
- long start = box->m_start;
- long end = box->m_start + box->m_len;
+ int start = box->m_start;
+ int end = box->m_start + box->m_len;
if (offset() < start)
return result;
if (offset() <= end) {
@@ -527,8 +527,8 @@
// Make sure that 0 <= constrainedOffset <= num kids, otherwise using this Position
// in DOM calls can result in exceptions.
- long maxOffset = node()->isTextNode() ? static_cast<TextImpl *>(node())->length(): node()->childNodeCount();
- long constrainedOffset = offset() <= 0 ? 0 : kMin(maxOffset, offset());
+ int maxOffset = node()->isTextNode() ? static_cast<TextImpl *>(node())->length(): node()->childNodeCount();
+ int constrainedOffset = offset() <= 0 ? 0 : kMin(maxOffset, offset());
if (!node()->parentNode())
return Position(node(), constrainedOffset);
@@ -540,7 +540,7 @@
if (!renderer->isReplaced() && !renderer->isBR())
return Position(node(), constrainedOffset);
- long o = offset();
+ int o = offset();
const NodeImpl *n = node();
while ((n = n->previousSibling()))
o++;
@@ -717,8 +717,8 @@
if (pos.node()->isTextNode() && !pos.inRenderedText())
return false;
- long thisRenderedOffset = renderedOffset();
- long posRenderedOffset = pos.renderedOffset();
+ int thisRenderedOffset = renderedOffset();
+ int posRenderedOffset = pos.renderedOffset();
if (renderer == posRenderer && thisRenderedOffset == posRenderedOffset)
return false;
@@ -743,12 +743,12 @@
}
if (nextRenderedEditable(node()) == pos.node() &&
- thisRenderedOffset == (long)node()->caretMaxRenderedOffset() && posRenderedOffset == 0) {
+ thisRenderedOffset == (int)node()->caretMaxRenderedOffset() && posRenderedOffset == 0) {
return false;
}
if (previousRenderedEditable(node()) == pos.node() &&
- thisRenderedOffset == 0 && posRenderedOffset == (long)pos.node()->caretMaxRenderedOffset()) {
+ thisRenderedOffset == 0 && posRenderedOffset == (int)pos.node()->caretMaxRenderedOffset()) {
return false;
}
@@ -781,7 +781,7 @@
if (node()->isTextNode()) {
TextImpl *textNode = static_cast<TextImpl *>(node());
- if (offset() < (long)textNode->length()) {
+ if (offset() < (int)textNode->length()) {
DOMString string = static_cast<TextImpl *>(node())->data();
const QChar &c = string[offset()];
if (considerNonCollapsibleWhitespace ? (c.isSpace() || c.unicode() == 0xa0) : isCollapsibleWhitespace(c))
@@ -809,7 +809,7 @@
if (isNull())
fprintf(stderr, "Position [%s]: null\n", msg);
else
- fprintf(stderr, "Position [%s]: %s [%p] at %ld\n", msg, node()->nodeName().qstring().latin1(), node(), offset());
+ fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, node()->nodeName().qstring().latin1(), node(), offset());
}
#ifndef NDEBUG
1.35 +4 -4 WebCore/khtml/xml/dom_position.h
Index: dom_position.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_position.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dom_position.h 21 Jun 2005 18:11:10 -0000 1.34
+++ dom_position.h 16 Sep 2005 22:42:20 -0000 1.35
@@ -41,7 +41,7 @@
{
public:
Position() : m_node(0), m_offset(0) { }
- Position(NodeImpl *node, long offset);
+ Position(NodeImpl *node, int offset);
Position(const Position &);
~Position();
@@ -50,7 +50,7 @@
void clear();
NodeImpl *node() const { return m_node; }
- long offset() const { return m_offset; }
+ int offset() const { return m_offset; }
bool isNull() const { return m_node == 0; }
bool isNotNull() const { return m_node != 0; }
@@ -96,7 +96,7 @@
#endif
private:
- long renderedOffset() const;
+ int renderedOffset() const;
bool inRenderedText() const;
@@ -104,7 +104,7 @@
Position nextCharacterPosition(khtml::EAffinity affinity) const;
NodeImpl *m_node;
- long m_offset;
+ int m_offset;
};
inline bool operator==(const Position &a, const Position &b)
1.33 +16 -16 WebCore/khtml/xml/dom_textimpl.cpp
Index: dom_textimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dom_textimpl.cpp 16 Sep 2005 06:36:18 -0000 1.32
+++ dom_textimpl.cpp 16 Sep 2005 22:42:20 -0000 1.33
@@ -80,12 +80,12 @@
getDocument()->removeMarkers(this);
}
-unsigned long CharacterDataImpl::length() const
+unsigned CharacterDataImpl::length() const
{
return str->l;
}
-DOMString CharacterDataImpl::substringData( const unsigned long offset, const unsigned long count, int &exceptioncode )
+DOMString CharacterDataImpl::substringData( const unsigned offset, const unsigned count, int &exceptioncode )
{
exceptioncode = 0;
checkCharDataOperation(offset, exceptioncode);
@@ -116,7 +116,7 @@
oldStr->deref();
}
-void CharacterDataImpl::insertData( const unsigned long offset, const DOMString &arg, int &exceptioncode )
+void CharacterDataImpl::insertData( const unsigned offset, const DOMString &arg, int &exceptioncode )
{
exceptioncode = 0;
checkCharDataOperation(offset, exceptioncode);
@@ -138,7 +138,7 @@
getDocument()->shiftMarkers(this, offset, length);
}
-void CharacterDataImpl::deleteData( const unsigned long offset, const unsigned long count, int &exceptioncode )
+void CharacterDataImpl::deleteData( const unsigned offset, const unsigned count, int &exceptioncode )
{
exceptioncode = 0;
checkCharDataOperation(offset, exceptioncode);
@@ -160,14 +160,14 @@
getDocument()->shiftMarkers(this, offset + count, -count);
}
-void CharacterDataImpl::replaceData( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode )
+void CharacterDataImpl::replaceData( const unsigned offset, const unsigned count, const DOMString &arg, int &exceptioncode )
{
exceptioncode = 0;
checkCharDataOperation(offset, exceptioncode);
if (exceptioncode)
return;
- unsigned long realCount;
+ unsigned realCount;
if (offset + count > str->l)
realCount = str->l-offset;
else
@@ -231,7 +231,7 @@
dispatchSubtreeModifiedEvent();
}
-void CharacterDataImpl::checkCharDataOperation( const unsigned long offset, int &exceptioncode )
+void CharacterDataImpl::checkCharDataOperation( const unsigned offset, int &exceptioncode )
{
exceptioncode = 0;
@@ -249,24 +249,24 @@
}
}
-long CharacterDataImpl::maxOffset() const
+int CharacterDataImpl::maxOffset() const
{
- return (long)length();
+ return (int)length();
}
-long CharacterDataImpl::caretMinOffset() const
+int CharacterDataImpl::caretMinOffset() const
{
RenderText *r = static_cast<RenderText *>(renderer());
return r && r->isText() ? r->caretMinOffset() : 0;
}
-long CharacterDataImpl::caretMaxOffset() const
+int CharacterDataImpl::caretMaxOffset() const
{
RenderText *r = static_cast<RenderText *>(renderer());
- return r && r->isText() ? r->caretMaxOffset() : (long)length();
+ return r && r->isText() ? r->caretMaxOffset() : (int)length();
}
-unsigned long CharacterDataImpl::caretMaxRenderedOffset() const
+unsigned CharacterDataImpl::caretMaxRenderedOffset() const
{
RenderText *r = static_cast<RenderText *>(renderer());
return r ? r->caretMaxRenderedOffset() : length();
@@ -354,17 +354,17 @@
{
}
-TextImpl *TextImpl::splitText( const unsigned long offset, int &exceptioncode )
+TextImpl *TextImpl::splitText( const unsigned offset, int &exceptioncode )
{
exceptioncode = 0;
// INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than
// the number of 16-bit units in data.
- // ### we explicitly check for a negative long that has been cast to an unsigned long
+ // ### we explicitly check for a negative number that has been cast to an unsigned
// ... this can happen if JS code passes in -1 - we need to catch this earlier! (in the
// kjs bindings)
- if (offset > str->l || (long)offset < 0) {
+ if (offset > str->l || (int)offset < 0) {
exceptioncode = DOMException::INDEX_SIZE_ERR;
return 0;
}
1.20 +11 -11 WebCore/khtml/xml/dom_textimpl.h
Index: dom_textimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dom_textimpl.h 29 Aug 2005 18:00:46 -0000 1.19
+++ dom_textimpl.h 16 Sep 2005 22:42:20 -0000 1.20
@@ -46,12 +46,12 @@
virtual DOMString data() const;
virtual void setData( const DOMString &_data, int &exceptioncode );
- virtual unsigned long length ( ) const;
- virtual DOMString substringData ( const unsigned long offset, const unsigned long count, int &exceptioncode );
+ virtual unsigned length ( ) const;
+ virtual DOMString substringData ( const unsigned offset, const unsigned count, int &exceptioncode );
virtual void appendData ( const DOMString &arg, int &exceptioncode );
- virtual void insertData ( const unsigned long offset, const DOMString &arg, int &exceptioncode );
- virtual void deleteData ( const unsigned long offset, const unsigned long count, int &exceptioncode );
- virtual void replaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode );
+ virtual void insertData ( const unsigned offset, const DOMString &arg, int &exceptioncode );
+ virtual void deleteData ( const unsigned offset, const unsigned count, int &exceptioncode );
+ virtual void replaceData ( const unsigned offset, const unsigned count, const DOMString &arg, int &exceptioncode );
virtual bool containsOnlyWhitespace() const;
bool containsOnlyWhitespace(unsigned int from, unsigned int len) const;
@@ -64,12 +64,12 @@
// Other methods (not part of DOM)
DOMStringImpl *string() { return str; }
- virtual void checkCharDataOperation( const unsigned long offset, int &exceptioncode );
+ virtual void checkCharDataOperation( const unsigned offset, int &exceptioncode );
- virtual long maxOffset() const;
- virtual long caretMinOffset() const;
- virtual long caretMaxOffset() const;
- virtual unsigned long caretMaxRenderedOffset() const;
+ virtual int maxOffset() const;
+ virtual int caretMinOffset() const;
+ virtual int caretMaxOffset() const;
+ virtual unsigned caretMaxRenderedOffset() const;
virtual bool rendererIsNeeded(khtml::RenderStyle *);
@@ -118,7 +118,7 @@
// DOM methods & attributes for CharacterData
- TextImpl *splitText ( const unsigned long offset, int &exceptioncode );
+ TextImpl *splitText ( const unsigned offset, int &exceptioncode );
// DOM methods overridden from parent classes
const AtomicString& localName() const;
1.25 +15 -15 WebCore/kwq/DOM-CSS.mm
Index: DOM-CSS.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM-CSS.mm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DOM-CSS.mm 29 Aug 2005 21:29:28 -0000 1.24
+++ DOM-CSS.mm 16 Sep 2005 22:42:23 -0000 1.25
@@ -219,12 +219,12 @@
return DOM_cast<StyleSheetListImpl *>(_internal);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _styleSheetListImpl]->length();
}
-- (DOMStyleSheet *)item:(unsigned long)index
+- (DOMStyleSheet *)item:(unsigned)index
{
return [DOMStyleSheet _DOMStyleSheetWithImpl:[self _styleSheetListImpl]->item(index)];
}
@@ -293,15 +293,15 @@
return [DOMCSSRuleList _ruleListWithImpl:[self _CSSStyleSheetImpl]->cssRules()];
}
-- (unsigned long)insertRule:(NSString *)rule :(unsigned long)index
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index
{
int exceptionCode;
- unsigned long result = [self _CSSStyleSheetImpl]->insertRule(rule, index, exceptionCode);
+ unsigned result = [self _CSSStyleSheetImpl]->insertRule(rule, index, exceptionCode);
raiseOnDOMError(exceptionCode);
return result;
}
-- (void)deleteRule:(unsigned long)index
+- (void)deleteRule:(unsigned)index
{
int exceptionCode;
[self _CSSStyleSheetImpl]->deleteRule(index, exceptionCode);
@@ -372,12 +372,12 @@
[self _mediaListImpl]->setMediaText(mediaText);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _mediaListImpl]->length();
}
-- (NSString *)item:(unsigned long)index
+- (NSString *)item:(unsigned)index
{
return [self _mediaListImpl]->item(index);
}
@@ -446,12 +446,12 @@
return DOM_cast<CSSRuleListImpl *>(_internal);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _ruleListImpl]->length();
}
-- (DOMCSSRule *)item:(unsigned long)index
+- (DOMCSSRule *)item:(unsigned)index
{
return [DOMCSSRule _ruleWithImpl:[self _ruleListImpl]->item(index)];
}
@@ -634,12 +634,12 @@
return [DOMCSSRuleList _ruleListWithImpl:[self _mediaRuleImpl]->cssRules()];
}
-- (unsigned long)insertRule:(NSString *)rule :(unsigned long)index
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index
{
return [self _mediaRuleImpl]->insertRule(rule, index);
}
-- (void)deleteRule:(unsigned long)index
+- (void)deleteRule:(unsigned)index
{
[self _mediaRuleImpl]->deleteRule(index);
}
@@ -809,12 +809,12 @@
raiseOnDOMError(exceptionCode);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _styleDeclarationImpl]->length();
}
-- (NSString *)item:(unsigned long)index
+- (NSString *)item:(unsigned)index
{
return [self _styleDeclarationImpl]->item(index);
}
@@ -1013,12 +1013,12 @@
return static_cast<CSSValueListImpl *>(DOM_cast<CSSValueImpl *>(_internal));
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _valueListImpl]->length();
}
-- (DOMCSSValue *)item:(unsigned long)index
+- (DOMCSSValue *)item:(unsigned)index
{
return [DOMCSSValue _valueWithImpl:[self _valueListImpl]->item(index)];
}
1.46 +21 -21 WebCore/kwq/DOM.mm
Index: DOM.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- DOM.mm 29 Aug 2005 21:29:28 -0000 1.45
+++ DOM.mm 16 Sep 2005 22:42:23 -0000 1.46
@@ -645,12 +645,12 @@
return result;
}
-- (DOMNode *)item:(unsigned long)index
+- (DOMNode *)item:(unsigned)index
{
return [DOMNode _nodeWithImpl:[self _namedNodeMapImpl]->item(index)];
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _namedNodeMapImpl]->length();
}
@@ -741,12 +741,12 @@
return DOM_cast<NodeListImpl *>(_internal);
}
-- (DOMNode *)item:(unsigned long)index
+- (DOMNode *)item:(unsigned)index
{
return [DOMNode _nodeWithImpl:[self _nodeListImpl]->item(index)];
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _nodeListImpl]->length();
}
@@ -1132,12 +1132,12 @@
raiseOnDOMError(exceptionCode);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _characterDataImpl]->length();
}
-- (NSString *)substringData:(unsigned long)offset :(unsigned long)count
+- (NSString *)substringData:(unsigned)offset :(unsigned)count
{
int exceptionCode = 0;
NSString *result = [self _characterDataImpl]->substringData(offset, count, exceptionCode);
@@ -1154,7 +1154,7 @@
raiseOnDOMError(exceptionCode);
}
-- (void)insertData:(unsigned long)offset :(NSString *)arg
+- (void)insertData:(unsigned)offset :(NSString *)arg
{
ASSERT(arg);
@@ -1163,14 +1163,14 @@
raiseOnDOMError(exceptionCode);
}
-- (void)deleteData:(unsigned long)offset :(unsigned long) count
+- (void)deleteData:(unsigned)offset :(unsigned) count
{
int exceptionCode = 0;
[self _characterDataImpl]->deleteData(offset, count, exceptionCode);
raiseOnDOMError(exceptionCode);
}
-- (void)replaceData:(unsigned long)offset :(unsigned long)count :(NSString *)arg
+- (void)replaceData:(unsigned)offset :(unsigned)count :(NSString *)arg
{
ASSERT(arg);
@@ -1431,7 +1431,7 @@
return static_cast<TextImpl *>(DOM_cast<NodeImpl *>(_internal));
}
-- (DOMText *)splitText:(unsigned long)offset
+- (DOMText *)splitText:(unsigned)offset
{
int exceptionCode = 0;
DOMNode *result = [DOMNode _nodeWithImpl:[self _textImpl]->splitText(offset, exceptionCode)];
@@ -1613,7 +1613,7 @@
{
if (!_internal)
return @"<DOMRange: null>";
- return [NSString stringWithFormat:@"<DOMRange: %@ %ld %@ %ld>",
+ return [NSString stringWithFormat:@"<DOMRange: %@ %d %@ %d>",
[self startContainer], [self startOffset],
[self endContainer], [self endOffset]];
}
@@ -1626,10 +1626,10 @@
return result;
}
-- (long)startOffset
+- (int)startOffset
{
int exceptionCode = 0;
- long result = [self _rangeImpl]->startOffset(exceptionCode);
+ int result = [self _rangeImpl]->startOffset(exceptionCode);
raiseOnDOMError(exceptionCode);
return result;
}
@@ -1642,10 +1642,10 @@
return result;
}
-- (long)endOffset
+- (int)endOffset
{
int exceptionCode = 0;
- long result = [self _rangeImpl]->endOffset(exceptionCode);
+ int result = [self _rangeImpl]->endOffset(exceptionCode);
raiseOnDOMError(exceptionCode);
return result;
}
@@ -1666,14 +1666,14 @@
return result;
}
-- (void)setStart:(DOMNode *)refNode :(long)offset
+- (void)setStart:(DOMNode *)refNode :(int)offset
{
int exceptionCode = 0;
[self _rangeImpl]->setStart([refNode _nodeImpl], offset, exceptionCode);
raiseOnDOMError(exceptionCode);
}
-- (void)setEnd:(DOMNode *)refNode :(long)offset
+- (void)setEnd:(DOMNode *)refNode :(int)offset
{
int exceptionCode = 0;
[self _rangeImpl]->setEnd([refNode _nodeImpl], offset, exceptionCode);
@@ -1941,7 +1941,7 @@
return [DOMNode _nodeWithImpl:[self _nodeIteratorImpl]->root()];
}
-- (unsigned long)whatToShow
+- (unsigned)whatToShow
{
return [self _nodeIteratorImpl]->whatToShow();
}
@@ -2045,7 +2045,7 @@
return [DOMNode _nodeWithImpl:[self _treeWalkerImpl]->root()];
}
-- (unsigned long)whatToShow
+- (unsigned)whatToShow
{
return [self _treeWalkerImpl]->whatToShow();
}
@@ -2171,7 +2171,7 @@
@implementation DOMDocument (DOMDocumentTraversal)
-- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned long)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
{
NodeFilterImpl *cppFilter = 0;
if (filter) {
@@ -2187,7 +2187,7 @@
return [DOMNodeIterator _nodeIteratorWithImpl:impl filter:filter];
}
-- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned long)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences
{
NodeFilterImpl *cppFilter = 0;
if (filter) {
1.5 +10 -10 WebCore/kwq/DOMCSS.h
Index: DOMCSS.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMCSS.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMCSS.h 11 May 2005 00:58:28 -0000 1.4
+++ DOMCSS.h 16 Sep 2005 22:42:23 -0000 1.5
@@ -45,8 +45,8 @@
};
@interface DOMCSSRuleList : DOMObject
-- (unsigned long)length;
-- (DOMCSSRule *)item:(unsigned long)index;
+- (unsigned)length;
+- (DOMCSSRule *)item:(unsigned)index;
@end
enum {
@@ -77,8 +77,8 @@
@interface DOMCSSMediaRule : DOMCSSRule
- (DOMMediaList *)media;
- (DOMCSSRuleList *)cssRules;
-- (unsigned long)insertRule:(NSString *)rule :(unsigned long)index;
-- (void)deleteRule:(unsigned long)index;
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index;
+- (void)deleteRule:(unsigned)index;
@end
@interface DOMCSSFontFaceRule : DOMCSSRule
@@ -112,8 +112,8 @@
- (NSString *)removeProperty:(NSString *)propertyName;
- (NSString *)getPropertyPriority:(NSString *)propertyName;
- (void)setProperty:(NSString *)propertyName :(NSString *)value :(NSString *)priority;
-- (unsigned long)length;
-- (NSString *)item:(unsigned long)index;
+- (unsigned)length;
+- (NSString *)item:(unsigned)index;
- (DOMCSSRule *)parentRule;
@end
@@ -173,8 +173,8 @@
@end
@interface DOMCSSValueList : DOMCSSValue
-- (unsigned long)length;
-- (DOMCSSValue *)item:(unsigned long)index;
+- (unsigned)length;
+- (DOMCSSValue *)item:(unsigned)index;
@end
@interface DOMRGBColor : DOMObject
@@ -450,8 +450,8 @@
@interface DOMCSSStyleSheet : DOMStyleSheet
- (DOMCSSRule *)ownerRule;
- (DOMCSSRuleList *)cssRules;
-- (unsigned long)insertRule:(NSString *)rule :(unsigned long)index;
-- (void)deleteRule:(unsigned long)index;
+- (unsigned)insertRule:(NSString *)rule :(unsigned)index;
+- (void)deleteRule:(unsigned)index;
@end
@interface DOMDocument (DOMViewCSS)
1.4 +10 -10 WebCore/kwq/DOMCore.h
Index: DOMCore.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMCore.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMCore.h 14 May 2004 17:27:43 -0000 1.3
+++ DOMCore.h 16 Sep 2005 22:42:23 -0000 1.4
@@ -121,16 +121,16 @@
@end
@interface DOMNodeList : DOMObject
-- (DOMNode *)item:(unsigned long)index;
-- (unsigned long)length;
+- (DOMNode *)item:(unsigned)index;
+- (unsigned)length;
@end
@interface DOMNamedNodeMap : DOMObject
- (DOMNode *)getNamedItem:(NSString *)name;
- (DOMNode *)setNamedItem:(DOMNode *)arg;
- (DOMNode *)removeNamedItem:(NSString *)name;
-- (DOMNode *)item:(unsigned long)index;
-- (unsigned long)length;
+- (DOMNode *)item:(unsigned)index;
+- (unsigned)length;
- (DOMNode *)getNamedItemNS:(NSString *)namespaceURI :(NSString *)localName;
- (DOMNode *)setNamedItemNS:(DOMNode *)arg;
- (DOMNode *)removeNamedItemNS:(NSString *)namespaceURI :(NSString *)localName;
@@ -139,12 +139,12 @@
@interface DOMCharacterData : DOMNode
- (NSString *)data;
- (void)setData:(NSString *)data;
-- (unsigned long)length;
-- (NSString *)substringData:(unsigned long)offset :(unsigned long)count;
+- (unsigned)length;
+- (NSString *)substringData:(unsigned)offset :(unsigned)count;
- (void)appendData:(NSString *)arg;
-- (void)insertData:(unsigned long)offset :(NSString *)arg;
-- (void)deleteData:(unsigned long)offset :(unsigned long) count;
-- (void)replaceData:(unsigned long)offset :(unsigned long)count :(NSString *)arg;
+- (void)insertData:(unsigned)offset :(NSString *)arg;
+- (void)deleteData:(unsigned)offset :(unsigned) count;
+- (void)replaceData:(unsigned)offset :(unsigned)count :(NSString *)arg;
@end
@interface DOMAttr : DOMNode
@@ -175,7 +175,7 @@
@end
@interface DOMText : DOMCharacterData
-- (DOMText *)splitText:(unsigned long)offset;
+- (DOMText *)splitText:(unsigned)offset;
@end
@interface DOMComment : DOMCharacterData
1.5 +7 -7 WebCore/kwq/DOMEvents.h
Index: DOMEvents.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMEvents.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMEvents.h 14 Jul 2005 02:22:11 -0000 1.4
+++ DOMEvents.h 16 Sep 2005 22:42:23 -0000 1.5
@@ -68,22 +68,22 @@
@interface DOMUIEvent : DOMEvent
- (DOMAbstractView *)view;
-- (long)detail;
-- (void)initUIEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg;
+- (int)detail;
+- (void)initUIEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(int)detailArg;
@end
@interface DOMMouseEvent : DOMUIEvent
-- (long)screenX;
-- (long)screenY;
-- (long)clientX;
-- (long)clientY;
+- (int)screenX;
+- (int)screenY;
+- (int)clientX;
+- (int)clientY;
- (BOOL)ctrlKey;
- (BOOL)shiftKey;
- (BOOL)altKey;
- (BOOL)metaKey;
- (unsigned short)button;
- (id <DOMEventTarget>)relatedTarget;
-- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg;
+- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(int)detailArg :(int)screenXArg :(int)screenYArg :(int)clientX :(int)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg;
@end
enum {
1.6 +7 -7 WebCore/kwq/DOMEvents.mm
Index: DOMEvents.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMEvents.mm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMEvents.mm 10 May 2005 21:59:15 -0000 1.5
+++ DOMEvents.mm 16 Sep 2005 22:42:23 -0000 1.6
@@ -145,22 +145,22 @@
return static_cast<MouseEventImpl *>(DOM_cast<EventImpl *>(_internal));
}
-- (long)screenX
+- (int)screenX
{
return [self _mouseEventImpl]->screenX();
}
-- (long)screenY
+- (int)screenY
{
return [self _mouseEventImpl]->screenY();
}
-- (long)clientX
+- (int)clientX
{
return [self _mouseEventImpl]->clientX();
}
-- (long)clientY
+- (int)clientY
{
return [self _mouseEventImpl]->clientY();
}
@@ -195,7 +195,7 @@
return [DOMNode _nodeWithImpl:[self _mouseEventImpl]->relatedTarget()];
}
-- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg
+- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(int)detailArg :(int)screenXArg :(int)screenYArg :(int)clientX :(int)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg
{
DOMNode *relatedTarget = relatedTargetArg;
[self _mouseEventImpl]->initMouseEvent(typeArg, canBubbleArg, cancelableArg,
@@ -258,12 +258,12 @@
return [DOMAbstractView _abstractViewWithImpl:[self _UIEventImpl]->view()];
}
-- (long)detail
+- (int)detail
{
return [self _UIEventImpl]->detail();
}
-- (void)initUIEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg
+- (void)initUIEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(int)detailArg
{
[self _UIEventImpl]->initUIEvent(typeArg, canBubbleArg, cancelableArg, [viewArg _abstractViewImpl], detailArg);
}
1.12 +4 -4 WebCore/kwq/DOMExtensions.h
Index: DOMExtensions.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMExtensions.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMExtensions.h 1 Aug 2005 16:12:03 -0000 1.11
+++ DOMExtensions.h 16 Sep 2005 22:42:23 -0000 1.12
@@ -50,16 +50,16 @@
@interface DOMHTMLEmbedElement : DOMHTMLElement
- (NSString *)align;
- (void)setAlign:(NSString *)align;
-- (long)height;
-- (void)setHeight:(long)height;
+- (int)height;
+- (void)setHeight:(int)height;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)src;
- (void)setSrc:(NSString *)src;
- (NSString *)type;
- (void)setType:(NSString *)type;
-- (long)width;
-- (void)setWidth:(long)width;
+- (int)width;
+- (void)setWidth:(int)width;
@end
@interface DOMRGBColor (DOMRGBColorExtensions)
1.8 +72 -72 WebCore/kwq/DOMHTML.h
Index: DOMHTML.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMHTML.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMHTML.h 18 Jul 2005 21:44:30 -0000 1.7
+++ DOMHTML.h 16 Sep 2005 22:42:23 -0000 1.8
@@ -31,15 +31,15 @@
@class DOMHTMLTableSectionElement;
@interface DOMHTMLCollection : DOMObject
-- (unsigned long)length;
-- (DOMNode *)item:(unsigned long)index;
+- (unsigned)length;
+- (DOMNode *)item:(unsigned)index;
- (DOMNode *)namedItem:(NSString *)name;
@end
@interface DOMHTMLOptionsCollection : DOMObject
-- (unsigned long)length;
-- (void)setLength:(unsigned long)length;
-- (DOMNode *)item:(unsigned long)index;
+- (unsigned)length;
+- (void)setLength:(unsigned)length;
+- (DOMNode *)item:(unsigned)index;
- (DOMNode *)namedItem:(NSString *)name;
@end
@@ -165,7 +165,7 @@
@interface DOMHTMLFormElement : DOMHTMLElement
- (DOMHTMLCollection *)elements;
-- (long)length;
+- (int)length;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)acceptCharset;
@@ -184,11 +184,11 @@
@interface DOMHTMLSelectElement : DOMHTMLElement
- (NSString *)type;
-- (long)selectedIndex;
-- (void)setSelectedIndex:(long)selectedIndex;
+- (int)selectedIndex;
+- (void)setSelectedIndex:(int)selectedIndex;
- (NSString *)value;
- (void)setValue:(NSString *)value;
-- (long)length;
+- (int)length;
- (DOMHTMLFormElement *)form;
- (DOMHTMLOptionsCollection *)options;
- (BOOL)disabled;
@@ -197,12 +197,12 @@
- (void)setMultiple:(BOOL)multiple;
- (NSString *)name;
- (void)setName:(NSString *)name;
-- (long)size;
-- (void)setSize:(long)size;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)size;
+- (void)setSize:(int)size;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (void)add:(DOMHTMLElement *)element :(DOMHTMLElement *)before;
-- (void)remove:(long)index;
+- (void)remove:(int)index;
- (void)blur;
- (void)focus;
@end
@@ -219,7 +219,7 @@
- (BOOL)defaultSelected;
- (void)setDefaultSelected:(BOOL)defaultSelected;
- (NSString *)text;
-- (long)index;
+- (int)index;
- (BOOL)disabled;
- (void)setDisabled:(BOOL)disabled;
- (NSString *)label;
@@ -248,18 +248,18 @@
- (void)setChecked:(BOOL)checked;
- (BOOL)disabled;
- (void)setDisabled:(BOOL)disabled;
-- (long)maxLength;
-- (void)setMaxLength:(long)maxLength;
+- (int)maxLength;
+- (void)setMaxLength:(int)maxLength;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (BOOL)readOnly;
- (void)setReadOnly:(BOOL)readOnly;
-- (unsigned long)size;
-- (void)setSize:(unsigned long)size;
+- (unsigned)size;
+- (void)setSize:(unsigned)size;
- (NSString *)src;
- (void)setSrc:(NSString *)src;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)type;
- (void)setType:(NSString *)type;
- (NSString *)useMap;
@@ -278,18 +278,18 @@
- (DOMHTMLFormElement *)form;
- (NSString *)accessKey;
- (void)setAccessKey:(NSString *)accessKey;
-- (long)cols;
-- (void)setCols:(long)cols;
+- (int)cols;
+- (void)setCols:(int)cols;
- (BOOL)disabled;
- (void)setDisabled:(BOOL)disabled;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (BOOL)readOnly;
- (void)setReadOnly:(BOOL)readOnly;
-- (long)rows;
-- (void)setRows:(long)rows;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)rows;
+- (void)setRows:(int)rows;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)type;
- (NSString *)value;
- (void)setValue:(NSString *)value;
@@ -306,8 +306,8 @@
- (void)setDisabled:(BOOL)disabled;
- (NSString *)name;
- (void)setName:(NSString *)name;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)type;
- (NSString *)value;
- (void)setValue:(NSString *)value;
@@ -343,8 +343,8 @@
@interface DOMHTMLOListElement : DOMHTMLElement
- (BOOL)compact;
- (void)setCompact:(BOOL)compact;
-- (long)start;
-- (void)setStart:(long)start;
+- (int)start;
+- (void)setStart:(int)start;
- (NSString *)type;
- (void)setType:(NSString *)type;
@end
@@ -367,8 +367,8 @@
@interface DOMHTMLLIElement : DOMHTMLElement
- (NSString *)type;
- (void)setType:(NSString *)type;
-- (long)value;
-- (void)setValue:(long)value;
+- (int)value;
+- (void)setValue:(int)value;
@end
@interface DOMHTMLDivElement : DOMHTMLElement
@@ -392,8 +392,8 @@
@end
@interface DOMHTMLPreElement : DOMHTMLElement
-- (long)width;
-- (void)setWidth:(long)width;
+- (int)width;
+- (void)setWidth:(int)width;
@end
@interface DOMHTMLBRElement : DOMHTMLElement
@@ -456,8 +456,8 @@
- (void)setRev:(NSString *)rev;
- (NSString *)shape;
- (void)setShape:(NSString *)shape;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)target;
- (void)setTarget:(NSString *)target;
- (NSString *)type;
@@ -475,10 +475,10 @@
- (void)setAlt:(NSString *)alt;
- (NSString *)border;
- (void)setBorder:(NSString *)border;
-- (long)height;
-- (void)setHeight:(long)height;
-- (long)hspace;
-- (void)setHspace:(long)hspace;
+- (int)height;
+- (void)setHeight:(int)height;
+- (int)hspace;
+- (void)setHspace:(int)hspace;
- (BOOL)isMap;
- (void)setIsMap:(BOOL)isMap;
- (NSString *)longDesc;
@@ -487,10 +487,10 @@
- (void)setSrc:(NSString *)src;
- (NSString *)useMap;
- (void)setUseMap:(NSString *)useMap;
-- (long)vspace;
-- (void)setVspace:(long)vspace;
-- (long)width;
-- (void)setWidth:(long)width;
+- (int)vspace;
+- (void)setVspace:(int)vspace;
+- (int)width;
+- (void)setWidth:(int)width;
@end
@interface DOMHTMLObjectElement : DOMHTMLElement
@@ -513,20 +513,20 @@
- (void)setDeclare:(BOOL)declare;
- (NSString *)height;
- (void)setHeight:(NSString *)height;
-- (long)hspace;
-- (void)setHspace:(long)hspace;
+- (int)hspace;
+- (void)setHspace:(int)hspace;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)standby;
- (void)setStandby:(NSString *)standby;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)type;
- (void)setType:(NSString *)type;
- (NSString *)useMap;
- (void)setUseMap:(NSString *)useMap;
-- (long)vspace;
-- (void)setVspace:(long)vspace;
+- (int)vspace;
+- (void)setVspace:(int)vspace;
- (NSString *)width;
- (void)setWidth:(NSString *)width;
- (DOMDocument *)contentDocument;
@@ -556,14 +556,14 @@
- (void)setCodeBase:(NSString *)codeBase;
- (NSString *)height;
- (void)setHeight:(NSString *)height;
-- (long)hspace;
-- (void)setHspace:(long)hspace;
+- (int)hspace;
+- (void)setHspace:(int)hspace;
- (NSString *)name;
- (void)setName:(NSString *)name;
- (NSString *)object;
- (void)setObject:(NSString *)object;
-- (long)vspace;
-- (void)setVspace:(long)vspace;
+- (int)vspace;
+- (void)setVspace:(int)vspace;
- (NSString *)width;
- (void)setWidth:(NSString *)width;
@end
@@ -587,8 +587,8 @@
- (void)setNoHref:(BOOL)noHref;
- (NSString *)shape;
- (void)setShape:(NSString *)shape;
-- (long)tabIndex;
-- (void)setTabIndex:(long)tabIndex;
+- (int)tabIndex;
+- (void)setTabIndex:(int)tabIndex;
- (NSString *)target;
- (void)setTarget:(NSString *)target;
@end
@@ -644,8 +644,8 @@
- (void)deleteTFoot;
- (DOMHTMLElement *)createCaption;
- (void)deleteCaption;
-- (DOMHTMLElement *)insertRow:(long)index;
-- (void)deleteRow:(long)index;
+- (DOMHTMLElement *)insertRow:(int)index;
+- (void)deleteRow:(int)index;
@end
@interface DOMHTMLTableCaptionElement : DOMHTMLElement
@@ -660,8 +660,8 @@
- (void)setCh:(NSString *)ch;
- (NSString *)chOff;
- (void)setChOff:(NSString *)chOff;
-- (long)span;
-- (void)setSpan:(long)span;
+- (int)span;
+- (void)setSpan:(int)span;
- (NSString *)vAlign;
- (void)setVAlign:(NSString *)vAlign;
- (NSString *)width;
@@ -678,13 +678,13 @@
- (NSString *)vAlign;
- (void)setVAlign:(NSString *)vAlign;
- (DOMHTMLCollection *)rows;
-- (DOMHTMLElement *)insertRow:(long)index;
-- (void)deleteRow:(long)index;
+- (DOMHTMLElement *)insertRow:(int)index;
+- (void)deleteRow:(int)index;
@end
@interface DOMHTMLTableRowElement : DOMHTMLElement
-- (long)rowIndex;
-- (long)sectionRowIndex;
+- (int)rowIndex;
+- (int)sectionRowIndex;
- (DOMHTMLCollection *)cells;
- (NSString *)align;
- (void)setAlign:(NSString *)align;
@@ -696,12 +696,12 @@
- (void)setChOff:(NSString *)chOff;
- (NSString *)vAlign;
- (void)setVAlign:(NSString *)vAlign;
-- (DOMHTMLElement *)insertCell:(long)index;
-- (void)deleteCell:(long)index;
+- (DOMHTMLElement *)insertCell:(int)index;
+- (void)deleteCell:(int)index;
@end
@interface DOMHTMLTableCellElement : DOMHTMLElement
-- (long)cellIndex;
+- (int)cellIndex;
- (NSString *)abbr;
- (void)setAbbr:(NSString *)abbr;
- (NSString *)align;
@@ -714,16 +714,16 @@
- (void)setCh:(NSString *)ch;
- (NSString *)chOff;
- (void)setChOff:(NSString *)chOff;
-- (long)colSpan;
-- (void)setColSpan:(long)colSpan;
+- (int)colSpan;
+- (void)setColSpan:(int)colSpan;
- (NSString *)headers;
- (void)setHeaders:(NSString *)headers;
- (NSString *)height;
- (void)setHeight:(NSString *)height;
- (BOOL)noWrap;
- (void)setNoWrap:(BOOL)noWrap;
-- (long)rowSpan;
-- (void)setRowSpan:(long)rowSpan;
+- (int)rowSpan;
+- (void)setRowSpan:(int)rowSpan;
- (NSString *)scope;
- (void)setScope:(NSString *)scope;
- (NSString *)vAlign;
1.29 +77 -77 WebCore/kwq/DOMHTML.mm
Index: DOMHTML.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMHTML.mm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DOMHTML.mm 29 Aug 2005 21:29:28 -0000 1.28
+++ DOMHTML.mm 16 Sep 2005 22:42:23 -0000 1.29
@@ -175,12 +175,12 @@
return DOM_cast<HTMLCollectionImpl *>(_internal);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _collectionImpl]->length();
}
-- (DOMNode *)item:(unsigned long)index
+- (DOMNode *)item:(unsigned)index
{
return [DOMNode _nodeWithImpl:[self _collectionImpl]->item(index)];
}
@@ -267,17 +267,17 @@
return DOM_cast<HTMLOptionsCollectionImpl *>(_internal);
}
-- (unsigned long)length
+- (unsigned)length
{
return [self _optionsCollectionImpl]->length();
}
-- (void)setLength:(unsigned long)length
+- (void)setLength:(unsigned)length
{
[self _optionsCollectionImpl]->setLength(length);
}
-- (DOMNode *)item:(unsigned long)index
+- (DOMNode *)item:(unsigned)index
{
return [DOMNode _nodeWithImpl:[self _optionsCollectionImpl]->item(index)];
}
@@ -917,7 +917,7 @@
return [DOMHTMLCollection _collectionWithImpl:collection];
}
-- (long)length
+- (int)length
{
return [self _formElementImpl]->length();
}
@@ -1039,12 +1039,12 @@
return [self _selectElementImpl]->type();
}
-- (long)selectedIndex
+- (int)selectedIndex
{
return [self _selectElementImpl]->selectedIndex();
}
-- (void)setSelectedIndex:(long)selectedIndex
+- (void)setSelectedIndex:(int)selectedIndex
{
[self _selectElementImpl]->setSelectedIndex(selectedIndex);
}
@@ -1060,12 +1060,12 @@
[self _selectElementImpl]->setValue(s.impl());
}
-- (long)length
+- (int)length
{
return [self _selectElementImpl]->length();
}
-- (void)setLength:(long)length
+- (void)setLength:(int)length
{
// FIXME: Not yet clear what to do about this one.
// There's some JavaScript-specific hackery in the JavaScript bindings for this.
@@ -1112,22 +1112,22 @@
[self _selectElementImpl]->setName(name);
}
-- (long)size
+- (int)size
{
return [self _selectElementImpl]->size();
}
-- (void)setSize:(long)size
+- (void)setSize:(int)size
{
[self _selectElementImpl]->setSize(size);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _selectElementImpl]->tabIndex();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
[self _selectElementImpl]->setTabIndex(tabIndex);
}
@@ -1139,7 +1139,7 @@
raiseOnDOMError(exceptionCode);
}
-- (void)remove:(long)index
+- (void)remove:(int)index
{
[self _selectElementImpl]->remove(index);
}
@@ -1212,7 +1212,7 @@
return [self _optionElementImpl]->text();
}
-- (long)index
+- (int)index
{
return [self _optionElementImpl]->index();
}
@@ -1352,12 +1352,12 @@
[self _inputElementImpl]->setDisabled(disabled);
}
-- (long)maxLength
+- (int)maxLength
{
return [self _inputElementImpl]->maxLength();
}
-- (void)setMaxLength:(long)maxLength
+- (void)setMaxLength:(int)maxLength
{
[self _inputElementImpl]->setMaxLength(maxLength);
}
@@ -1382,12 +1382,12 @@
[self _inputElementImpl]->setReadOnly(readOnly);
}
-- (unsigned long)size
+- (unsigned)size
{
return [self _inputElementImpl]->size();
}
-- (void)setSize:(unsigned long)size
+- (void)setSize:(unsigned)size
{
[self _inputElementImpl]->setSize(size);
}
@@ -1402,12 +1402,12 @@
[self _inputElementImpl]->setSrc(src);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _inputElementImpl]->tabIndex();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
[self _inputElementImpl]->setTabIndex(tabIndex);
}
@@ -1496,12 +1496,12 @@
[self _textAreaElementImpl]->setAttribute(accesskeyAttr, accessKey);
}
-- (long)cols
+- (int)cols
{
return [self _textAreaElementImpl]->getAttribute(colsAttr).toInt();
}
-- (void)setCols:(long)cols
+- (void)setCols:(int)cols
{
DOMString value(QString::number(cols));
[self _textAreaElementImpl]->setAttribute(colsAttr, value);
@@ -1537,23 +1537,23 @@
[self _textAreaElementImpl]->setAttribute(readonlyAttr, readOnly ? "" : 0);
}
-- (long)rows
+- (int)rows
{
return [self _textAreaElementImpl]->getAttribute(rowsAttr).toInt();
}
-- (void)setRows:(long)rows
+- (void)setRows:(int)rows
{
DOMString value(QString::number(rows));
[self _textAreaElementImpl]->setAttribute(rowsAttr, value);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _textAreaElementImpl]->tabIndex();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
[self _textAreaElementImpl]->setTabIndex(tabIndex);
}
@@ -1637,12 +1637,12 @@
[self _buttonElementImpl]->setName(name);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _buttonElementImpl]->tabIndex();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
[self _buttonElementImpl]->setTabIndex(tabIndex);
}
@@ -1795,12 +1795,12 @@
[self _oListElementImpl]->setCompact(compact);
}
-- (long)start
+- (int)start
{
return [self _oListElementImpl]->getAttribute(startAttr).toInt();
}
-- (void)setStart:(long)start
+- (void)setStart:(int)start
{
DOMString value(QString::number(start));
[self _oListElementImpl]->setAttribute(startAttr, value);
@@ -1892,12 +1892,12 @@
[self _liElementImpl]->setType(type);
}
-- (long)value
+- (int)value
{
return [self _liElementImpl]->value();
}
-- (void)setValue:(long)value
+- (void)setValue:(int)value
{
[self _liElementImpl]->setValue(value);
}
@@ -1987,12 +1987,12 @@
return static_cast<HTMLPreElementImpl *>(DOM_cast<NodeImpl *>(_internal));
}
-- (long)width
+- (int)width
{
return [self _preElementImpl]->getAttribute(widthAttr).toInt();
}
-- (void)setWidth:(long)width
+- (void)setWidth:(int)width
{
DOMString string(QString::number(width));
[self _preElementImpl]->setAttribute(widthAttr, string);
@@ -2272,12 +2272,12 @@
[self _anchorElementImpl]->setShape(shape);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _anchorElementImpl]->tabIndex();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
[self _anchorElementImpl]->setTabIndex(tabIndex);
}
@@ -2364,23 +2364,23 @@
[self _imageElementImpl]->setAttribute(borderAttr, border);
}
-- (long)height
+- (int)height
{
return [self _imageElementImpl]->getAttribute(heightAttr).toInt();
}
-- (void)setHeight:(long)height
+- (void)setHeight:(int)height
{
DOMString string(QString::number(height));
[self _imageElementImpl]->setAttribute(heightAttr, string);
}
-- (long)hspace
+- (int)hspace
{
return [self _imageElementImpl]->getAttribute(hspaceAttr).toInt();
}
-- (void)setHspace:(long)hspace
+- (void)setHspace:(int)hspace
{
DOMString string(QString::number(hspace));
[self _imageElementImpl]->setAttribute(hspaceAttr, string);
@@ -2426,23 +2426,23 @@
[self _imageElementImpl]->setAttribute(usemapAttr, useMap);
}
-- (long)vspace
+- (int)vspace
{
return [self _imageElementImpl]->getAttribute(vspaceAttr).toInt();
}
-- (void)setVspace:(long)vspace
+- (void)setVspace:(int)vspace
{
DOMString string(QString::number(vspace));
[self _imageElementImpl]->setAttribute(vspaceAttr, string);
}
-- (long)width
+- (int)width
{
return [self _imageElementImpl]->getAttribute(widthAttr).toInt();
}
-- (void)setWidth:(long)width
+- (void)setWidth:(int)width
{
DOMString string(QString::number(width));
[self _imageElementImpl]->setAttribute(widthAttr, string);
@@ -2552,12 +2552,12 @@
[self _objectElementImpl]->setAttribute(heightAttr, height);
}
-- (long)hspace
+- (int)hspace
{
return [self _objectElementImpl]->getAttribute(hspaceAttr).toInt();
}
-- (void)setHspace:(long)hspace
+- (void)setHspace:(int)hspace
{
DOMString string(QString::number(hspace));
[self _objectElementImpl]->setAttribute(hspaceAttr, string);
@@ -2583,12 +2583,12 @@
[self _objectElementImpl]->setAttribute(standbyAttr, standby);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _objectElementImpl]->getAttribute(tabindexAttr).toInt();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
DOMString string(QString::number(tabIndex));
[self _objectElementImpl]->setAttribute(tabindexAttr, string);
@@ -2614,12 +2614,12 @@
[self _objectElementImpl]->setAttribute(usemapAttr, useMap);
}
-- (long)vspace
+- (int)vspace
{
return [self _objectElementImpl]->getAttribute(vspaceAttr).toInt();
}
-- (void)setVspace:(long)vspace
+- (void)setVspace:(int)vspace
{
DOMString string(QString::number(vspace));
[self _objectElementImpl]->setAttribute(vspaceAttr, string);
@@ -2758,12 +2758,12 @@
[self _appletElementImpl]->setAttribute(heightAttr, height);
}
-- (long)hspace
+- (int)hspace
{
return [self _appletElementImpl]->getAttribute(hspaceAttr).toInt();
}
-- (void)setHspace:(long)hspace
+- (void)setHspace:(int)hspace
{
DOMString string(QString::number(hspace));
[self _appletElementImpl]->setAttribute(hspaceAttr, string);
@@ -2789,12 +2789,12 @@
[self _appletElementImpl]->setAttribute(objectAttr, object);
}
-- (long)vspace
+- (int)vspace
{
return [self _appletElementImpl]->getAttribute(vspaceAttr).toInt();
}
-- (void)setVspace:(long)vspace
+- (void)setVspace:(int)vspace
{
DOMString string(QString::number(vspace));
[self _appletElementImpl]->setAttribute(vspaceAttr, string);
@@ -2904,12 +2904,12 @@
[self _areaElementImpl]->setAttribute(shapeAttr, shape);
}
-- (long)tabIndex
+- (int)tabIndex
{
return [self _areaElementImpl]->getAttribute(tabindexAttr).toInt();
}
-- (void)setTabIndex:(long)tabIndex
+- (void)setTabIndex:(int)tabIndex
{
DOMString string(QString::number(tabIndex));
[self _areaElementImpl]->setAttribute(tabindexAttr, string);
@@ -3084,7 +3084,7 @@
return [DOMHTMLCollection _collectionWithImpl:collection];
}
-- (DOMHTMLElement *)insertRow:(long)index
+- (DOMHTMLElement *)insertRow:(int)index
{
int exceptioncode = 0;
HTMLElementImpl *impl = [self _tableSectionElementImpl]->insertRow(index, exceptioncode);
@@ -3092,7 +3092,7 @@
return [DOMHTMLElement _elementWithImpl:impl];
}
-- (void)deleteRow:(long)index
+- (void)deleteRow:(int)index
{
int exceptioncode = 0;
[self _tableSectionElementImpl]->deleteRow(index, exceptioncode);
@@ -3282,7 +3282,7 @@
[self _tableElementImpl]->deleteCaption();
}
-- (DOMHTMLElement *)insertRow:(long)index
+- (DOMHTMLElement *)insertRow:(int)index
{
int exceptioncode = 0;
HTMLTableElementImpl *impl = static_cast<HTMLTableElementImpl *>([self _tableElementImpl]->insertRow(index, exceptioncode));
@@ -3290,7 +3290,7 @@
return [DOMHTMLTableElement _tableElementWithImpl:impl];
}
-- (void)deleteRow:(long)index
+- (void)deleteRow:(int)index
{
int exceptioncode = 0;
[self _tableElementImpl]->deleteRow(index, exceptioncode);
@@ -3350,12 +3350,12 @@
[self _tableColElementImpl]->setAttribute(charoffAttr, chOff);
}
-- (long)span
+- (int)span
{
return [self _tableColElementImpl]->getAttribute(spanAttr).toInt();
}
-- (void)setSpan:(long)span
+- (void)setSpan:(int)span
{
DOMString string(QString::number(span));
[self _tableColElementImpl]->setAttribute(spanAttr, string);
@@ -3390,12 +3390,12 @@
return static_cast<HTMLTableRowElementImpl *>(DOM_cast<NodeImpl *>(_internal));
}
-- (long)rowIndex
+- (int)rowIndex
{
return [self _tableRowElementImpl]->rowIndex();
}
-- (long)sectionRowIndex
+- (int)sectionRowIndex
{
return [self _tableRowElementImpl]->sectionRowIndex();
}
@@ -3456,7 +3456,7 @@
[self _tableRowElementImpl]->setAttribute(valignAttr, vAlign);
}
-- (DOMHTMLElement *)insertCell:(long)index
+- (DOMHTMLElement *)insertCell:(int)index
{
int exceptioncode = 0;
HTMLTableCellElementImpl *impl = static_cast<HTMLTableCellElementImpl *>([self _tableRowElementImpl]->insertCell(index, exceptioncode));
@@ -3464,7 +3464,7 @@
return [DOMHTMLTableCellElement _tableCellElementWithImpl:impl];
}
-- (void)deleteCell:(long)index
+- (void)deleteCell:(int)index
{
int exceptioncode = 0;
[self _tableRowElementImpl]->deleteCell(index, exceptioncode);
@@ -3475,7 +3475,7 @@
@implementation DOMHTMLTableCellElement
-- (long)cellIndex
+- (int)cellIndex
{
return [self _tableCellElementImpl]->cellIndex();
}
@@ -3540,12 +3540,12 @@
[self _tableCellElementImpl]->setAttribute(charoffAttr, chOff);
}
-- (long)colSpan
+- (int)colSpan
{
return [self _tableCellElementImpl]->getAttribute(colspanAttr).toInt();
}
-- (void)setColSpan:(long)colSpan
+- (void)setColSpan:(int)colSpan
{
DOMString string(QString::number(colSpan));
[self _tableCellElementImpl]->setAttribute(colspanAttr, string);
@@ -3581,12 +3581,12 @@
[self _tableCellElementImpl]->setAttribute(nowrapAttr, noWrap ? "" : 0);
}
-- (long)rowSpan
+- (int)rowSpan
{
return [self _tableCellElementImpl]->getAttribute(rowspanAttr).toInt();
}
-- (void)setRowSpan:(long)rowSpan
+- (void)setRowSpan:(int)rowSpan
{
DOMString string(QString::number(rowSpan));
[self _tableCellElementImpl]->setAttribute(rowspanAttr, string);
@@ -3904,12 +3904,12 @@
[self _embedElementImpl]->setAttribute(alignAttr, align);
}
-- (long)height
+- (int)height
{
return [self _embedElementImpl]->getAttribute(heightAttr).toInt();
}
-- (void)setHeight:(long)height
+- (void)setHeight:(int)height
{
DOMString string(QString::number(height));
[self _embedElementImpl]->setAttribute(heightAttr, string);
@@ -3945,12 +3945,12 @@
[self _embedElementImpl]->setAttribute(typeAttr, type);
}
-- (long)width
+- (int)width
{
return [self _embedElementImpl]->getAttribute(widthAttr).toInt();
}
-- (void)setWidth:(long)width
+- (void)setWidth:(int)width
{
DOMString string(QString::number(width));
[self _embedElementImpl]->setAttribute(widthAttr, string);
1.4 +4 -4 WebCore/kwq/DOMRange.h
Index: DOMRange.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMRange.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMRange.h 13 May 2004 23:24:24 -0000 1.3
+++ DOMRange.h 16 Sep 2005 22:42:23 -0000 1.4
@@ -47,13 +47,13 @@
@interface DOMRange : DOMObject
- (DOMNode *)startContainer;
-- (long)startOffset;
+- (int)startOffset;
- (DOMNode *)endContainer;
-- (long)endOffset;
+- (int)endOffset;
- (BOOL)collapsed;
- (DOMNode *)commonAncestorContainer;
-- (void)setStart:(DOMNode *)refNode :(long)offset;
-- (void)setEnd:(DOMNode *)refNode :(long)offset;
+- (void)setStart:(DOMNode *)refNode :(int)offset;
+- (void)setEnd:(DOMNode *)refNode :(int)offset;
- (void)setStartBefore:(DOMNode *)refNode;
- (void)setStartAfter:(DOMNode *)refNode;
- (void)setEndBefore:(DOMNode *)refNode;
1.3 +4 -4 WebCore/kwq/DOMStylesheets.h
Index: DOMStylesheets.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMStylesheets.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMStylesheets.h 13 May 2004 23:24:24 -0000 1.2
+++ DOMStylesheets.h 16 Sep 2005 22:42:23 -0000 1.3
@@ -42,15 +42,15 @@
@end
@interface DOMStyleSheetList : DOMObject
-- (unsigned long)length;
-- (DOMStyleSheet *)item:(unsigned long)index;
+- (unsigned)length;
+- (DOMStyleSheet *)item:(unsigned)index;
@end
@interface DOMMediaList : DOMObject
- (NSString *)mediaText;
- (void)setMediaText:(NSString *)mediaText;
-- (unsigned long)length;
-- (NSString *)item:(unsigned long)index;
+- (unsigned)length;
+- (NSString *)item:(unsigned)index;
- (void)deleteMedium:(NSString *)oldMedium;
- (void)appendMedium:(NSString *)newMedium;
@end
1.4 +4 -4 WebCore/kwq/DOMTraversal.h
Index: DOMTraversal.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMTraversal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMTraversal.h 13 May 2004 23:24:24 -0000 1.3
+++ DOMTraversal.h 16 Sep 2005 22:42:23 -0000 1.4
@@ -60,7 +60,7 @@
id <DOMNodeFilter> m_filter;
}
- (DOMNode *)root;
-- (unsigned long)whatToShow;
+- (unsigned)whatToShow;
- (id <DOMNodeFilter>)filter;
- (BOOL)expandEntityReferences;
- (DOMNode *)nextNode;
@@ -73,7 +73,7 @@
id <DOMNodeFilter> m_filter;
}
- (DOMNode *)root;
-- (unsigned long)whatToShow;
+- (unsigned)whatToShow;
- (id <DOMNodeFilter>)filter;
- (BOOL)expandEntityReferences;
- (DOMNode *)currentNode;
@@ -88,6 +88,6 @@
@end
@interface DOMDocument (DOMDocumentTraversal)
-- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned long)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
-- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned long)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
+- (DOMNodeIterator *)createNodeIterator:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
+- (DOMTreeWalker *)createTreeWalker:(DOMNode *)root :(unsigned)whatToShow :(id <DOMNodeFilter>)filter :(BOOL)expandEntityReferences;
@end
1.672 +4 -5 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- KWQKHTMLPart.mm 14 Sep 2005 03:43:02 -0000 1.671
+++ KWQKHTMLPart.mm 16 Sep 2005 22:42:23 -0000 1.672
@@ -1001,12 +1001,12 @@
// we don't get foiled by any word boundary problems at the start. It means we might
// do a tiny bit more searching.
NodeImpl *searchEndAfterWrapNode = it.range()->endContainer(exception);
- long searchEndAfterWrapOffset = it.range()->endOffset(exception);
+ int searchEndAfterWrapOffset = it.range()->endOffset(exception);
while (1) {
if (!it.atEnd()) { // we may be starting at the end of the doc, and already by atEnd
const QChar *chars = it.characters();
- long len = it.length();
+ int len = it.length();
if (len > 1 || !chars[0].isSpace()) {
NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:(unichar *)chars length:len freeWhenDone:NO];
NSRange misspelling = [checker checkSpellingOfString:chunk startingAt:0 language:nil wrap:NO inSpellDocumentWithTag:[_bridge spellCheckerDocumentTag] wordCount:NULL];
@@ -1591,7 +1591,7 @@
// copy to m_workingURL after fixing m_url above
d->m_workingURL = m_url;
- emit started( 0L );
+ emit started(NULL);
// -----------begin-----------
clear();
@@ -1599,7 +1599,6 @@
doc->setInPageCache(NO);
d->m_bCleared = false;
- d->m_cacheId = 0;
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
d->m_referrer = m_url.url();
@@ -4036,7 +4035,7 @@
while (!it.atEnd()) { // we may be starting at the end of the doc, and already by atEnd
const QChar *chars = it.characters();
- long len = it.length();
+ int len = it.length();
if (len > 1 || !chars[0].isSpace()) {
NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:(unichar *)chars length:len freeWhenDone:NO];
int startIndex = 0;
1.117 +5 -18 WebCore/kwq/KWQString.h
Index: KWQString.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- KWQString.h 12 Sep 2005 03:40:36 -0000 1.116
+++ KWQString.h 16 Sep 2005 22:42:23 -0000 1.117
@@ -473,19 +473,11 @@
bool endsWith(const QString &) const;
- // NOTE: toXXXXX integer functions only support base 10 and base 16
- // NOTE: toShort, toUShort, toULong, and toDouble are NOT used but are kept
- // for completeness
- short toShort(bool *ok=NULL, int base=10) const;
- // NOTE: ok and base NOT used for toUShort
- ushort toUShort(bool *ok=NULL, int base=10) const;
- int toInt(bool *ok=NULL, int base=10) const;
- // NOTE: base NOT used for toUInt
- uint toUInt(bool *ok=NULL, int base=10) const;
- long toLong(bool *ok=NULL, int base=10) const;
- ulong toULong(bool *ok=NULL, int base=10) const;
- float toFloat(bool *ok=NULL) const;
- double toDouble(bool *ok=NULL) const;
+ short toShort(bool *ok = NULL, int base = 10) const;
+ ushort toUShort(bool *ok = NULL, int base = 10) const;
+ int toInt(bool *ok = NULL, int base = 10) const;
+ uint toUInt(bool *ok = NULL, int base = 10) const;
+ double toDouble(bool *ok = NULL) const;
static QString number(int);
static QString number(uint);
@@ -653,11 +645,6 @@
return latin1();
}
-inline float QString::toFloat(bool *ok) const
-{
- return toDouble(ok);
-}
-
inline bool QString::operator!() const
{
return isNull();
1.140 +23 -30 WebCore/kwq/KWQString.mm
Index: KWQString.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.mm,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- KWQString.mm 28 Jun 2005 01:54:35 -0000 1.139
+++ KWQString.mm 16 Sep 2005 22:42:24 -0000 1.140
@@ -1628,43 +1628,36 @@
*buffer++ = *uc++;
}
-
short QString::toShort(bool *ok, int base) const
{
- long v = toLong( ok, base );
- if ( ok && *ok && (v < -32768 || v > 32767) ) {
- *ok = FALSE;
- v = 0;
+ int v = toInt(ok, base);
+ short sv = v;
+ if (sv != v) {
+ if (ok)
+ *ok = FALSE;
+ return 0;
}
- return (short)v;
+ return sv;
}
ushort QString::toUShort(bool *ok, int base) const
{
- ulong v = toULong( ok, base );
- if ( ok && *ok && (v > 65535) ) {
- *ok = FALSE;
- v = 0;
+ uint v = toUInt(ok, base);
+ ushort sv = v;
+ if (sv != v) {
+ if (ok)
+ *ok = FALSE;
+ return 0;
}
- return (ushort)v;
+ return sv;
}
int QString::toInt(bool *ok, int base) const
{
- return (int)toLong( ok, base );
-}
-
-uint QString::toUInt(bool *ok, int base) const
-{
- return (uint)toULong( ok, base );
-}
-
-long QString::toLong(bool *ok, int base) const
-{
const QChar *p = unicode();
- long val=0;
+ int val=0;
int l = dataHandle[0]->_length;
- const long max_mult = LONG_MAX / base;
+ const int max_mult = INT_MAX / base;
bool is_ok = FALSE;
int neg = 0;
if ( !p )
@@ -1680,7 +1673,7 @@
p++;
}
- // NOTE: toULong() code is similar
+ // NOTE: toUInt() code is similar
if ( !l || !ok_in_base(*p,base) )
goto bye;
while ( l && ok_in_base(*p,base) ) {
@@ -1695,7 +1688,7 @@
else
dv = c - 'A' + 10;
}
- if ( val > max_mult || (val == max_mult && dv > (LONG_MAX % base)+neg) )
+ if ( val > max_mult || (val == max_mult && dv > (INT_MAX % base)+neg) )
goto bye;
val = base*val + dv;
p++;
@@ -1712,12 +1705,12 @@
return is_ok ? val : 0;
}
-ulong QString::toULong(bool *ok, int base) const
+uint QString::toUInt(bool *ok, int base) const
{
const QChar *p = unicode();
- ulong val=0;
+ uint val=0;
int l = dataHandle[0]->_length;
- const ulong max_mult = ULONG_MAX / base;
+ const uint max_mult = UINT_MAX / base;
bool is_ok = FALSE;
if ( !p )
goto bye;
@@ -1726,7 +1719,7 @@
if ( *p == '+' )
l--,p++;
- // NOTE: toLong() code is similar
+ // NOTE: toInt() code is similar
if ( !l || !ok_in_base(*p,base) )
goto bye;
while ( l && ok_in_base(*p,base) ) {
@@ -1741,7 +1734,7 @@
else
dv = c - 'A' + 10;
}
- if ( val > max_mult || (val == max_mult && dv > (ULONG_MAX % base)) )
+ if ( val > max_mult || (val == max_mult && dv > (UINT_MAX % base)) )
goto bye;
val = base*val + dv;
p++;
1.27 +5 -5 WebCore/kwq/KWQTextEdit.h
Index: KWQTextEdit.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- KWQTextEdit.h 30 Aug 2005 09:30:24 -0000 1.26
+++ KWQTextEdit.h 16 Sep 2005 22:42:24 -0000 1.27
@@ -76,13 +76,13 @@
void setWritingDirection(QPainter::TextDirection);
- long selectionStart();
- long selectionEnd();
- void setSelectionStart(long);
- void setSelectionEnd(long);
+ int selectionStart();
+ int selectionEnd();
+ void setSelectionStart(int);
+ void setSelectionEnd(int);
void selectAll();
- void setSelectionRange(long, long);
+ void setSelectionRange(int, int);
QSize sizeWithColumnsAndRows(int numColumns, int numRows) const;
1.51 +11 -11 WebCore/kwq/KWQTextEdit.mm
Index: KWQTextEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- KWQTextEdit.mm 30 Aug 2005 09:30:24 -0000 1.50
+++ KWQTextEdit.mm 16 Sep 2005 22:42:24 -0000 1.51
@@ -179,7 +179,7 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-long QTextEdit::selectionStart()
+int QTextEdit::selectionStart()
{
KWQTextArea *textView = (KWQTextArea *)getView();
@@ -193,7 +193,7 @@
return 0;
}
-long QTextEdit::selectionEnd()
+int QTextEdit::selectionEnd()
{
KWQTextArea *textView = (KWQTextArea *)getView();
@@ -207,7 +207,7 @@
return 0;
}
-void QTextEdit::setSelectionStart(long start)
+void QTextEdit::setSelectionStart(int start)
{
KWQTextArea *textView = (KWQTextArea *)getView();
@@ -219,8 +219,8 @@
}
// coerce start to a valid value
- long maxLength = [[textView text] length];
- long newStart = start;
+ int maxLength = [[textView text] length];
+ int newStart = start;
if (newStart < 0)
newStart = 0;
if (newStart > maxLength)
@@ -240,7 +240,7 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-void QTextEdit::setSelectionEnd(long end)
+void QTextEdit::setSelectionEnd(int end)
{
KWQTextArea *textView = (KWQTextArea *)getView();
@@ -252,8 +252,8 @@
}
// coerce end to a valid value
- long maxLength = [[textView text] length];
- long newEnd = end;
+ int maxLength = [[textView text] length];
+ int newEnd = end;
if (newEnd < 0)
newEnd = 0;
if (newEnd > maxLength)
@@ -292,13 +292,13 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-void QTextEdit::setSelectionRange(long start, long length)
+void QTextEdit::setSelectionRange(int start, int length)
{
KWQTextArea *textView = (KWQTextArea *)getView();
KWQ_BLOCK_EXCEPTIONS;
- long newStart = start;
- long newLength = length;
+ int newStart = start;
+ int newLength = length;
if (newStart < 0) {
// truncate the length by the negative start
newLength = length + newStart;
1.414 +2 -2 WebCore/kwq/WebCoreBridge.mm
Index: WebCoreBridge.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- WebCoreBridge.mm 15 Sep 2005 01:25:54 -0000 1.413
+++ WebCoreBridge.mm 16 Sep 2005 22:42:24 -0000 1.414
@@ -1616,10 +1616,10 @@
int exception = 0;
fromStartRange->setEnd(range->startContainer(exception), range->startOffset(exception), exception);
- long startPosition = TextIterator::rangeLength(fromStartRange.get());
+ int startPosition = TextIterator::rangeLength(fromStartRange.get());
fromStartRange->setEnd(range->endContainer(exception), range->endOffset(exception), exception);
- long endPosition = TextIterator::rangeLength(fromStartRange.get());
+ int endPosition = TextIterator::rangeLength(fromStartRange.get());
return NSMakeRange(startPosition, endPosition - startPosition);
}
1.826 +69 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- ChangeLog 11 Sep 2005 10:41:15 -0000 1.825
+++ ChangeLog 16 Sep 2005 22:42:27 -0000 1.826
@@ -1,3 +1,72 @@
+2005-09-16 Adele Peterson <adele at apple.com>
+
+ Change by Darin, reviewed by me and Maciej.
+
+ Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=4547
+ use int instead of long for 32-bit (to prepare for LP64 compiling)
+
+ * bindings/c/c_class.h:
+ (KJS::Bindings::CClass::constructorAt):
+ (KJS::Bindings::CClass::numConstructors):
+ * bindings/c/c_runtime.h:
+ (KJS::Bindings::CMethod::numParameters):
+ * bindings/jni/jni_class.cpp:
+ (JavaClass::JavaClass):
+ * bindings/jni/jni_class.h:
+ (KJS::Bindings::JavaClass::constructorAt):
+ (KJS::Bindings::JavaClass::numConstructors):
+ * bindings/jni/jni_instance.cpp:
+ (JavaInstance::invokeMethod):
+ * bindings/jni/jni_jsobject.cpp:
+ (JSObject::convertJObjectToValue):
+ (JSObject::listFromJArray):
+ * bindings/jni/jni_runtime.cpp:
+ (JavaMethod::JavaMethod):
+ * bindings/jni/jni_runtime.h:
+ (KJS::Bindings::JavaConstructor::_commonCopy):
+ (KJS::Bindings::JavaConstructor::parameterAt):
+ (KJS::Bindings::JavaConstructor::numParameters):
+ (KJS::Bindings::JavaMethod::_commonCopy):
+ (KJS::Bindings::JavaMethod::parameterAt):
+ (KJS::Bindings::JavaMethod::numParameters):
+ * bindings/npapi.h:
+ * bindings/objc/WebScriptObject.mm:
+ (listFromNSArray):
+ * bindings/objc/objc_class.h:
+ (KJS::Bindings::ObjcClass::constructorAt):
+ (KJS::Bindings::ObjcClass::numConstructors):
+ * bindings/objc/objc_instance.h:
+ * bindings/objc/objc_runtime.h:
+ * bindings/objc/objc_runtime.mm:
+ (ObjcMethod::numParameters):
+ * bindings/runtime.h:
+ * kjs/identifier.h:
+ * kjs/internal.h:
+ * kjs/property_slot.h:
+ (KJS::PropertySlot::setCustomIndex):
+ (KJS::PropertySlot::index):
+ (KJS::PropertySlot::):
+ * kjs/regexp_object.cpp:
+ (RegExpObjectImp::backrefGetter):
+ (RegExpObjectImp::getOwnPropertySlot):
+ * kjs/simple_number.h:
+ (KJS::SimpleNumber::):
+ (KJS::SimpleNumber::value):
+ (KJS::SimpleNumber::fits):
+ (KJS::SimpleNumber::integerFits):
+ (KJS::SimpleNumber::make):
+ * kjs/string_object.cpp:
+ (substituteBackreferences):
+ * kjs/ustring.cpp:
+ (KJS::UString::from):
+ (KJS::UString::toUInt32):
+ (KJS::UString::find):
+ (KJS::UString::rfind):
+ * kjs/ustring.h:
+ * kjs/value.cpp:
+ (KJS::jsNumber):
+ * kjs/value.h:
+
2005-09-11 Eric Seidel <eseidel at apple.com>
No review requested, build fix affects only SVG.
1.3 +6 -6 JavaScriptCore/bindings/npapi.h
Index: npapi.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/npapi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- npapi.h 16 Aug 2004 03:41:56 -0000 1.2
+++ npapi.h 16 Sep 2005 22:42:27 -0000 1.3
@@ -108,21 +108,21 @@
typedef unsigned short uint16;
#endif
#ifndef _UINT32
-#if defined(__alpha)
+#if __LP64__
typedef unsigned int uint32;
-#else /* __alpha */
+#else /* __LP64__ */
typedef unsigned long uint32;
-#endif /* __alpha */
+#endif /* __LP64__ */
#endif
#ifndef _INT16
typedef short int16;
#endif
#ifndef _INT32
-#if defined(__alpha)
+#if __LP64__
typedef int int32;
-#else /* __alpha */
+#else /* __LP64__ */
typedef long int32;
-#endif /* __alpha */
+#endif /* __LP64__ */
#endif
#ifndef FALSE
1.32 +5 -5 JavaScriptCore/bindings/runtime.h
Index: runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/runtime.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- runtime.h 16 Aug 2005 00:47:21 -0000 1.31
+++ runtime.h 16 Sep 2005 22:42:27 -0000 1.32
@@ -53,8 +53,8 @@
class Constructor
{
public:
- virtual Parameter *parameterAt(long i) const = 0;
- virtual long numParameters() const = 0;
+ virtual Parameter *parameterAt(int i) const = 0;
+ virtual int numParameters() const = 0;
virtual ~Constructor() {}
};
@@ -97,7 +97,7 @@
public:
virtual const char *name() const = 0;
- virtual long numParameters() const = 0;
+ virtual int numParameters() const = 0;
virtual ~Method() {}
};
@@ -109,8 +109,8 @@
virtual MethodList methodsNamed(const char *name, Instance *instance) const = 0;
- virtual Constructor *constructorAt(long i) const = 0;
- virtual long numConstructors() const = 0;
+ virtual Constructor *constructorAt(int i) const = 0;
+ virtual int numConstructors() const = 0;
virtual Field *fieldNamed(const char *name, Instance *instance) const = 0;
1.6 +2 -2 JavaScriptCore/bindings/c/c_class.h
Index: c_class.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/c/c_class.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- c_class.h 1 Oct 2004 00:24:39 -0000 1.5
+++ c_class.h 16 Sep 2005 22:42:28 -0000 1.6
@@ -77,11 +77,11 @@
virtual Field *fieldNamed(const char *name, Instance *instance) const;
- virtual Constructor *constructorAt(long i) const {
+ virtual Constructor *constructorAt(int i) const {
return 0;
};
- virtual long numConstructors() const { return 0; };
+ virtual int numConstructors() const { return 0; };
private:
NPClass *_isa;
1.7 +1 -1 JavaScriptCore/bindings/c/c_runtime.h
Index: c_runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/c/c_runtime.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- c_runtime.h 8 Aug 2005 04:07:23 -0000 1.6
+++ c_runtime.h 16 Sep 2005 22:42:28 -0000 1.7
@@ -68,7 +68,7 @@
virtual const char *name() const { return _NPN_UTF8FromIdentifier(_methodIdentifier); };
- virtual long numParameters() const { return 0; };
+ virtual int numParameters() const { return 0; };
private:
NPIdentifier _methodIdentifier;
1.15 +3 -3 JavaScriptCore/bindings/jni/jni_class.cpp
Index: jni_class.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_class.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jni_class.cpp 10 Aug 2005 20:51:00 -0000 1.14
+++ jni_class.cpp 16 Sep 2005 22:42:28 -0000 1.15
@@ -43,12 +43,12 @@
_name = strdup (classNameC);
releaseCharactersForJString(className, classNameC);
- long i;
+ int i;
JNIEnv *env = getJNIEnv();
// Get the fields
jarray fields = (jarray)callJNIObjectMethod (aClass, "getFields", "()[Ljava/lang/reflect/Field;");
- long numFields = env->GetArrayLength (fields);
+ int numFields = env->GetArrayLength (fields);
_fields = CFDictionaryCreateMutable(NULL, numFields, &kCFTypeDictionaryKeyCallBacks, NULL);
for (i = 0; i < numFields; i++) {
jobject aJField = env->GetObjectArrayElement ((jobjectArray)fields, i);
@@ -61,7 +61,7 @@
// Get the methods
jarray methods = (jarray)callJNIObjectMethod (aClass, "getMethods", "()[Ljava/lang/reflect/Method;");
- long numMethods = env->GetArrayLength (methods);
+ int numMethods = env->GetArrayLength (methods);
_methods = CFDictionaryCreateMutable(NULL, numMethods, &kCFTypeDictionaryKeyCallBacks, NULL);
for (i = 0; i < numMethods; i++) {
jobject aJMethod = env->GetObjectArrayElement ((jobjectArray)methods, i);
1.11 +3 -3 JavaScriptCore/bindings/jni/jni_class.h
Index: jni_class.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_class.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jni_class.h 10 Aug 2005 20:51:00 -0000 1.10
+++ jni_class.h 16 Sep 2005 22:42:28 -0000 1.11
@@ -48,11 +48,11 @@
virtual Field *fieldNamed(const char *name, Instance *instance) const;
- virtual Constructor *constructorAt(long i) const {
+ virtual Constructor *constructorAt(int i) const {
return &_constructors[i];
};
- virtual long numConstructors() const { return _numConstructors; };
+ virtual int numConstructors() const { return _numConstructors; };
bool isNumberClass() const;
bool isBooleanClass() const;
@@ -67,7 +67,7 @@
CFDictionaryRef _fields;
CFDictionaryRef _methods;
JavaConstructor *_constructors;
- long _numConstructors;
+ int _numConstructors;
};
} // namespace Bindings
1.30 +1 -1 JavaScriptCore/bindings/jni/jni_instance.cpp
Index: jni_instance.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_instance.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jni_instance.cpp 16 Aug 2005 00:47:22 -0000 1.29
+++ jni_instance.cpp 16 Sep 2005 22:42:28 -0000 1.30
@@ -267,7 +267,7 @@
break;
case long_type: {
- resultValue = Number((long int)result.j);
+ resultValue = jsNumber(result.j);
}
break;
1.13 +2 -2 JavaScriptCore/bindings/jni/jni_jsobject.cpp
Index: jni_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jni_jsobject.cpp 8 Aug 2005 04:07:24 -0000 1.12
+++ jni_jsobject.cpp 16 Sep 2005 22:42:28 -0000 1.13
@@ -425,7 +425,7 @@
// Pull the nativeJSObject value from the Java instance. This is a
// pointer to the ObjectImp.
JNIEnv *env = getJNIEnv();
- jfieldID fieldID = env->GetFieldID((jclass)classOfInstance, "nativeJSObject", "long");
+ jfieldID fieldID = env->GetFieldID((jclass)classOfInstance, "nativeJSObject", "int");
if (fieldID == NULL) {
return Undefined();
}
@@ -447,7 +447,7 @@
List JSObject::listFromJArray(jobjectArray jArray) const
{
JNIEnv *env = getJNIEnv();
- long i, numObjects = jArray ? env->GetArrayLength (jArray) : 0;
+ int i, numObjects = jArray ? env->GetArrayLength (jArray) : 0;
List aList;
for (i = 0; i < numObjects; i++) {
1.29 +1 -1 JavaScriptCore/bindings/jni/jni_runtime.cpp
Index: jni_runtime.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_runtime.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jni_runtime.cpp 16 Aug 2005 00:47:22 -0000 1.28
+++ jni_runtime.cpp 16 Sep 2005 22:42:28 -0000 1.29
@@ -297,7 +297,7 @@
_methodID = 0;
jclass modifierClass = env->FindClass("java/lang/reflect/Modifier");
- long modifiers = callJNIIntMethod (aMethod, "getModifiers", "()I");
+ int modifiers = callJNIIntMethod (aMethod, "getModifiers", "()I");
_isStatic = (bool)callJNIStaticBooleanMethod (modifierClass, "isStatic", "(I)Z", modifiers);
}
1.27 +8 -8 JavaScriptCore/bindings/jni/jni_runtime.h
Index: jni_runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_runtime.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jni_runtime.h 8 Aug 2005 04:07:24 -0000 1.26
+++ jni_runtime.h 16 Sep 2005 22:42:28 -0000 1.27
@@ -124,7 +124,7 @@
void _commonCopy(const JavaConstructor &other) {
_numParameters = other._numParameters;
_parameters = new JavaParameter[_numParameters];
- long i;
+ int i;
for (i = 0; i < _numParameters; i++) {
_parameters[i] = other._parameters[i];
}
@@ -146,12 +146,12 @@
return *this;
}
- virtual Parameter *parameterAt(long i) const { return &_parameters[i]; };
- virtual long numParameters() const { return _numParameters; };
+ virtual Parameter *parameterAt(int i) const { return &_parameters[i]; };
+ virtual int numParameters() const { return _numParameters; };
private:
JavaParameter *_parameters;
- long _numParameters;
+ int _numParameters;
};
@@ -222,7 +222,7 @@
_numParameters = other._numParameters;
_parameters = new JavaParameter[_numParameters];
- long i;
+ int i;
for (i = 0; i < _numParameters; i++) {
_parameters[i] = other._parameters[i];
}
@@ -246,8 +246,8 @@
virtual const char *name() const { return _name.UTF8String(); };
RuntimeType returnType() const { return _returnType.UTF8String(); };
- virtual Parameter *parameterAt(long i) const { return &_parameters[i]; };
- virtual long numParameters() const { return _numParameters; };
+ virtual Parameter *parameterAt(int i) const { return &_parameters[i]; };
+ virtual int numParameters() const { return _numParameters; };
const char *signature() const;
JNIType JNIReturnType() const;
@@ -258,7 +258,7 @@
private:
JavaParameter *_parameters;
- long _numParameters;
+ int _numParameters;
JavaString _name;
mutable UString *_signature;
JavaString _returnType;
1.24 +1 -1 JavaScriptCore/bindings/objc/WebScriptObject.mm
Index: WebScriptObject.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/WebScriptObject.mm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- WebScriptObject.mm 26 Aug 2005 17:58:27 -0000 1.23
+++ WebScriptObject.mm 16 Sep 2005 22:42:29 -0000 1.24
@@ -169,7 +169,7 @@
static List listFromNSArray(ExecState *exec, NSArray *array)
{
- long i, numObjects = array ? [array count] : 0;
+ int i, numObjects = array ? [array count] : 0;
List aList;
for (i = 0; i < numObjects; i++) {
1.6 +2 -2 JavaScriptCore/bindings/objc/objc_class.h
Index: objc_class.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_class.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- objc_class.h 16 Aug 2005 00:47:23 -0000 1.5
+++ objc_class.h 16 Sep 2005 22:42:29 -0000 1.6
@@ -70,8 +70,8 @@
virtual ValueImp *fallbackObject(ExecState *exec, Instance *instance, const Identifier &propertyName);
- virtual Constructor *constructorAt(long i) const { return 0; }
- virtual long numConstructors() const { return 0; }
+ virtual Constructor *constructorAt(int i) const { return 0; }
+ virtual int numConstructors() const { return 0; }
ClassStructPtr isa() { return _isa; }
1.8 +1 -1 JavaScriptCore/bindings/objc/objc_instance.h
Index: objc_instance.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_instance.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- objc_instance.h 8 Aug 2005 04:07:26 -0000 1.7
+++ objc_instance.h 16 Sep 2005 22:42:29 -0000 1.8
@@ -76,7 +76,7 @@
ObjectStructPtr _instance;
mutable ObjcClass *_class;
ObjectStructPtr _pool;
- long _beginCount;
+ int _beginCount;
};
} // namespace Bindings
1.15 +1 -1 JavaScriptCore/bindings/objc/objc_runtime.h
Index: objc_runtime.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_runtime.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- objc_runtime.h 16 Aug 2005 00:47:23 -0000 1.14
+++ objc_runtime.h 16 Sep 2005 22:42:29 -0000 1.15
@@ -118,7 +118,7 @@
virtual const char *name() const;
- virtual long numParameters() const;
+ virtual int numParameters() const;
NSMethodSignature *getMethodSignature() const;
1.21 +1 -1 JavaScriptCore/bindings/objc/objc_runtime.mm
Index: objc_runtime.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/objc_runtime.mm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- objc_runtime.mm 16 Aug 2005 00:47:23 -0000 1.20
+++ objc_runtime.mm 16 Sep 2005 22:42:29 -0000 1.21
@@ -51,7 +51,7 @@
return (const char *)_selector;
}
-long ObjcMethod::numParameters() const
+int ObjcMethod::numParameters() const
{
return [getMethodSignature() numberOfArguments] - 2;
}
1.18 +0 -1 JavaScriptCore/kjs/identifier.h
Index: identifier.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/identifier.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- identifier.h 25 Aug 2005 17:46:54 -0000 1.17
+++ identifier.h 16 Sep 2005 22:42:30 -0000 1.18
@@ -50,7 +50,6 @@
bool isNull() const { return _ustring.isNull(); }
bool isEmpty() const { return _ustring.isEmpty(); }
- unsigned long toULong(bool *ok) const { return _ustring.toULong(ok); }
uint32_t toUInt32(bool *ok) const { return _ustring.toUInt32(ok); }
uint32_t toStrictUInt32(bool *ok) const { return _ustring.toStrictUInt32(ok); }
unsigned toArrayIndex(bool *ok) const { return _ustring.toArrayIndex(ok); }
1.39 +2 -0 JavaScriptCore/kjs/internal.h
Index: internal.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/internal.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- internal.h 4 Sep 2005 01:18:12 -0000 1.38
+++ internal.h 16 Sep 2005 22:42:30 -0000 1.39
@@ -116,6 +116,8 @@
friend ValueImp *jsNumber(unsigned);
friend ValueImp *jsNumber(long);
friend ValueImp *jsNumber(unsigned long);
+ friend ValueImp *jsNumber(long long);
+ friend ValueImp *jsNumber(unsigned long long);
friend ValueImp *jsNumber(double);
friend ValueImp *jsNumber(double, bool);
public:
1.5 +3 -3 JavaScriptCore/kjs/property_slot.h
Index: property_slot.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/property_slot.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- property_slot.h 19 Aug 2005 16:01:55 -0000 1.4
+++ property_slot.h 16 Sep 2005 22:42:30 -0000 1.5
@@ -74,7 +74,7 @@
m_getValue = getValue;
}
- void setCustomIndex(ObjectImp *slotBase, unsigned long index, GetValueFunc getValue)
+ void setCustomIndex(ObjectImp *slotBase, unsigned index, GetValueFunc getValue)
{
assert(getValue);
m_slotBase = slotBase;
@@ -91,7 +91,7 @@
ObjectImp *slotBase() const { return m_slotBase; }
const HashEntry *staticEntry() const { return m_data.staticEntry; }
- unsigned long index() const { return m_data.index; }
+ unsigned index() const { return m_data.index; }
private:
static ValueImp *undefinedGetter(ExecState *, const Identifier&, const PropertySlot&);
@@ -102,7 +102,7 @@
union {
ValueImp **valueSlot;
const HashEntry *staticEntry;
- unsigned long index;
+ unsigned index;
} m_data;
};
1.24 +3 -4 JavaScriptCore/kjs/regexp_object.cpp
Index: regexp_object.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/regexp_object.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- regexp_object.cpp 4 Sep 2005 01:18:13 -0000 1.23
+++ regexp_object.cpp 16 Sep 2005 22:42:30 -0000 1.24
@@ -214,7 +214,7 @@
ValueImp *RegExpObjectImp::backrefGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
{
RegExpObjectImp *thisObj = static_cast<RegExpObjectImp *>(slot.slotBase());
- unsigned long i = slot.index();
+ unsigned i = slot.index();
if (i < thisObj->lastNrSubPatterns + 1) {
int *lastOvector = thisObj->lastOvector;
@@ -231,9 +231,8 @@
if (s[0] == '$' && lastOvector)
{
bool ok;
- unsigned long i = s.substr(1).toULong(&ok);
- if (ok)
- {
+ unsigned i = s.substr(1).toUInt32(&ok);
+ if (ok) {
slot.setCustomIndex(this, i, backrefGetter);
return true;
}
1.15 +23 -10 JavaScriptCore/kjs/simple_number.h
Index: simple_number.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/simple_number.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- simple_number.h 10 Sep 2005 19:10:24 -0000 1.14
+++ simple_number.h 16 Sep 2005 22:42:30 -0000 1.15
@@ -36,6 +36,8 @@
using std::signbit;
#endif
+#define KJS_MIN_MACRO(a, b) ((a) < (b) ? (a) : (b))
+
namespace KJS {
class ValueImp;
@@ -51,18 +53,29 @@
class SimpleNumber {
public:
- enum { tag = 1, shift = 2, mask = (1 << shift) - 1, sign = 1L << (sizeof(long) * 8 - 1 ), max = (1L << ((sizeof(long) * 8 - 1) - shift)) - 1, min = -max - 1, imax = (1L << ((sizeof(int) * 8 - 1) - shift)) - 1, imin = -imax - 1 };
-
+ enum {
+ tag = 1,
+ shift = 2,
+ mask = (1 << shift) - 1,
+ bits = KJS_MIN_MACRO(sizeof(ValueImp *) * 8 - shift, sizeof(long) * 8),
+ sign = 1UL << (bits + shift - 1),
+ umax = sign >> 1,
+ smax = static_cast<long>(umax),
+ smin = static_cast<long>(-umax - 1)
+ };
+
static inline bool is(const ValueImp *imp) { return ((long)imp & mask) == tag; }
- static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~max : 0); }
+ static inline long value(const ValueImp *imp) { return ((long)imp >> shift) | (((long)imp & sign) ? ~umax : 0); }
- static inline bool fits(int i) { return i <= imax && i >= imin; }
- static inline bool fits(unsigned i) { return i <= (unsigned)max; }
- static inline bool fits(long i) { return i <= max && i >= min; }
- static inline bool fits(unsigned long i) { return i <= (unsigned)max; }
- static inline bool integerFits(double d) { return !(d < min || d > max); }
- static inline bool fits(double d) { return d >= min && d <= max && d == (double)(long)d && !isNegativeZero(d); }
- static inline ValueImp *make(long i) { return (ValueImp *)((i << shift) | tag); }
+ static inline bool fits(int i) { return i <= smax && i >= smin; }
+ static inline bool fits(unsigned i) { return i <= umax; }
+ static inline bool fits(long i) { return i <= smax && i >= smin; }
+ static inline bool fits(unsigned long i) { return i <= umax; }
+ static inline bool fits(long long i) { return i <= smax && i >= smin; }
+ static inline bool fits(unsigned long long i) { return i <= umax; }
+ static inline bool integerFits(double d) { return !(d < smin || d > smax); }
+ static inline bool fits(double d) { return d >= smin && d <= smax && d == (double)(long)d && !isNegativeZero(d); }
+ static inline ValueImp *make(long i) { return reinterpret_cast<ValueImp *>(static_cast<uintptr_t>((i << shift) | tag)); }
};
}
1.44 +1 -1 JavaScriptCore/kjs/string_object.cpp
Index: string_object.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/string_object.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- string_object.cpp 16 Aug 2005 00:47:26 -0000 1.43
+++ string_object.cpp 16 Sep 2005 22:42:30 -0000 1.44
@@ -242,7 +242,7 @@
continue;
}
// Assume number part is one char exactly
- unsigned long backrefIndex = substitutedReplacement.substr(i+1,1).toULong(&converted, false /* tolerate empty string */);
+ unsigned backrefIndex = substitutedReplacement.substr(i+1,1).toUInt32(&converted, false /* tolerate empty string */);
if (converted && backrefIndex <= (unsigned)reg->subPatterns()) {
int backrefStart = (*ovector)[2*backrefIndex];
int backrefLength = (*ovector)[2*backrefIndex+1] - backrefStart;
1.60 +39 -19 JavaScriptCore/kjs/ustring.cpp
Index: ustring.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/ustring.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ustring.cpp 19 Aug 2005 20:24:17 -0000 1.59
+++ ustring.cpp 16 Sep 2005 22:42:30 -0000 1.60
@@ -488,13 +488,38 @@
UString UString::from(int i)
{
- return from((long)i);
+ UChar buf[1 + sizeof(i) * 3];
+ UChar *end = buf + sizeof(buf) / sizeof(UChar);
+ UChar *p = end;
+
+ if (i == 0) {
+ *--p = '0';
+ } else if (i == INT_MIN) {
+ char minBuf[1 + sizeof(i) * 3];
+ sprintf(minBuf, "%d", INT_MIN);
+ return UString(minBuf);
+ } else {
+ bool negative = false;
+ if (i < 0) {
+ negative = true;
+ i = -i;
+ }
+ while (i) {
+ *--p = (unsigned short)((i % 10) + '0');
+ i /= 10;
+ }
+ if (negative) {
+ *--p = '-';
+ }
+ }
+
+ return UString(p, end - p);
}
UString UString::from(unsigned int u)
{
- UChar buf[20];
- UChar *end = buf + 20;
+ UChar buf[sizeof(u) * 3];
+ UChar *end = buf + sizeof(buf) / sizeof(UChar);
UChar *p = end;
if (u == 0) {
@@ -511,14 +536,14 @@
UString UString::from(long l)
{
- UChar buf[20];
- UChar *end = buf + 20;
+ UChar buf[1 + sizeof(l) * 3];
+ UChar *end = buf + sizeof(buf) / sizeof(UChar);
UChar *p = end;
if (l == 0) {
*--p = '0';
} else if (l == LONG_MIN) {
- char minBuf[20];
+ char minBuf[1 + sizeof(l) * 3];
sprintf(minBuf, "%ld", LONG_MIN);
return UString(minBuf);
} else {
@@ -938,12 +963,12 @@
return toDouble(false, true);
}
-unsigned long UString::toULong(bool *ok, bool tolerateEmptyString) const
+uint32_t UString::toUInt32(bool *ok) const
{
- double d = toDouble(false, tolerateEmptyString);
+ double d = toDouble();
bool b = true;
- if (isNaN(d) || d != static_cast<unsigned long>(d)) {
+ if (isNaN(d) || d != static_cast<uint32_t>(d)) {
b = false;
d = 0;
}
@@ -951,17 +976,12 @@
if (ok)
*ok = b;
- return static_cast<unsigned long>(d);
-}
-
-unsigned long UString::toULong(bool *ok) const
-{
- return toULong(ok, true);
+ return static_cast<uint32_t>(d);
}
-uint32_t UString::toUInt32(bool *ok) const
+uint32_t UString::toUInt32(bool *ok, bool tolerateEmptyString) const
{
- double d = toDouble();
+ double d = toDouble(false, tolerateEmptyString);
bool b = true;
if (isNaN(d) || d != static_cast<uint32_t>(d)) {
@@ -1046,7 +1066,7 @@
if (fsz == 0)
return pos;
const UChar *end = data() + sz - fsz;
- long fsizeminusone = (fsz - 1) * sizeof(UChar);
+ int fsizeminusone = (fsz - 1) * sizeof(UChar);
const UChar *fdata = f.data();
unsigned short fchar = fdata->uc;
++fdata;
@@ -1081,7 +1101,7 @@
pos = sz - fsz;
if (fsz == 0)
return pos;
- long fsizeminusone = (fsz - 1) * sizeof(UChar);
+ int fsizeminusone = (fsz - 1) * sizeof(UChar);
const UChar *fdata = f.data();
for (const UChar *c = data() + pos; c >= data(); c--) {
if (*c == *fdata && !memcmp(c + 1, fdata + 1, fsizeminusone))
1.40 +6 -7 JavaScriptCore/kjs/ustring.h
Index: ustring.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/ustring.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ustring.h 25 Aug 2005 17:46:54 -0000 1.39
+++ ustring.h 16 Sep 2005 22:42:30 -0000 1.40
@@ -302,9 +302,9 @@
*/
static UString from(unsigned int u);
/**
- * Constructs a string from a long.
+ * Constructs a string from a long int.
*/
- static UString from(long l);
+ static UString from(long u);
/**
* Constructs a string from a double.
*/
@@ -419,15 +419,14 @@
double toDouble(bool tolerateTrailingJunk, bool tolerateEmptyString) const;
double toDouble(bool tolerateTrailingJunk) const;
double toDouble() const;
+
/**
- * Attempts an conversion to an unsigned long integer. ok will be set
+ * Attempts an conversion to a 32-bit integer. ok will be set
* according to the success.
- * @param tolerateEmptyString if false, toULong will return false for *ok for an empty string.
+ * @param tolerateEmptyString if false, toUInt32 will return false for *ok for an empty string.
*/
- unsigned long toULong(bool *ok, bool tolerateEmptyString) const;
- unsigned long toULong(bool *ok = 0) const;
-
uint32_t toUInt32(bool *ok = 0) const;
+ uint32_t toUInt32(bool *ok, bool tolerateEmptyString) const;
uint32_t toStrictUInt32(bool *ok = 0) const;
/**
1.29 +10 -0 JavaScriptCore/kjs/value.cpp
Index: value.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/value.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- value.cpp 10 Sep 2005 18:24:43 -0000 1.28
+++ value.cpp 16 Sep 2005 22:42:30 -0000 1.29
@@ -201,6 +201,16 @@
return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
}
+ValueImp *jsNumber(long long i)
+{
+ return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
+}
+
+ValueImp *jsNumber(unsigned long long i)
+{
+ return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
+}
+
ValueImp *jsNumber(double d)
{
return SimpleNumber::fits(d)
1.35 +2 -0 JavaScriptCore/kjs/value.h
Index: value.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/value.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- value.h 4 Sep 2005 06:21:54 -0000 1.34
+++ value.h 16 Sep 2005 22:42:30 -0000 1.35
@@ -189,6 +189,8 @@
ValueImp *jsNumber(unsigned);
ValueImp *jsNumber(long);
ValueImp *jsNumber(unsigned long);
+ValueImp *jsNumber(long long);
+ValueImp *jsNumber(unsigned long long);
AllocatedValueImp *jsString(const UString &); // returns empty string if passed null string
AllocatedValueImp *jsString(const char * = ""); // returns empty string if passed 0
More information about the webkit-changes
mailing list