Reviewed by Hyatt.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2006 06:59:15 +0000 (06:59 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2006 06:59:15 +0000 (06:59 +0000)
        - moved Cursor into the platform directory from KWQ
        - removed a lot of other unneeded stuff from KWQ

        * platform/Cursor.h: Added.
        * platform/mac/CursorMac.mm: Added.
        * platform/mac/CursorWin.cpp: Added.

        * kwq/KWQBuffer.cpp: Removed.
        * kwq/KWQBuffer.h: Removed.
        * kwq/KWQCursor.h: Removed.
        * kwq/KWQCursor.mm: Removed.
        * kwq/KWQIODevice.h: Removed.
        * kwq/KWQKCursor.h: Removed.
        * kwq/KWQKCursor.mm: Removed.
        * kwq/KWQKDebug.h: Removed.
        * kwq/KWQSignalStubs.cpp: Removed.

        * ForwardingHeaders/kcursor.h: Removed.
        * ForwardingHeaders/kdebug.h: Removed.
        * ForwardingHeaders/qbuffer.h: Removed.

        * kwq/KWQEvent.h: Removed unused constants and types QCustomEvent,
        QFocusEvent, QHideEvent, QShowEvent, QContextMenuEvent, and QResizeEvent.

        * kwq/KWQLoader.h: Removed KWQLoader class since signals are no longer needed.
        * kwq/KWQLoader.mm: Ditto.

        * kwq/KWQNamespace.h: Removed DontClip, ShowPrefix, WordBreak, LayoutDirection,
        LeftToRight, RightToLeft, RasterOp, CopyROP, OrROP, and XorROP.

        * kwq/KWQObject.h: Removed blockSignals, sender, _signalsBlocked, _sender,
        and KWQObjectSenderScope.
        * kwq/KWQObject.cpp:
        (QObject::QObject): Removed _signalsBlocked.
        (QObject::connect): Removed special-case signals to not complain about.
        All of them were either unused, converted to non-signal functions, or in one
        case (slotScrollBarMoved) turned into a FIXME.

        * kwq/KWQPainter.h: Removed rasterOp and setRasterOp.
        * kwq/KWQPainter.mm: Ditto.

        * kwq/KWQSignal.h:
        * kwq/KWQSignal.cpp: (KWQSignal::disconnect): Removed special cases for
        various signals; all are now using plain function calls instead.

        * kwq/KWQSlot.h:
        * kwq/KWQSlot.cpp: Removed slots that are no longer needed because they
        are using plain function calls instead of signals.

        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        Updated for changed files.

        * bridge/mac/FrameViewMac.mm: Moved the contents of KWQKHTMLView.cpp in here.
        * bridge/mac/KWQKHTMLView.cpp: Removed.

        * bridge/mac/MacFrame.h: Removed signals, changed setStatusBarText to take
        String instead of QString.
        * bridge/mac/MacFrame.mm:
        (WebCore::MacFrame::MacFrame): Removed signals.
        (WebCore::MacFrame::setStatusBarText): Changed parameter type.
        (WebCore::MacFrame::openURLFromPageCache): Removed parameter from started function.
        (WebCore::MacFrame::khtmlMouseMoveEvent): Changed from QCursor() to pointerCursor().

        * dom/DocumentImpl.h:
        * dom/DocumentImpl.cpp:
        (WebCore::DocumentImpl::DocumentImpl): Removed signals.
        (WebCore::DocumentImpl::implicitOpen): Ditto.
        (WebCore::DocumentImpl::determineParseMode): Removed a use of kdDebug.
        (WebCore::DocumentImpl::finishedParsing): Added. Does a setParsing(false) and then
        calls finishedParsing on the frame. Replaces the old finishedParsing signal.

        * dom/xml_tokenizer.h:
        * dom/xml_tokenizer.cpp: Removed the finishedParsing signal since it's not just
        a function on the document.
        (WebCore::XMLTokenizer::finish): Call the function instead of emitting the signal.

        * khtml/html/htmlparser.h:
        * khtml/html/htmlparser.cpp: Moved the parser inside the WebCore namespace.

        * khtml/html/htmltokenizer.h:
        * khtml/html/htmltokenizer.cpp: (WebCore::HTMLTokenizer::end): Updated
        to call finishedParsing function on document rather than emitting a signal.

        * kwq/KWQComboBox.mm:
        (-[KWQPopUpButton becomeFirstResponder]): Use QEvent instead of QFocusEvent.
        (-[KWQPopUpButton resignFirstResponder]): Ditto.
        * kwq/KWQFileButton.mm: (KWQFileButton::focusChanged): Ditto.
        * kwq/KWQListBox.mm:
        (-[KWQTableView becomeFirstResponder]): Ditto.
        (-[KWQTableView resignFirstResponder]): Ditto.
        * kwq/KWQSlider.mm:
        (-[KWQSlider becomeFirstResponder]): Ditto.
        (-[KWQSlider resignFirstResponder]): Ditto.
        * kwq/KWQTextArea.mm:
        (-[KWQTextAreaTextView becomeFirstResponder]): Ditto.
        (-[KWQTextAreaTextView resignFirstResponder]): Ditto.
        * kwq/KWQTextField.mm:
        (-[KWQTextFieldController setHasFocus:]): Ditto.

        * kwq/KWQTextStream.h: Removed the mode parameter from the QTextStream constructor.
        Removed the QTextIStream and QTextOStream classes.
        * kwq/KWQTextStream.cpp: (QTextStream::QTextStream): Removed the mode parameter.

        * loader/CachedCSSStyleSheet.h: Changed to take a ByteArray instead of a QBuffer.
        * loader/CachedCSSStyleSheet.cpp: (WebCore::CachedCSSStyleSheet::data): Ditto.
        * loader/CachedImage.h: Ditto.
        * loader/CachedImage.cpp: (WebCore::CachedImage::data): Ditto.
        * loader/CachedObject.h: Ditto.
        * loader/CachedScript.h: Ditto.
        * loader/CachedScript.cpp: (WebCore::CachedScript::data): Ditto.
        * loader/CachedXBLDocument.h: Ditto.
        * loader/CachedXBLDocument.cpp: (WebCore::CachedXBLDocument::data): Ditto.
        * loader/CachedXSLStyleSheet.h:
        * loader/CachedXSLStyleSheet.cpp: (WebCore::CachedXSLStyleSheet::data): Ditto.

        * loader/DocLoader.cpp: (WebCore::DocLoader::setLoadInProgress): Added a call
        to loadDone on the frame. Replaces the requestFailed and requestDone signals.

        * loader/DocLoader.h: Removed include of <qbuffer.h>.

        * loader/Request.h:
        * loader/Request.cpp: Updated to use ByteArray instead of QBuffer.

        * loader/loader.h: Removed unused signals.
        * loader/loader.cpp:
        (WebCore::Loader::Loader): Removed use of KWQLoader.
        (WebCore::Loader::~Loader): Ditto.
        (WebCore::Loader::load): Removed code to emit unused requestStarted signal.
        (WebCore::Loader::slotFinished): Removed code to emit requestFailed and
        requestDone signals, now handled by DocLoader::setLoadInProgress(false).
        (WebCore::Loader::slotReceivedResponse): Use ByteArray instead of QBuffer.
        (WebCore::Loader::slotData): Ditto.

        * page/Frame.h: Removed setURLCursor, urlCursor, slotRestoreData, slotIncZoom,
        slotDecZoom, slotLoadImages, slotPartRemoved, slotActiveFrameChanged,
        slotChildURLRequest, slotShowDocument, slotAutoScroll, slotPrintFrame, slotSelectAll,
        slotProgressUpdate, slotJobPercent, slotJobSpeed.connectChild, disconnectChild,
        and changed a number of others from slots to plain old functions.
        * page/Frame.cpp:
        (WebCore::Frame::Frame): Don't connect to loader signals.
        (WebCore::Frame::~Frame): Don't disconnect from loader signals.
        (WebCore::Frame::didOpenURL): Call started function instead of emitting
        started signal. Don't connect to speed and percent signals (which never
        existed in WebCore anyway).
        (WebCore::Frame::stopLoading): Call finishedParsing function instead of
        calling slotFinishedParsing.
        (WebCore::Frame::executeScript): Removed redundant checks and let
        submitFormAgain do the checking.
        (WebCore::Frame::clear): Removed code to disconnect from finishedParsing
        signal; we now use a function. Also removed loop that calls disconnectChild,
        becase again we use functions now instead of signals.
        (WebCore::Frame::setDocument): Remove code to disconnect and connect to the
        finishedParsing signal.
        (WebCore::Frame::begin): Remove code to connect to the finishedParsing signal.
        (WebCore::Frame::finishedParsing): Moved code that does setParsing(false) into
        the document class. Also renamed from slotFinishedParsing.
        (WebCore::Frame::loadDone): Renamed from slotLoaderRequestDone.
        (WebCore::Frame::checkCompleted): Changed to call the completed function instead
        of emitting one of the two completed signals.
        (WebCore::Frame::loadSubframe): Removed call to connectChild because we now use
        functions instead of signals. Also change the call to completed to pass false
        instead of true.
        (WebCore::Frame::submitFormAgain): Change function around so we are less likely
        to leak if something strange happens inside submitForm.
        (WebCore::Frame::submitForm): Remove code to connect signal. We now call
        submitFormAgain from inside the completed function.
        (WebCore::Frame::parentCompleted): Renamed from slotParentCompleted. No longer
        a slot, now called from completed.
        (WebCore::Frame::childCompleted): Renamed from slotChildCompleted.
        (WebCore::Frame::setJSStatusBarText): Removed "emit" from function call. Changed
        to use String instead of QString.
        (WebCore::Frame::setJSDefaultStatusBarText): Ditto.
        (WebCore::Frame::sendResizeEvent): Changed to send DOM event directly instead of
        creating a QResizeEvent to send along to the FrameView.
        (WebCore::Frame::scrollToAnchor): Changed to not pass a parameter to the started
        function, which no longer takes one.
        (WebCore::Frame::frameDetached): Removed code that calls disconnectChild, since
        we no longer use signals.
        (WebCore::Frame::completed): Added. Calls childCompleted, parentCompleted, and
        submitFormAgain.
        (WebCore::Frame::setStatusBarText): Added.
        (WebCore::Frame::started): Added. Sets the complete flag to false for the frame
        and all its ancestors, which is what slotChildStarted did recursively.

        * page/FramePrivate.h: Removed m_activeFrame and changed m_kjsStatusBarText and
        m_kjsDefaultStatusBarText to String from QString.

        * page/FrameView.h: Removed resizeEvent, focusInEvent, focusOutEvent, and
        slotPaletteChanged. Changed cleared from a signal to a private function and
        slotScrollBarMoved to a private function named scrollBarMoved.
        * page/FrameView.cpp:
        (WebCore::FrameView::FrameView): Removed connect call here that was connecting
        a signal that's nonexistent in WebCore; we'll want to rig it up later.
        (WebCore::FrameView::~FrameView): Added a call to setQWidget(0) here to replace
        something that was done with a signal before.
        (WebCore::FrameView::clear): Call cleared as a function rather than a signal.
        (WebCore::selectCursor): Changed to use Cursor instead of QCursor.
        (WebCore::FrameView::scrollBarMoved): Renamed this function, which is never called.
        Added a FIXME about calling it.
        (WebCore::FrameView::cleared): Added. Calls viewCleared on the owner part, which
        used to be done with a signal.

        * platform/Widget.h: Changed to Cursor from QCursor.
        * platform/mac/WidgetMac.mm: (WebCore::Widget::setCursor): Ditto.

        * rendering/render_frames.h:
        * rendering/render_frames.cpp:
        (WebCore::RenderFrameSet::userResize): Removed cursor-setting code here. We might
        want to use resize cursors for frames again, but it was mostly disabled anyway and
        it's not clear which cursors to use.
        (WebCore::RenderPart::setWidget): Removed code to connect to the cleared signal.
        Instead, FrameView takes care of it directly.
        (WebCore::RenderPart::viewCleared): Renamed from slotViewCleared.
        (WebCore::RenderFrame::viewCleared): Ditto.
        (WebCore::RenderPartObject::viewCleared): Ditto.

        * rendering/render_image.cpp:
        (WebCore::RenderImage::imageChanged): Removed use of WordBreak, which doesn't exist
        in WebCore text rendering.
        (WebCore::RenderImage::paint): Ditto.

        * rendering/render_list.cpp: (RenderListMarker::paint): Removed use of DontClip, which
        doesn't exist in WebCore text rendering. Also removed incorrect use of references to
        temporaries for the ". " and " ." strings.

        * rendering/render_object.cpp:
        (WebCore::RenderObject::drawBorder): Removed call to setRasterOp since it is a no-op
        in WebCore's painter. Added a FIXME.
        (WebCore::RenderObject::information): Remove mode parameter to QTextStream.

        * rendering/render_replaced.h: Removed slotWidgetDestructed, made setQWidget public,
        * rendering/render_replaced.cpp:
        (WebCore::RenderWidget::setQWidget): Removed code to connect slotWidgetDestructed to
        the destroyed signal. Instead FrameView calls setQWidget(0) on us.
        (WebCore::RenderWidget::eventFilter): Removed use of QFocusEvent::reason, which is
        never "popup" in WebCore.

        * WebCore+SVG/kdom.h:
        * css/css_stylesheetimpl.cpp:
        * css/css_valueimpl.cpp:
        * css/cssparser.cpp:
        * kcanvas/KCanvasCreator.cpp:
        * kcanvas/KCanvasResources.cpp:
        * kcanvas/RenderPath.cpp:
        * khtml/ecma/xmlserializer.cpp:
        * khtml/html/html_baseimpl.cpp:
        * khtml/xsl/xsl_stylesheetimpl.cpp:
        * ksvg2/svg/SVGPathSegLinetoImpl.cpp:
        * ksvg2/svg/SVGStyledTransformableElementImpl.cpp:
        * ksvg2/svg/SVGTransformImpl.cpp:
        * platform/StringImpl.cpp:
        * rendering/RenderBlock.cpp:
        * rendering/render_box.cpp:
        * rendering/render_canvas.cpp:
        * rendering/render_flow.cpp:
        * rendering/render_form.cpp:
        * rendering/render_layer.cpp:
        * rendering/render_style.cpp:
        Removed includes of <kdebug.h>.

        * css/css_base.cpp: (CSSSelector::selectorText):
        * khtml/ecma/kjs_binding.cpp:
        (KJS::ScriptInterpreter::wasRunByUserGesture):
        * khtml/ecma/kjs_css.cpp:
        (KJS::DOMCSSRule::putValueProperty):
        * khtml/ecma/kjs_dom.cpp:
        (KJS::DOMNode::getValueProperty):
        (KJS::DOMNode::putValueProperty):
        (KJS::DOMDocument::getValueProperty):
        * khtml/ecma/kjs_events.cpp:
        (KJS::DOMEvent::getValueProperty):
        (KJS::DOMUIEvent::getValueProperty):
        (KJS::DOMMouseEvent::getValueProperty):
        (KJS::DOMKeyboardEvent::getValueProperty):
        (KJS::Clipboard::getValueProperty):
        (KJS::Clipboard::putValueProperty):
        * khtml/ecma/kjs_html.cpp:
        (KJS::HTMLDocument::getValueProperty):
        (KJS::KJS::HTMLDocument::putValueProperty):
        (KJS::HTMLElement::anchorGetter):
        (KJS::HTMLElement::areaGetter):
        (KJS::KJS::HTMLElementFunction::callAsFunction):
        * khtml/ecma/kjs_navigator.cpp:
        (KJS::Navigator::getValueProperty):
        * khtml/ecma/kjs_traversal.cpp:
        (KJS::DOMNodeIterator::getValueProperty):
        (KJS::DOMTreeWalker::getValueProperty):
        * khtml/ecma/kjs_window.cpp:
        (KJS::Screen::getValueProperty):
        (KJS::Window::scheduleClose):
        (KJS::Window::isSafeScript):
        (KJS::Window::clear):
        (KJS::LocationFunc::callAsFunction):
        (KJS::History::getValueProperty):
        * ksvg2/svg/SVGAnimateColorElementImpl.cpp:
        (SVGAnimateColorElementImpl::handleTimerEvent):
        * ksvg2/svg/SVGAnimateElementImpl.cpp:
        (SVGAnimateElementImpl::handleTimerEvent):
        * ksvg2/svg/SVGAnimateTransformElementImpl.cpp:
        (SVGAnimateTransformElementImpl::handleTimerEvent):
        * ksvg2/svg/SVGAnimationElementImpl.cpp:
        (SVGAnimationElementImpl::parseMappedAttribute):
        * ksvg2/svg/SVGCursorElementImpl.cpp:
        * ksvg2/svg/SVGDocumentImpl.cpp:
        (WebCore::SVGDocumentImpl::finishedParsing):
        * ksvg2/svg/SVGLengthImpl.cpp:
        (SVGLengthImpl::updateValueInSpecifiedUnits):
        Removed use of kdWarning, kdDebug, etc.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

124 files changed:
WebCore/ChangeLog
WebCore/ForwardingHeaders/kcursor.h [deleted file]
WebCore/ForwardingHeaders/kdebug.h [deleted file]
WebCore/ForwardingHeaders/qbuffer.h [deleted file]
WebCore/WebCore+SVG/kdom.h
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/js/JSDOMCore.cpp
WebCore/bindings/objc/DOM.mm
WebCore/bridge/mac/FrameViewMac.mm
WebCore/bridge/mac/KWQKHTMLView.cpp [deleted file]
WebCore/bridge/mac/MacFrame.h
WebCore/bridge/mac/MacFrame.mm
WebCore/css/css_base.cpp
WebCore/css/css_stylesheetimpl.cpp
WebCore/css/css_valueimpl.cpp
WebCore/css/cssparser.cpp
WebCore/dom/DOMImplementationImpl.cpp
WebCore/dom/DOMImplementationImpl.h
WebCore/dom/DocumentImpl.cpp
WebCore/dom/DocumentImpl.h
WebCore/dom/xml_tokenizer.cpp
WebCore/dom/xml_tokenizer.h
WebCore/kcanvas/KCanvasCreator.cpp
WebCore/kcanvas/KCanvasResources.cpp
WebCore/kcanvas/RenderPath.cpp
WebCore/khtml/ecma/kjs_binding.cpp
WebCore/khtml/ecma/kjs_css.cpp
WebCore/khtml/ecma/kjs_css.h
WebCore/khtml/ecma/kjs_dom.cpp
WebCore/khtml/ecma/kjs_events.cpp
WebCore/khtml/ecma/kjs_html.cpp
WebCore/khtml/ecma/kjs_navigator.cpp
WebCore/khtml/ecma/kjs_traversal.cpp
WebCore/khtml/ecma/kjs_window.cpp
WebCore/khtml/ecma/xmlserializer.cpp
WebCore/khtml/html/html_baseimpl.cpp
WebCore/khtml/html/htmlparser.cpp
WebCore/khtml/html/htmlparser.h
WebCore/khtml/html/htmltokenizer.cpp
WebCore/khtml/html/htmltokenizer.h
WebCore/khtml/html/kentities.h [deleted file]
WebCore/khtml/xsl/xsl_stylesheetimpl.cpp
WebCore/ksvg2/svg/SVGAnimateColorElementImpl.cpp
WebCore/ksvg2/svg/SVGAnimateElementImpl.cpp
WebCore/ksvg2/svg/SVGAnimateTransformElementImpl.cpp
WebCore/ksvg2/svg/SVGAnimationElementImpl.cpp
WebCore/ksvg2/svg/SVGCursorElementImpl.cpp
WebCore/ksvg2/svg/SVGDocumentImpl.cpp
WebCore/ksvg2/svg/SVGLengthImpl.cpp
WebCore/ksvg2/svg/SVGPathSegLinetoImpl.cpp
WebCore/ksvg2/svg/SVGStyledTransformableElementImpl.cpp
WebCore/ksvg2/svg/SVGTransformImpl.cpp
WebCore/kwq/KWQBuffer.cpp [deleted file]
WebCore/kwq/KWQBuffer.h [deleted file]
WebCore/kwq/KWQComboBox.mm
WebCore/kwq/KWQCursor.mm [deleted file]
WebCore/kwq/KWQEvent.h
WebCore/kwq/KWQFileButton.mm
WebCore/kwq/KWQIODevice.h [deleted file]
WebCore/kwq/KWQKCursor.h [deleted file]
WebCore/kwq/KWQKCursor.mm [deleted file]
WebCore/kwq/KWQKDebug.h [deleted file]
WebCore/kwq/KWQListBox.mm
WebCore/kwq/KWQLoader.h
WebCore/kwq/KWQLoader.mm
WebCore/kwq/KWQNamespace.h
WebCore/kwq/KWQObject.cpp
WebCore/kwq/KWQObject.h
WebCore/kwq/KWQPainter.h
WebCore/kwq/KWQPainter.mm
WebCore/kwq/KWQSignal.cpp
WebCore/kwq/KWQSignal.h
WebCore/kwq/KWQSignalStubs.cpp [deleted file]
WebCore/kwq/KWQSlider.mm
WebCore/kwq/KWQSlot.cpp
WebCore/kwq/KWQSlot.h
WebCore/kwq/KWQTextArea.mm
WebCore/kwq/KWQTextField.mm
WebCore/kwq/KWQTextStream.cpp
WebCore/kwq/KWQTextStream.h
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedCSSStyleSheet.h
WebCore/loader/CachedImage.cpp
WebCore/loader/CachedImage.h
WebCore/loader/CachedObject.h
WebCore/loader/CachedScript.cpp
WebCore/loader/CachedScript.h
WebCore/loader/CachedXBLDocument.cpp
WebCore/loader/CachedXBLDocument.h
WebCore/loader/CachedXSLStyleSheet.cpp
WebCore/loader/CachedXSLStyleSheet.h
WebCore/loader/DocLoader.cpp
WebCore/loader/DocLoader.h
WebCore/loader/Request.cpp
WebCore/loader/Request.h
WebCore/loader/loader.cpp
WebCore/loader/loader.h
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/page/FrameView.cpp
WebCore/page/FrameView.h
WebCore/platform/Cursor.h [moved from WebCore/kwq/KWQCursor.h with 53% similarity]
WebCore/platform/StringImpl.cpp
WebCore/platform/Widget.h
WebCore/platform/mac/CursorMac.mm [new file with mode: 0644]
WebCore/platform/mac/WidgetMac.mm
WebCore/platform/win/CursorWin.cpp [new file with mode: 0644]
WebCore/rendering/RenderBlock.cpp
WebCore/rendering/render_box.cpp
WebCore/rendering/render_canvas.cpp
WebCore/rendering/render_flow.cpp
WebCore/rendering/render_form.cpp
WebCore/rendering/render_form.h
WebCore/rendering/render_frames.cpp
WebCore/rendering/render_frames.h
WebCore/rendering/render_image.cpp
WebCore/rendering/render_layer.cpp
WebCore/rendering/render_list.cpp
WebCore/rendering/render_object.cpp
WebCore/rendering/render_replaced.cpp
WebCore/rendering/render_replaced.h
WebCore/rendering/render_style.cpp

index 5a394d108e0cbf81a4b487cde9c0fb086b7da153..962d89889b00e9732b704bf0020b437683cbcd9d 100644 (file)
@@ -1,3 +1,317 @@
+2006-02-20  Darin Adler  <darin@apple.com>
+
+        Reviewed by Hyatt.
+
+        - moved Cursor into the platform directory from KWQ
+        - removed a lot of other unneeded stuff from KWQ
+
+        * platform/Cursor.h: Added.
+        * platform/mac/CursorMac.mm: Added.
+        * platform/mac/CursorWin.cpp: Added.
+
+        * kwq/KWQBuffer.cpp: Removed.
+        * kwq/KWQBuffer.h: Removed.
+        * kwq/KWQCursor.h: Removed.
+        * kwq/KWQCursor.mm: Removed.
+        * kwq/KWQIODevice.h: Removed.
+        * kwq/KWQKCursor.h: Removed.
+        * kwq/KWQKCursor.mm: Removed.
+        * kwq/KWQKDebug.h: Removed.
+        * kwq/KWQSignalStubs.cpp: Removed.
+
+        * ForwardingHeaders/kcursor.h: Removed.
+        * ForwardingHeaders/kdebug.h: Removed.
+        * ForwardingHeaders/qbuffer.h: Removed.
+
+        * kwq/KWQEvent.h: Removed unused constants and types QCustomEvent,
+        QFocusEvent, QHideEvent, QShowEvent, QContextMenuEvent, and QResizeEvent.
+
+        * kwq/KWQLoader.h: Removed KWQLoader class since signals are no longer needed.
+        * kwq/KWQLoader.mm: Ditto.
+
+        * kwq/KWQNamespace.h: Removed DontClip, ShowPrefix, WordBreak, LayoutDirection,
+        LeftToRight, RightToLeft, RasterOp, CopyROP, OrROP, and XorROP.
+
+        * kwq/KWQObject.h: Removed blockSignals, sender, _signalsBlocked, _sender,
+        and KWQObjectSenderScope.
+        * kwq/KWQObject.cpp:
+        (QObject::QObject): Removed _signalsBlocked.
+        (QObject::connect): Removed special-case signals to not complain about.
+        All of them were either unused, converted to non-signal functions, or in one
+        case (slotScrollBarMoved) turned into a FIXME.
+
+        * kwq/KWQPainter.h: Removed rasterOp and setRasterOp.
+        * kwq/KWQPainter.mm: Ditto.
+
+        * kwq/KWQSignal.h:
+        * kwq/KWQSignal.cpp: (KWQSignal::disconnect): Removed special cases for
+        various signals; all are now using plain function calls instead.
+
+        * kwq/KWQSlot.h:
+        * kwq/KWQSlot.cpp: Removed slots that are no longer needed because they
+        are using plain function calls instead of signals.
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        Updated for changed files.
+
+        * bridge/mac/FrameViewMac.mm: Moved the contents of KWQKHTMLView.cpp in here.
+        * bridge/mac/KWQKHTMLView.cpp: Removed.
+
+        * bridge/mac/MacFrame.h: Removed signals, changed setStatusBarText to take
+        String instead of QString.
+        * bridge/mac/MacFrame.mm:
+        (WebCore::MacFrame::MacFrame): Removed signals.
+        (WebCore::MacFrame::setStatusBarText): Changed parameter type.
+        (WebCore::MacFrame::openURLFromPageCache): Removed parameter from started function.
+        (WebCore::MacFrame::khtmlMouseMoveEvent): Changed from QCursor() to pointerCursor().
+
+        * dom/DocumentImpl.h:
+        * dom/DocumentImpl.cpp:
+        (WebCore::DocumentImpl::DocumentImpl): Removed signals.
+        (WebCore::DocumentImpl::implicitOpen): Ditto.
+        (WebCore::DocumentImpl::determineParseMode): Removed a use of kdDebug.
+        (WebCore::DocumentImpl::finishedParsing): Added. Does a setParsing(false) and then
+        calls finishedParsing on the frame. Replaces the old finishedParsing signal.
+
+        * dom/xml_tokenizer.h:
+        * dom/xml_tokenizer.cpp: Removed the finishedParsing signal since it's not just
+        a function on the document.
+        (WebCore::XMLTokenizer::finish): Call the function instead of emitting the signal.
+
+        * khtml/html/htmlparser.h:
+        * khtml/html/htmlparser.cpp: Moved the parser inside the WebCore namespace.
+
+        * khtml/html/htmltokenizer.h:
+        * khtml/html/htmltokenizer.cpp: (WebCore::HTMLTokenizer::end): Updated
+        to call finishedParsing function on document rather than emitting a signal.
+
+        * kwq/KWQComboBox.mm:
+        (-[KWQPopUpButton becomeFirstResponder]): Use QEvent instead of QFocusEvent.
+        (-[KWQPopUpButton resignFirstResponder]): Ditto.
+        * kwq/KWQFileButton.mm: (KWQFileButton::focusChanged): Ditto.
+        * kwq/KWQListBox.mm:
+        (-[KWQTableView becomeFirstResponder]): Ditto.
+        (-[KWQTableView resignFirstResponder]): Ditto.
+        * kwq/KWQSlider.mm:
+        (-[KWQSlider becomeFirstResponder]): Ditto.
+        (-[KWQSlider resignFirstResponder]): Ditto.
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextAreaTextView becomeFirstResponder]): Ditto.
+        (-[KWQTextAreaTextView resignFirstResponder]): Ditto.
+        * kwq/KWQTextField.mm:
+        (-[KWQTextFieldController setHasFocus:]): Ditto.
+
+        * kwq/KWQTextStream.h: Removed the mode parameter from the QTextStream constructor.
+        Removed the QTextIStream and QTextOStream classes.
+        * kwq/KWQTextStream.cpp: (QTextStream::QTextStream): Removed the mode parameter.
+
+        * loader/CachedCSSStyleSheet.h: Changed to take a ByteArray instead of a QBuffer.
+        * loader/CachedCSSStyleSheet.cpp: (WebCore::CachedCSSStyleSheet::data): Ditto.
+        * loader/CachedImage.h: Ditto.
+        * loader/CachedImage.cpp: (WebCore::CachedImage::data): Ditto.
+        * loader/CachedObject.h: Ditto.
+        * loader/CachedScript.h: Ditto.
+        * loader/CachedScript.cpp: (WebCore::CachedScript::data): Ditto.
+        * loader/CachedXBLDocument.h: Ditto.
+        * loader/CachedXBLDocument.cpp: (WebCore::CachedXBLDocument::data): Ditto.
+        * loader/CachedXSLStyleSheet.h:
+        * loader/CachedXSLStyleSheet.cpp: (WebCore::CachedXSLStyleSheet::data): Ditto.
+
+        * loader/DocLoader.cpp: (WebCore::DocLoader::setLoadInProgress): Added a call
+        to loadDone on the frame. Replaces the requestFailed and requestDone signals.
+
+        * loader/DocLoader.h: Removed include of <qbuffer.h>.
+
+        * loader/Request.h:
+        * loader/Request.cpp: Updated to use ByteArray instead of QBuffer.
+
+        * loader/loader.h: Removed unused signals.
+        * loader/loader.cpp:
+        (WebCore::Loader::Loader): Removed use of KWQLoader.
+        (WebCore::Loader::~Loader): Ditto.
+        (WebCore::Loader::load): Removed code to emit unused requestStarted signal.
+        (WebCore::Loader::slotFinished): Removed code to emit requestFailed and
+        requestDone signals, now handled by DocLoader::setLoadInProgress(false).
+        (WebCore::Loader::slotReceivedResponse): Use ByteArray instead of QBuffer.
+        (WebCore::Loader::slotData): Ditto.
+
+        * page/Frame.h: Removed setURLCursor, urlCursor, slotRestoreData, slotIncZoom,
+        slotDecZoom, slotLoadImages, slotPartRemoved, slotActiveFrameChanged,
+        slotChildURLRequest, slotShowDocument, slotAutoScroll, slotPrintFrame, slotSelectAll,
+        slotProgressUpdate, slotJobPercent, slotJobSpeed.connectChild, disconnectChild,
+        and changed a number of others from slots to plain old functions.
+        * page/Frame.cpp:
+        (WebCore::Frame::Frame): Don't connect to loader signals.
+        (WebCore::Frame::~Frame): Don't disconnect from loader signals.
+        (WebCore::Frame::didOpenURL): Call started function instead of emitting
+        started signal. Don't connect to speed and percent signals (which never
+        existed in WebCore anyway).
+        (WebCore::Frame::stopLoading): Call finishedParsing function instead of
+        calling slotFinishedParsing.
+        (WebCore::Frame::executeScript): Removed redundant checks and let
+        submitFormAgain do the checking.
+        (WebCore::Frame::clear): Removed code to disconnect from finishedParsing
+        signal; we now use a function. Also removed loop that calls disconnectChild,
+        becase again we use functions now instead of signals.
+        (WebCore::Frame::setDocument): Remove code to disconnect and connect to the
+        finishedParsing signal.
+        (WebCore::Frame::begin): Remove code to connect to the finishedParsing signal.
+        (WebCore::Frame::finishedParsing): Moved code that does setParsing(false) into
+        the document class. Also renamed from slotFinishedParsing.
+        (WebCore::Frame::loadDone): Renamed from slotLoaderRequestDone.
+        (WebCore::Frame::checkCompleted): Changed to call the completed function instead
+        of emitting one of the two completed signals.
+        (WebCore::Frame::loadSubframe): Removed call to connectChild because we now use
+        functions instead of signals. Also change the call to completed to pass false
+        instead of true.
+        (WebCore::Frame::submitFormAgain): Change function around so we are less likely
+        to leak if something strange happens inside submitForm.
+        (WebCore::Frame::submitForm): Remove code to connect signal. We now call
+        submitFormAgain from inside the completed function.
+        (WebCore::Frame::parentCompleted): Renamed from slotParentCompleted. No longer
+        a slot, now called from completed.
+        (WebCore::Frame::childCompleted): Renamed from slotChildCompleted.
+        (WebCore::Frame::setJSStatusBarText): Removed "emit" from function call. Changed
+        to use String instead of QString.
+        (WebCore::Frame::setJSDefaultStatusBarText): Ditto.
+        (WebCore::Frame::sendResizeEvent): Changed to send DOM event directly instead of
+        creating a QResizeEvent to send along to the FrameView.
+        (WebCore::Frame::scrollToAnchor): Changed to not pass a parameter to the started
+        function, which no longer takes one.
+        (WebCore::Frame::frameDetached): Removed code that calls disconnectChild, since
+        we no longer use signals.
+        (WebCore::Frame::completed): Added. Calls childCompleted, parentCompleted, and
+        submitFormAgain.
+        (WebCore::Frame::setStatusBarText): Added.
+        (WebCore::Frame::started): Added. Sets the complete flag to false for the frame
+        and all its ancestors, which is what slotChildStarted did recursively.
+
+        * page/FramePrivate.h: Removed m_activeFrame and changed m_kjsStatusBarText and
+        m_kjsDefaultStatusBarText to String from QString.
+
+        * page/FrameView.h: Removed resizeEvent, focusInEvent, focusOutEvent, and
+        slotPaletteChanged. Changed cleared from a signal to a private function and
+        slotScrollBarMoved to a private function named scrollBarMoved.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView): Removed connect call here that was connecting
+        a signal that's nonexistent in WebCore; we'll want to rig it up later.
+        (WebCore::FrameView::~FrameView): Added a call to setQWidget(0) here to replace
+        something that was done with a signal before.
+        (WebCore::FrameView::clear): Call cleared as a function rather than a signal.
+        (WebCore::selectCursor): Changed to use Cursor instead of QCursor.
+        (WebCore::FrameView::scrollBarMoved): Renamed this function, which is never called.
+        Added a FIXME about calling it.
+        (WebCore::FrameView::cleared): Added. Calls viewCleared on the owner part, which
+        used to be done with a signal.
+
+        * platform/Widget.h: Changed to Cursor from QCursor.
+        * platform/mac/WidgetMac.mm: (WebCore::Widget::setCursor): Ditto.
+
+        * rendering/render_frames.h:
+        * rendering/render_frames.cpp:
+        (WebCore::RenderFrameSet::userResize): Removed cursor-setting code here. We might
+        want to use resize cursors for frames again, but it was mostly disabled anyway and
+        it's not clear which cursors to use.
+        (WebCore::RenderPart::setWidget): Removed code to connect to the cleared signal.
+        Instead, FrameView takes care of it directly.
+        (WebCore::RenderPart::viewCleared): Renamed from slotViewCleared.
+        (WebCore::RenderFrame::viewCleared): Ditto.
+        (WebCore::RenderPartObject::viewCleared): Ditto.
+
+        * rendering/render_image.cpp:
+        (WebCore::RenderImage::imageChanged): Removed use of WordBreak, which doesn't exist
+        in WebCore text rendering.
+        (WebCore::RenderImage::paint): Ditto.
+
+        * rendering/render_list.cpp: (RenderListMarker::paint): Removed use of DontClip, which
+        doesn't exist in WebCore text rendering. Also removed incorrect use of references to
+        temporaries for the ". " and " ." strings.
+
+        * rendering/render_object.cpp:
+        (WebCore::RenderObject::drawBorder): Removed call to setRasterOp since it is a no-op
+        in WebCore's painter. Added a FIXME.
+        (WebCore::RenderObject::information): Remove mode parameter to QTextStream.
+
+        * rendering/render_replaced.h: Removed slotWidgetDestructed, made setQWidget public,
+        * rendering/render_replaced.cpp:
+        (WebCore::RenderWidget::setQWidget): Removed code to connect slotWidgetDestructed to
+        the destroyed signal. Instead FrameView calls setQWidget(0) on us.
+        (WebCore::RenderWidget::eventFilter): Removed use of QFocusEvent::reason, which is
+        never "popup" in WebCore.
+
+        * WebCore+SVG/kdom.h:
+        * css/css_stylesheetimpl.cpp:
+        * css/css_valueimpl.cpp:
+        * css/cssparser.cpp:
+        * kcanvas/KCanvasCreator.cpp:
+        * kcanvas/KCanvasResources.cpp:
+        * kcanvas/RenderPath.cpp:
+        * khtml/ecma/xmlserializer.cpp:
+        * khtml/html/html_baseimpl.cpp:
+        * khtml/xsl/xsl_stylesheetimpl.cpp:
+        * ksvg2/svg/SVGPathSegLinetoImpl.cpp:
+        * ksvg2/svg/SVGStyledTransformableElementImpl.cpp:
+        * ksvg2/svg/SVGTransformImpl.cpp:
+        * platform/StringImpl.cpp:
+        * rendering/RenderBlock.cpp:
+        * rendering/render_box.cpp:
+        * rendering/render_canvas.cpp:
+        * rendering/render_flow.cpp:
+        * rendering/render_form.cpp:
+        * rendering/render_layer.cpp:
+        * rendering/render_style.cpp:
+        Removed includes of <kdebug.h>.
+
+        * css/css_base.cpp: (CSSSelector::selectorText):
+        * khtml/ecma/kjs_binding.cpp:
+        (KJS::ScriptInterpreter::wasRunByUserGesture):
+        * khtml/ecma/kjs_css.cpp:
+        (KJS::DOMCSSRule::putValueProperty):
+        * khtml/ecma/kjs_dom.cpp:
+        (KJS::DOMNode::getValueProperty):
+        (KJS::DOMNode::putValueProperty):
+        (KJS::DOMDocument::getValueProperty):
+        * khtml/ecma/kjs_events.cpp:
+        (KJS::DOMEvent::getValueProperty):
+        (KJS::DOMUIEvent::getValueProperty):
+        (KJS::DOMMouseEvent::getValueProperty):
+        (KJS::DOMKeyboardEvent::getValueProperty):
+        (KJS::Clipboard::getValueProperty):
+        (KJS::Clipboard::putValueProperty):
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocument::getValueProperty):
+        (KJS::KJS::HTMLDocument::putValueProperty):
+        (KJS::HTMLElement::anchorGetter):
+        (KJS::HTMLElement::areaGetter):
+        (KJS::KJS::HTMLElementFunction::callAsFunction):
+        * khtml/ecma/kjs_navigator.cpp:
+        (KJS::Navigator::getValueProperty):
+        * khtml/ecma/kjs_traversal.cpp:
+        (KJS::DOMNodeIterator::getValueProperty):
+        (KJS::DOMTreeWalker::getValueProperty):
+        * khtml/ecma/kjs_window.cpp:
+        (KJS::Screen::getValueProperty):
+        (KJS::Window::scheduleClose):
+        (KJS::Window::isSafeScript):
+        (KJS::Window::clear):
+        (KJS::LocationFunc::callAsFunction):
+        (KJS::History::getValueProperty):
+        * ksvg2/svg/SVGAnimateColorElementImpl.cpp:
+        (SVGAnimateColorElementImpl::handleTimerEvent):
+        * ksvg2/svg/SVGAnimateElementImpl.cpp:
+        (SVGAnimateElementImpl::handleTimerEvent):
+        * ksvg2/svg/SVGAnimateTransformElementImpl.cpp:
+        (SVGAnimateTransformElementImpl::handleTimerEvent):
+        * ksvg2/svg/SVGAnimationElementImpl.cpp:
+        (SVGAnimationElementImpl::parseMappedAttribute):
+        * ksvg2/svg/SVGCursorElementImpl.cpp:
+        * ksvg2/svg/SVGDocumentImpl.cpp:
+        (WebCore::SVGDocumentImpl::finishedParsing):
+        * ksvg2/svg/SVGLengthImpl.cpp:
+        (SVGLengthImpl::updateValueInSpecifiedUnits):
+        Removed use of kdWarning, kdDebug, etc.
+
 2006-02-20  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/ForwardingHeaders/kcursor.h b/WebCore/ForwardingHeaders/kcursor.h
deleted file mode 100644 (file)
index 9231f66..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include "KWQKCursor.h"
diff --git a/WebCore/ForwardingHeaders/kdebug.h b/WebCore/ForwardingHeaders/kdebug.h
deleted file mode 100644 (file)
index 5d485cd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include "KWQKDebug.h"
diff --git a/WebCore/ForwardingHeaders/qbuffer.h b/WebCore/ForwardingHeaders/qbuffer.h
deleted file mode 100644 (file)
index 5bbe061..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include "KWQBuffer.h"
index b1129f40c49ab44af6021eac7b8be12fdbf7cd08..a3d6cccda836cf254593f049c155cc0c2c808a8b 100644 (file)
 #define KDOM_H
 #if SVG_SUPPORT
 
-#include <kdebug.h>
-
-#include <QString.h>
-
+#include "QString.h"
 #include "PlatformString.h"
 
 /**
  * @short General namespace specific definitions.
  */
-namespace KDOM
+namespace WebCore
 {
     /**
      * All DOM constants
@@ -127,9 +124,6 @@ namespace KDOM
      * A TimeStamp represents a number of milliseconds
      */
     typedef unsigned long long DOMTimeStamp;
-
-    // Debugging helper
-    inline kdbgstream  &operator<<(kdbgstream  &stream, const DOMString &string) { return (stream << string.qstring()); }
 };
 
 #endif // SVG_SUPPORT
index 86a0f4d4db16ff04d40fd5c89e811068207a195e..bbf3d94e4197242610542a6c49b79c481eb1e916 100644 (file)
                <Filter\r
                        Name="kwq"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\kwq\KWQBuffer.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\KWQBuffer.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\kwq\KWQCharsets.h"\r
                                >\r
                                RelativePath="..\..\kwq\KWQCString.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\KWQCursor.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\kwq\KWQDateTime.h"\r
                                >\r
                                RelativePath="..\..\kwq\KWQKCookieJar.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\KWQKCursor.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\kwq\KWQKDebug.h"\r
                                >\r
                                        RelativePath="..\..\khtml\html\htmltokenizer.h"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath="..\..\khtml\html\kentities.h"\r
-                                       >\r
-                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="editing"\r
                                RelativePath="..\..\platform\Color.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\platform\Cursor.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\platform\FloatPoint.cpp"\r
                                >\r
index acf18d06145728ba807846f3bc5449de03d4022e..18dfaee14eb214bb5ee1029688e73f80756e1e16 100644 (file)
@@ -53,7 +53,6 @@
                65BF022E0974816300C43196 /* Frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65BF02290974816300C43196 /* Frame.cpp */; };
                65BF022F0974816300C43196 /* Frame.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF022A0974816300C43196 /* Frame.h */; };
                65BF02300974816300C43196 /* FramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF022B0974816300C43196 /* FramePrivate.h */; };
-               65BF02410974819000C43196 /* KWQKHTMLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65BF02380974819000C43196 /* KWQKHTMLView.cpp */; };
                65BF02440974819000C43196 /* MacFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF023B0974819000C43196 /* MacFrame.h */; };
                65BF02450974819000C43196 /* MacFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65BF023C0974819000C43196 /* MacFrame.mm */; };
                65C7F4320979E2620022E453 /* WebCorePageBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7F4310979E2620022E453 /* WebCorePageBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1991C08245E59001E9ABC /* dom_elementimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D2F802DE4476018635CA /* dom_elementimpl.h */; };
                93F1992008245E59001E9ABC /* dom_xmlimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30002DE4476018635CA /* dom_xmlimpl.h */; };
                93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* xml_tokenizer.h */; };
-               93F1992708245E59001E9ABC /* KWQBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = F587867C02DE3B8601EA4122 /* KWQBuffer.h */; };
                93F1992908245E59001E9ABC /* KWQCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* KWQCString.h */; };
                93F1992A08245E59001E9ABC /* KWQCharsets.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784CC02DE375901EA4122 /* KWQCharsets.h */; };
                93F1992C08245E59001E9ABC /* KWQCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868002DE3B8601EA4122 /* KWQCollection.h */; };
                93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* KWQComboBox.h */; };
-               93F1992F08245E59001E9ABC /* KWQCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868402DE3B8601EA4122 /* KWQCursor.h */; };
+               93F1992F08245E59001E9ABC /* Cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868402DE3B8601EA4122 /* Cursor.h */; };
                93F1993308245E59001E9ABC /* KWQDef.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784DA02DE375901EA4122 /* KWQDef.h */; };
                93F1993708245E59001E9ABC /* KWQEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868802DE3B8601EA4122 /* KWQEvent.h */; };
                93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* KWQFileButton.h */; };
                93F1993A08245E59001E9ABC /* KWQFont.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868A02DE3B8601EA4122 /* KWQFont.h */; };
                93F1993C08245E59001E9ABC /* KWQFontMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868D02DE3B8601EA4122 /* KWQFontMetrics.h */; };
                93F1993E08245E59001E9ABC /* KWQGuardedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */; };
-               93F1993F08245E59001E9ABC /* KWQIODevice.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869602DE3B8601EA4122 /* KWQIODevice.h */; };
                93F1994408245E59001E9ABC /* KWQKConfigBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F302DE382001EA4122 /* KWQKConfigBase.h */; };
                93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784EE02DE375901EA4122 /* KWQKCookieJar.h */; };
-               93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587862002DE398401EA4122 /* KWQKCursor.h */; };
                93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F402DE382001EA4122 /* KWQKDebug.h */; };
                93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
                93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */; };
                93F19A0908245E59001E9ABC /* southWestResizeCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2C052B966D000440A1 /* southWestResizeCursor.tiff */; };
                93F19A0A08245E59001E9ABC /* waitCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2D052B966D000440A1 /* waitCursor.tiff */; };
                93F19A0B08245E59001E9ABC /* westResizeCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */; };
-               93F19A1008245E59001E9ABC /* KWQBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784C802DE375901EA4122 /* KWQBuffer.cpp */; };
                93F19A1308245E59001E9ABC /* KWQCharsets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784CD02DE375901EA4122 /* KWQCharsets.cpp */; };
                93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* KWQComboBox.mm */; };
                93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* KWQCString.cpp */; };
-               93F19A1908245E59001E9ABC /* KWQCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D602DE375901EA4122 /* KWQCursor.mm */; };
                93F19A1C08245E59001E9ABC /* KWQEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784DE02DE375901EA4122 /* KWQEvent.mm */; };
                93F19A1E08245E59001E9ABC /* KWQFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784E002DE375901EA4122 /* KWQFont.mm */; };
                93F19A1F08245E59001E9ABC /* KWQFontMetrics.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784E202DE375901EA4122 /* KWQFontMetrics.mm */; };
                93F19A2208245E59001E9ABC /* KWQGuardedPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784E602DE375901EA4122 /* KWQGuardedPtr.cpp */; };
                93F19A2408245E59001E9ABC /* KWQKConfigBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784ED02DE375901EA4122 /* KWQKConfigBase.mm */; };
                93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */; };
-               93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* KWQKCursor.mm */; };
+               93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
                93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */; };
                93F19A2E08245E59001E9ABC /* KWQKJavaAppletWidget.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784FF02DE375901EA4122 /* KWQKJavaAppletWidget.mm */; };
                93F19A3008245E59001E9ABC /* KWQKJobClasses.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850102DE375901EA4122 /* KWQKJobClasses.mm */; };
                93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* KWQRegExp.cpp */; };
                93F19A4B08245E59001E9ABC /* KWQRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852C02DE375901EA4122 /* KWQRegion.cpp */; };
                93F19A4C08245E59001E9ABC /* KWQScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587852E02DE375901EA4122 /* KWQScrollView.mm */; };
-               93F19A4D08245E59001E9ABC /* KWQSignalStubs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852F02DE375901EA4122 /* KWQSignalStubs.cpp */; };
                93F19A5008245E59001E9ABC /* KWQStringList.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853202DE375901EA4122 /* KWQStringList.mm */; };
                93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* KWQTextArea.mm */; };
                93F19A5208245E59001E9ABC /* KWQTextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853702DE375901EA4122 /* KWQTextCodec.cpp */; };
                65BF02290974816300C43196 /* Frame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Frame.cpp; sourceTree = "<group>"; };
                65BF022A0974816300C43196 /* Frame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Frame.h; sourceTree = "<group>"; };
                65BF022B0974816300C43196 /* FramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FramePrivate.h; sourceTree = "<group>"; };
-               65BF02380974819000C43196 /* KWQKHTMLView.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = KWQKHTMLView.cpp; sourceTree = "<group>"; };
                65BF023B0974819000C43196 /* MacFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacFrame.h; sourceTree = "<group>"; };
                65BF023C0974819000C43196 /* MacFrame.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MacFrame.mm; sourceTree = "<group>"; };
                65C7F4310979E2620022E453 /* WebCorePageBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePageBridge.h; sourceTree = "<group>"; };
                F56234E003026D7301629B47 /* WebCoreEncodings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreEncodings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F565AE8502ECA583018635CA /* WebCoreSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F565AE8602ECA583018635CA /* WebCoreSettings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSettings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58784C802DE375901EA4122 /* KWQBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQBuffer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784CC02DE375901EA4122 /* KWQCharsets.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQCharsets.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784CD02DE375901EA4122 /* KWQCharsets.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQCharsets.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784D202DE375901EA4122 /* KWQComboBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQComboBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784D502DE375901EA4122 /* KWQCString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQCString.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58784D602DE375901EA4122 /* KWQCursor.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQCursor.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784DA02DE375901EA4122 /* KWQDef.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQDef.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784DE02DE375901EA4122 /* KWQEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQEvent.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784E002DE375901EA4122 /* KWQFont.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQFont.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784ED02DE375901EA4122 /* KWQKConfigBase.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKConfigBase.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784EE02DE375901EA4122 /* KWQKCookieJar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKCookieJar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784EF02DE375901EA4122 /* KWQKCookieJar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCookieJar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58784F002DE375901EA4122 /* KWQKCursor.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKCursor.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKHistoryProvider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784FF02DE375901EA4122 /* KWQKJavaAppletWidget.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKJavaAppletWidget.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587850102DE375901EA4122 /* KWQKJobClasses.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKJobClasses.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587852B02DE375901EA4122 /* KWQRegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQRegExp.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587852C02DE375901EA4122 /* KWQRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQRegion.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587852E02DE375901EA4122 /* KWQScrollView.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQScrollView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587852F02DE375901EA4122 /* KWQSignalStubs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQSignalStubs.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853202DE375901EA4122 /* KWQStringList.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQStringList.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853502DE375901EA4122 /* KWQTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853602DE375901EA4122 /* KWQTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58785F402DE382001EA4122 /* KWQKDebug.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKDebug.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587860202DE382001EA4122 /* KWQKURL.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKURL.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587862002DE398401EA4122 /* KWQKCursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKCursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKJavaAppletWidget.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKIOGlobal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864B02DE3A9A01EA4122 /* KWQKJobClasses.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKJobClasses.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKSSLKeyGen.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKPartsHistoryProvider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587867C02DE3B8601EA4122 /* KWQBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQBuffer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868002DE3B8601EA4122 /* KWQCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQCollection.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868202DE3B8601EA4122 /* KWQComboBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQComboBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868302DE3B8601EA4122 /* KWQCString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQCString.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587868402DE3B8601EA4122 /* KWQCursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQCursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = Cursor.h; path = platform/Cursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868802DE3B8601EA4122 /* KWQEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQEvent.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868A02DE3B8601EA4122 /* KWQFont.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFont.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868D02DE3B8601EA4122 /* KWQFontMetrics.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFontMetrics.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQGuardedPtr.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587869602DE3B8601EA4122 /* KWQIODevice.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQIODevice.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869802DE3B8601EA4122 /* KWQLineEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLineEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869902DE3B8601EA4122 /* KWQPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869E02DE3B8601EA4122 /* KWQNamespace.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQNamespace.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                F523D18402DE42E8018635CA /* css */,
                                F523D32402DE4478018635CA /* dom */,
                                93309D86099E64910056E581 /* editing */,
+                               A8C0FB51089701F700BA5114 /* kcanvas */,
+                               F523D16302DE42AE018635CA /* khtml */,
+                               A8C0F6E9089701F100BA5114 /* ksvg2 */,
+                               F58785E802DE377601EA4122 /* kwq */,
                                BCB16BFB0979C38700467741 /* loader */,
                                65BF02180974806300C43196 /* page */,
                                BCF1A5BA097832090061A123 /* platform */,
                                F523D2F302DE443B018635CA /* rendering */,
-                               F523D16302DE42AE018635CA /* khtml */,
-                               E1F0424309839389006694EA /* xml */,
-                               F58785E802DE377601EA4122 /* kwq */,
                                F58785E902DE378A01EA4122 /* WebCore SPI */,
-                               A8C0FB51089701F700BA5114 /* kcanvas */,
-                               A8C0F6E9089701F100BA5114 /* ksvg2 */,
                                A8C0F6DC089701F100BA5114 /* WebCore+SVG */,
+                               E1F0424309839389006694EA /* xml */,
                                089C1665FE841158C02AAC07 /* Resources */,
                                0867D69AFE84028FC02AAC07 /* Frameworks */,
                                034768DFFF38A50411DB9C8B /* Products */,
                        children = (
                                93F19B1908245E59001E9ABC /* Info.plist */,
                                84C0FA1E052B9652000440A1 /* Cursor Images */,
-                               ED048ABB0833F132006E1E67 /* textAreaResizeCorner.tiff */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
                6582A14809999D6C00BEEB6D /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               BCC47E2209A3D6B300ADB771 /* FontFamilyMac.mm */,
-                               9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
-                               6582A17709999EA000BEEB6D /* QStringMac.mm */,
                                6582A14909999D6C00BEEB6D /* ColorMac.mm */,
+                               F58784F002DE375901EA4122 /* CursorMac.mm */,
                                6582A14A09999D6C00BEEB6D /* FloatPointMac.mm */,
                                6582A14B09999D6C00BEEB6D /* FloatRectMac.mm */,
                                6582A14C09999D6C00BEEB6D /* FloatSizeMac.mm */,
+                               BCC47E2209A3D6B300ADB771 /* FontFamilyMac.mm */,
                                6582A14D09999D6C00BEEB6D /* ImageMac.mm */,
                                6582A14E09999D6D00BEEB6D /* ImageSourceMac.cpp */,
                                6582A14F09999D6D00BEEB6D /* IntPointMac.mm */,
                                6582A15109999D6D00BEEB6D /* IntSizeMac.mm */,
                                6582A15209999D6D00BEEB6D /* PDFDocumentImage.h */,
                                6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */,
+                               6582A17709999EA000BEEB6D /* QStringMac.mm */,
                                6582A15409999D6D00BEEB6D /* ScreenMac.mm */,
                                93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
                                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */,
+                               9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
                        );
                        name = mac;
                        path = platform/mac;
                65BF02180974806300C43196 /* page */ = {
                        isa = PBXGroup;
                        children = (
-                               65BF022A0974816300C43196 /* Frame.h */,
                                65BF02290974816300C43196 /* Frame.cpp */,
+                               65BF022A0974816300C43196 /* Frame.h */,
                                65BF022B0974816300C43196 /* FramePrivate.h */,
-                               65A21483097A3F5300B9050A /* FrameTree.h */,
                                65A21482097A3F5300B9050A /* FrameTree.cpp */,
-                               65CBFEF80974F607001DAC25 /* FrameView.h */,
+                               65A21483097A3F5300B9050A /* FrameTree.h */,
                                65CBFEF70974F607001DAC25 /* FrameView.cpp */,
-                               65A21467097A329100B9050A /* Page.h */,
+                               65CBFEF80974F607001DAC25 /* FrameView.h */,
                                65FEA86809833ADE00BED4AB /* Page.cpp */,
+                               65A21467097A329100B9050A /* Page.h */,
                                65D1C1C909932B22000CB324 /* Plugin.h */,
                        );
                        path = page;
                        children = (
                                BCEA4945097F0F770094C9E4 /* BrowserExtensionMac.h */,
                                BCEA4946097F0F770094C9E4 /* BrowserExtensionMac.mm */,
+                               9380F68609A143B2001FDB34 /* FrameViewMac.mm */,
+                               65BF023B0974819000C43196 /* MacFrame.h */,
+                               65BF023C0974819000C43196 /* MacFrame.mm */,
+                               937D809909A063330092A01E /* PageMac.h */,
                                654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */,
+                               654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */,
                                65C7F4310979E2620022E453 /* WebCorePageBridge.h */,
                                65C7F44B0979E8C90022E453 /* WebCorePageBridge.mm */,
-                               654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */,
-                               65BF02380974819000C43196 /* KWQKHTMLView.cpp */,
-                               937D809909A063330092A01E /* PageMac.h */,
-                               65BF023B0974819000C43196 /* MacFrame.h */,
-                               65BF023C0974819000C43196 /* MacFrame.mm */,
-                               9380F68609A143B2001FDB34 /* FrameViewMac.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                84C0FA2A052B966D000440A1 /* southEastResizeCursor.tiff */,
                                84C0FA2B052B966D000440A1 /* southResizeCursor.tiff */,
                                84C0FA2C052B966D000440A1 /* southWestResizeCursor.tiff */,
+                               ED048ABB0833F132006E1E67 /* textAreaResizeCorner.tiff */,
                                84C0FA2D052B966D000440A1 /* waitCursor.tiff */,
                                84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */,
                        );
                A88427FC093081AD00B6D461 /* KDOM Support */ = {
                        isa = PBXGroup;
                        children = (
+                               A884283D09308C1C00B6D461 /* DOMList.h */,
+                               A884283C09308C1C00B6D461 /* kdom.h */,
+                               A884283A09308C1C00B6D461 /* kdomevents.h */,
                                A884284609308C1C00B6D461 /* KDOMHeaders.h */,
+                               A884284309308C1C00B6D461 /* KDOMSettings.h */,
+                               A884284009308C1C00B6D461 /* Namespace.h */,
+                               A884283F09308C1C00B6D461 /* RGBColorImpl.cpp */,
+                               A884283E09308C1C00B6D461 /* RGBColorImpl.h */,
+                               A884283909308C1C00B6D461 /* SVGElementFactoryWrapper.cpp */,
                                A884283809308C1C00B6D461 /* SVGNamesWrapper.cpp */,
                                A8C32D96093D8EA4000B9CAC /* XLinkNamesWrapper.cpp */,
-                               A884283909308C1C00B6D461 /* SVGElementFactoryWrapper.cpp */,
-                               A884283E09308C1C00B6D461 /* RGBColorImpl.h */,
-                               A884283F09308C1C00B6D461 /* RGBColorImpl.cpp */,
-                               A884284009308C1C00B6D461 /* Namespace.h */,
-                               A884283D09308C1C00B6D461 /* DOMList.h */,
-                               A884284309308C1C00B6D461 /* KDOMSettings.h */,
-                               A884283A09308C1C00B6D461 /* kdomevents.h */,
-                               A884283C09308C1C00B6D461 /* kdom.h */,
                        );
                        name = "KDOM Support";
                        sourceTree = "<group>";
                        children = (
                                A8C0F6EB089701F100BA5114 /* KCanvasRenderingStyle.cpp */,
                                A8C0F6EC089701F100BA5114 /* KCanvasRenderingStyle.h */,
+                               A8C0F6EF089701F100BA5114 /* KSVGTimeScheduler.cpp */,
+                               A8C0F6F0089701F100BA5114 /* KSVGTimeScheduler.h */,
                                A8DF5FA2098460AA0052981B /* SVGDocumentExtensions.cpp */,
                                A8DF5FA1098460AA0052981B /* SVGDocumentExtensions.h */,
                                FAE0418D097596C9000540BE /* SVGImageLoader.cpp */,
                                FAE0418E097596C9000540BE /* SVGImageLoader.h */,
-                               A8C0F6EF089701F100BA5114 /* KSVGTimeScheduler.cpp */,
-                               A8C0F6F0089701F100BA5114 /* KSVGTimeScheduler.h */,
                                A8C32D89093D8BFA000B9CAC /* xlinkattrs.in */,
                        );
                        path = misc;
                A8C0F7F1089701F300BA5114 /* events */ = {
                        isa = PBXGroup;
                        children = (
-                               A8C0F7F5089701F300BA5114 /* SVGZoomEventImpl.cpp */,
-                               A8C0F7F6089701F300BA5114 /* SVGZoomEventImpl.h */,
                                A8DF545D0983A7510052981B /* JSSVGLazyEventListener.cpp */,
                                A8DF545C0983A7510052981B /* JSSVGLazyEventListener.h */,
+                               A8C0F7F5089701F300BA5114 /* SVGZoomEventImpl.cpp */,
+                               A8C0F7F6089701F300BA5114 /* SVGZoomEventImpl.h */,
                        );
                        path = events;
                        sourceTree = "<group>";
                                A8C0F830089701F300BA5114 /* SVGColorImpl.h */,
                                A8C0F831089701F300BA5114 /* SVGComponentTransferFunctionElementImpl.cpp */,
                                A8C0F832089701F300BA5114 /* SVGComponentTransferFunctionElementImpl.h */,
-                               A82FC33B08CBB07C00EFEE23 /* SVGCursorElementImpl.h */,
                                A82FC33C08CBB07C00EFEE23 /* SVGCursorElementImpl.cpp */,
+                               A82FC33B08CBB07C00EFEE23 /* SVGCursorElementImpl.h */,
                                A8C0F833089701F300BA5114 /* SVGDefsElementImpl.cpp */,
                                A8C0F834089701F300BA5114 /* SVGDefsElementImpl.h */,
                                A8C0F835089701F300BA5114 /* SVGDescElementImpl.cpp */,
                                A8C0F842089701F300BA5114 /* SVGEllipseElementImpl.h */,
                                A8C0F845089701F300BA5114 /* SVGExternalResourcesRequiredImpl.cpp */,
                                A8C0F846089701F300BA5114 /* SVGExternalResourcesRequiredImpl.h */,
-                               A7638A950995965D0007E14F /* SVGFEDisplacementMapElementImpl.h */,
-                               A7638A960995965D0007E14F /* SVGFEDisplacementMapElementImpl.cpp */,
                                A8C0F847089701F300BA5114 /* SVGFEBlendElementImpl.cpp */,
                                A8C0F848089701F300BA5114 /* SVGFEBlendElementImpl.h */,
                                A8C0F849089701F300BA5114 /* SVGFEColorMatrixElementImpl.cpp */,
                                A8C0F84E089701F300BA5114 /* SVGFECompositeElementImpl.h */,
                                A8C32961093BB7B2000B9CAC /* SVGFEDiffuseLightingElementImpl.cpp */,
                                A8C32960093BB7B2000B9CAC /* SVGFEDiffuseLightingElementImpl.h */,
+                               A7638A960995965D0007E14F /* SVGFEDisplacementMapElementImpl.cpp */,
+                               A7638A950995965D0007E14F /* SVGFEDisplacementMapElementImpl.h */,
                                A8C3295F093BB7B2000B9CAC /* SVGFEDistantLightElementImpl.cpp */,
                                A8C3295E093BB7B2000B9CAC /* SVGFEDistantLightElementImpl.h */,
                                A8C0F84F089701F300BA5114 /* SVGFEFloodElementImpl.cpp */,
                A8C0FB51089701F700BA5114 /* kcanvas */ = {
                        isa = PBXGroup;
                        children = (
-                               65743B50097076F8001E7CEF /* RenderSVGText.cpp */,
-                               65743B51097076F8001E7CEF /* RenderSVGText.h */,
-                               FAE0418A09759694000540BE /* RenderSVGImage.cpp */,
-                               FAE0418909759694000540BE /* RenderSVGImage.h */,
-                               A8FEFB090979F472005839FD /* RenderForeignObject.cpp */,
-                               A8FEFB080979F472005839FD /* RenderForeignObject.h */,
                                A8C0FB53089701F700BA5114 /* device */,
                                A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */,
                                A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */,
                                A8C0FB7F089701F800BA5114 /* KCanvasFilters.h */,
                                A8C0FB80089701F800BA5114 /* KCanvasImage.cpp */,
                                A8C0FB81089701F800BA5114 /* KCanvasImage.h */,
-                               A8C0FB82089701F800BA5114 /* RenderPath.cpp */,
-                               A8C0FB83089701F800BA5114 /* RenderPath.h */,
                                A8C0FB84089701F800BA5114 /* KCanvasMatrix.cpp */,
                                A8C0FB85089701F800BA5114 /* KCanvasMatrix.h */,
-                               A8C0FB86089701F800BA5114 /* KCanvasPath.h */,
                                4758C44308C5F217009BAF05 /* KCanvasPath.cpp */,
+                               A8C0FB86089701F800BA5114 /* KCanvasPath.h */,
                                A8C0FB89089701F800BA5114 /* KCanvasResourceListener.h */,
                                A8C0FB8A089701F800BA5114 /* KCanvasResources.cpp */,
                                A8C0FB8B089701F800BA5114 /* KCanvasResources.h */,
-                               A810E39308A4160F00333D98 /* KCanvasTreeDebug.h */,
                                A810E39408A4160F00333D98 /* KCanvasTreeDebug.cpp */,
+                               A810E39308A4160F00333D98 /* KCanvasTreeDebug.h */,
+                               A8FEFB090979F472005839FD /* RenderForeignObject.cpp */,
+                               A8FEFB080979F472005839FD /* RenderForeignObject.h */,
+                               A8C0FB82089701F800BA5114 /* RenderPath.cpp */,
+                               A8C0FB83089701F800BA5114 /* RenderPath.h */,
+                               FAE0418A09759694000540BE /* RenderSVGImage.cpp */,
+                               FAE0418909759694000540BE /* RenderSVGImage.h */,
+                               65743B50097076F8001E7CEF /* RenderSVGText.cpp */,
+                               65743B51097076F8001E7CEF /* RenderSVGText.h */,
                        );
                        path = kcanvas;
                        sourceTree = "<group>";
                                A8C0FB6A089701F800BA5114 /* KCanvasFilterQuartz.mm */,
                                A8C0FB6B089701F800BA5114 /* KCanvasItemQuartz.h */,
                                A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */,
+                               A81655D2096BBEAC00601058 /* KCanvasMaskerQuartz.h */,
+                               A81655D3096BBEAC00601058 /* KCanvasMaskerQuartz.mm */,
+                               A8ABC99909445EC00013945F /* KCanvasPathQuartz.h */,
+                               A8ABC99A09445EC00013945F /* KCanvasPathQuartz.mm */,
                                A8C0FB6D089701F800BA5114 /* KCanvasResourcesQuartz.h */,
                                A8C0FB6E089701F800BA5114 /* KCanvasResourcesQuartz.mm */,
                                A8C0FB71089701F800BA5114 /* KRenderingDeviceQuartz.h */,
                                A8C0FB75089701F800BA5114 /* KRenderingPaintServerQuartz.mm */,
                                A8C0FB76089701F800BA5114 /* QuartzSupport.h */,
                                A8C0FB77089701F800BA5114 /* QuartzSupport.mm */,
-                               A81655D2096BBEAC00601058 /* KCanvasMaskerQuartz.h */,
-                               A81655D3096BBEAC00601058 /* KCanvasMaskerQuartz.mm */,
-                               A8ABC99909445EC00013945F /* KCanvasPathQuartz.h */,
-                               A8ABC99A09445EC00013945F /* KCanvasPathQuartz.mm */,
                        );
                        path = quartz;
                        sourceTree = "<group>";
                A8C3291F093BB732000B9CAC /* filters */ = {
                        isa = PBXGroup;
                        children = (
-                               A7638A8909958EA50007E14F /* WKDisplacementMapFilter.h */,
-                               A7638A8A09958EA50007E14F /* WKDisplacementMapFilter.m */,
-                               A7638A91099592C30007E14F /* WKDisplacementMapFilter.cikernel */,
                                A8C32920093BB732000B9CAC /* WKArithmeticFilter.cikernel */,
                                A8C32921093BB732000B9CAC /* WKArithmeticFilter.h */,
                                A8C32922093BB732000B9CAC /* WKArithmeticFilter.m */,
                                A8C32923093BB732000B9CAC /* WKDiffuseLightingFilter.cikernel */,
                                A8C32924093BB732000B9CAC /* WKDiffuseLightingFilter.h */,
                                A8C32925093BB732000B9CAC /* WKDiffuseLightingFilter.m */,
+                               A7638A91099592C30007E14F /* WKDisplacementMapFilter.cikernel */,
+                               A7638A8909958EA50007E14F /* WKDisplacementMapFilter.h */,
+                               A7638A8A09958EA50007E14F /* WKDisplacementMapFilter.m */,
                                A8C32926093BB732000B9CAC /* WKDistantLightFilter.cikernel */,
                                A8C32927093BB732000B9CAC /* WKDistantLightFilter.h */,
                                A8C32928093BB732000B9CAC /* WKDistantLightFilter.m */,
                BC41978B059293BE0016347F /* xbl */ = {
                        isa = PBXGroup;
                        children = (
-                               BC41978E059293F30016347F /* xbl_binding_manager.h */,
-                               BC419795059294CA0016347F /* xbl_binding_manager.cpp */,
-                               BCBDB094059A28B100B83B92 /* xbl_binding.h */,
                                BCBDB093059A28B100B83B92 /* xbl_binding.cpp */,
-                               BCEACC8F0592E0AD009D6AEF /* xbl_docimpl.h */,
+                               BCBDB094059A28B100B83B92 /* xbl_binding.h */,
+                               BC419795059294CA0016347F /* xbl_binding_manager.cpp */,
+                               BC41978E059293F30016347F /* xbl_binding_manager.h */,
                                BCEACC8E0592E0AD009D6AEF /* xbl_docimpl.cpp */,
-                               BCD990DD0594B9FC00AB848D /* xbl_tokenizer.h */,
-                               BCD990D90594B9E500AB848D /* xbl_tokenizer.cpp */,
-                               BC74596305954CC80058C893 /* xbl_protobinding.h */,
+                               BCEACC8F0592E0AD009D6AEF /* xbl_docimpl.h */,
                                BC74596205954CC80058C893 /* xbl_protobinding.cpp */,
-                               BC745A1B05955F390058C893 /* xbl_protohandler.h */,
+                               BC74596305954CC80058C893 /* xbl_protobinding.h */,
                                BC745A1A05955F380058C893 /* xbl_protohandler.cpp */,
-                               BCBDB0380597B36E00B83B92 /* xbl_protoimplementation.h */,
+                               BC745A1B05955F390058C893 /* xbl_protohandler.h */,
                                BCBDB0370597B36E00B83B92 /* xbl_protoimplementation.cpp */,
+                               BCBDB0380597B36E00B83B92 /* xbl_protoimplementation.h */,
+                               BCD990D90594B9E500AB848D /* xbl_tokenizer.cpp */,
+                               BCD990DD0594B9FC00AB848D /* xbl_tokenizer.h */,
                        );
                        name = xbl;
                        path = khtml;
                BCB16BFB0979C38700467741 /* loader */ = {
                        isa = PBXGroup;
                        children = (
-                               BCFB2E5D0979E46400BA703D /* CachedObjectClient.h */,
                                BCB16BFE0979C3BD00467741 /* Cache.cpp */,
                                BCB16BFF0979C3BD00467741 /* Cache.h */,
                                BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */,
                                BCB16C030979C3BD00467741 /* CachedImage.h */,
                                BCB16C060979C3BD00467741 /* CachedObject.cpp */,
                                BCB16C070979C3BD00467741 /* CachedObject.h */,
+                               BCFB2E5D0979E46400BA703D /* CachedObjectClient.h */,
                                BCB16C080979C3BD00467741 /* CachedObjectClientWalker.cpp */,
                                BCB16C090979C3BD00467741 /* CachedObjectClientWalker.h */,
                                BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
                BCF1A5BA097832090061A123 /* platform */ = {
                        isa = PBXGroup;
                        children = (
-                               BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */,
-                               BCC47E2509A3D6F100ADB771 /* FontFamily.h */,
-                               9380F47109A11AB4001FDB34 /* Widget.cpp */,
-                               9380F47209A11AB4001FDB34 /* Widget.h */,
                                6582A14809999D6C00BEEB6D /* mac */,
-                               6582A13D09999CD600BEEB6D /* QString.cpp */,
-                               6582A13E09999CD600BEEB6D /* QString.h */,
-                               BC6B7ECE0998AC7F0052867B /* ImageSource.h */,
-                               93CD4FEB0995FD2A007ECC97 /* PlatformString.h */,
+                               BCFB2F74097A2E1A00BA703D /* Arena.cpp */,
+                               BCFB2F75097A2E1A00BA703D /* Arena.h */,
+                               BCB16B880979B01400467741 /* Array.h */,
+                               BCB16B890979B01400467741 /* ArrayImpl.cpp */,
+                               BCB16B8A0979B01400467741 /* ArrayImpl.h */,
                                93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */,
                                93CD4FD80995F9EA007ECC97 /* AtomicString.h */,
                                93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */,
-                               93CD4FDA0995F9EA007ECC97 /* String.cpp */,
-                               93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */,
-                               93CD4FDD0995F9EA007ECC97 /* StringImpl.h */,
-                               9305B24C098F1B6B00C28855 /* Timer.h */,
-                               93309EA1099EB78C0056E581 /* Timer.cpp */,
-                               93309EA0099EB78C0056E581 /* SharedTimer.h */,
-                               BC9C328A09933A6D001D6924 /* ImageAnimationObserver.h */,
-                               BCD75ABB0989A446003E28DF /* Image.h */,
-                               BC6B7BBB0993611A0052867B /* PDFDocumentImage.h */,
-                               BC6B7BAE0993603C0052867B /* Image.cpp */,
                                BC075985098861A400407B48 /* Brush.h */,
-                               BCC8D1710988301200140BF2 /* Pen.cpp */,
-                               BCC8D1720988301200140BF2 /* Pen.h */,
                                BCC8CFC80986CD2400140BF2 /* Color.cpp */,
                                BCC8CFC90986CD2400140BF2 /* Color.h */,
                                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
-                               BCFB2F74097A2E1A00BA703D /* Arena.cpp */,
-                               BCFB2F75097A2E1A00BA703D /* Arena.h */,
-                               BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
-                               BCFB2F40097A24B500BA703D /* SegmentedString.h */,
-                               BCB16B880979B01400467741 /* Array.h */,
-                               BCB16B890979B01400467741 /* ArrayImpl.cpp */,
-                               BCB16B8A0979B01400467741 /* ArrayImpl.h */,
-                               BCB16AF50979A08500467741 /* FloatRect.cpp */,
-                               BCB16AF60979A08500467741 /* FloatRect.h */,
-                               BCB16AF70979A08500467741 /* IntRect.cpp */,
-                               BCB16AF80979A08500467741 /* IntRect.h */,
+                               F587868402DE3B8601EA4122 /* Cursor.h */,
                                BC73E3900978CED700EDFF8A /* FloatPoint.cpp */,
                                BC73E3910978CED700EDFF8A /* FloatPoint.h */,
+                               BCB16AF50979A08500467741 /* FloatRect.cpp */,
+                               BCB16AF60979A08500467741 /* FloatRect.h */,
+                               BC73E25B0978682700EDFF8A /* FloatSize.cpp */,
+                               BC73E25C0978682700EDFF8A /* FloatSize.h */,
+                               BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */,
+                               BCC47E2509A3D6F100ADB771 /* FontFamily.h */,
+                               BC6B7BAE0993603C0052867B /* Image.cpp */,
+                               BCD75ABB0989A446003E28DF /* Image.h */,
+                               BC9C328A09933A6D001D6924 /* ImageAnimationObserver.h */,
+                               BC6B7ECE0998AC7F0052867B /* ImageSource.h */,
                                BC73E3180978AFFB00EDFF8A /* IntPoint.h */,
                                BC73E2FC0978AF9C00EDFF8A /* IntPointArray.cpp */,
                                BC73E2FD0978AF9C00EDFF8A /* IntPointArray.h */,
-                               BC73E25B0978682700EDFF8A /* FloatSize.cpp */,
-                               BC73E25C0978682700EDFF8A /* FloatSize.h */,
+                               BCB16AF70979A08500467741 /* IntRect.cpp */,
+                               BCB16AF80979A08500467741 /* IntRect.h */,
                                BCF1A5EF097839600061A123 /* IntSize.h */,
+                               BC6B7BBB0993611A0052867B /* PDFDocumentImage.h */,
+                               BCC8D1710988301200140BF2 /* Pen.cpp */,
+                               BCC8D1720988301200140BF2 /* Pen.h */,
+                               93CD4FEB0995FD2A007ECC97 /* PlatformString.h */,
+                               6582A13D09999CD600BEEB6D /* QString.cpp */,
+                               6582A13E09999CD600BEEB6D /* QString.h */,
+                               9385F761098D9C3100D90D24 /* Screen.h */,
+                               BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
+                               BCFB2F40097A24B500BA703D /* SegmentedString.h */,
                                BCFB2E830979FD4F00BA703D /* Shared.h */,
+                               93309EA0099EB78C0056E581 /* SharedTimer.h */,
+                               93CD4FDA0995F9EA007ECC97 /* String.cpp */,
+                               93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */,
+                               93CD4FDD0995F9EA007ECC97 /* StringImpl.h */,
                                93E62D990985F41600E1B5E3 /* SystemTime.h */,
-                               9385F761098D9C3100D90D24 /* Screen.h */,
+                               93309EA1099EB78C0056E581 /* Timer.cpp */,
+                               9305B24C098F1B6B00C28855 /* Timer.h */,
+                               9380F47109A11AB4001FDB34 /* Widget.cpp */,
+                               9380F47209A11AB4001FDB34 /* Widget.h */,
                        );
                        name = platform;
                        sourceTree = "<group>";
                F523D15002DE4271018635CA /* other */ = {
                        isa = PBXGroup;
                        children = (
-                               F58784CC02DE375901EA4122 /* KWQCharsets.h */,
                                F5BFAAC10309CDF6018635CE /* character-sets.txt */,
-                               F550D70B02E13281018635CA /* mac-encodings.txt */,
-                               F550D70C02E13281018635CA /* make-charset-table.pl */,
+                               F58784CD02DE375901EA4122 /* KWQCharsets.cpp */,
+                               F58784CC02DE375901EA4122 /* KWQCharsets.h */,
                                2D90660B0665D937006B6F1A /* KWQClipboard.h */,
                                2D90660C0665D937006B6F1A /* KWQClipboard.mm */,
-                               F58784CD02DE375901EA4122 /* KWQCharsets.cpp */,
                                F58784DA02DE375901EA4122 /* KWQDef.h */,
                                BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */,
                                BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */,
                                65A640F00533BB1F0085E777 /* KWQExceptions.h */,
+                               65F80697054D9F86008BF776 /* KWQExceptions.mm */,
                                93CCF7D4033BD43C008635CE /* KWQFileButton.h */,
                                93CCF7D5033BD43C008635CE /* KWQFileButton.mm */,
                                93B641F206E28C5C0055F610 /* KWQFormData.h */,
                                93861DE0032C2E52008635CE /* KWQLogging.m */,
                                9394E0A403AA5BBE008635CE /* KWQPageState.h */,
                                9394E0A503AA5BBE008635CE /* KWQPageState.mm */,
-                               93955A4103D72932008635CE /* KWQRenderTreeDebug.h */,
                                93955A4203D72932008635CE /* KWQRenderTreeDebug.cpp */,
+                               93955A4103D72932008635CE /* KWQRenderTreeDebug.h */,
                                93386B90037045B3008635CE /* KWQResourceLoader.h */,
                                93386B91037045B3008635CE /* KWQResourceLoader.mm */,
-                               F587852F02DE375901EA4122 /* KWQSignalStubs.cpp */,
-                               BE8BD8F306359F6000D3F20B /* KWQTextUtilities.h */,
-                               BE1A407106CA8A33005B28CF /* KWQTextUtilities.mm */,
+                               BC7B2AF80450824100A8000F /* KWQScrollBar.h */,
+                               BC7B2AF90450824100A8000F /* KWQScrollBar.mm */,
                                F587853502DE375901EA4122 /* KWQTextArea.h */,
                                F587853602DE375901EA4122 /* KWQTextArea.mm */,
                                F587851B02DE375901EA4122 /* KWQTextField.h */,
                                F587851C02DE375901EA4122 /* KWQTextField.mm */,
+                               BE8BD8F306359F6000D3F20B /* KWQTextUtilities.h */,
+                               BE1A407106CA8A33005B28CF /* KWQTextUtilities.mm */,
                                F587854002DE375901EA4122 /* KWQView.h */,
                                F587854302DE375901EA4122 /* KWQWindowWidget.h */,
                                F587854402DE375901EA4122 /* KWQWindowWidget.mm */,
-                               BC7B2AF80450824100A8000F /* KWQScrollBar.h */,
-                               BC7B2AF90450824100A8000F /* KWQScrollBar.mm */,
-                               65F80697054D9F86008BF776 /* KWQExceptions.mm */,
+                               F550D70B02E13281018635CA /* mac-encodings.txt */,
+                               F550D70C02E13281018635CA /* make-charset-table.pl */,
                        );
                        name = other;
                        sourceTree = "<group>";
                                F523D18602DE4322018635CA /* css_rule.h */,
                                F523D18802DE4322018635CA /* css_stylesheet.h */,
                                F523D18A02DE4322018635CA /* css_value.h */,
-                               F523D19002DE4322018635CA /* dom_exception.h */,
-                               F523D19502DE4322018635CA /* dom_node.h */,
                                F523D19C02DE4322018635CA /* dom2_events.cpp */,
                                F523D19D02DE4322018635CA /* dom2_events.h */,
                                F523D19F02DE4322018635CA /* dom2_range.h */,
                                F523D1A002DE4322018635CA /* dom2_traversal.cpp */,
                                F523D1A102DE4322018635CA /* dom2_traversal.h */,
+                               F523D19002DE4322018635CA /* dom_exception.h */,
+                               F523D19502DE4322018635CA /* dom_node.h */,
                        );
                        path = dom;
                        sourceTree = "<group>";
                F523D23402DE436B018635CA /* ecma */ = {
                        isa = PBXGroup;
                        children = (
+                               1A69D380085627410009880D /* domparser.cpp */,
+                               1A69D37F085627410009880D /* domparser.h */,
+                               E1F7F55E0981AF570073BE6A /* JSXMLHttpRequest.cpp */,
+                               E1F7F55F0981AF570073BE6A /* JSXMLHttpRequest.h */,
                                F523D1F402DE4369018635CA /* kjs_binding.cpp */,
                                F523D1F502DE4369018635CA /* kjs_binding.h */,
                                F523D1F602DE4369018635CA /* kjs_css.cpp */,
                                F523D20E02DE4369018635CA /* kjs_views.h */,
                                F523D21002DE4369018635CA /* kjs_window.cpp */,
                                F523D21102DE4369018635CA /* kjs_window.h */,
-                               E1F7F55E0981AF570073BE6A /* JSXMLHttpRequest.cpp */,
-                               E1F7F55F0981AF570073BE6A /* JSXMLHttpRequest.h */,
                                65912B0D0586921000123A69 /* xmlserializer.cpp */,
                                65912B0E0586921000123A69 /* xmlserializer.h */,
-                               1A69D380085627410009880D /* domparser.cpp */,
-                               1A69D37F085627410009880D /* domparser.h */,
                                A83C81A0091189B9009BF4A7 /* XSLTProcessor.cpp */,
                                A83C819F091189B9009BF4A7 /* XSLTProcessor.h */,
                        );
                F523D27702DE4398018635CA /* html */ = {
                        isa = PBXGroup;
                        children = (
-                               BCEF3432087B563E00BBF833 /* htmlfactory.cpp */,
-                               BCEF3433087B563E00BBF833 /* htmlfactory.h */,
-                               550A0BCB085F604D007353D6 /* htmlnames.cpp */,
-                               550A0BCC085F604D007353D6 /* htmlnames.h */,
+                               A8136D370973A8E700D74463 /* FormDataList.cpp */,
+                               A8136D360973A8E700D74463 /* FormDataList.h */,
                                F523D23702DE4396018635CA /* html_baseimpl.cpp */,
                                F523D23802DE4396018635CA /* html_baseimpl.h */,
                                F523D23902DE4396018635CA /* html_blockimpl.cpp */,
                                51F6A3D60663BF04004D2919 /* html_canvasimpl.h */,
                                F523D23B02DE4396018635CA /* html_documentimpl.cpp */,
                                F523D23C02DE4396018635CA /* html_documentimpl.h */,
-                               F523D23E02DE4396018635CA /* HTMLElementImpl.cpp */,
-                               F523D23F02DE4396018635CA /* HTMLElementImpl.h */,
                                F523D24202DE4396018635CA /* html_headimpl.cpp */,
                                F523D24302DE4396018635CA /* html_headimpl.h */,
                                F523D24402DE4396018635CA /* html_imageimpl.cpp */,
                                F523D24D02DE4396018635CA /* html_objectimpl.h */,
                                F523D24E02DE4396018635CA /* html_tableimpl.cpp */,
                                F523D24F02DE4396018635CA /* html_tableimpl.h */,
-                               F523D25002DE4396018635CA /* htmlparser.cpp */,
-                               F523D25102DE4396018635CA /* htmlparser.h */,
-                               F523D25202DE4396018635CA /* htmltokenizer.cpp */,
-                               F523D25302DE4396018635CA /* htmltokenizer.h */,
-                               A81369AE097374F500D74463 /* HTMLIsIndexElementImpl.h */,
-                               A81369AF097374F500D74463 /* HTMLIsIndexElementImpl.cpp */,
-                               A81369B0097374F500D74463 /* HTMLInputElementImpl.h */,
-                               A81369B1097374F500D74463 /* HTMLInputElementImpl.cpp */,
-                               A81369B2097374F500D74463 /* HTMLGenericFormElementImpl.h */,
-                               A81369B3097374F500D74463 /* HTMLGenericFormElementImpl.cpp */,
-                               A81369B4097374F500D74463 /* HTMLFormElementImpl.h */,
-                               A81369B5097374F500D74463 /* HTMLFormElementImpl.cpp */,
-                               A81369B6097374F500D74463 /* HTMLButtonElementImpl.h */,
+                               A8DF3FCB097FA0FB0052981B /* HTMLBaseFontElementImpl.cpp */,
+                               A8DF3FCA097FA0FB0052981B /* HTMLBaseFontElementImpl.h */,
                                A81369B7097374F500D74463 /* HTMLButtonElementImpl.cpp */,
-                               A81369B8097374F500D74463 /* HTMLFieldSetElementImpl.h */,
+                               A81369B6097374F500D74463 /* HTMLButtonElementImpl.h */,
+                               A8DF3FC9097FA0FB0052981B /* HTMLCollectionImpl.cpp */,
+                               A8DF3FC8097FA0FB0052981B /* HTMLCollectionImpl.h */,
+                               F523D23E02DE4396018635CA /* HTMLElementImpl.cpp */,
+                               F523D23F02DE4396018635CA /* HTMLElementImpl.h */,
+                               BCEF3432087B563E00BBF833 /* htmlfactory.cpp */,
+                               BCEF3433087B563E00BBF833 /* htmlfactory.h */,
                                A81369B9097374F500D74463 /* HTMLFieldSetElementImpl.cpp */,
-                               A81369BA097374F500D74463 /* HTMLTextAreaElementImpl.h */,
-                               A81369BB097374F500D74463 /* HTMLTextAreaElementImpl.cpp */,
-                               A81369BC097374F500D74463 /* HTMLSelectElementImpl.h */,
-                               A81369BD097374F500D74463 /* HTMLSelectElementImpl.cpp */,
-                               A81369BE097374F500D74463 /* HTMLOptionsCollectionImpl.h */,
-                               9327A94109968D1A0068A546 /* HTMLOptionsCollectionImpl.cpp */,
-                               A81369C0097374F500D74463 /* HTMLOptionElementImpl.h */,
-                               A81369C1097374F500D74463 /* HTMLOptionElementImpl.cpp */,
-                               A81369C2097374F500D74463 /* HTMLOptGroupElementImpl.h */,
-                               A81369C3097374F500D74463 /* HTMLOptGroupElementImpl.cpp */,
-                               A81369C4097374F500D74463 /* HTMLLegendElementImpl.h */,
-                               A81369C5097374F500D74463 /* HTMLLegendElementImpl.cpp */,
-                               A81369C6097374F500D74463 /* HTMLLabelElementImpl.h */,
-                               A81369C7097374F500D74463 /* HTMLLabelElementImpl.cpp */,
-                               A81369C8097374F500D74463 /* HTMLKeygenElementImpl.h */,
-                               A81369C9097374F600D74463 /* HTMLKeygenElementImpl.cpp */,
-                               A8136D360973A8E700D74463 /* FormDataList.h */,
-                               A8136D370973A8E700D74463 /* FormDataList.cpp */,
-                               A8DF3FC6097FA0FB0052981B /* HTMLFormCollectionImpl.h */,
+                               A81369B8097374F500D74463 /* HTMLFieldSetElementImpl.h */,
                                A8DF3FC7097FA0FB0052981B /* HTMLFormCollectionImpl.cpp */,
-                               A8DF3FC8097FA0FB0052981B /* HTMLCollectionImpl.h */,
-                               A8DF3FC9097FA0FB0052981B /* HTMLCollectionImpl.cpp */,
-                               A8DF3FCA097FA0FB0052981B /* HTMLBaseFontElementImpl.h */,
-                               A8DF3FCB097FA0FB0052981B /* HTMLBaseFontElementImpl.cpp */,
-                               A8DF3FCC097FA0FB0052981B /* HTMLNameCollectionImpl.h */,
+                               A8DF3FC6097FA0FB0052981B /* HTMLFormCollectionImpl.h */,
+                               A81369B5097374F500D74463 /* HTMLFormElementImpl.cpp */,
+                               A81369B4097374F500D74463 /* HTMLFormElementImpl.h */,
+                               A81369B3097374F500D74463 /* HTMLGenericFormElementImpl.cpp */,
+                               A81369B2097374F500D74463 /* HTMLGenericFormElementImpl.h */,
+                               A81369B1097374F500D74463 /* HTMLInputElementImpl.cpp */,
+                               A81369B0097374F500D74463 /* HTMLInputElementImpl.h */,
+                               A81369AF097374F500D74463 /* HTMLIsIndexElementImpl.cpp */,
+                               A81369AE097374F500D74463 /* HTMLIsIndexElementImpl.h */,
+                               A81369C9097374F600D74463 /* HTMLKeygenElementImpl.cpp */,
+                               A81369C8097374F500D74463 /* HTMLKeygenElementImpl.h */,
+                               A81369C7097374F500D74463 /* HTMLLabelElementImpl.cpp */,
+                               A81369C6097374F500D74463 /* HTMLLabelElementImpl.h */,
+                               A81369C5097374F500D74463 /* HTMLLegendElementImpl.cpp */,
+                               A81369C4097374F500D74463 /* HTMLLegendElementImpl.h */,
                                A8DF3FCD097FA0FB0052981B /* HTMLNameCollectionImpl.cpp */,
+                               A8DF3FCC097FA0FB0052981B /* HTMLNameCollectionImpl.h */,
+                               550A0BCB085F604D007353D6 /* htmlnames.cpp */,
+                               550A0BCC085F604D007353D6 /* htmlnames.h */,
+                               A81369C3097374F500D74463 /* HTMLOptGroupElementImpl.cpp */,
+                               A81369C2097374F500D74463 /* HTMLOptGroupElementImpl.h */,
+                               A81369C1097374F500D74463 /* HTMLOptionElementImpl.cpp */,
+                               A81369C0097374F500D74463 /* HTMLOptionElementImpl.h */,
+                               9327A94109968D1A0068A546 /* HTMLOptionsCollectionImpl.cpp */,
+                               A81369BE097374F500D74463 /* HTMLOptionsCollectionImpl.h */,
+                               F523D25002DE4396018635CA /* htmlparser.cpp */,
+                               F523D25102DE4396018635CA /* htmlparser.h */,
+                               A81369BD097374F500D74463 /* HTMLSelectElementImpl.cpp */,
+                               A81369BC097374F500D74463 /* HTMLSelectElementImpl.h */,
+                               A81369BB097374F500D74463 /* HTMLTextAreaElementImpl.cpp */,
+                               A81369BA097374F500D74463 /* HTMLTextAreaElementImpl.h */,
+                               F523D25202DE4396018635CA /* htmltokenizer.cpp */,
+                               F523D25302DE4396018635CA /* htmltokenizer.h */,
                        );
                        path = html;
                        sourceTree = "<group>";
                F523D2F302DE443B018635CA /* rendering */ = {
                        isa = PBXGroup;
                        children = (
-                               AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */,
-                               AB67D1A7097F3AE300F9392E /* RenderTextField.h */,
                                BCEA4813097D93020094C9E4 /* bidi.cpp */,
                                BCEA4814097D93020094C9E4 /* bidi.h */,
                                BCEA4815097D93020094C9E4 /* break_lines.cpp */,
                                BCEA481D097D93020094C9E4 /* render_applet.h */,
                                BCEA481E097D93020094C9E4 /* render_arena.cpp */,
                                BCEA481F097D93020094C9E4 /* render_arena.h */,
-                               BCEA4820097D93020094C9E4 /* RenderBlock.cpp */,
-                               BCEA4821097D93020094C9E4 /* RenderBlock.h */,
                                BCEA4822097D93020094C9E4 /* render_box.cpp */,
                                BCEA4823097D93020094C9E4 /* render_box.h */,
                                BCEA4824097D93020094C9E4 /* render_br.cpp */,
                                BCEA4829097D93020094C9E4 /* render_canvas.h */,
                                BCEA482A097D93020094C9E4 /* render_canvasimage.cpp */,
                                BCEA482B097D93020094C9E4 /* render_canvasimage.h */,
-                               BCEA482C097D93020094C9E4 /* RenderContainer.cpp */,
-                               BCEA482D097D93020094C9E4 /* RenderContainer.h */,
                                BCEA482E097D93020094C9E4 /* render_flexbox.cpp */,
                                BCEA482F097D93020094C9E4 /* render_flexbox.h */,
                                BCEA4830097D93020094C9E4 /* render_flow.cpp */,
                                BCEA4843097D93020094C9E4 /* render_replaced.h */,
                                BCEA4844097D93020094C9E4 /* render_style.cpp */,
                                BCEA4845097D93020094C9E4 /* render_style.h */,
-                               BCEA4848097D93020094C9E4 /* render_theme_mac.h */,
-                               BCEA4849097D93020094C9E4 /* render_theme_mac.mm */,
                                BCEA484A097D93020094C9E4 /* render_theme.cpp */,
                                BCEA484B097D93020094C9E4 /* render_theme.h */,
+                               BCEA4848097D93020094C9E4 /* render_theme_mac.h */,
+                               BCEA4849097D93020094C9E4 /* render_theme_mac.mm */,
+                               BCEA4820097D93020094C9E4 /* RenderBlock.cpp */,
+                               BCEA4821097D93020094C9E4 /* RenderBlock.h */,
+                               BCEA482C097D93020094C9E4 /* RenderContainer.cpp */,
+                               BCEA482D097D93020094C9E4 /* RenderContainer.h */,
+                               A8DF4AE20980C42C0052981B /* RenderTable.cpp */,
+                               A8DF4AE10980C42C0052981B /* RenderTable.h */,
+                               A8DF4AE00980C42C0052981B /* RenderTableCell.cpp */,
+                               A8DF4ADF0980C42C0052981B /* RenderTableCell.h */,
+                               A8DF4ADE0980C42C0052981B /* RenderTableCol.cpp */,
+                               A8DF4AE70980C42C0052981B /* RenderTableCol.h */,
+                               A8DF4AE60980C42C0052981B /* RenderTableRow.cpp */,
+                               A8DF4AE40980C42C0052981B /* RenderTableRow.h */,
+                               A8DF4AE30980C42C0052981B /* RenderTableSection.cpp */,
+                               A8DF4AE50980C42C0052981B /* RenderTableSection.h */,
                                BCEA484C097D93020094C9E4 /* RenderText.cpp */,
                                BCEA484D097D93020094C9E4 /* RenderText.h */,
+                               AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */,
+                               AB67D1A7097F3AE300F9392E /* RenderTextField.h */,
                                BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */,
                                BCEA484F097D93020094C9E4 /* RenderTextFragment.h */,
                                BCEA4850097D93020094C9E4 /* table_layout.cpp */,
                                BCEA4851097D93020094C9E4 /* table_layout.h */,
-                               A8DF4AE00980C42C0052981B /* RenderTableCell.cpp */,
-                               A8DF4ADF0980C42C0052981B /* RenderTableCell.h */,
-                               A8DF4AE20980C42C0052981B /* RenderTable.cpp */,
-                               A8DF4AE10980C42C0052981B /* RenderTable.h */,
-                               A8DF4AE30980C42C0052981B /* RenderTableSection.cpp */,
-                               A8DF4AE50980C42C0052981B /* RenderTableSection.h */,
-                               A8DF4AE60980C42C0052981B /* RenderTableRow.cpp */,
-                               A8DF4AE40980C42C0052981B /* RenderTableRow.h */,
-                               A8DF4ADE0980C42C0052981B /* RenderTableCol.cpp */,
-                               A8DF4AE70980C42C0052981B /* RenderTableCol.h */,
                        );
                        path = rendering;
                        sourceTree = "<group>";
                                55998A57052B598F0017A6C1 /* Accessibility */,
                                F587871802DE3B8801EA4122 /* qt */,
                                F587861C02DE382201EA4122 /* kdecore */,
-                               F587862F02DE398601EA4122 /* kdeui */,
                                F587865F02DE3A9C01EA4122 /* kio */,
                                F587867502DE3B3301EA4122 /* kparts */,
                                F587864302DE3A1601EA4122 /* khtml */,
                F58785E902DE378A01EA4122 /* WebCore SPI */ = {
                        isa = PBXGroup;
                        children = (
-                               6552E7A8096AA11B0006F248 /* WebCoreFrameNamespaces.h */,
-                               6552E7A9096AA11B0006F248 /* WebCoreFrameNamespaces.m */,
+                               F58EF58E02DFDFB7018635CA /* WebCore.exp */,
                                F5B2A4FC02E2220F018635CB /* WebCoreCache.h */,
                                F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */,
                                F587854902DE375901EA4122 /* WebCoreCookieAdapter.h */,
                                F587854A02DE375901EA4122 /* WebCoreCookieAdapter.m */,
                                F56234DF03026D7301629B47 /* WebCoreEncodings.h */,
-                               E1EE773508F1086C00166870 /* WebCoreTextDecoder.h */,
-                               E1EE773608F1086C00166870 /* WebCoreTextDecoder.mm */,
                                F56234E003026D7301629B47 /* WebCoreEncodings.mm */,
+                               6552E7A8096AA11B0006F248 /* WebCoreFrameNamespaces.h */,
+                               6552E7A9096AA11B0006F248 /* WebCoreFrameNamespaces.m */,
                                F587854C02DE375901EA4122 /* WebCoreFrameView.h */,
                                BE26F15305517DE000BFA0C3 /* WebCoreGraphicsBridge.h */,
                                BE26F15405517DE000BFA0C3 /* WebCoreGraphicsBridge.m */,
                                9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */,
                                F565AE8502ECA583018635CA /* WebCoreSettings.h */,
                                F565AE8602ECA583018635CA /* WebCoreSettings.mm */,
+                               E1EE773508F1086C00166870 /* WebCoreTextDecoder.h */,
+                               E1EE773608F1086C00166870 /* WebCoreTextDecoder.mm */,
                                F587855102DE375901EA4122 /* WebCoreTextRenderer.h */,
                                F587855202DE375901EA4122 /* WebCoreTextRendererFactory.h */,
                                F587855302DE375901EA4122 /* WebCoreTextRendererFactory.mm */,
                                F587855502DE375901EA4122 /* WebCoreViewFactory.m */,
                                5150C2A10702629000AF642C /* WebDashboardRegion.h */,
                                5150C2A50702629800AF642C /* WebDashboardRegion.m */,
-                               F58EF58E02DFDFB7018635CA /* WebCore.exp */,
                        );
                        name = "WebCore SPI";
                        path = kwq;
                        name = kdecore;
                        sourceTree = "<group>";
                };
-               F587862F02DE398601EA4122 /* kdeui */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F587862002DE398401EA4122 /* KWQKCursor.h */,
-                               F58784F002DE375901EA4122 /* KWQKCursor.mm */,
-                       );
-                       name = kdeui;
-                       sourceTree = "<group>";
-               };
                F587864302DE3A1601EA4122 /* khtml */ = {
                        isa = PBXGroup;
                        children = (
                F587867502DE3B3301EA4122 /* kparts */ = {
                        isa = PBXGroup;
                        children = (
-                               F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */,
                                F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */,
+                               F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */,
                        );
                        name = kparts;
                        sourceTree = "<group>";
                F587871802DE3B8801EA4122 /* qt */ = {
                        isa = PBXGroup;
                        children = (
-                               F587867C02DE3B8601EA4122 /* KWQBuffer.h */,
-                               F58784C802DE375901EA4122 /* KWQBuffer.cpp */,
                                F587868002DE3B8601EA4122 /* KWQCollection.h */,
                                F587868202DE3B8601EA4122 /* KWQComboBox.h */,
                                F58784D202DE375901EA4122 /* KWQComboBox.mm */,
-                               F587868302DE3B8601EA4122 /* KWQCString.h */,
                                F58784D502DE375901EA4122 /* KWQCString.cpp */,
-                               F587868402DE3B8601EA4122 /* KWQCursor.h */,
-                               F58784D602DE375901EA4122 /* KWQCursor.mm */,
+                               F587868302DE3B8601EA4122 /* KWQCString.h */,
                                F587868802DE3B8601EA4122 /* KWQEvent.h */,
                                F58784DE02DE375901EA4122 /* KWQEvent.mm */,
                                F587868A02DE3B8601EA4122 /* KWQFont.h */,
                                F58784E002DE375901EA4122 /* KWQFont.mm */,
                                F587868D02DE3B8601EA4122 /* KWQFontMetrics.h */,
                                F58784E202DE375901EA4122 /* KWQFontMetrics.mm */,
-                               F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */,
                                F58784E602DE375901EA4122 /* KWQGuardedPtr.cpp */,
-                               F587869602DE3B8601EA4122 /* KWQIODevice.h */,
+                               F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */,
                                F587869802DE3B8601EA4122 /* KWQLineEdit.h */,
                                F587851202DE375901EA4122 /* KWQLineEdit.mm */,
                                F587851302DE375901EA4122 /* KWQListBox.h */,
                                F587851402DE375901EA4122 /* KWQListBox.mm */,
-                               F587869902DE3B8601EA4122 /* KWQPtrList.h */,
-                               F587851502DE375901EA4122 /* KWQListImpl.h */,
                                F587851602DE375901EA4122 /* KWQListImpl.cpp */,
+                               F587851502DE375901EA4122 /* KWQListImpl.h */,
                                F587869E02DE3B8601EA4122 /* KWQNamespace.h */,
-                               F587869F02DE3B8601EA4122 /* KWQObject.h */,
                                F587851D02DE375901EA4122 /* KWQObject.cpp */,
-                               F5117BC902F9FFEF018635CE /* KWQSignal.h */,
-                               F5117BCA02F9FFEF018635CE /* KWQSignal.cpp */,
-                               F5117BCB02F9FFEF018635CE /* KWQSlot.h */,
-                               F5117BCC02F9FFEF018635CE /* KWQSlot.cpp */,
+                               F587869F02DE3B8601EA4122 /* KWQObject.h */,
                                F58786A302DE3B8601EA4122 /* KWQPainter.h */,
                                F587851F02DE375901EA4122 /* KWQPainter.mm */,
                                F58786A402DE3B8601EA4122 /* KWQPalette.h */,
                                F58786AA02DE3B8601EA4122 /* KWQPrinter.h */,
-                               F58786AC02DE3B8601EA4122 /* KWQPtrList.h */,
+                               F587869902DE3B8601EA4122 /* KWQPtrList.h */,
                                F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */,
-                               F58786B302DE3B8601EA4122 /* KWQRegExp.h */,
                                F587852B02DE375901EA4122 /* KWQRegExp.cpp */,
-                               F58786B402DE3B8601EA4122 /* KWQRegion.h */,
+                               F58786B302DE3B8601EA4122 /* KWQRegExp.h */,
                                F587852C02DE375901EA4122 /* KWQRegion.cpp */,
+                               F58786B402DE3B8601EA4122 /* KWQRegion.h */,
                                F58786B502DE3B8601EA4122 /* KWQScrollView.h */,
                                F587852E02DE375901EA4122 /* KWQScrollView.mm */,
+                               F5117BCA02F9FFEF018635CE /* KWQSignal.cpp */,
+                               F5117BC902F9FFEF018635CE /* KWQSignal.h */,
                                BC86FB8D061F5C23006BB822 /* KWQSlider.h */,
                                BC86FB8E061F5C23006BB822 /* KWQSlider.mm */,
+                               F5117BCC02F9FFEF018635CE /* KWQSlot.cpp */,
+                               F5117BCB02F9FFEF018635CE /* KWQSlot.h */,
                                F58786BA02DE3B8601EA4122 /* KWQStringList.h */,
                                F587853202DE375901EA4122 /* KWQStringList.mm */,
-                               F58786BD02DE3B8601EA4122 /* KWQTextCodec.h */,
                                F587853702DE375901EA4122 /* KWQTextCodec.cpp */,
+                               F58786BD02DE3B8601EA4122 /* KWQTextCodec.h */,
                                F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */,
                                F587853802DE375901EA4122 /* KWQTextEdit.mm */,
-                               F58786BF02DE3B8601EA4122 /* KWQTextStream.h */,
                                F587853902DE375901EA4122 /* KWQTextStream.cpp */,
+                               F58786BF02DE3B8601EA4122 /* KWQTextStream.h */,
                                F58786C202DE3B8601EA4122 /* KWQValueList.h */,
-                               F587853B02DE375901EA4122 /* KWQValueListImpl.h */,
                                F587853C02DE375901EA4122 /* KWQValueListImpl.cpp */,
-                               A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */,
+                               F587853B02DE375901EA4122 /* KWQValueListImpl.h */,
                                A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */,
+                               A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */,
+                               F58786AC02DE3B8601EA4122 /* KWQPtrList.h */,
                        );
                        name = qt;
                        sourceTree = "<group>";
                                93F1991C08245E59001E9ABC /* dom_elementimpl.h in Headers */,
                                93F1992008245E59001E9ABC /* dom_xmlimpl.h in Headers */,
                                93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */,
-                               93F1992708245E59001E9ABC /* KWQBuffer.h in Headers */,
                                93F1992908245E59001E9ABC /* KWQCString.h in Headers */,
                                93F1992A08245E59001E9ABC /* KWQCharsets.h in Headers */,
                                93F1992C08245E59001E9ABC /* KWQCollection.h in Headers */,
                                93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */,
-                               93F1992F08245E59001E9ABC /* KWQCursor.h in Headers */,
+                               93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                93F1993308245E59001E9ABC /* KWQDef.h in Headers */,
                                93F1993708245E59001E9ABC /* KWQEvent.h in Headers */,
                                93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */,
                                93F1993A08245E59001E9ABC /* KWQFont.h in Headers */,
                                93F1993C08245E59001E9ABC /* KWQFontMetrics.h in Headers */,
                                93F1993E08245E59001E9ABC /* KWQGuardedPtr.h in Headers */,
-                               93F1993F08245E59001E9ABC /* KWQIODevice.h in Headers */,
                                93F1994408245E59001E9ABC /* KWQKConfigBase.h in Headers */,
                                93F1994508245E59001E9ABC /* KWQKCookieJar.h in Headers */,
-                               93F1994608245E59001E9ABC /* KWQKCursor.h in Headers */,
                                93F1994708245E59001E9ABC /* KWQKDebug.h in Headers */,
                                93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */,
                                93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               93F19A1008245E59001E9ABC /* KWQBuffer.cpp in Sources */,
                                93F19A1308245E59001E9ABC /* KWQCharsets.cpp in Sources */,
                                93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */,
                                93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */,
-                               93F19A1908245E59001E9ABC /* KWQCursor.mm in Sources */,
                                93F19A1C08245E59001E9ABC /* KWQEvent.mm in Sources */,
                                93F19A1E08245E59001E9ABC /* KWQFont.mm in Sources */,
                                93F19A1F08245E59001E9ABC /* KWQFontMetrics.mm in Sources */,
                                93F19A2208245E59001E9ABC /* KWQGuardedPtr.cpp in Sources */,
                                93F19A2408245E59001E9ABC /* KWQKConfigBase.mm in Sources */,
                                93F19A2508245E59001E9ABC /* KWQKCookieJar.mm in Sources */,
-                               93F19A2608245E59001E9ABC /* KWQKCursor.mm in Sources */,
+                               93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
                                93F19A2908245E59001E9ABC /* KWQKHistoryProvider.mm in Sources */,
                                93F19A2E08245E59001E9ABC /* KWQKJavaAppletWidget.mm in Sources */,
                                93F19A3008245E59001E9ABC /* KWQKJobClasses.mm in Sources */,
                                93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */,
                                93F19A4B08245E59001E9ABC /* KWQRegion.cpp in Sources */,
                                93F19A4C08245E59001E9ABC /* KWQScrollView.mm in Sources */,
-                               93F19A4D08245E59001E9ABC /* KWQSignalStubs.cpp in Sources */,
                                93F19A5008245E59001E9ABC /* KWQStringList.mm in Sources */,
                                93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */,
                                93F19A5208245E59001E9ABC /* KWQTextCodec.cpp in Sources */,
                                A81369E5097374F600D74463 /* HTMLKeygenElementImpl.cpp in Sources */,
                                A8136D390973A8E700D74463 /* FormDataList.cpp in Sources */,
                                65BF022E0974816300C43196 /* Frame.cpp in Sources */,
-                               65BF02410974819000C43196 /* KWQKHTMLView.cpp in Sources */,
                                65BF02450974819000C43196 /* MacFrame.mm in Sources */,
                                FAE0418C09759694000540BE /* RenderSVGImage.cpp in Sources */,
                                FAE0418F097596C9000540BE /* SVGImageLoader.cpp in Sources */,
index 8f8b5a413b7516483f6f5797198d8ece6460befa..d20012c75e5b567bc601a5d2df4a1e8c5c121b20 100644 (file)
@@ -1,7 +1,7 @@
 #include "config.h"
 
 // These are generated files.
-// I keep modifying and rewording this line here to make the file rebuild.
+// I keep modifying this line here to make the file rebuild.
 
 #include "JSAttr.cpp"
 #include "JSCharacterData.cpp"
index 4de791cb17229f9373fb0f71d909b3c5c878ac8a..3910063342ad5a8d6f47c81a260c26fcdf318139 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "DOM.h"
 
+#import "CDATASectionImpl.h"
+#import "CommentImpl.h"
 #import "ContainerNodeImpl.h"
 #import "DOMEventsInternal.h"
 #import "DOMHTML.h"
 #import "DocumentFragmentImpl.h"
 #import "DocumentImpl.h"
 #import "DocumentTypeImpl.h"
+#import "HTMLElementImpl.h"
 #import "KWQFoundationExtras.h"
 #import "MacFrame.h"
 #import "NodeListImpl.h"
+#import "PlatformString.h"
+#import "StringImpl.h"
+#import "css_stylesheetimpl.h"
 #import "csshelper.h"
 #import "dom2_events.h"
 #import "dom2_range.h"
 #import "dom_elementimpl.h"
 #import "dom_exception.h"
 #import "dom_node.h"
-#import "PlatformString.h"
-#import "StringImpl.h"
-#import "CDATASectionImpl.h"
-#import "CommentImpl.h"
 #import "dom_xmlimpl.h"
-#import "HTMLElementImpl.h"
 #import "htmlnames.h"
 #import "render_image.h"
 #import <JavaScriptCore/WebScriptObjectPrivate.h>
 #import <kxmlcore/Assertions.h>
 #import <kxmlcore/HashMap.h>
-#include <objc/objc-class.h>
+#import <objc/objc-class.h>
 
 using namespace WebCore;
 using namespace HTMLNames;
@@ -873,9 +874,9 @@ static ListenerMap *listenerMap;
     ASSERT(systemId);
 
     int exceptionCode = 0;
-    DocumentTypeImpl *impl = [self _DOMImplementationImpl]->createDocumentType(qualifiedName, publicId, systemId, exceptionCode);
+    RefPtr<DocumentTypeImpl> impl = [self _DOMImplementationImpl]->createDocumentType(qualifiedName, publicId, systemId, exceptionCode);
     raiseOnDOMError(exceptionCode);
-    return static_cast<DOMDocumentType *>([DOMNode _nodeWithImpl:impl]);
+    return static_cast<DOMDocumentType *>([DOMNode _nodeWithImpl:impl.get()]);
 }
 
 - (DOMDocument *)createDocument:(NSString *)namespaceURI :(NSString *)qualifiedName :(DOMDocumentType *)doctype
@@ -884,9 +885,9 @@ static ListenerMap *listenerMap;
     ASSERT(qualifiedName);
 
     int exceptionCode = 0;
-    DocumentImpl *impl = [self _DOMImplementationImpl]->createDocument(namespaceURI, qualifiedName, [doctype _documentTypeImpl], exceptionCode);
+    RefPtr<DocumentImpl> impl = [self _DOMImplementationImpl]->createDocument(namespaceURI, qualifiedName, [doctype _documentTypeImpl], exceptionCode);
     raiseOnDOMError(exceptionCode);
-    return static_cast<DOMDocument *>([DOMNode _nodeWithImpl:impl]);
+    return static_cast<DOMDocument *>([DOMNode _nodeWithImpl:impl.get()]);
 }
 
 @end
@@ -899,7 +900,7 @@ static ListenerMap *listenerMap;
     ASSERT(media);
 
     int exceptionCode = 0;
-    DOMCSSStyleSheet *result = [DOMCSSStyleSheet _CSSStyleSheetWithImpl:[self _DOMImplementationImpl]->createCSSStyleSheet(title, media, exceptionCode)];
+    DOMCSSStyleSheet *result = [DOMCSSStyleSheet _CSSStyleSheetWithImpl:[self _DOMImplementationImpl]->createCSSStyleSheet(title, media, exceptionCode).get()];
     raiseOnDOMError(exceptionCode);
     return result;
 }
index 35d86e83b44127d874fea3cb15eb529135f9ec63..51cba7920b32a5c8bb52f84c68ad2f798e7eeb14 100644 (file)
 
 #import "DocumentImpl.h"
 #import "KWQExceptions.h"
+#import "KWQWindowWidget.h"
 #import "MacFrame.h"
 #import "WebCoreFrameBridge.h"
 #import "render_object.h"
 
 namespace WebCore {
 
+Widget* FrameView::topLevelWidget() const 
+{
+    return Mac(frame())->topLevelWidget();
+}
+
 void FrameView::updateBorder()
 {
     KWQ_BLOCK_EXCEPTIONS;
@@ -52,4 +58,9 @@ void FrameView::updateDashboardRegions()
     }
 }
 
+IntPoint FrameView::viewportToGlobal(const IntPoint &p) const
+{
+    return static_cast<KWQWindowWidget*>(topLevelWidget())->viewportToGlobal(p);
+}
+
 }
diff --git a/WebCore/bridge/mac/KWQKHTMLView.cpp b/WebCore/bridge/mac/KWQKHTMLView.cpp
deleted file mode 100644 (file)
index 006f805..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "FrameView.h"
-
-#include "MacFrame.h"
-#include "KWQWindowWidget.h"
-
-namespace WebCore {
-
-/*
-    Currently this file just extends the KDE implementation.
-    See khtml/khtmlview.cpp for the rest of the implementation.
-*/
-
-Widget *FrameView::topLevelWidget() const 
-{
-    return Mac(frame())->topLevelWidget();
-}
-
-IntPoint FrameView::viewportToGlobal(const IntPoint &p) const
-{
-    return static_cast<KWQWindowWidget *>(topLevelWidget())->viewportToGlobal(p);
-}
-
-}
index 2fe54180e8769423622d63a1a9e9d9dd6a05bdff..3391b0216f7391dacc561c0fe351a7ce7c4a429b 100644 (file)
@@ -137,7 +137,7 @@ public:
     QString advanceToNextMisspelling(bool startBeforeSelection = false);
     
     virtual void setTitle(const DOMString &);
-    void setStatusBarText(const QString &status);
+    virtual void setStatusBarText(const String&);
 
     virtual void urlSelected(const KURL &url, int button, int state, const URLArgs &args);
 
@@ -339,10 +339,6 @@ private:
 
     WebCoreFrameBridge *_bridge;
     
-    KWQSignal _started;
-    KWQSignal _completed;
-    KWQSignal _completedWithBool;
-    
     NSView *_mouseDownView;
     bool _mouseDownWasInSubframe;
     bool _sendingEventToSubview;
index b1dcbfe1d38689fb85d7d5e77c49bb0bc88e486b..c892dfcc10dbdadf851af4eeb212297b57895b3a 100644 (file)
@@ -28,6 +28,7 @@
 
 #import "BrowserExtensionMac.h"
 #import "Cache.h"
+#import "Cursor.h"
 #import "DOMInternal.h"
 #import "EventNames.h"
 #import "FramePrivate.h"
@@ -37,7 +38,6 @@
 #import "InlineTextBox.h"
 #import "KWQAccObjectCache.h"
 #import "KWQClipboard.h"
-#import "KWQCursor.h"
 #import "KWQEditCommand.h"
 #import "KWQEvent.h"
 #import "KWQExceptions.h"
@@ -105,26 +105,6 @@ using namespace HTMLNames;
 
 NSEvent *MacFrame::_currentEvent = nil;
 
-void Frame::completed()
-{
-    Mac(this)->_completed.call();
-}
-
-void Frame::completed(bool arg)
-{
-    Mac(this)->_completed.call(arg);
-}
-
-void Frame::setStatusBarText(const QString &status)
-{
-    Mac(this)->setStatusBarText(status);
-}
-
-void Frame::started(Job *j)
-{
-    Mac(this)->_started.call(j);
-}
-
 bool FrameView::isFrameView() const
 {
     return true;
@@ -133,9 +113,6 @@ bool FrameView::isFrameView() const
 MacFrame::MacFrame(Page* page, RenderPart* ownerRenderer)
     : Frame(page, ownerRenderer)
     , _bridge(nil)
-    , _started(this, SIGNAL(started(KIO::Job *)))
-    , _completed(this, SIGNAL(completed()))
-    , _completedWithBool(this, SIGNAL(completed(bool)))
     , _mouseDownView(nil)
     , _sendingEventToSubview(false)
     , _mouseDownMayStartDrag(false)
@@ -675,9 +652,9 @@ void MacFrame::setTitle(const DOMString &title)
     KWQ_UNBLOCK_EXCEPTIONS;
 }
 
-void MacFrame::setStatusBarText(const QString &status)
+void MacFrame::setStatusBarText(const String& status)
 {
-    QString text = status;
+    QString text = status.qstring();
     text.replace(QChar('\\'), backslashAsCurrencySymbol());
 
     KWQ_BLOCK_EXCEPTIONS;
@@ -1216,7 +1193,7 @@ void MacFrame::openURLFromPageCache(KWQPageState *state)
     // copy to m_workingURL after fixing url() above
     d->m_workingURL = url();
         
-    emit started(NULL);
+    started();
     
     // -----------begin-----------
     clear();
@@ -1720,7 +1697,7 @@ void MacFrame::khtmlMouseMoveEvent(MouseMoveEvent *event)
 
         if (_mouseDownMayStartDrag) {
             // We are starting a text/image/url drag, so the cursor should be an arrow
-            d->m_view->viewport()->setCursor(QCursor());
+            d->m_view->viewport()->setCursor(pointerCursor());
             
             NSPoint dragLocation = [_currentEvent locationInWindow];
             if (dragHysteresisExceeded(dragLocation.x, dragLocation.y)) {
index 96b6fc3f4ecda7b71e78b910d979a83ecf2dd9db..16aec20e94ff011cfc647a17f8253bab83b911fe 100644 (file)
@@ -26,8 +26,6 @@
 //#define CSS_DEBUG
 
 #include "config.h"
-#include "kdebug.h"
-
 #include "css_base.h"
 
 #ifdef CSS_DEBUG
@@ -303,7 +301,7 @@ DOMString CSSSelector::selectorText() const
                 str += "*=";
                 break;
             default:
-                kdWarning(6080) << "Unhandled case in CSSStyleRuleImpl::selectorText : match=" << cs->match << endl;
+                break;
         }
         if (cs->match != CSSSelector::Set) {
             str += "\"";
index 57b435600bc031f9547c38f56f1da03b61ee9afa..c4a744363e2c5ef9929a503b65696cc457f817c5 100644 (file)
@@ -38,8 +38,6 @@
 #include "html/html_documentimpl.h"
 #include "loader.h"
 
-#include <kdebug.h>
-
 using namespace DOM;
 using namespace khtml;
 // --------------------------------------------------------------------------------
index 9ae0ea910383a28c01d3ed9eb9a38962911de9c6..afd107a76e0a63294c6fa3456feb8a131ed352e0 100644 (file)
@@ -42,7 +42,6 @@
 #include "rendering/font.h"
 #include "rendering/render_style.h"
 #include "StringImpl.h"
-#include <kdebug.h>
 #include <qregexp.h>
 
 #if SVG_SUPPORT
index 9bbabd24d8f9b57d620be79743f1a1cc6f15d9f4..361949254b1975223e35458686f909fb07315609 100644 (file)
 #define YYDEBUG 0
 
 #include "config.h"
-#include <kdebug.h>
+#include "cssparser.h"
+
 #include <kurl.h>
 
-#include "cssparser.h"
 #include "css_valueimpl.h"
 #include "css_ruleimpl.h"
 #include "css_stylesheetimpl.h"
index 0be21b6ed7477f932c673dacc3b449d485291f1d..299cc527ecd05d564136aa08e2cd737954318d53 100644 (file)
 
 #include "config.h"
 #include "DOMImplementationImpl.h"
-#include "DocumentTypeImpl.h"
-#include "html_documentimpl.h"
 
+#include "DocumentTypeImpl.h"
 #include "PlatformString.h"
-#include "dom_exception.h"
 #include "css_stylesheetimpl.h"
+#include "dom_exception.h"
+#include "html_documentimpl.h"
 
-namespace DOM {
+namespace WebCore {
 
 // FIXME: An implementation of this is still waiting for me to understand the distinction between
 // a "malformed" qualified name and one with bad characters in it. For example, is a second colon
 // an illegal character or a malformed qualified name? This will determine both what parameters
 // this function needs to take and exactly what it will do. Should also be exported so that
 // ElementImpl can use it too.
-static bool qualifiedNameIsMalformed(const DOMString &)
+static bool qualifiedNameIsMalformed(const String&)
 {
     return false;
 }
 
-DOMImplementationImpl::DOMImplementationImpl()
-{
-}
-
-DOMImplementationImpl::~DOMImplementationImpl()
+bool DOMImplementationImpl::hasFeature (const String& feature, const String& version) const
 {
-}
-
-bool DOMImplementationImpl::hasFeature (const DOMString &feature, const DOMString &version) const
-{
-    DOMString lower = feature.lower();
+    String lower = feature.lower();
     if (lower == "core" || lower == "html" || lower == "xml" || lower == "xhtml")
         return version.isEmpty() || version == "1.0" || version == "2.0";
     if (lower == "css"
@@ -71,47 +63,46 @@ bool DOMImplementationImpl::hasFeature (const DOMString &feature, const DOMStrin
     return false;
 }
 
-DocumentTypeImpl *DOMImplementationImpl::createDocumentType( const DOMString &qualifiedName, const DOMString &publicId,
-                                                             const DOMString &systemId, int &exceptioncode )
+PassRefPtr<DocumentTypeImpl> DOMImplementationImpl::createDocumentType(const String& qualifiedName,
+    const String& publicId, const String& systemId, ExceptionCode& ec)
 {
     // Not mentioned in spec: throw NAMESPACE_ERR if no qualifiedName supplied
     if (qualifiedName.isNull()) {
-        exceptioncode = DOMException::NAMESPACE_ERR;
+        ec = DOMException::NAMESPACE_ERR;
         return 0;
     }
 
     // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    DOMString prefix, localName;
+    String prefix, localName;
     if (!DocumentImpl::parseQualifiedName(qualifiedName, prefix, localName)) {
-        exceptioncode = DOMException::INVALID_CHARACTER_ERR;
+        ec = DOMException::INVALID_CHARACTER_ERR;
         return 0;
     }
 
     // NAMESPACE_ERR: Raised if the qualifiedName is malformed.
     if (qualifiedNameIsMalformed(qualifiedName)) {
-        exceptioncode = DOMException::NAMESPACE_ERR;
+        ec = DOMException::NAMESPACE_ERR;
         return 0;
     }
 
+    ec = 0;
     return new DocumentTypeImpl(this, 0, qualifiedName, publicId, systemId);
 }
 
-DOMImplementationImpl* DOMImplementationImpl::getInterface(const DOMString& /*feature*/) const
+DOMImplementationImpl* DOMImplementationImpl::getInterface(const String& /*feature*/) const
 {
     // ###
     return 0;
 }
 
-DocumentImpl *DOMImplementationImpl::createDocument( const DOMString &namespaceURI, const DOMString &qualifiedName,
-                                                     DocumentTypeImpl *doctype, int &exceptioncode )
+PassRefPtr<DocumentImpl> DOMImplementationImpl::createDocument(const String& namespaceURI,
+    const String& qualifiedName, DocumentTypeImpl* doctype, ExceptionCode& ec)
 {
-    exceptioncode = 0;
-
     if (!qualifiedName.isEmpty()) {
         // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-        DOMString prefix, localName;
+        String prefix, localName;
         if (!DocumentImpl::parseQualifiedName(qualifiedName, prefix, localName)) {
-            exceptioncode = DOMException::INVALID_CHARACTER_ERR;
+            ec = DOMException::INVALID_CHARACTER_ERR;
             return 0;
         }
 
@@ -122,7 +113,7 @@ DocumentImpl *DOMImplementationImpl::createDocument( const DOMString &namespaceU
         //   from "http://www.w3.org/XML/1998/namespace" [Namespaces].
         int colonpos = -1;
         uint i;
-        DOMStringImpl *qname = qualifiedName.impl();
+        StringImpl *qname = qualifiedName.impl();
         for (i = 0; i < qname->l && colonpos < 0; i++) {
             if ((*qname)[i] == ':')
                 colonpos = i;
@@ -133,7 +124,7 @@ DocumentImpl *DOMImplementationImpl::createDocument( const DOMString &namespaceU
             (colonpos == 3 && qualifiedName[0] == 'x' && qualifiedName[1] == 'm' && qualifiedName[2] == 'l' &&
              namespaceURI != "http://www.w3.org/XML/1998/namespace")) {
 
-            exceptioncode = DOMException::NAMESPACE_ERR;
+            ec = DOMException::NAMESPACE_ERR;
             return 0;
         }
     }
@@ -141,38 +132,40 @@ DocumentImpl *DOMImplementationImpl::createDocument( const DOMString &namespaceU
     // WRONG_DOCUMENT_ERR: Raised if doctype has already been used with a different document or was
     // created from a different implementation.
     if (doctype && (doctype->getDocument() || doctype->implementation() != this)) {
-        exceptioncode = DOMException::WRONG_DOCUMENT_ERR;
+        ec = DOMException::WRONG_DOCUMENT_ERR;
         return 0;
     }
 
     // ### this is completely broken.. without a view it will not work (Dirk)
-    DocumentImpl *doc = new DocumentImpl(this, 0);
+    RefPtr<DocumentImpl> doc = new DocumentImpl(this, 0);
 
     // now get the interesting parts of the doctype
     if (doctype)
-        doc->setDocType(new DocumentTypeImpl(doc, *doctype));
+        doc->setDocType(new DocumentTypeImpl(doc.get(), *doctype));
 
     if (!qualifiedName.isEmpty())
-        doc->addChild(doc->createElementNS(namespaceURI, qualifiedName, exceptioncode));
+        doc->addChild(doc->createElementNS(namespaceURI, qualifiedName, ec));
     
-    return doc;
+    ec = 0;
+    return doc.release();
 }
 
-CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(const DOMString &/*title*/, const DOMString &media, int &/*exception*/)
+PassRefPtr<CSSStyleSheetImpl> DOMImplementationImpl::createCSSStyleSheet(const String&, const String& media, ExceptionCode& ec)
 {
     // ### TODO : title should be set, and media could have wrong syntax, in which case we should generate an exception.
-    CSSStyleSheetImpl * const nullSheet = 0;
-    CSSStyleSheetImpl *sheet = new CSSStyleSheetImpl(nullSheet);
-    sheet->setMedia(new MediaListImpl(sheet, media));
-    return sheet;
+    ec = 0;
+    CSSStyleSheetImpl* const nullSheet = 0;
+    RefPtr<CSSStyleSheetImpl> sheet = new CSSStyleSheetImpl(nullSheet);
+    sheet->setMedia(new MediaListImpl(sheet.get(), media));
+    return sheet.release();
 }
 
-DocumentImpl *DOMImplementationImpl::createDocument( FrameView *v )
+PassRefPtr<DocumentImpl> DOMImplementationImpl::createDocument(FrameView* v)
 {
     return new DocumentImpl(this, v);
 }
 
-HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( FrameView *v )
+PassRefPtr<HTMLDocumentImpl> DOMImplementationImpl::createHTMLDocument(FrameView* v)
 {
     return new HTMLDocumentImpl(this, v);
 }
@@ -183,7 +176,7 @@ DOMImplementationImpl* DOMImplementationImpl::instance()
     return i.get();
 }
 
-bool DOMImplementationImpl::isXMLMIMEType(const DOMString& mimeType)
+bool DOMImplementationImpl::isXMLMIMEType(const String& mimeType)
 {
     if (mimeType == "text/xml" || mimeType == "application/xml" || mimeType == "application/xhtml+xml" ||
         mimeType == "text/xsl" || mimeType == "application/rss+xml" || mimeType == "application/atom+xml"
@@ -195,13 +188,13 @@ bool DOMImplementationImpl::isXMLMIMEType(const DOMString& mimeType)
     return false;
 }
 
-HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument(const DOMString &title)
+PassRefPtr<HTMLDocumentImpl> DOMImplementationImpl::createHTMLDocument(const String& title)
 {
-    HTMLDocumentImpl *d = createHTMLDocument( 0 /* ### create a view otherwise it doesn't work */);
+    RefPtr<HTMLDocumentImpl> d = createHTMLDocument(0 /* ### create a view otherwise it doesn't work */);
     d->open();
     // FIXME: Need to escape special characters in the title?
     d->write("<html><head><title>" + title.qstring() + "</title></head>");
-    return d;
+    return d.release();
 }
 
-};
\ No newline at end of file
+}
index 2380aded542c01606d693cd27d10fe175fb231df..3ede2e2a62c122842fa53d82a1763aa6d3eefe5b 100644 (file)
  * Boston, MA 02111-1307, USA.
  *
  */
+
 #ifndef DOM_DOMImplementationImpl_h
 #define DOM_DOMImplementationImpl_h
 
 #include "Shared.h"
 
+namespace KXMLCore {
+    template <typename T> class PassRefPtr;
+}
+using KXMLCore::PassRefPtr;
+
 namespace WebCore {
 
 class CSSStyleSheetImpl;
-class DOMString;
 class DocumentImpl;
 class DocumentTypeImpl;
 class FrameView;
 class HTMLDocumentImpl;
+class String;
+
+typedef int ExceptionCode;
 
 class DOMImplementationImpl : public Shared<DOMImplementationImpl> {
 public:
-    DOMImplementationImpl();
-    ~DOMImplementationImpl();
-
     // DOM methods & attributes for DOMImplementation
-    bool hasFeature(const DOMString& feature, const DOMString& version) const;
-    DocumentTypeImpl *createDocumentType( const DOMString &qualifiedName, const DOMString &publicId,
-                                          const DOMString &systemId, int &exceptioncode );
-    DocumentImpl *createDocument( const DOMString &namespaceURI, const DOMString &qualifiedName,
-                                  DocumentTypeImpl *doctype, int &exceptioncode );
+    bool hasFeature(const String& feature, const String& version) const;
+    PassRefPtr<DocumentTypeImpl> createDocumentType(const String& qualifiedName, const String& publicId, const String &systemId, ExceptionCode&);
+    PassRefPtr<DocumentImpl> createDocument(const String& namespaceURI, const String& qualifiedName, DocumentTypeImpl*, ExceptionCode&);
 
-    DOMImplementationImpl* getInterface(const DOMString& feature) const;
+    DOMImplementationImpl* getInterface(const String& feature) const;
 
     // From the DOMImplementationCSS interface
-    CSSStyleSheetImpl *createCSSStyleSheet(const DOMString &title, const DOMString &media, int &exceptioncode);
+    PassRefPtr<CSSStyleSheetImpl> createCSSStyleSheet(const String& title, const String& media, ExceptionCode&);
 
     // From the HTMLDOMImplementation interface
-    HTMLDocumentImpl* createHTMLDocument( const DOMString& title);
+    PassRefPtr<HTMLDocumentImpl> createHTMLDocument(const String& title);
 
     // Other methods (not part of DOM)
-    DocumentImpl *createDocument( FrameView *v = 0 );
-    HTMLDocumentImpl *createHTMLDocument( FrameView *v = 0 );
+    PassRefPtr<DocumentImpl> createDocument(FrameView* = 0);
+    PassRefPtr<HTMLDocumentImpl> createHTMLDocument(FrameView* = 0);
 
     // Returns the static instance of this class - only one instance of this class should
     // ever be present, and is used as a factory method for creating DocumentImpl objects
-    static DOMImplementationImpl *instance();
-    
-    static bool isXMLMIMEType(const DOMString& mimeType);
+    static DOMImplementationImplinstance();
+
+    static bool isXMLMIMEType(const String& mimeType);
 };
 
 } //namespace
index 90ef4692116f95980d932faaa81f1e79cc4f8c7f..4da71c68226fcb2cd641d64564aa166bc46ba5e1 100644 (file)
@@ -65,7 +65,6 @@
 #include "VisiblePosition.h"
 #include "visible_text.h"
 #include "xml_tokenizer.h"
-#include <kdebug.h>
 #include <qregexp.h>
 #include "HTMLNameCollectionImpl.h"
 
@@ -202,7 +201,6 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl* impl, FrameView *v)
 #ifdef KHTML_XSLT
     , m_transformSource(0)
 #endif
-    , m_finishedParsing(this, SIGNAL(finishedParsing()))
     , m_savedRenderer(0)
     , m_passwordFields(0)
     , m_secureForms(0)
@@ -1102,7 +1100,6 @@ void DocumentImpl::implicitOpen()
 
     clear();
     m_tokenizer = createTokenizer();
-    connect(m_tokenizer,SIGNAL(finishedParsing()),this,SIGNAL(finishedParsing()));
     setParsing(true);
 }
 
@@ -1351,7 +1348,6 @@ void DocumentImpl::determineParseMode(const QString &/*str*/)
     // determine their parse mode.
     pMode = Strict;
     hMode = XHtml;
-    kdDebug(6020) << " using strict parseMode" << endl;
 }
 
 NodeImpl *DocumentImpl::nextFocusNode(NodeImpl *fromNode)
@@ -3087,4 +3083,11 @@ PassRefPtr<NameNodeListImpl> DocumentImpl::getElementsByName(const String &eleme
     return new NameNodeListImpl(this, elementName);
 }
 
+void DocumentImpl::finishedParsing()
+{
+    setParsing(false);
+    if (Frame* f = frame())
+        f->finishedParsing();
+}
+
 }
index 1eb8193aeae4be18a2f934fc755f6116aec76573..d6f0b3f9508c4d95e7c032a97965fa66f73644aa 100644 (file)
@@ -531,7 +531,6 @@ public:
 
     void setDocType(PassRefPtr<DocumentTypeImpl>);
 
-signals:
     void finishedParsing();
 
 protected:
@@ -658,8 +657,6 @@ protected:
     int m_docID; // A unique document identifier used for things like document-specific mapped attributes.
 
 public:
-    KWQSignal m_finishedParsing;
-
     bool inPageCache();
     void setInPageCache(bool flag);
     void restoreRenderer(RenderObject*);
index 0efe1b43b1c3be119aab921490dac24706f0c288..ac1f17273acb520ad2c693c38ac03abb69d61e13 100644 (file)
 #include "config.h"
 #include "xml_tokenizer.h"
 
+#include "CDATASectionImpl.h"
 #include "Cache.h"
 #include "CachedScript.h"
-#include "KWQLoader.h"
+#include "CommentImpl.h"
 #include "DocLoader.h"
 #include "DocumentFragmentImpl.h"
 #include "DocumentImpl.h"
 #include "DocumentTypeImpl.h"
 #include "Frame.h"
 #include "FrameView.h"
+#include "KWQLoader.h"
 #include "SegmentedString.h"
 #include "dom_node.h"
-#include "CDATASectionImpl.h"
-#include "CommentImpl.h"
 #include "dom_xmlimpl.h"
 #include "html_headimpl.h"
 #include "html_tableimpl.h"
 #include "htmlnames.h"
-#include "kentities.h" // for xhtml entity name lookup
+#include "htmltokenizer.h"
+#include <kxmlcore/Vector.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
-#include <kxmlcore/Vector.h>
 
 #include <kio/job.h>
 
@@ -61,16 +61,6 @@ const int maxErrors = 25;
 
 typedef HashMap<DOMStringImpl *, DOMStringImpl *> PrefixForNamespaceMap;
 
-Tokenizer::Tokenizer() : m_parserStopped(false)
-    , m_finishedParsing(this, SIGNAL(finishedParsing()))
-{
-}
-
-void Tokenizer::finishedParsing()
-{
-    m_finishedParsing.call();
-}
-
 class XMLTokenizer : public Tokenizer, public CachedObjectClient
 {
 public:
@@ -724,14 +714,13 @@ static xmlEntity sharedXHTMLEntity = {
     XML_INTERNAL_PREDEFINED_ENTITY, 0, 0, 0, 0, 0
 };
 
-static xmlEntityPtr getXHTMLEntity(const xmlChar *name)
+static xmlEntityPtr getXHTMLEntity(const xmlCharname)
 {
-    const char *namePosition = (const char *)name;
-    const Entity *e = findEntity(namePosition, strlen(namePosition));
-    if (!e)
+    unsigned short c = decodeNamedEntity(reinterpret_cast<const char*>(name));
+    if (!c)
         return 0;
 
-    QCString value = QString(QChar(e->code)).utf8();
+    QCString value = QString(QChar(c)).utf8();
     assert(value.length() < 5);
     sharedXHTMLEntity.length = value.length();
     sharedXHTMLEntity.name = name;
@@ -846,7 +835,7 @@ void XMLTokenizer::finish()
     }
 
     setCurrentNode(0);
-    emit finishedParsing();
+    m_doc->finishedParsing();
 }
 
 static inline RefPtr<ElementImpl> createXHTMLParserErrorHeader(DocumentImpl* doc, const DOMString& errorMessages) 
index 5bbe21a6f8b9edbaea5ae96641ca341ecd7f0d73..318f48041496e8dce1b7fe13e0f6e1a30a3cd495 100644 (file)
 #ifndef XML_Tokenizer_h_
 #define XML_Tokenizer_h_
 
-#include <kxmlcore/HashMap.h>
-#include <qobject.h>
 #include "PlatformString.h"
+#include <kxmlcore/HashMap.h>
 
 namespace WebCore {
 
-class DOMString;
+class DocLoader;
 class DocumentFragmentImpl;
 class DocumentImpl;
 class ElementImpl;
 class FrameView;
-class NodeImpl;
 class SegmentedString;
 
-class Tokenizer : public QObject
+class Tokenizer
 {
 public:
-    Tokenizer();
+    Tokenizer() : m_parserStopped(false) { }
+    virtual ~Tokenizer() { }
+
     // Script output must be prepended, while new data
     // received during executing a script must be appended, hence the
     // extra bool to be able to distinguish between both cases.
@@ -57,12 +57,6 @@ protected:
     // it stops receiving data. We use m_parserStopped to stop the tokenizer
     // even when it has buffered data.
     bool m_parserStopped;
-
-signals:
-    void finishedParsing();
-
-private:
-    KWQSignal m_finishedParsing;
 };
 
 Tokenizer* newXMLTokenizer(DocumentImpl*, FrameView* = 0);
@@ -70,8 +64,8 @@ Tokenizer* newXMLTokenizer(DocumentImpl*, FrameView* = 0);
 void* xmlDocPtrForString(const QString& source, const QString& URL = QString());
 void setLoaderForLibXMLCallbacks(DocLoader*);
 #endif
-HashMap<DOMString, DOMString> parseAttributes(const DOMString&, bool& attrsOK);
-bool parseXMLDocumentFragment(const DOMString&, DocumentFragmentImpl*, ElementImpl* parent = 0);
+HashMap<String, String> parseAttributes(const String&, bool& attrsOK);
+bool parseXMLDocumentFragment(const String&, DocumentFragmentImpl*, ElementImpl* parent = 0);
 
 }
 
index 201dba6e9770e2e8dbd6e586cd3193cf3656e24d..95642afa61f30b9678edffd35d4f79886c7831de 100644 (file)
 
 #include "config.h"
 #if SVG_SUPPORT
-#include <math.h>
+#include "KCanvasCreator.h"
 
-#include <kdebug.h>
+#include <math.h>
 
 #include "kcanvas/KCanvas.h"
 #include "KCanvasPath.h"
-#include "KCanvasCreator.h"
 #include "KRenderingDevice.h"
 #include "KCanvasContainer.h"
 
index be284e9d672ced2b1ef4e542b36dccd8a8011d0a..0dcf8191cbe514ae968e414c29958bec6fc24028 100644 (file)
 
 #include "config.h"
 #if SVG_SUPPORT
+#include "KCanvasResources.h"
+
 #include "IntRect.h"
-#include <kdebug.h>
 
 #include "kcanvas/KCanvas.h"
 #include "kcanvas/RenderPath.h"
 #include "kcanvas/KCanvasImage.h"
 #include "KCanvasMatrix.h"
 #include "KCanvasContainer.h"
-#include "KCanvasResources.h"
 #include "KRenderingDevice.h"
 
 #include "SVGStyledElementImpl.h"
index 40c616477210b2097cc1c72c5d67557251b1c08b..ea12ae4ebacfbe4958177fdbd434e6b5f3280e6d 100644 (file)
 
 #include "config.h"
 #if SVG_SUPPORT
+#include "RenderPath.h"
+
 #include "IntRect.h"
-#include <kdebug.h>
 #include <kxmlcore/Assertions.h>
 
 #include "kcanvas/KCanvas.h"
-#include "kcanvas/RenderPath.h"
 #include "KCanvasMatrix.h"
 #include "KRenderingDevice.h"
 #include "KCanvasContainer.h"
index 88327a193215481d37e886a9ab8cc14a8e050f46..1a8b67c8bb8839b56140fe9520a5ba81e2ff3094 100644 (file)
@@ -40,8 +40,6 @@
 #include "dom/css_stylesheet.h"
 #include "Frame.h"
 
-#include <kdebug.h>
-
 using namespace WebCore;
 using namespace EventNames;
 
@@ -202,21 +200,15 @@ bool ScriptInterpreter::wasRunByUserGesture() const
       type == submitEvent );
     if (eventOk)
       return true;
-  } else // no event
-  {
-    if ( m_inlineCode  && !m_timerCallback )
-    {
+  } else { // no event
+    if (m_inlineCode  && !m_timerCallback)
       // This is the <a href="javascript:window.open('...')> case -> we let it through
       return true;
-      kdDebug(6070) << "Window.open, smart policy, no event, inline code -> ok" << endl;
-    }
-    else // This is the <script>window.open(...)</script> case or a timer callback -> block it
-      kdDebug(6070) << "Window.open, smart policy, no event, <script> tag -> refused" << endl;
+    // This is the <script>window.open(...)</script> case or a timer callback -> block it
   }
   return false;
 }
 
-
 bool ScriptInterpreter::isGlobalObject(JSValue *v)
 {
     return v->isObject(&Window::info);
index 3de41fc71f6a3c7d3946a0a8515275d00aff176b..8626f11d9a37661de92ff36fd607399defbb2643 100644 (file)
@@ -32,8 +32,6 @@
 #include "kjs_dom.h"
 #include "htmlnames.h"
 
-#include <kdebug.h>
-
 #include "kjs_css.lut.h"
 
 using namespace DOM::HTMLNames;
@@ -335,20 +333,20 @@ void DOMStyleSheet::put(ExecState *exec, const Identifier &propertyName, JSValue
     DOMObject::put(exec, propertyName, value, attr);
 }
 
-JSValue *getDOMStyleSheet(ExecState *exec, StyleSheetImpl *ss)
+JSValue* getDOMStyleSheet(ExecState *exec, PassRefPtr<StyleSheetImpl> ss)
 {
   DOMObject *ret;
   if (!ss)
     return jsNull();
   ScriptInterpreter *interp = static_cast<ScriptInterpreter *>(exec->dynamicInterpreter());
-  if ((ret = interp->getDOMObject(ss)))
+  if ((ret = interp->getDOMObject(ss.get())))
     return ret;
   else {
     if (ss->isCSSStyleSheet())
-      ret = new DOMCSSStyleSheet(exec, static_cast<CSSStyleSheetImpl *>(ss));
+      ret = new DOMCSSStyleSheet(exec, static_cast<CSSStyleSheetImpl *>(ss.get()));
     else
-      ret = new DOMStyleSheet(exec,ss);
-    interp->putDOMObject(ss, ret);
+      ret = new DOMStyleSheet(exec, ss.get());
+    interp->putDOMObject(ss.get(), ret);
     return ret;
   }
 }
@@ -886,9 +884,6 @@ void DOMCSSRule::putValueProperty(ExecState *exec, int token, JSValue *value, in
   case Charset_Encoding:
     static_cast<CSSCharsetRuleImpl *>(m_impl.get())->setEncoding(value->toString(exec).domString());
     return;
-
-  default:
-    kdWarning() << "DOMCSSRule::putValueProperty unhandled token " << token << endl;
   }
 }
 
index 044afd890f85cda532004b5392242ab646b4f736..83278ae0639edc07606826fb978ac3f6123193d0 100644 (file)
@@ -86,7 +86,7 @@ namespace KJS {
     RefPtr<DOM::StyleSheetImpl> m_impl;
   };
 
-  JSValue *getDOMStyleSheet(ExecState *exec, DOM::StyleSheetImpl *ss);
+  JSValue* getDOMStyleSheet(ExecState*, PassRefPtr<WebCore::StyleSheetImpl>);
 
   class DOMStyleSheetList : public DOMObject {
   public:
index abe00d0b0fb5a0f47c75f528ea7e5686ea5e6d3b..7878b74aea4ecf3e3654939d1a4e5ae4542eddb7 100644 (file)
@@ -55,7 +55,6 @@
 #include "kjs_views.h"
 #include "kjs_window.h"
 #include "render_canvas.h"
-#include <kdebug.h>
 
 #if __APPLE__
 #include <JavaScriptCore/runtime_object.h>
@@ -415,7 +414,6 @@ JSValue *DOMNode::getValueProperty(ExecState *exec, int token) const
     case ScrollTop:
       return jsNumber(rend && rend->layer() ? rend->layer()->scrollYOffset() : 0);
     default:
-      kdWarning() << "Unhandled token in DOMNode::getValueProperty : " << token << endl;
       break;
     }
   }
@@ -580,8 +578,6 @@ void DOMNode::putValueProperty(ExecState *exec, int token, JSValue *value, int /
       rend->layer()->scrollToXOffset(value->toInt32(exec));
     break;
   }
-  default:
-    kdWarning() << "DOMNode::putValueProperty unhandled token " << token << endl;
   }
 }
 
@@ -923,7 +919,6 @@ JSValue *DOMDocument::getValueProperty(ExecState *exec, int token) const
   case DOMDocument::DefaultView: // DOM2
     return getDOMAbstractView(exec,doc.defaultView());
   default:
-    kdWarning() << "DOMDocument::getValueProperty unhandled token " << token << endl;
     return NULL;
   }
 }
index bbed7fe558c47f3952ba0aeae6f021e1650cd37e..5c3196a04e76d1487905879423b15da7bab5b7f8 100644 (file)
@@ -38,8 +38,6 @@
 #include "JSMutationEvent.h"
 #include "JSWheelEvent.h"
 
-#include <kdebug.h>
-
 using namespace WebCore;
 using namespace EventNames;
 using namespace HTMLNames;
@@ -442,7 +440,6 @@ JSValue *DOMEvent::getValueProperty(ExecState *exec, int token) const
     }
   }
   default:
-    kdWarning() << "Unhandled token in DOMEvent::getValueProperty : " << token << endl;
     return NULL;
   }
 }
@@ -606,7 +603,6 @@ JSValue *DOMUIEvent::getValueProperty(ExecState *exec, int token) const
   case Which:
     return jsNumber(event.which());
   default:
-    kdWarning() << "Unhandled token in DOMUIEvent::getValueProperty : " << token << endl;
     return jsUndefined();
   }
 }
@@ -707,7 +703,6 @@ JSValue *DOMMouseEvent::getValueProperty(ExecState *exec, int token) const
   case Y:
     return jsNumber(event.y());
   default:
-    kdWarning() << "Unhandled token in DOMMouseEvent::getValueProperty : " << token << endl;
     return NULL;
   }
 }
@@ -791,7 +786,6 @@ JSValue *DOMKeyboardEvent::getValueProperty(ExecState *exec, int token) const
   case AltGraphKey:
     return jsBoolean(event.altGraphKey());
   default:
-    kdWarning() << "Unhandled token in DOMKeyboardEvent::getValueProperty : " << token << endl;
     return NULL;
   }
 }
@@ -875,7 +869,6 @@ JSValue *Clipboard::getValueProperty(ExecState *exec, int token) const
             }
         }
         default:
-            kdWarning() << "Clipboard::getValueProperty unhandled token " << token << endl;
             return NULL;
     }
 }
@@ -898,8 +891,6 @@ void Clipboard::putValueProperty(ExecState *exec, int token, JSValue *value, int
             if (clipboard->isForDragging())
                 clipboard->setEffectAllowed(value->toString(exec).domString());
             break;
-        default:
-            kdWarning() << "Clipboard::putValueProperty unhandled token " << token << endl;
     }
 }
 
index f9655b8ecd0e35c915875aa74f3418a82a7b925b..1a3b0a7bac03a9c3b762036970aa1a61424bb0fa 100644 (file)
@@ -66,8 +66,6 @@
 #include "rendering/render_object.h"
 #include "rendering/render_layer.h"
 
-#include <kdebug.h>
-
 #include "css/cssparser.h"
 #include "css/css_stylesheetimpl.h"
 #include "css/css_ruleimpl.h"
@@ -271,7 +269,6 @@ JSValue *HTMLDocument::getValueProperty(ExecState *exec, int token) const
   case Scripts: // TODO (IE-specific)
     {
       // To be implemented. Meanwhile, return an object with a length property set to 0
-      kdWarning() << "KJS::HTMLDocument document.scripts called - not implemented" << endl;
       JSObject *obj = new JSObject;
       obj->put(exec, lengthPropertyName, jsNumber(0));
       return obj;
@@ -444,8 +441,6 @@ void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, JSValue *va
     // Add "all" to the property map.
     putDirect("all", value);
     break;
-  default:
-    kdWarning() << "HTMLDocument::putValueProperty unhandled token " << token << endl;
   }
 }
 
@@ -1830,7 +1825,6 @@ JSValue *HTMLElement::anchorGetter(ExecState* exec, int token) const
         case AnchorHost:            return jsString(KURL(anchor.href().qstring()).host());
         case AnchorHostname: {
             KURL url(anchor.href().qstring());
-            kdDebug(6070) << "anchor::hostname uses:" <<url.url()<<endl;
             if (url.port()==0)
                 return jsString(url.host());
             else
@@ -1959,7 +1953,6 @@ JSValue *HTMLElement::areaGetter(ExecState* exec, int token) const
         case AreaHost:            return jsString(KURL(area.href().qstring()).host());
         case AreaHostName: {
             KURL url(area.href().qstring());
-            kdDebug(6070) << "link::hostname uses:" <<url.url()<<endl;
             if (url.port()==0)
                 return jsString(url.host());
             else
@@ -2255,7 +2248,6 @@ JSValue *KJS::HTMLElementFunction::callAsFunction(ExecState *exec, JSObject *thi
 {
     if (!thisObj->inherits(&KJS::HTMLElement::info))
         return throwError(exec, TypeError);
-    kdDebug() << "KJS::HTMLElementFunction::tryCall " << endl;
     DOMExceptionTranslator exception(exec);
     HTMLElementImpl &element = *static_cast<HTMLElementImpl *>(static_cast<HTMLElement *>(thisObj)->impl());
 
index 067d3afdaf81a25f6c2bc11e8317bcf13cfc3eb0..4e44ebf2294d4c5a714be466a1e96713d95f9b32 100644 (file)
@@ -25,7 +25,6 @@
 #include <klocale.h>
 
 #include <kconfig.h>
-#include <kdebug.h>
 
 #include "kjs_navigator.h"
 #include "kjs/lookup.h"
@@ -223,8 +222,7 @@ JSValue *Navigator::getValueProperty(ExecState *exec, int token) const
   case CookieEnabled:
     return jsBoolean(KWQKCookieJar::cookieEnabled());
   default:
-    kdWarning() << "Unhandled token in DOMEvent::getValueProperty : " << token << endl;
-    return NULL;
+    return 0;
   }
 }
 
index cd2aa035af3b9f7b62e618e174991a5a65d9664a..bc79e8aa03565e91767ce8d75012b9f63290f4c6 100644 (file)
@@ -25,7 +25,6 @@
 #include "DocumentImpl.h"
 #include "dom2_traversalimpl.h"
 #include "Frame.h"
-#include <kdebug.h>
 #include <kjs/protect.h>
 
 using namespace DOM;
@@ -93,8 +92,7 @@ JSValue *DOMNodeIterator::getValueProperty(ExecState *exec, int token) const
   case PointerBeforeReferenceNode:
     return jsBoolean(ni.pointerBeforeReferenceNode());
  default:
-   kdWarning() << "Unhandled token in DOMNodeIterator::getValueProperty : " << token << endl;
-   return NULL;
+   return 0;
   }
 }
 
@@ -276,8 +274,7 @@ JSValue *DOMTreeWalker::getValueProperty(ExecState *exec, int token) const
   case CurrentNode:
     return getDOMNode(exec,tw.currentNode());
   default:
-    kdWarning() << "Unhandled token in DOMTreeWalker::getValueProperty : " << token << endl;
-    return NULL;
+    return 0;
   }
 }
 
index 1fbc1733d02f1d9d21bebef2d7ee186b69ff0f93..9acd36aacdee8488b8eb58a570d78d6add2c0ce2 100644 (file)
@@ -54,7 +54,6 @@
 #include "render_canvas.h"
 #include "xmlserializer.h"
 #include <kconfig.h>
-#include <kdebug.h>
 #include <kjs/collector.h>
 #include <klocale.h>
 #include "FrameTree.h"
@@ -187,7 +186,6 @@ JSValue* Screen::getValueProperty(ExecState*, int token) const
   case AvailWidth:
     return jsNumber(usableScreenRect(widget).width());
   default:
-    kdWarning() << "Screen::getValueProperty unhandled token " << token << endl;
     return jsUndefined();
   }
 }
@@ -1197,7 +1195,6 @@ bool Window::toBoolean(ExecState *) const
 
 void Window::scheduleClose()
 {
-  kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl;
   ASSERT(winq);
   m_frame->scheduleClose();
 }
@@ -1266,15 +1263,11 @@ bool Window::isSafeScript(const ScriptInterpreter *origin, const ScriptInterpret
 
 bool Window::isSafeScript(ExecState *exec) const
 {
-  if (m_frame.isNull()) { // frame deleted ? can't grant access
-    kdDebug(6070) << "Window::isSafeScript: accessing deleted frame !" << endl;
+  if (m_frame.isNull()) // frame deleted ? can't grant access
     return false;
-  }
   Frame *activePart = static_cast<ScriptInterpreter *>( exec->dynamicInterpreter() )->frame();
-  if (!activePart) {
-    kdDebug(6070) << "Window::isSafeScript: current interpreter's frame is 0L!" << endl;
+  if (!activePart)
     return false;
-  }
   if ( activePart == m_frame ) // Not calling from another frame, no problem.
     return true;
 
@@ -1388,7 +1381,6 @@ void Window::clear()
   if (m_returnValueSlot)
     if (JSValue *returnValue = getDirect("returnValue"))
       *m_returnValueSlot = returnValue;
-  kdDebug(6070) << "Window::clear " << this << endl;
   delete winq;
   winq = new WindowQObject(this);
 
@@ -2286,8 +2278,7 @@ JSValue *LocationFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const
     case Location::ToString:
       return jsString(location->toString(exec));
     }
-  } else
-    kdDebug(6070) << "LocationFunc::tryExecute - no frame!" << endl;
+  }
   return jsUndefined();
 }
 
@@ -2492,7 +2483,6 @@ JSValue *History::getValueProperty(ExecState *, int token) const
     return jsNumber(ext->getHistoryLength());
   }
   default:
-    kdWarning() << "Unhandled token in History::getValueProperty : " << token << endl;
     return jsUndefined();
   }
 }
index c83cfb5f654246a425b0f55a36a98964362dfe46..4bd9f38812a7815679d9bd853ff6f108fd5d2c56 100644 (file)
@@ -26,8 +26,6 @@
 #include "dom/dom_exception.h"
 #include "markup.h"
 
-#include <kdebug.h>
-
 using DOM::NodeImpl;
 
 namespace KJS {
index 6c921f594739dd2c63d5b27e66732c6d7fea1817..6be8b8237ad70734eac0a95a0a8a4bcdc16009b6 100644 (file)
@@ -46,7 +46,6 @@
 #include "htmlnames.h"
 
 #include <kurl.h>
-#include <kdebug.h>
 
 namespace WebCore {
 using namespace EventNames;
index 5c2f848fdfbc26649d2c018727f155bc79512379..96aee20691fbecf985cf4fb640ae04250ee5415a 100644 (file)
 #include <kxmlcore/HashMap.h>
 #include <kxmlcore/HashSet.h>
 
-using namespace WebCore;
-using namespace HTMLNames;
+namespace WebCore {
 
-//----------------------------------------------------------------------------
+using namespace HTMLNames;
 
 /**
  * @internal
@@ -69,7 +68,7 @@ class HTMLStackElem
 public:
     HTMLStackElem(const AtomicString& _tagName,
                   int _level,
-                  DOM::NodeImpl *_node,
+                  NodeImpl *_node,
                   HTMLStackElem * _next
         )
         :
@@ -121,7 +120,7 @@ HTMLParser::HTMLParser(FrameView *_parent, DocumentImpl *doc, bool includesComme
     reset();
 }
 
-HTMLParser::HTMLParser(DOM::DocumentFragmentImpl *i, DocumentImpl *doc, bool includesComments)
+HTMLParser::HTMLParser(DocumentFragmentImpl *i, DocumentImpl *doc, bool includesComments)
     : current(0), currentIsReferenced(false), includesCommentsInDOM(includesComments)
 {
     HTMLWidget = 0;
@@ -162,7 +161,7 @@ void HTMLParser::reset()
     discard_until = nullAtom;
 }
 
-void HTMLParser::setCurrent(DOM::NodeImpl *newCurrent) 
+void HTMLParser::setCurrent(NodeImpl *newCurrent) 
 {
     bool newCurrentIsReferenced = newCurrent && newCurrent != doc();
     if (newCurrentIsReferenced) 
@@ -345,7 +344,7 @@ bool HTMLParser::handleError(NodeImpl* n, bool flat, const AtomicString& localNa
             if (!head)
                 createHead();
             if (head) {
-                DOM::NodeImpl *newNode = head->addChild(n);
+                NodeImpl *newNode = head->addChild(n);
                 if (newNode) {
                     pushBlock(localName, tagPriority);
                     setCurrent(newNode);
@@ -864,7 +863,7 @@ void HTMLParser::popNestedHeaderTag()
     }
 }
 
-bool HTMLParser::isInline(DOM::NodeImpl* node) const
+bool HTMLParser::isInline(NodeImpl* node) const
 {
     if (node->isTextNode())
         return true;
@@ -1117,7 +1116,7 @@ void HTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
                                                     // if it becomes necessary to do so.
 }
 
-void HTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
+void HTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, NodeImpl* malformedTableParent)
 {
     // Loop for each tag that needs to be reopened.
     while (elem) {
@@ -1334,11 +1333,16 @@ void HTMLParser::startBody()
 void HTMLParser::finished()
 {
     // In the case of a completely empty document, here's the place to create the HTML element.
-    if (current && current->isDocumentNode() && current->firstChild() == 0) {
+    if (current && current->isDocumentNode() && !current->firstChild())
         insertNode(new HTMLHtmlElementImpl(document));
-    }
 
     // This ensures that "current" is not left pointing to a node when the document is destroyed.
     freeBlock();
     setCurrent(0);
+
+    // Warning, this may delete the tokenizer and parser, so don't try to do anything else after this.
+    if (HTMLWidget)
+        document->finishedParsing();
+}
+
 }
index f6c5e8a6fb687c1af0437dac4b640864926d3365..1572c52501cbaa23df2c5da704b279f3679bcc17 100644 (file)
@@ -5,7 +5,7 @@
               (C) 1997 Torben Weis (weis@kde.org)
               (C) 1998 Waldo Bastian (bastian@kde.org)
               (C) 1999 Lars Knoll (knoll@kde.org)
-    Copyright (C) 2004 Apple Computer, Inc.
+    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
 #ifndef HTMLPARSER_H
 #define HTMLPARSER_H
 
-#include "html/html_documentimpl.h"
-
-class HTMLStackElem;
+#include "html_documentimpl.h"
 
 namespace WebCore {
-    class DocumentFragmentImpl;
-    class FrameView;
-    class HTMLDocumentImpl;
-    class HTMLElementImpl;
-    class HTMLFormElementImpl;
-    class HTMLHeadElementImpl;
-    class HTMLMapElementImpl;
-    class NodeImpl;
-    class Token;
-}
+
+class DocumentFragmentImpl;
+class FrameView;
+class HTMLElementImpl;
+class HTMLFormElementImpl;
+class HTMLHeadElementImpl;
+class HTMLMapElementImpl;
+class HTMLStackElem;
+class Token;
 
 /**
  * The parser for html. It receives a stream of tokens from the HTMLTokenizer, and
@@ -52,14 +49,14 @@ namespace WebCore {
 class HTMLParser
 {
 public:
-    HTMLParser(WebCore::FrameView *w, DOM::DocumentImpl *i, bool includesComments=false);
-    HTMLParser(DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc, bool includesComments=false);
+    HTMLParser(FrameView *w, DocumentImpl *i, bool includesComments=false);
+    HTMLParser(DocumentFragmentImpl *frag, DocumentImpl *doc, bool includesComments=false);
     virtual ~HTMLParser();
 
     /**
      * parses one token delivered by the tokenizer
      */
-    PassRefPtr<WebCore::NodeImpl> parseToken(WebCore::Token*);
+    PassRefPtr<NodeImpl> parseToken(Token*);
     
     /**
      * tokenizer says it's not going to be sending us any more tokens
@@ -75,55 +72,55 @@ public:
     bool noSpaces() const { return !inBody; }
     bool selectMode() const { return inSelect; }
 
-    DOM::HTMLDocumentImpl *doc() const { return static_cast<DOM::HTMLDocumentImpl *>(document); }
+    HTMLDocumentImpl *doc() const { return static_cast<HTMLDocumentImpl *>(document); }
 
 protected:
-    void setCurrent(DOM::NodeImpl* newCurrent);
-    void setSkipMode(const DOM::QualifiedName& qName) { discard_until = qName.localName(); }
+    void setCurrent(NodeImpl* newCurrent);
+    void setSkipMode(const QualifiedName& qName) { discard_until = qName.localName(); }
 
-    WebCore::FrameView *HTMLWidget;
-    DOM::DocumentImpl *document;
+    FrameView *HTMLWidget;
+    DocumentImpl *document;
 
     /*
      * generate a node from the token
      */
-    PassRefPtr<WebCore::NodeImpl> getNode(WebCore::Token*);
-    bool textCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool commentCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool headCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool bodyCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool framesetCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool iframeCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool formCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool isindexCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool selectCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool ddCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool dtCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool nestedCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool nestedStyleCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool tableCellCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool tableSectionCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool noembedCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool noscriptCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool noframesCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool nolayerCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-    bool mapCreateErrorCheck(WebCore::Token*, RefPtr<WebCore::NodeImpl>&);
-
-    void processCloseTag(khtml::Token *);
-
-    bool insertNode(DOM::NodeImpl *n, bool flat = false);
-    bool handleError(DOM::NodeImpl* n, bool flat, const DOM::AtomicString& localName, int tagPriority);
+    PassRefPtr<NodeImpl> getNode(Token*);
+    bool textCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool commentCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool headCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool bodyCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool framesetCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool iframeCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool formCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool isindexCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool selectCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool ddCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool dtCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool nestedCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool nestedStyleCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool tableCellCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool tableSectionCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool noembedCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool noscriptCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool noframesCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool nolayerCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+    bool mapCreateErrorCheck(Token*, RefPtr<NodeImpl>&);
+
+    void processCloseTag(Token *);
+
+    bool insertNode(NodeImpl *n, bool flat = false);
+    bool handleError(NodeImpl* n, bool flat, const AtomicString& localName, int tagPriority);
     
     // The currently active element (the one new elements will be added to).  Can be a DocumentFragment, a Document or an Element.
-    DOM::NodeImpl* current;
+    NodeImpl* current;
 
     bool currentIsReferenced;
 
     HTMLStackElem *blockStack;
 
-    void pushBlock(const DOM::AtomicString& tagName, int _level);
-    void popBlock(const DOM::AtomicString& tagName);
-    void popBlock(const DOM::QualifiedName& qName) { return popBlock(qName.localName()); } // Convenience function for readability.
+    void pushBlock(const AtomicString& tagName, int _level);
+    void popBlock(const AtomicString& tagName);
+    void popBlock(const QualifiedName& qName) { return popBlock(qName.localName()); } // Convenience function for readability.
     void popOneBlock(bool delBlock = true);
     void popInlineBlocks();
 
@@ -131,39 +128,39 @@ protected:
 
     void createHead();
 
-    bool isResidualStyleTag(const DOM::AtomicString& tagName);
-    bool isAffectedByResidualStyle(const DOM::AtomicString& tagName);
+    bool isResidualStyleTag(const AtomicString& tagName);
+    bool isAffectedByResidualStyle(const AtomicString& tagName);
     void handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem);
-    void reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent);
+    void reopenResidualStyleTags(HTMLStackElem* elem, NodeImpl* malformedTableParent);
 
-    bool allowNestedRedundantTag(const DOM::AtomicString& tagName);
+    bool allowNestedRedundantTag(const AtomicString& tagName);
     
-    static bool isHeaderTag(const DOM::AtomicString& tagName);
+    static bool isHeaderTag(const AtomicString& tagName);
     void popNestedHeaderTag();
 
-    bool isInline(DOM::NodeImpl* node) const;
+    bool isInline(NodeImpl* node) const;
     
     /*
      * currently active form
      */
-    DOM::HTMLFormElementImpl *form;
+    HTMLFormElementImpl *form;
 
     /*
      * current map
      */
-    DOM::HTMLMapElementImpl *map;
+    HTMLMapElementImpl *map;
 
     /*
      * the head element. Needed for crappy html which defines <base> after </head>
      */
-    DOM::HTMLHeadElementImpl *head;
+    HTMLHeadElementImpl *head;
 
     /*
      * a possible <isindex> element in the head. Compatibility hack for
      * html from the stone age
      */
-    RefPtr<DOM::NodeImpl> isindex;
-    DOM::NodeImpl* handleIsindex(khtml::Token*);
+    RefPtr<NodeImpl> isindex;
+    NodeImpl* handleIsindex(Token*);
 
     /*
      * inserts the stupid isIndex element.
@@ -179,12 +176,14 @@ protected:
     /*
      * tells the parser to discard all tags, until it reaches the one specified
      */
-    DOM::AtomicString discard_until;
+    AtomicString discard_until;
 
     bool headLoaded;
     int inStrayTableContent;
 
     bool includesCommentsInDOM;
 };
+
+}
     
 #endif // HTMLPARSER_H
index e95fa2fc8b5b0921d00d0fdf14331088d7df0907..27748760d4974b728bcbfca1a4e8ea09e3c2e141 100644 (file)
 #include <ctype.h>
 #include <stdlib.h>
 
-// turn off inlining to allow proper linking on newer gcc (xmltokenizer.cpp also uses findEntity())
-#undef __inline
-#define __inline
 #include "kentities.c"
-#undef __inline
 
 // #define INSTRUMENT_LAYOUT_SCHEDULING 1
 
@@ -1545,27 +1541,21 @@ void HTMLTokenizer::end()
     ASSERT(!m_timer.isActive());
     m_timer.stop(); // Only helps if assertion above fires, but do it anyway.
 
-    if ( buffer == 0 ) {
-        parser->finished();
-        emit finishedParsing();
-        return;
-    }
+    if (buffer) {
+        // parseTag is using the buffer for different matters
+        if (!m_state.hasTagState())
+            processToken();
 
-    // parseTag is using the buffer for different matters
-    if (!m_state.hasTagState())
-        processToken();
+        if (scriptCode)
+            KHTML_DELETE_QCHAR_VEC(scriptCode);
+        scriptCode = 0;
+        scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
 
-    if(buffer)
         KHTML_DELETE_QCHAR_VEC(buffer);
+        buffer = 0;
+    }
 
-    if(scriptCode)
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
-
-    scriptCode = 0;
-    scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
-    buffer = 0;
     parser->finished();
-    emit finishedParsing();
 }
 
 void HTMLTokenizer::finish()
@@ -1781,4 +1771,10 @@ void parseHTMLDocumentFragment(const DOMString &source, DocumentFragmentImpl *fr
     ASSERT(!tok.processingData());      // make sure we're done (see 3963151)
 }
 
+unsigned short decodeNamedEntity(const char* name)
+{
+    const Entity* e = findEntity(name, strlen(name));
+    return e ? e->code : 0;
+}
+
 }
index 558f64f62c3d84f091f0181ea69ebc97cbc87d22..9c5556e409b5538a356bb179a7a399d9cafb2573 100644 (file)
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
-//----------------------------------------------------------------------------
-//
-// KDE HTML Widget -- Tokenizers
 
 #ifndef HTMLTOKENIZER_H
 #define HTMLTOKENIZER_H
 
 #include "CachedObjectClient.h"
+#include "KWQGuardedPtr.h"
 #include "SegmentedString.h"
 #include "Timer.h"
 #include "dom_qname.h"
 #include "xml_tokenizer.h"
 #include <qptrqueue.h>
-#include <QString.h>
-
-class HTMLParser;
 
 namespace KXMLCore {
     template <class T> class PassRefPtr;
@@ -50,7 +45,9 @@ class CachedScript;
 class DocumentFragmentImpl;
 class DocumentImpl;
 class FrameView;
+class HTMLParser;
 class NamedMappedAttrMapImpl;
+class NodeImpl;
 
 /**
  * @internal
@@ -343,13 +340,15 @@ private:
     unsigned int m_cBufferPos;
     
     SegmentedString src;
-    HTMLParser *parser;
+    HTMLParserparser;
     QGuardedPtr<FrameView> view;    
     bool inWrite;
 };
 
-void parseHTMLDocumentFragment(const DOMString &, DocumentFragmentImpl *);
+void parseHTMLDocumentFragment(const String&, DocumentFragmentImpl*);
+
+unsigned short decodeNamedEntity(const char*);
 
 }
 
-#endif // HTMLTOKENIZER
+#endif
diff --git a/WebCore/khtml/html/kentities.h b/WebCore/khtml/html/kentities.h
deleted file mode 100644 (file)
index 0d65747..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-// This must be kept in sync with khtml/misc/kentities.gperf
-struct Entity {
-    const char *name;
-    int code;
-};
-
-const struct Entity *findEntity(const char *str, unsigned int len);
index bd4ff749b4ab7788c6d6cc658f910343e11f339d..d663a5eea725a5ecfcd95ea137150861148b2033 100644 (file)
@@ -33,8 +33,6 @@
 #include "xsl_stylesheetimpl.h"
 #include "xml_tokenizer.h"
 
-#include <kdebug.h>
-
 #include <libxslt/xsltutils.h>
 #include <libxml/uri.h>
 
index 96865bf36a5f312e95cd83d731c8944b3f5e5f9f..9cf44e9a10df62eb749a7627b04af6d040186fdd 100644 (file)
@@ -28,8 +28,6 @@
 #include "DocumentImpl.h"
 #include "SVGDocumentExtensions.h"
 
-#include <kdebug.h>
-
 using namespace WebCore;
 
 SVGAnimateColorElementImpl::SVGAnimateColorElementImpl(const QualifiedName& tagName, DocumentImpl *doc)
@@ -125,7 +123,7 @@ void SVGAnimateColorElementImpl::handleTimerEvent(double timePercentage)
                 break;
             default:
             {
-                kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
+                //kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
                 return;
             }
         }
index 30f3357068581a12b23f398d0ead1ff8c2b98af6..950759ddd9317c5ea44ce85a12c75bae880a8d8b 100644 (file)
@@ -27,8 +27,6 @@
 #include "DocumentImpl.h"
 #include "SVGDocumentExtensions.h"
 
-#include <kdebug.h>
-
 using namespace WebCore;
 
 SVGAnimateElementImpl::SVGAnimateElementImpl(const QualifiedName& tagName, DocumentImpl *doc)
@@ -115,7 +113,7 @@ void SVGAnimateElementImpl::handleTimerEvent(double timePercentage)
                 break;*/
             default:
             {
-                kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
+                //kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
                 return;
             }
         }
index 51d5a68066df5ab14f62288015edb4e965362d3f..08d899ada75e340d6372c209cca2ab7747bafd52 100644 (file)
@@ -38,8 +38,6 @@
 #include "DocumentImpl.h"
 #include "SVGDocumentExtensions.h"
 
-#include <kdebug.h>
-
 #include <cmath>
 
 using namespace WebCore;
@@ -165,7 +163,7 @@ void SVGAnimateTransformElementImpl::handleTimerEvent(double timePercentage)
                 break;
             default:
             {
-                kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
+                //kdError() << k_funcinfo << " Unable to detect animation mode! Aborting creation!" << endl;
                 return;
             }
         }
index 58501ce9c70394362e8fa2b382a085e13b63aa0a..c2833a6b191a46d4983a36fb7870cae5bbcb5d2e 100644 (file)
@@ -160,7 +160,7 @@ void SVGAnimationElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
                 // Register keyDownEventListener for the character
                 QString character = current.mid(current.length() - 2, 1);
 
-                kdDebug() << k_funcinfo << " Supposed to register accessKey Character: " << character << " UNSUPPORTED!" << endl;
+                //kdDebug() << k_funcinfo << " Supposed to register accessKey Character: " << character << " UNSUPPORTED!" << endl;
             }
             else if(current.startsWith(QString::fromLatin1("wallclock")))
             {
@@ -168,7 +168,7 @@ void SVGAnimationElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
                 int secondBrace = current.find(')');
 
                 QString wallclockValue = current.mid(firstBrace + 1, secondBrace - firstBrace - 2);
-                kdDebug() << k_funcinfo << " Supposed to use wallClock value: " << wallclockValue << " UNSUPPORTED!" << endl;
+                //kdDebug() << k_funcinfo << " Supposed to use wallClock value: " << wallclockValue << " UNSUPPORTED!" << endl;
             }
             else if(current.contains('.'))
             {
@@ -194,7 +194,7 @@ void SVGAnimationElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
                     QString event = current.mid(dotPosition + 1, plusMinusPosition - dotPosition - 1);
                     clockValue = current.mid(dotPosition + event.length() + 1);
 
-                    kdDebug() << k_funcinfo << " Supposed to use DOM Event: " << event << " UNSUPPORTED!" << endl;
+                    //kdDebug() << k_funcinfo << " Supposed to use DOM Event: " << event << " UNSUPPORTED!" << endl;
                 }
             }
             else
@@ -205,7 +205,7 @@ void SVGAnimationElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
                     if(!isIndefinite(m_begin))
                         m_begin *= 1000.0;
 
-                    kdDebug() << k_funcinfo << " Setting begin time to " << m_begin << " ms!" << endl;
+                    //kdDebug() << k_funcinfo << " Setting begin time to " << m_begin << " ms!" << endl;
                 }
                 else
                 {
@@ -213,7 +213,7 @@ void SVGAnimationElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
                     if(!isIndefinite(m_end))
                         m_end *= 1000.0;
 
-                    kdDebug() << k_funcinfo << " Setting end time to " << m_end << " ms!" << endl;
+                    //kdDebug() << k_funcinfo << " Setting end time to " << m_end << " ms!" << endl;
                 }
             }
         }
index 43389b50c552c5bcf490a147ea0342d029c647ef..89eb4eaac46bf53dd4f7ebe07f3a298e6f605efd 100644 (file)
@@ -25,7 +25,6 @@
 #include <kdom/core/AttrImpl.h>
 #include "DocumentImpl.h"
 #include "DocLoader.h"
-#include <kdebug.h>
 
 #include "SVGNames.h"
 #include "SVGHelper.h"
index 300364827cdd3ff88284c7f7b05c6ba3d4050ff1..ad157dbe9ba9ada490e6cd4369648c598e43d82d 100644 (file)
@@ -137,6 +137,10 @@ FrameView *SVGDocumentImpl::svgView() const
 
 void SVGDocumentImpl::finishedParsing()
 {
+    // FIXME: Two problems:
+    // 1) This is never called since it's a non-virtual function.
+    // 2) If this was called it would need to call the base class's implementation of finishedParsing.
+
     addScripts(rootElement());
 
     m_scriptsIt = new Q3PtrListIterator<SVGScriptElementImpl>(m_scripts);
index ebfac94bedd37e5d4a6c659b6fe183caac4eb5fa..1734b3504c6c93cd7befd85819f405813fad19ce 100644 (file)
@@ -24,8 +24,6 @@
 #if SVG_SUPPORT
 #include "IntRect.h"
 
-#include <kdebug.h>
-
 #include <kcanvas/KCanvas.h>
 #include <kcanvas/RenderPath.h>
 #include "KCanvasRenderingStyle.h"
@@ -245,13 +243,13 @@ bool SVGLengthImpl::updateValueInSpecifiedUnits(bool notify)
     switch(m_unitType)
     {
         case SVG_LENGTHTYPE_PERCENTAGE:
-            kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_PERCENTAGE - UNSUPPORTED! Please report!" << endl;
+            //kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_PERCENTAGE - UNSUPPORTED! Please report!" << endl;
             return false;
         case SVG_LENGTHTYPE_EMS:
-            kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_EMS - UNSUPPORTED! Please report!" << endl;
+            //kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_EMS - UNSUPPORTED! Please report!" << endl;
             return false;
         case SVG_LENGTHTYPE_EXS:
-            kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_EXS - UNSUPPORTED! Please report!" << endl;
+            //kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_EXS - UNSUPPORTED! Please report!" << endl;
             return false;
         case SVG_LENGTHTYPE_PX:
             m_valueInSpecifiedUnits = m_value;
index 229f750bf951854680435bdd7d605a4da44183f5..635fc9c53ffb207776a6f1321c0c857a97615960 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #if SVG_SUPPORT
-#include <kdebug.h>
 
 #include "SVGPathSegLinetoImpl.h"
 #include "SVGStyledElementImpl.h"
index cc0689f68c92a9951554a115b2913ef6f5d7d137..56e29cbbf11fffa89ead06fa4787d53858a740a3 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #if SVG_SUPPORT
-#include <kdebug.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 
index 2271c223c05f53ec4450634eebf288eee54d8810..9ba607b7005d39f6949deb8535347ea5b71e582a 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #if SVG_SUPPORT
-#include <kdebug.h>
 
 #include "SVGMatrixImpl.h"
 #include "SVGTransformImpl.h"
diff --git a/WebCore/kwq/KWQBuffer.cpp b/WebCore/kwq/KWQBuffer.cpp
deleted file mode 100644 (file)
index a0c5228..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "KWQBuffer.h"
-
-void QBuffer::open(int)
-{
-    if (!opened) {
-        opened = true;
-        pos = 0;
-    }
-}
-
-int QBuffer::writeBlock(const char *data, uint len)
-{
-    // FIXME: could easily be optimized a lot - leave extra space in
-    // buffer for amortized constant time growth
-
-    if (pos+len > ba.size()) {
-        if (!ba.resize(pos+len)) {
-            return -1;
-        }
-    }
-    memcpy(ba.data()+pos, data, len);
-    pos += len;
-
-    return len;
-}
-
-bool QBuffer::setBuffer(ByteArray newBuff)
-{
-    if (isOpen())
-        return false;
-    ba.duplicate(newBuff.data(), newBuff.size());
-    return true;
-}
-
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
deleted file mode 100644 (file)
index 618587d..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QBUFFER_H_
-#define QBUFFER_H_
-
-#include "KWQDef.h"
-
-#include "Array.h"
-#include "QString.h"
-#include "KWQIODevice.h"
-
-class QBuffer {
-public:
-    QBuffer() : opened(false), pos(0) { }
-    QBuffer(ByteArray b) : opened(false), ba(b), pos(0) { }
-
-    bool setBuffer(ByteArray);
-    ByteArray buffer() const { return ba; }
-    uint size() const { return ba.size(); }
-    bool isOpen() const { return opened; }
-    void open(int);
-    void close() { opened = false; }
-    int writeBlock(const char *, uint);
-
-private:
-    bool opened;
-    ByteArray ba;
-    uint pos;
-};
-
-#endif
index 03d474af621b581b38d86964c937639d2c7923f0..b605dcf3c0ffd390debcc2c7639ac78319d1a019 100644 (file)
@@ -496,7 +496,7 @@ void QComboBox::populate()
                 if (layer)
                     layer->scrollRectToVisible(w->absoluteBoundingBoxRect());
             }
-            QFocusEvent event(QEvent::FocusIn);
+            QEvent event(QEvent::FocusIn);
             if (widget->eventFilterObject())
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
         }
@@ -510,7 +510,7 @@ void QComboBox::populate()
     if (resign) {
         Widget *widget = [self widget];
         if (widget) {
-            QFocusEvent event(QEvent::FocusOut);
+            QEvent event(QEvent::FocusOut);
             if (widget->eventFilterObject()) {
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
                 [MacFrame::bridgeForWidget(widget) formControlIsResigningFirstResponder:self];
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
deleted file mode 100644 (file)
index 55e15c6..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#import "config.h"
-#import "KWQCursor.h"
-
-#import "KWQFoundationExtras.h"
-#import "WebCoreImageRenderer.h"
-
-namespace WebCore {
-
-static NSCursor *createCustomCursor(Image* image)
-{
-    // FIXME: The cursor won't animate properly.  Not sure if that's a big deal.
-    NSImage *img = image->getNSImage();
-    if (!img)
-        return nil;
-    return [[NSCursor alloc] initWithImage:img hotSpot:NSZeroPoint];
-}
-
-QCursor::QCursor()
-    : cursor(nil)
-{
-}
-
-QCursor::QCursor(Image* image)
-    : cursor(createCustomCursor(image))
-{
-}
-
-QCursor::QCursor(const QCursor& other)
-    : cursor(KWQRetain(other.cursor))
-{
-}
-
-QCursor::~QCursor()
-{
-    KWQRelease(cursor);
-}
-
-QCursor QCursor::makeWithNSCursor(NSCursor * c)
-{
-    QCursor q;
-    q.cursor = KWQRetain(c);
-    return q;
-}
-      
-QCursor& QCursor::operator=(const QCursor& other)
-{
-    KWQRetain(other.cursor);
-    KWQRelease(cursor);
-    cursor = other.cursor;
-    return *this;
-}
-
-NSCursor *QCursor::handle() const
-{
-    return cursor;
-}
-
-}
index 80544dde491d866861e0086c9a8114a0bd220cb8..76238518ed25749ea57215b294e90f6ff3f750e6 100644 (file)
@@ -27,8 +27,7 @@
 #define QEVENT_H_
 
 #include "KWQNamespace.h"
-#include "KWQRegion.h"
-#include "IntPointArray.h"
+#include "IntPoint.h"
 #include "QString.h"
 
 #ifdef __OBJC__
 class NSEvent;
 #endif
 
-class QEvent : public Qt {
+class QEvent {
 public:
 
     enum Type {
-        None,
-        Enter,
-        Leave,
         MouseButtonPress,
         MouseButtonRelease,
         MouseButtonDblClick,
@@ -52,10 +48,7 @@ public:
         FocusOut,
         KeyPress,
         KeyRelease,
-        Paint,
-        Resize,
-        Wheel,
-        KParts
+        Wheel
     };
 
     QEvent(Type type) : _type(type) { }
@@ -67,8 +60,6 @@ private:
     Type  _type;
 };
 
-typedef QEvent QCustomEvent;
-
 class QMouseEvent : public QEvent {
 public:
     QMouseEvent(Type, NSEvent *);
@@ -79,9 +70,9 @@ public:
     int y() const { return _position.y(); }
     int globalX() const { return _globalPosition.x(); }
     int globalY() const { return _globalPosition.y(); }
-    ButtonState button() const { return static_cast<ButtonState>(_button); }
-    ButtonState state() const { return static_cast<ButtonState>(_state); }
-    ButtonState stateAfter() const { return static_cast<ButtonState>(_stateAfter); }
+    Qt::ButtonState button() const { return static_cast<Qt::ButtonState>(_button); }
+    Qt::ButtonState state() const { return static_cast<Qt::ButtonState>(_state); }
+    Qt::ButtonState stateAfter() const { return static_cast<Qt::ButtonState>(_stateAfter); }
 
     int clickCount() const { return _clickCount; }
 
@@ -100,7 +91,7 @@ class QKeyEvent : public QEvent {
 public:
     QKeyEvent(NSEvent *, bool forceAutoRepeat = false);
 
-    ButtonState state() const { return static_cast<ButtonState>(_state); }
+    Qt::ButtonState state() const { return static_cast<Qt::ButtonState>(_state); }
     bool isAccepted() const { return _isAccepted; }
     QString text() const { return _text; }
     bool isAutoRepeat() const { return _autoRepeat; }
@@ -121,18 +112,9 @@ private:
     int _WindowsKeyCode;
 };
 
-class QFocusEvent : public QEvent {
-public:
-    enum Reason { Popup, Other };
-
-    QFocusEvent(Type type) : QEvent(type) { }
-
-    static Reason reason() { return Other; }
-};
-
 class QWheelEvent : public QEvent {
 public:
-    QWheelEvent(const IntPoint &position, const IntPoint &globalPosition, int delta, int state, Orientation orientation)
+    QWheelEvent(const IntPoint& position, const IntPoint& globalPosition, int delta, int state, Qt::Orientation orientation)
         : QEvent(Wheel), _position(position), _globalPosition(globalPosition), _delta(delta), _state(state)
         , _orientation(orientation), _isAccepted(false)
         { }
@@ -142,7 +124,7 @@ public:
     const IntPoint &globalPos() const { return _globalPosition; }
     int delta() const { return _delta; }
     int state() const { return _state; }
-    Orientation orientation() const { return _orientation; }
+    Qt::Orientation orientation() const { return _orientation; }
     bool isAccepted() const { return _isAccepted; }
 
     int x() const { return _position.x(); }
@@ -158,17 +140,8 @@ private:
     IntPoint _globalPosition;
     int _delta;
     int _state;
-    Orientation _orientation;
+    Qt::Orientation _orientation;
     bool _isAccepted;
 };
 
-class QHideEvent;
-class QShowEvent;
-class QContextMenuEvent;
-
-class QResizeEvent : public QEvent {
-public:
-    QResizeEvent() : QEvent(Resize) { }
-};
-
 #endif
index 179a38af74018dcdf61feb9aff90fbce26d97aa3..a78f910cc0629557eb19f2ee5e8da1bd19562dd9 100644 (file)
@@ -161,11 +161,11 @@ void KWQFileButton::focusChanged(bool nowHasFocus)
             if (layer)
                 layer->scrollRectToVisible(widget->absoluteBoundingBoxRect());
         }        
-        QFocusEvent event(QEvent::FocusIn);
+        QEvent event(QEvent::FocusIn);
         const_cast<QObject *>(eventFilterObject())->eventFilter(this, &event);
     }
     else {
-        QFocusEvent event(QEvent::FocusOut);
+        QEvent event(QEvent::FocusOut);
         const_cast<QObject *>(eventFilterObject())->eventFilter(this, &event);
     }
 }
diff --git a/WebCore/kwq/KWQIODevice.h b/WebCore/kwq/KWQIODevice.h
deleted file mode 100644 (file)
index 6916e64..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef QIODEVICE_H_
-#define QIODEVICE_H_
-
-#define IO_WriteOnly            0x0002
-#define IO_ReadOnly             0x0001
-
-#endif
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
deleted file mode 100644 (file)
index 1e5cecb..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KCURSOR_H_
-#define KCURSOR_H_
-
-#include "KWQCursor.h"
-
-class KCursor {
-public:
-
-    static QCursor arrowCursor();
-    static QCursor crossCursor();
-    static QCursor handCursor();
-    static QCursor sizeAllCursor();
-    static QCursor sizeHorCursor();
-    static QCursor sizeVerCursor();
-    static QCursor sizeBDiagCursor();
-    static QCursor sizeFDiagCursor();
-    static QCursor ibeamCursor();
-    static QCursor waitCursor();
-    static QCursor whatsThisCursor();
-    
-    static QCursor eastResizeCursor();
-    static QCursor northResizeCursor();
-    static QCursor northEastResizeCursor();
-    static QCursor northWestResizeCursor();
-    static QCursor southResizeCursor();
-    static QCursor southEastResizeCursor();
-    static QCursor southWestResizeCursor();
-    static QCursor westResizeCursor();
-
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
deleted file mode 100644 (file)
index 3cdbcdb..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#import "KWQKCursor.h"
-
-#import "KWQExceptions.h"
-
-// Simple NSDictionary and NSCursor calls shouldn't need protection,
-// but creating a cursor with a bad image might throw.
-
-@interface KWQKCursorBundleDummy : NSObject { }
-@end
-@implementation KWQKCursorBundleDummy
-@end
-
-@interface NSCursor (WebCoreCursorAdditions)
-+ (NSCursor *)_WebCore_cursorWithName:(NSString *)name hotSpot:(NSPoint)hotSpot;
-@end
-
-@implementation NSCursor (WebCoreCursorAdditions)
-
-+ (NSCursor *)_WebCore_cursorWithName:(NSString *)name hotSpot:(NSPoint)hotSpot
-{
-    static NSMutableDictionary *nameToCursor = nil;
-    if (!nameToCursor) {
-        nameToCursor = [[NSMutableDictionary alloc] init];
-    }
-    
-    NSCursor *cursor;
-    KWQ_BLOCK_EXCEPTIONS;
-    cursor = [nameToCursor objectForKey:name];
-    if (!cursor) { 
-        NSImage *cursorImage = [[NSImage alloc] initWithContentsOfFile:
-            [[NSBundle bundleForClass:[KWQKCursorBundleDummy class]]
-            pathForResource:name ofType:@"tiff"]];
-        if (cursorImage) {
-            cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpot];
-            [cursorImage release];
-            [nameToCursor setObject:cursor forKey:name];
-            [cursor release];
-        }
-
-    }
-    return cursor;
-    KWQ_UNBLOCK_EXCEPTIONS;
-    
-    return nil;
-}
-
-@end
-
-QCursor KCursor::arrowCursor() { return QCursor(); }
-QCursor KCursor::crossCursor() { return QCursor::makeWithNSCursor([NSCursor crosshairCursor]); }
-QCursor KCursor::handCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"linkCursor" hotSpot:NSMakePoint(6.0, 1.0)]); }
-QCursor KCursor::sizeAllCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"moveCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
-QCursor KCursor::sizeHorCursor() { return QCursor(); }
-QCursor KCursor::sizeVerCursor() { return QCursor(); }
-QCursor KCursor::sizeBDiagCursor() { return QCursor(); }
-QCursor KCursor::sizeFDiagCursor() { return QCursor(); }
-QCursor KCursor::ibeamCursor() { return QCursor::makeWithNSCursor([NSCursor IBeamCursor]); }
-QCursor KCursor::waitCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"waitCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
-QCursor KCursor::whatsThisCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"helpCursor" hotSpot:NSMakePoint(8.0, 8.0)]); }
-
-QCursor KCursor::eastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"eastResizeCursor" hotSpot:NSMakePoint(14.0, 7.0)]); }
-QCursor KCursor::northResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northResizeCursor" hotSpot:NSMakePoint(7.0, 1.0)]); }
-QCursor KCursor::northEastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northEastResizeCursor" hotSpot:NSMakePoint(14.0, 1.0)]); }
-QCursor KCursor::northWestResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"northWestResizeCursor" hotSpot:NSMakePoint(0.0, 0.0)]); }
-QCursor KCursor::southResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southResizeCursor" hotSpot:NSMakePoint(7.0, 14.0)]); }
-QCursor KCursor::southEastResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southEastResizeCursor" hotSpot:NSMakePoint(14.0, 14.0)]); }
-QCursor KCursor::southWestResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"southWestResizeCursor" hotSpot:NSMakePoint(1.0, 14.0)]); }
-QCursor KCursor::westResizeCursor() { return QCursor::makeWithNSCursor([NSCursor _WebCore_cursorWithName:@"westResizeCursor" hotSpot:NSMakePoint(1.0, 7.0)]); }
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
deleted file mode 100644 (file)
index f628824..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef KDEBUG_H_
-#define KDEBUG_H_
-
-#include "QString.h"
-#include "KWQTextStream.h"
-
-#define                k_funcinfo      "[" << __FILE__ << ":" << __LINE__ << "] "
-
-class kdbgstream;
-
-typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
-
-class kdbgstream {
-public:
-    kdbgstream(unsigned int area = 0, unsigned int level = 0, bool print = true) { }
-    
-    kdbgstream &operator<<(int) { return *this; }
-    kdbgstream &operator<<(unsigned int) { return *this; }
-    kdbgstream &operator<<(long) { return *this; }
-    kdbgstream &operator<<(unsigned long) { return *this; }
-    kdbgstream &operator<<(double) { return *this; }
-    kdbgstream &operator<<(const char *) { return *this; }
-    kdbgstream &operator<<(const void *) { return *this; }
-    kdbgstream &operator<<(const QChar &) { return *this; }
-    kdbgstream &operator<<(const QString &) { return *this; }
-    kdbgstream &operator<<(const QCString &) { return *this; }
-    kdbgstream &operator<<(KDBGFUNC) { return *this; }
-};
-
-inline kdbgstream &endl(kdbgstream &s) { return s; }
-
-inline kdbgstream kdDebug(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdWarning(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdWarning(bool cond, int area = 0) { return kdbgstream(); }
-inline kdbgstream kdError(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdError(bool cond, int area = 0) { return kdbgstream(); }
-inline kdbgstream kdFatal(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdFatal(bool cond, int area = 0) { return kdbgstream(); }
-inline QString kdBacktrace() { return QString(); }
-
-#endif
index 04e478cff4c741b4da299b90889e4d31d57f5f1b..0e7ac69bdaba1615dda4ff567c8982bd7471ccd3 100644 (file)
@@ -576,7 +576,7 @@ static Boolean KWQTableViewTypeSelectCallback(UInt32 index, void *listDataPtr, v
         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
 
         if (_box) {
-            QFocusEvent event(QEvent::FocusIn);
+            QEvent event(QEvent::FocusIn);
             if (_box->eventFilterObject())
                 const_cast<QObject *>(_box->eventFilterObject())->eventFilter(_box, &event);
         }
@@ -589,7 +589,7 @@ static Boolean KWQTableViewTypeSelectCallback(UInt32 index, void *listDataPtr, v
 {
     BOOL resign = [super resignFirstResponder];
     if (resign && _box) {
-        QFocusEvent event(QEvent::FocusOut);
+        QEvent event(QEvent::FocusOut);
 
         if (_box->eventFilterObject()) {
             const_cast<QObject *>(_box->eventFilterObject())->eventFilter(_box, &event);
index 8ba81c61d250d57b72bd5f5f9f671a558a053b46..99c96fd3466ff0fd835c751baaf8fabf0722f8ed 100644 (file)
@@ -65,12 +65,3 @@ bool KWQResponseIsMultipart(NSURLResponse *response);
 int KWQNumberOfPendingOrLoadingRequests(khtml::DocLoader *dl);
 time_t KWQCacheObjectExpiresTime(khtml::DocLoader *docLoader, NSURLResponse *response);
 NSString *KWQHeaderStringFromDictionary(NSDictionary *headers, int statusCode);
-
-class KWQLoader
-{
-public:
-    KWQLoader(khtml::Loader *);
-    KWQSignal _requestStarted;
-    KWQSignal _requestDone;
-    KWQSignal _requestFailed;
-};
index 5a46fc37c2a76d1d6112d2508e03e8c10b5a685b..2b0d90405e4c9edd80f5bea1cec16f665945bf6e 100644 (file)
@@ -347,13 +347,6 @@ time_t KWQCacheObjectExpiresTime(khtml::DocLoader *docLoader, NSURLResponse *res
     return 0;
 }
 
-KWQLoader::KWQLoader(Loader *loader)
-    : _requestStarted(loader, SIGNAL(requestStarted(khtml::DocLoader *, khtml::CachedObject *)))
-    , _requestDone(loader, SIGNAL(requestDone(khtml::DocLoader *, khtml::CachedObject *)))
-    , _requestFailed(loader, SIGNAL(requestFailed(khtml::DocLoader *, khtml::CachedObject *)))
-{
-}
-
 namespace khtml {
     
 void CachedObject::setResponse(NSURLResponse *response)
index e17693b27336d817c5fea9aa123cccf8cef6d8b7..7c4d2272ab4b4d71cc5cd1e47a14efd218bf8011 100644 (file)
@@ -30,7 +30,6 @@
 
 class Qt {
 public:
-
      enum ButtonState {
         NoButton        = 0x0000,
         LeftButton      = 0x0001,
@@ -52,27 +51,12 @@ public:
         AlignHCenter    = 0x0004,
         AlignVCenter    = 0x0020,
         AlignCenter     = AlignVCenter | AlignHCenter,
-
-        DontClip        = 0x0080,           // misc. flags
-        ShowPrefix      = 0x0200,
-        WordBreak       = 0x0400,
-    };
-
-    enum LayoutDirection {
-        LeftToRight     = 0,
-        RightToLeft     = 1
     };
 
     enum Orientation {
         Horizontal,
         Vertical
     };
-
-    enum RasterOp { // raster op mode
-        CopyROP,
-        OrROP,
-        XorROP,
-    };
 };
 
 #endif
index 3d99857f4bba643f0427d5c718dcc51af5dba635..a6c47266f32140940b6251b8ce37935a5c85c231 100644 (file)
 #include <kxmlcore/Assertions.h>
 #include <kxmlcore/HashMap.h>
 
-const QObject *QObject::_sender;
-
 QObject::QObject()
-    : _signalListHead(0), _signalsBlocked(false)
+    : _signalListHead(0)
     , _destroyed(this, SIGNAL(destroyed()))
     , _eventFilterObject(0)
 {
@@ -62,17 +60,7 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
     
     KWQSignal *signal = sender->findSignal(signalName);
     if (!signal) {
-#if !ERROR_DISABLED
-        if (1
-            && !KWQNamesMatch(member, SIGNAL(setStatusBarText(const QString &)))
-            && !KWQNamesMatch(member, SLOT(slotJobPercent(KIO::Job *, unsigned long)))
-            && !KWQNamesMatch(member, SLOT(slotJobSpeed(KIO::Job *, unsigned long)))
-            && !KWQNamesMatch(member, SLOT(slotScrollBarMoved()))
-            && !KWQNamesMatch(member, SLOT(slotShowDocument(const QString &, const QString &)))
-            && !KWQNamesMatch(member, SLOT(slotViewCleared())) // FIXME: Should implement this one!
-            )
         LOG_ERROR("connecting member %s to signal %s, but that signal was not found", member, signalName);
-#endif
         return;
     }
     signal->connect(KWQSlot(const_cast<QObject *>(receiver), member));
index 10b0d0193745ce7e128f8e72030e2a57830a3a20..d742270f5593c6365b02510938fbcf2ce93b941e 100644 (file)
@@ -57,12 +57,8 @@ public:
 
     virtual bool eventFilter(QObject *object, QEvent *event) { return false; }
 
-    void blockSignals(bool b) { _signalsBlocked = b; }
-
     virtual bool event(QEvent *);
 
-    static const QObject *sender() { return _sender; }
-    
     virtual bool isKHTMLLoader() const;
     virtual bool isFrame() const;
     virtual bool isFrameView() const;
@@ -77,8 +73,6 @@ private:
     QPtrList<QObject> _guardedPtrDummyList;
     
     mutable KWQSignal *_signalListHead;
-    bool _signalsBlocked;
-    static const QObject *_sender;
 
     KWQSignal _destroyed;
     
@@ -86,17 +80,6 @@ private:
     
     friend class KWQGuardedPtrBase;
     friend class KWQSignal;
-    friend class KWQObjectSenderScope;
-};
-
-class KWQObjectSenderScope
-{
-public:
-    KWQObjectSenderScope(const QObject *o) : m_savedSender(QObject::_sender) { QObject::_sender = o; }
-    ~KWQObjectSenderScope() { QObject::_sender = m_savedSender; }
-
-private:
-    const QObject *m_savedSender;
 };
 
 #endif
index d4edae5a0839d8d75670401a58cada2b8726a7fc..95d256bf894895a14e3b25e45817c793b494e520 100644 (file)
@@ -108,9 +108,6 @@ public:
     void addClip(const IntRect&);
     void addRoundedRectClip(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight);
 
-    RasterOp rasterOp() const;
-    void setRasterOp(RasterOp);
-
     void drawText(int x, int y, int tabWidth, int xpos, int, int, int alignmentFlags, const QString&);
     void drawHighlightForText(int x, int y, int h, int tabWidth, int xpos,
         const QChar*, int length, int from, int to, int toAdd,
index d6620cb14a6cfc082370bd922ecbbc8ddc71d82c..3effc3ecc69d40a69c3e66742df676b16d7c9d0c 100644 (file)
@@ -794,15 +794,6 @@ void QPainter::addRoundedRectClip(const IntRect& rect, const IntSize& topLeft, c
     CGContextClip(context);
 }
 
-Qt::RasterOp QPainter::rasterOp() const
-{
-    return CopyROP;
-}
-
-void QPainter::setRasterOp(RasterOp)
-{
-}
-
 void QPainter::setPaintingDisabled(bool f)
 {
     data->state.paintingDisabled = f;
index 06d668599b386cd25ff02315e8d305eefa46c799..5f93e9bc8fc61142441a3cd4e619f1424d576cd0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,9 +31,6 @@
 
 using KIO::Job;
 
-using khtml::CachedObject;
-using khtml::DocLoader;
-
 KWQSignal::KWQSignal(QObject *object, const char *name)
     : _object(object), _next(object->_signalListHead), _name(name)
 {
@@ -56,9 +53,8 @@ KWQSignal::~KWQSignal()
 void KWQSignal::connect(const KWQSlot &slot)
 {
 #if !ERROR_DISABLED
-    if (_slots.contains(slot)) {
+    if (_slots.contains(slot))
         LOG_ERROR("connecting the same slot to a signal twice, %s", _name);
-    }
 #endif
     _slots.append(slot);
 }
@@ -66,134 +62,72 @@ void KWQSignal::connect(const KWQSlot &slot)
 void KWQSignal::disconnect(const KWQSlot &slot)
 {
 #if !ERROR_DISABLED
-    if (!_slots.contains(slot)
-            && !KWQNamesMatch(_name, SIGNAL(finishedParsing()))
-            && !KWQNamesMatch(_name, SIGNAL(requestDone(khtml::DocLoader *, khtml::CachedObject *)))
-            && !KWQNamesMatch(_name, SIGNAL(requestFailed(khtml::DocLoader *, khtml::CachedObject *)))
-            && !KWQNamesMatch(_name, SIGNAL(requestStarted(khtml::DocLoader *, khtml::CachedObject *)))
-            ) {
+    if (!_slots.contains(slot))
         LOG_ERROR("disconnecting a signal that wasn't connected, %s", _name);
-    }
 #endif
     _slots.remove(slot);
 }
 
 void KWQSignal::call() const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call();
-        }
-    }
-}
-
-void KWQSignal::call(bool b) const
-{
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(b);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call();
 }
 
 void KWQSignal::call(int i) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(i);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call(i);
 }
 
 void KWQSignal::call(const DOM::DOMString &s) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(s);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call(s);
 }
 
 void KWQSignal::call(Job *j) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(j);
-        }
-    }
-}
-
-void KWQSignal::call(DocLoader *l, CachedObject *o) const
-{
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(l, o);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call(j);
 }
 
 void KWQSignal::call(Job *j, const char *d, int s) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(j, d, s);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call(j, d, s);
 }
 
 void KWQSignal::call(Job *j, const KURL &u) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).call(j, u);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).call(j, u);
 }
 
 void KWQSignal::callWithData(Job *j, NSData *d) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).callWithData(j, d);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).callWithData(j, d);
 }
 
 void KWQSignal::callWithResponse(Job *j, NSURLResponse *r) const
 {
-    if (!_object->_signalsBlocked) {
-        KWQObjectSenderScope senderScope(_object);
-        QValueList<KWQSlot> copiedSlots(_slots);
-        QValueListConstIterator<KWQSlot> end = copiedSlots.end();
-        for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
-            (*it).callWithResponse(j, r);
-        }
-    }
+    QValueList<KWQSlot> copiedSlots(_slots);
+    QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+    for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it)
+        (*it).callWithResponse(j, r);
 }
index 0922d32410cdfac8c0c48ef9b175e1d631fe37e9..bbcf27a35f527cf85a708269c26fda67bd20e64a 100644 (file)
@@ -38,11 +38,9 @@ public:
     void disconnect(const KWQSlot &);
     
     void call() const; // should be "emit"; can't be due to define in qobject.h
-    void call(bool) const;
     void call(int) const;
     void call(const DOM::DOMString&) const;
     void call(KIO::Job *) const;
-    void call(khtml::DocLoader *, khtml::CachedObject *) const;
     void call(KIO::Job *, const char *data, int size) const;
     void call(KIO::Job *, const KURL &) const;
     void callWithData(KIO::Job *, NSData *) const;
diff --git a/WebCore/kwq/KWQSignalStubs.cpp b/WebCore/kwq/KWQSignalStubs.cpp
deleted file mode 100644 (file)
index 346ec97..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-#include "config.h"
-#include "FrameView.h"
-#include "loader.h"
-#include "xml_tokenizer.h"
-
-#include "KWQLoader.h"
-
-using namespace WebCore;
-
-namespace WebCore {
-
-void FrameView::cleared()
-{
-}
-
-void Loader::requestDone(DocLoader *l, CachedObject *o)
-{
-    kwq->_requestDone.call(l, o);
-}
-
-void Loader::requestFailed(DocLoader *l, CachedObject *o)
-{
-    kwq->_requestFailed.call(l, o);
-}
-
-void Loader::requestStarted(DocLoader *l, CachedObject *o)
-{
-    kwq->_requestStarted.call(l, o);
-}
-
-}
index cb62d34e40e640e4acc9a58a91551706c9f27aac..23f86d3ec489ea4b514de1faa0e6123980d97c78 100644 (file)
@@ -110,7 +110,7 @@ using namespace WebCore;
         }
 
         if (slider) {
-            QFocusEvent event(QEvent::FocusIn);
+            QEvent event(QEvent::FocusIn);
             if (slider->eventFilterObject())
                 const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
         }
@@ -122,7 +122,7 @@ using namespace WebCore;
 {
     BOOL resign = [super resignFirstResponder];
     if (resign && slider) {
-        QFocusEvent event(QEvent::FocusOut);
+        QEvent event(QEvent::FocusOut);
         if (slider->eventFilterObject()) {
             const_cast<QObject *>(slider->eventFilterObject())->eventFilter(slider, &event);
             [MacFrame::bridgeForWidget(slider) formControlIsResigningFirstResponder:self];
index 378bec61f9a603ce9fb5bbdb0c55181bb5401208..35f30c7ecabaa3a7a3fcd67150cd4961ff45cf7f 100644 (file)
@@ -41,14 +41,7 @@ using KIO::Job;
 using KJS::WindowQObject;
 
 enum FunctionNumber {
-    signalFinishedParsing,
-    slotChildCompleted,
-    slotChildCompletedWithBool,
-    slotChildStarted,
     slotClicked,
-    slotFinishedParsing,
-    slotLoaderRequestDone,
-    slotParentCompleted,
     slotParentDestroyed,
     slotPerformSearch,
     slotReturnPressed,
@@ -56,11 +49,9 @@ enum FunctionNumber {
     slotSelectionChanged,
     slotSliderValueChanged,
     slotStateChanged,
-    slotSubmitFormAgain,
     slotTextChanged,
     slotTextChangedWithString,
     slotValueChanged,
-    slotWidgetDestructed,
     slotData_Loader,
     slotData_XMLHttpRequest,
     slotRedirection_Frame,
@@ -79,11 +70,6 @@ KWQSlot::KWQSlot(QObject *object, const char *member)
         } else
     
     CASE(slotClicked, (), RenderFormElement)
-    CASE(slotChildCompleted, (), Frame)
-    CASE(slotChildStarted, (KIO::Job *), Frame)
-    CASE(slotFinishedParsing, (), Frame)
-    CASE(slotLoaderRequestDone, (khtml::DocLoader *, khtml::CachedObject *), Frame)
-    CASE(slotParentCompleted, (), Frame)
     CASE(slotPerformSearch, (), RenderLineEdit)
     CASE(slotReturnPressed, (), RenderLineEdit)
     CASE(slotSelected, (int), RenderSelect)
@@ -91,18 +77,11 @@ KWQSlot::KWQSlot(QObject *object, const char *member)
     CASE(slotSliderValueChanged, (), RenderSlider)
     CASE(slotTextChanged, (), RenderTextArea)
     CASE(slotValueChanged, (int), RenderScrollMediator)
-    CASE(slotWidgetDestructed, (), RenderWidget)
        
     #undef CASE
 
-    if (KWQNamesMatch(member, SIGNAL(finishedParsing()))) {
-        m_function = signalFinishedParsing;
-    } else if (KWQNamesMatch(member, SLOT(slotChildCompleted(bool)))) {
-        m_function = slotChildCompletedWithBool;
-    } else if (KWQNamesMatch(member, SLOT(parentDestroyed()))) {
+    if (KWQNamesMatch(member, SLOT(parentDestroyed()))) {
         m_function = slotParentDestroyed;
-    } else if (KWQNamesMatch(member, SLOT(submitFormAgain()))) {
-        m_function = slotSubmitFormAgain;
     } else if (KWQNamesMatch(member, SLOT(slotTextChanged(const DOMString &)))) {
         m_function = slotTextChangedWithString;
     } else if (KWQNamesMatch(member, SLOT(slotData(KIO::Job *, const char *, int)))) {
@@ -147,44 +126,18 @@ void KWQSlot::call() const
             return;
     
     switch (m_function) {
-        CASE(signalFinishedParsing, DocumentImpl, m_finishedParsing.call)
-        CASE(slotChildCompleted, Frame, slotChildCompleted)
         CASE(slotClicked, RenderFormElement, slotClicked)
-        CASE(slotFinishedParsing, Frame, slotFinishedParsing)
-        CASE(slotParentCompleted, Frame, slotParentCompleted)
         CASE(slotParentDestroyed, WindowQObject, parentDestroyed)
         CASE(slotPerformSearch, RenderLineEdit, slotPerformSearch)
         CASE(slotReturnPressed, RenderLineEdit, slotReturnPressed)
         CASE(slotSelectionChanged, RenderFormElement, slotSelectionChanged)
         CASE(slotSliderValueChanged, RenderSlider, slotSliderValueChanged)
-        CASE(slotSubmitFormAgain, Frame, submitFormAgain)
         CASE(slotTextChanged, RenderTextArea, slotTextChanged)
-        CASE(slotWidgetDestructed, RenderWidget, slotWidgetDestructed)
     }
     
     #undef CASE
 }
 
-void KWQSlot::call(bool b) const
-{
-    if (m_object.isNull()) {
-        return;
-    }
-    
-    #define CASE(member, type, function) \
-        case member: \
-            static_cast<type *>(m_object.pointer())->function(b); \
-            return;
-    
-    switch (m_function) {
-        CASE(slotChildCompletedWithBool, Frame, slotChildCompleted)
-    }
-    
-    #undef CASE
-    
-    call();
-}
-
 void KWQSlot::call(int i) const
 {
     if (m_object.isNull()) {
@@ -224,9 +177,6 @@ void KWQSlot::call(Job *job) const
     }
     
     switch (m_function) {
-        case slotChildStarted:
-            static_cast<Frame *>(m_object.pointer())->slotChildStarted(job);
-            return;
         case slotFinished_Frame:
             static_cast<Frame *>(m_object.pointer())->slotFinished(job);
             return;
@@ -304,21 +254,6 @@ void KWQSlot::callWithResponse(KIO::Job *job, NSURLResponse *response) const
     call();
 }
 
-void KWQSlot::call(DocLoader *loader, CachedObject *cachedObject) const
-{
-    if (m_object.isNull()) {
-        return;
-    }
-    
-    switch (m_function) {
-        case slotLoaderRequestDone:
-            static_cast<Frame *>(m_object.pointer())->slotLoaderRequestDone(loader, cachedObject);
-            return;
-    }
-    
-    call();
-}
-
 bool operator==(const KWQSlot &a, const KWQSlot &b)
 {
     return a.m_object == b.m_object && (a.m_object == 0 || a.m_function == b.m_function);
index ba431aba9a9ccea3914f16dca01bed7c43780bb4..8bcd749df86c60215ecfadd388bbe9f7206c5d91 100644 (file)
@@ -43,11 +43,6 @@ namespace KIO {
     class Job;
 }
 
-namespace khtml {
-    class CachedObject;
-    class DocLoader;
-}
-
 namespace DOM {
     class DOMString;
 }
@@ -64,11 +59,9 @@ public:
     void clear() { m_object = 0; }
     
     void call() const;
-    void call(bool) const;
     void call(int) const;
     void call(const DOM::DOMString&) const;
     void call(KIO::Job *) const;
-    void call(khtml::DocLoader *, khtml::CachedObject *) const;
     void call(KIO::Job *, const char *, int) const;
     void call(KIO::Job *, const KURL &) const;
     void callWithData(KIO::Job *, NSData *) const;
index 3f7de9f8fe0c03e77ddc61b425658488cc795973..3f287310a9e1ad98dae1dcf8ffca50733b86dcd3 100644 (file)
@@ -973,7 +973,7 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
         }
         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
         if (widget) {
-            QFocusEvent event(QEvent::FocusIn);
+            QEvent event(QEvent::FocusIn);
             if (widget->eventFilterObject())
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
         }
@@ -994,7 +994,7 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
         [self _KWQ_setKeyboardFocusRingNeedsDisplay];
 
         if (widget) {
-            QFocusEvent event(QEvent::FocusOut);
+            QEvent event(QEvent::FocusOut);
             if (widget->eventFilterObject()) {
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
                 [MacFrame::bridgeForWidget(widget) formControlIsResigningFirstResponder:self];
index f360266be3677c77ebacc6e498f4270a0ce3234e..5cadd8269cb6a2636477af2e27b5c261b7e96749 100644 (file)
@@ -405,7 +405,7 @@ using namespace WebCore;
         }
         
         if (widget) {
-            QFocusEvent event(QEvent::FocusIn);
+            QEvent event(QEvent::FocusIn);
             if (widget->eventFilterObject())
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
         }
@@ -425,7 +425,7 @@ using namespace WebCore;
         lastSelectedRange = [self selectedRange];
         
         if (widget) {
-            QFocusEvent event(QEvent::FocusOut);
+            QEvent event(QEvent::FocusOut);
             if (widget->eventFilterObject()) {
                 const_cast<QObject *>(widget->eventFilterObject())->eventFilter(widget, &event);
                 if (widget)
index 493af5b79a7723c2abff38d2c5cd330498070279..3953f89370ee8d08e6a7488eb7c5a3f1516728c7 100644 (file)
  */
 
 #include "config.h"
-#include "KWQLogging.h"
-
 #include "KWQTextStream.h"
 
+#include "QString.h"
+#include "KWQLogging.h"
+
 const size_t integerOrPointerAsStringBufferSize = 100; // large enough for any integer or pointer in string format, including trailing null character
 const char *precisionFormats[] = { "%.0f", "%.1f", "%.2f", "%.3f", "%.4f", "%.5f" "%.6f"}; 
 const int maxPrecision = 6; // must match to precisionFormats
@@ -38,10 +39,9 @@ QTextStream::QTextStream(const ByteArray &ba)
 {
 }
 
-QTextStream::QTextStream(QString *s, int mode)
+QTextStream::QTextStream(QString *s)
     : _hasByteArray(false), _string(s), _precision(defaultPrecision)
 {
-    ASSERT(mode == IO_WriteOnly);
 }
 
 QTextStream &QTextStream::operator<<(char c)
index 280c07e039d61a642b2bbde7c477716360750aa6..c7d38d88489ca95e73b91c61ea16129c52211927 100644 (file)
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
-#include "KWQIODevice.h"
-#include "QString.h"
+#include "Array.h"
 
+class QCString;
+class QChar;
+class QString;
 class QTextStream;
 
 typedef QTextStream &(*QTextStreamManipulator)(QTextStream &);
@@ -38,7 +40,7 @@ QTextStream &endl(QTextStream& stream);
 class QTextStream {
 public:
     QTextStream(const ByteArray &);
-    QTextStream(QString *, int mode = IO_WriteOnly);
+    QTextStream(QString*);
 
     QTextStream &operator<<(char);
     QTextStream &operator<<(const QChar &);
@@ -67,14 +69,4 @@ private:
     int _precision;
 };
 
-class QTextIStream : public QTextStream {
-public:
-    QTextIStream(QString *s) : QTextStream(s, IO_ReadOnly) { }
-};
-
-class QTextOStream : public QTextStream {
-public:
-    QTextOStream(QString *s) : QTextStream(s, IO_WriteOnly) { }
-};
-
 #endif
index ec280ac225b545be771be28d6763627d452c9047..e66bac41a289b6aee6458fb1244304887f341be3 100644 (file)
@@ -33,7 +33,6 @@
 #include "CachedObjectClientWalker.h"
 #include "KWQLoader.h"
 #include "loader.h"
-#include <qbuffer.h>
 #include <qtextcodec.h>
 
 namespace WebCore {
@@ -89,13 +88,13 @@ void CachedCSSStyleSheet::setCharset( const QString &chs )
     }
 }
 
-void CachedCSSStyleSheet::data( QBuffer &buffer, bool eof )
+void CachedCSSStyleSheet::data(ByteArray& data, bool eof )
 {
-    if(!eof) return;
-    buffer.close();
-    setSize(buffer.buffer().size());
-    QString data = m_codec->toUnicode( buffer.buffer().data(), size() );
-    m_sheet = DOMString(data);
+    if (!eof)
+        return;
+
+    setSize(data.size());
+    m_sheet = DOMString(m_codec->toUnicode(data.data(), size()));
     m_loading = false;
 
     checkNotify();
index 3534d300fadbaf1ee527dd9dc1626e4ab8a83d8d..785fa76e47890999e3ab1d60e0fa214629d9be17 100644 (file)
@@ -48,7 +48,7 @@ namespace khtml
         virtual void deref(CachedObjectClient*);
 
         virtual void setCharset(const QString&);
-        virtual void data(QBuffer&, bool atEnd);
+        virtual void data(ByteArray&, bool atEnd);
         virtual void error(int code, const char* message);
 
         virtual bool schedule() const { return true; }
index 4b661de2e90717aab6a9a630d5b9ffffc62bb721..9f16874e40502fd65761b2dde687b0ddbe3b8fab 100644 (file)
@@ -112,20 +112,20 @@ void CachedImage::clear()
     setSize(0);
 }
 
-void CachedImage::data(QBuffer& _buffer, bool eof)
+void CachedImage::data(ByteArray& data, bool eof)
 {
     bool sizeAvailable = false;
     
-    m_dataSize = _buffer.size();
+    m_dataSize = data.size();
 
     // Create the image if it doesn't yet exist.
     if (!m_image)
         m_image = new Image(this, KWQResponseMIMEType(m_response) == "application/pdf");
         
-    // Give the data to the image object for processing.  It will
-    // not do anything now, but will delay decoding until queried for info (like size or specific image frames).
-    sizeAvailable = m_image->setData(_buffer.buffer(), eof);
-    
+    // Give all the data so far to the image object for processing.
+    // It will not do anything now, but will delay decoding until queried for info (like size or specific image frames).
+    sizeAvailable = m_image->setData(data, eof);
+
     // Go ahead and tell our observers to try to draw if we have either
     // received all the data or the size is known.  Each chunk from the
     // network causes observers to repaint, which will force that chunk
index dc32072c4fe1222924843e7384835dadfca446f7..9926f601e8dbc8786c3f6e54f05ed48512fb3ca7 100644 (file)
@@ -53,7 +53,7 @@ public:
     virtual void ref(CachedObjectClient*);
     virtual void deref(CachedObjectClient*);
 
-    virtual void data(QBuffer&, bool atEnd);
+    virtual void data(ByteArray&, bool atEnd);
     virtual void error(int code, const char* message);
 
     bool isErrorImage() const { return m_errorOccurred; }
index b79195dff129b4e525736c50c4d33a28305e46f6..c5b93854559e4144f9d4fe39308ae0decb1e071b 100644 (file)
@@ -34,8 +34,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-class QBuffer;
-
 namespace KIO {
     class Job;
 }
@@ -108,7 +106,7 @@ namespace WebCore
         virtual ~CachedObject();
 
         virtual void setCharset(const QString&) {}
-        virtual void data(QBuffer&, bool atEnd) = 0;
+        virtual void data(ByteArray&, bool atEnd) = 0;
         virtual void error(int code, const char* message) = 0;
 
         const DOMString &url() const { return m_url; }
index cff7b7833d8b4c4bdba85bf3ebd003ba799aad6b..664fb691925bfe032effa68f246b80d587447d86 100644 (file)
@@ -32,7 +32,6 @@
 #include "CachedObjectClient.h"
 #include "CachedObjectClientWalker.h"
 #include "loader.h"
-#include <qbuffer.h>
 #include <qtextcodec.h>
 
 namespace WebCore {
@@ -92,13 +91,12 @@ void CachedScript::setCharset( const QString &chs )
     }
 }
 
-void CachedScript::data( QBuffer &buffer, bool eof )
+void CachedScript::data(ByteArray& data, bool eof )
 {
-    if(!eof) return;
-    buffer.close();
-    setSize(buffer.buffer().size());
-    QString data = m_codec->toUnicode( buffer.buffer().data(), size() );
-    m_script = DOMString(data);
+    if (!eof)
+        return;
+    setSize(data.size());
+    m_script = String(m_codec->toUnicode(data.data(), size()));
     m_loading = false;
     checkNotify();
 }
index 1de4000025dfabdeabdf14aedd1a89550b949ae9..149a35880f8b0847c19b55455e5c9ac489418720 100644 (file)
 
 class QTextCodec;
 
-namespace WebCore
-{
-    class CachedScript : public CachedObject
-    {
+namespace WebCore {
+    class DocLoader;
+
+    class CachedScript : public CachedObject {
     public:
-       CachedScript(DocLoader*, const DOMString& URL, KIO::CacheControl, time_t expireDate, const QString& charset);
-       CachedScript(const DOMString& URL, const QString& scriptData);
+       CachedScript(DocLoader*, const String& URL, KIO::CacheControl, time_t expireDate, const QString& charset);
+       CachedScript(const String& URL, const QString& scriptData);
        virtual ~CachedScript();
 
-       const DOMString& script() const { return m_script; }
+       const String& script() const { return m_script; }
 
        virtual void ref(CachedObjectClient*);
        virtual void deref(CachedObjectClient*);
 
         virtual void setCharset(const QString&);
-       virtual void data(QBuffer&, bool atEnd);
+       virtual void data(ByteArray&, bool atEnd);
        virtual void error(int code, const char* message);
 
         virtual bool schedule() const { return false; }
@@ -56,7 +56,7 @@ namespace WebCore
        void checkNotify();
 
     private:
-       DOMString m_script;
+       String m_script;
         QTextCodec* m_codec;
         bool m_errorOccurred;
     };
index 67f19966df0f61de267a7da3b38a20695fd13e04..905461d4b8967294dc9f48886d22ec466eb69404 100644 (file)
@@ -36,9 +36,7 @@
 
 #include <kxmlcore/Assertions.h>
 
-using namespace DOM;
-
-namespace khtml {
+namespace WebCore {
 
 CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, time_t _expireDate)
 : CachedObject(url, XBL, _cachePolicy, _expireDate), m_document(0)
@@ -79,20 +77,19 @@ void CachedXBLDocument::setCharset( const QString &chs )
         m_decoder->setEncoding(chs.latin1(), Decoder::EncodingFromHTTPHeader);
 }
 
-void CachedXBLDocument::data( QBuffer &buffer, bool eof )
+void CachedXBLDocument::data(ByteArray& data, bool eof )
 {
-    if (!eof) return;
+    if (!eof)
+        return;
     
     assert(!m_document);
     
-    m_document =  new XBL::XBLDocumentImpl();
+    m_document = new XBL::XBLDocumentImpl();
     m_document->ref();
     m_document->open();
     
-    QString data = m_decoder->decode(buffer.buffer().data(), buffer.buffer().size());
-    m_document->write(data);
-    setSize(buffer.buffer().size());
-    buffer.close();
+    m_document->write(m_decoder->decode(data.data(), data.size()));
+    setSize(data.size());
     
     m_document->finishParsing();
     m_document->close();
index 8f173f849dfe412eb40a607782543b4d99246d61..2e74d4054e90750f3b67b14b4115550e014db63e 100644 (file)
@@ -52,7 +52,7 @@ namespace khtml
         virtual void deref(CachedObjectClient *consumer);
         
         virtual void setCharset( const QString &chs );
-        virtual void data( QBuffer &buffer, bool eof );
+        virtual void data(ByteArray&, bool eof );
         virtual void error( int err, const char *text );
         
         virtual bool schedule() const { return true; }
index 0cf09e25ee705f420f9c89f89795e0e512890bdc..f3c5ae5498dd50d7bf5c0ccab30ffa522af9e5b5 100644 (file)
@@ -34,7 +34,6 @@
 #include "decoder.h"
 #include "loader.h"
 #include <kxmlcore/Assertions.h>
-#include <qbuffer.h>
 
 namespace WebCore {
 
@@ -75,13 +74,13 @@ void CachedXSLStyleSheet::setCharset( const QString &chs )
         m_decoder->setEncoding(chs.latin1(), Decoder::EncodingFromHTTPHeader);
 }
 
-void CachedXSLStyleSheet::data(QBuffer &buffer, bool eof)
+void CachedXSLStyleSheet::data(ByteArray& data, bool eof)
 {
-    if(!eof) return;
-    buffer.close();
-    setSize(buffer.buffer().size());
-    QString data = m_decoder->decode(buffer.buffer().data(), size());
-    m_sheet = DOMString(data);
+    if (!eof)
+        return;
+
+    setSize(data.size());
+    m_sheet = DOMString(m_decoder->decode(data.data(), size()));
     m_loading = false;
     
     checkNotify();
index 63fc183cf208555b531d4e04b761c6dd38200de9..0b5b29be2751a42eaafe3c3ea7bc880284d4f2a5 100644 (file)
 #define KHTML_CachedXSLStyleSheet_h
 
 #include "CachedObject.h"
-
 #include <kio/global.h>
 
-class QString;
-class QBuffer;
+namespace WebCore {
 
-namespace khtml
-{
     class DocLoader;
     class Decoder;
-    class CachedObjectClient;
 
 #ifdef KHTML_XSLT
-    class CachedXSLStyleSheet : public CachedObject
-    {
-public:
-        CachedXSLStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, time_t _expireDate);
+    class CachedXSLStyleSheet : public CachedObject {
+    public:
+        CachedXSLStyleSheet(DocLoader*, const String& url, KIO::CacheControl cachePolicy, time_t expireDate);
 
-        const DOM::DOMString& sheet() const { return m_sheet; }
+        const String& sheet() const { return m_sheet; }
         
-        virtual void ref(CachedObjectClient *consumer);
-        virtual void deref(CachedObjectClient *consumer);
+        virtual void ref(CachedObjectClient*);
+        virtual void deref(CachedObjectClient*);
         
-        virtual void setCharset(const QString &chs);
-        virtual void data(QBuffer &buffer, bool eof);
-        virtual void error(int err, const char *text);
+        virtual void setCharset(const QString&);
+        virtual void data(ByteArray&, bool eof);
+        virtual void error(int err, const chartext);
         
         virtual bool schedule() const { return true; }
         
         void checkNotify();
         
-protected:
-        DOM::DOMString m_sheet;
+    protected:
+        String m_sheet;
         RefPtr<Decoder> m_decoder;
     };
 
 #endif
 
-};
+}
 
 #endif
index 1d0b3c5c7d07f92a6816017672f11ebfb46ade31..59887b52a05b4f52af21b424e5b6fd8caaba4372 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "config.h"
 #include "DocLoader.h"
+
 #include "CachedImage.h"
 #include "CachedScript.h"
 #include "CachedCSSStyleSheet.h"
@@ -39,9 +40,7 @@
 
 #include <kurl.h>
 
-using namespace DOM;
-
-namespace khtml {
+namespace WebCore {
 
 DocLoader::DocLoader(Frame *frame, DocumentImpl* doc)
 {
@@ -228,6 +227,8 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 void DocLoader::setLoadInProgress(bool load)
 {
     m_loadInProgress = load;
+    if (!load)
+        m_frame->loadDone();
 }
 
-};
+}
index 0a219ba0ddd00774b2c7fcb4454fde8b54fb80e3..8e6bc4fc4f7c44b3087fcc3e4af967453df9cc1f 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <khtml_settings.h>
 #include <kio/global.h>
-#include <qbuffer.h>
 #include <qptrlist.h>
 #include <qstringlist.h>
 
index f36240a1ab8bc8372c179f268b226c4de0829e38..b0d42b432ea95cf11fdd3047744974f45ba01468 100644 (file)
 
 #include "config.h"
 #include "Request.h"
+
 #include "CachedObject.h"
 
-namespace khtml {
+namespace WebCore {
 
-Request::Request(DocLoader* dl, CachedObject *_object, bool _incremental)
+Request::Request(DocLoader* docLoader, CachedObject* obj, bool inc)
+    : incremental(inc), object(obj), m_docLoader(docLoader), multipart(false)
 {
-    object = _object;
     object->setRequest(this);
-    incremental = _incremental;
-    m_docLoader = dl;
-    multipart = false;
 }
 
 Request::~Request()
@@ -45,4 +43,4 @@ Request::~Request()
     object->setRequest(0);
 }
 
-};
+}
index 15becb15b688c8f7b799c45950ff1533b104aac1..4a07b4bf754cf6e9d45d1e5283ddebf8cf95db16 100644 (file)
     This class provides all functionality needed for loading images, style sheets and html
     pages from the web. It has a memory cache for these objects.
 */
+
 #ifndef KHTML_Request_h
 #define KHTML_Request_h
 
-#include <qbuffer.h>
+#include "Array.h"
 
-namespace khtml
-{
+namespace WebCore {
     class CachedObject;
     class DocLoader;
 
-    class Request
-    {
+    template <class T> class Array;
+    typedef Array<char> ByteArray;
+
+    class Request {
     public:
-        Request(DocLoader* dl, CachedObject *_object, bool _incremental);
+        Request(DocLoader*, CachedObject*, bool incremental);
         ~Request();
+
         bool incremental;
-        QBuffer m_buffer;
-        CachedObject *object;
+        ByteArray m_buffer;
+        CachedObjectobject;
         DocLoader* m_docLoader;
         bool multipart;
-     };
+    };
 }
 
 #endif
index 25e82cf508c0905f97dce51eba447185f32b0808..1edbfa3e9ecef4c552db2de5ba326bff10bacba1 100644 (file)
@@ -70,22 +70,17 @@ static bool crossDomain(const QString &a, const QString &b)
 Loader::Loader()
 {
     m_requestsPending.setAutoDelete( true );
-    kwq = new KWQLoader(this);
 }
 
 Loader::~Loader()
 {
     deleteAllValues(m_requestsLoading);
-    delete kwq;
 }
 
 void Loader::load(DocLoader* dl, CachedObject *object, bool incremental)
 {
-    Request *req = new Request(dl, object, incremental);
+    Requestreq = new Request(dl, object, incremental);
     m_requestsPending.append(req);
-
-    emit requestStarted( req->m_docLoader, req->object );
-
     servePendingRequests();
 }
 
@@ -125,7 +120,7 @@ void Loader::servePendingRequests()
     m_requestsLoading.add(job, req);
 }
 
-void Loader::slotFinished(KIO::Job* job, NSData *allData)
+void Loader::slotFinished(KIO::Job* job, NSDataallData)
 {
     RequestMap::iterator i = m_requestsLoading.find(job);
     if (i == m_requestsLoading.end())
@@ -142,17 +137,13 @@ void Loader::slotFinished(KIO::Job* job, NSData *allData)
         docLoader->setLoadInProgress(true);
         r->object->error( job->error(), job->errorText().ascii() );
         docLoader->setLoadInProgress(false);
-        emit requestFailed( docLoader, object );
-        Cache::remove( object );
+        Cache::remove(object);
     }
     else {
         docLoader->setLoadInProgress(true);
         object->data(r->m_buffer, true);
         r->object->setAllData(allData);
         docLoader->setLoadInProgress(false);
-        
-        emit requestDone( docLoader, object );
-
         object->finish();
     }
 
@@ -177,10 +168,9 @@ void Loader::slotReceivedResponse(KIO::Job* job, NSURLResponse* response)
     if (r->multipart) {
         ASSERT(r->object->isImage());
         static_cast<CachedImage *>(r->object)->clear();
-        r->m_buffer = QBuffer();
+        r->m_buffer.resize(0);
         if (r->m_docLoader->frame())
             r->m_docLoader->frame()->checkCompleted();
-        
     } else if (KWQResponseIsMultipart(response)) {
         r->multipart = true;
         if (!r->object->isImage())
@@ -188,22 +178,20 @@ void Loader::slotReceivedResponse(KIO::Job* job, NSURLResponse* response)
     }
 }
 
-
-void Loader::slotData( KIO::Job*job, const char *data, int size )
+void Loader::slotData(KIO::Job* job, const char* data, int size)
 {
     Request *r = m_requestsLoading.get(job);
     if (!r)
         return;
 
-    if ( !r->m_buffer.isOpen() )
-        r->m_buffer.open( IO_WriteOnly );
-
-    r->m_buffer.writeBlock( data, size );
+    unsigned oldSize = r->m_buffer.size();
+    r->m_buffer.resize(oldSize + size);
+    memcpy(r->m_buffer.data() + oldSize, data, size);
 
     if (r->multipart)
-        r->object->data( r->m_buffer, true ); // the loader delivers the data in a multipart section all at once, send eof
-    else if(r->incremental)
-        r->object->data( r->m_buffer, false );
+        r->object->data(r->m_buffer, true); // the loader delivers the data in a multipart section all at once, send eof
+    else if (r->incremental)
+        r->object->data(r->m_buffer, false);
 }
 
 int Loader::numRequests( DocLoader* dl ) const
index a706a64a1c58d4a5899cbee89363a93572553684..a407e2d59c5195091ce5f634f5db83cda06087e3 100644 (file)
@@ -3,7 +3,7 @@
 
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2004 Apple Computer, Inc.
+    Copyright (C) 2004, 2006 Apple Computer, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -31,8 +31,6 @@
 #include <qobject.h>
 #include <qptrlist.h>
 
-class KWQLoader;
-
 namespace KIO {
     class Job;
 }
@@ -45,12 +43,12 @@ class NSData;
 class NSURLResponse;
 #endif
 
-namespace WebCore
-{
+namespace WebCore {
+
     class CachedObject;
-    class DOMString;
     class DocLoader;
     class Request;
+    class String;
 
     class Loader : public QObject
     {
@@ -66,16 +64,7 @@ namespace WebCore
         void removeBackgroundDecodingRequest(Request*);
         
         // may return 0L
-        KIO::Job* jobForRequest(const DOMString& URL) const;
-
-        KWQLoader *kwq;
-
-    signals:
-        friend class CachedImageCallback;
-
-        void requestStarted(DocLoader*, CachedObject*);
-        void requestDone(DocLoader*, CachedObject*);
-        void requestFailed(DocLoader*, CachedObject*);
+        KIO::Job* jobForRequest(const String& URL) const;
 
     protected slots:
         void slotFinished(KIO::Job*, NSData*);
index 539ad4d9d9d4ef7d4319976542628d865372ecd2..902179bfb27d5545a668fd55721b6e965ad0d270 100644 (file)
@@ -74,7 +74,6 @@
 #include "xml_tokenizer.h"
 #include "xmlhttprequest.h"
 #include <assert.h>
-#include <kcursor.h>
 #include <kio/global.h>
 #include <kio/job.h>
 #include <klocale.h>
@@ -170,11 +169,6 @@ Frame::Frame(Page* page, RenderPart* ownerRenderer)
 #if !NDEBUG
     ++FrameCounter::count;
 #endif
-
-    connect( Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-             this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-    connect( Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-             this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
 }
 
 Frame::~Frame()
@@ -190,11 +184,6 @@ Frame::~Frame()
   if (!d->m_bComplete)
     closeURL();
 
-  disconnect( Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-  disconnect( Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-
   clear(false);
 
   if (d->m_view) {
@@ -256,8 +245,8 @@ bool Frame::didOpenURL(const KURL &url)
   d->m_bLoadingMainResource = true;
   d->m_bLoadEventEmitted = false;
 
-  d->m_kjsStatusBarText = QString::null;
-  d->m_kjsDefaultStatusBarText = QString::null;
+  d->m_kjsStatusBarText = String();
+  d->m_kjsDefaultStatusBarText = String();
 
   d->m_bJScriptEnabled = d->m_settings->isJavaScriptEnabled(url.host());
   d->m_bJavaEnabled = d->m_settings->isJavaEnabled(url.host());
@@ -270,13 +259,7 @@ bool Frame::didOpenURL(const KURL &url)
     d->m_url.setPath("/");
   d->m_workingURL = d->m_url;
 
-  connect( d->m_job, SIGNAL( speed( KIO::Job*, unsigned long ) ),
-           this, SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
-
-  connect( d->m_job, SIGNAL( percent( KIO::Job*, unsigned long ) ),
-           this, SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
-
-  emit started( 0L );
+  started();
 
   return true;
 }
@@ -318,13 +301,13 @@ void Frame::stopLoading(bool sendUnload)
       d->m_doc->removeAllEventListenersFromAllNodes();
   }
 
-  d->m_bComplete = true; // to avoid emitting completed() in slotFinishedParsing() (David)
+  d->m_bComplete = true; // to avoid calling completed() in finishedParsing() (David)
   d->m_bLoadingMainResource = false;
   d->m_bLoadEventEmitted = true; // don't want that one either
   d->m_cachePolicy = KIO::CC_Verify; // Why here?
 
   if (d->m_doc && d->m_doc->parsing()) {
-    slotFinishedParsing();
+    finishedParsing();
     d->m_doc->setParsing(false);
   }
   
@@ -418,7 +401,7 @@ JSValue* Frame::executeScript(NodeImpl* n, const QString& script, bool forceUser
   JSValue* ret = proxy->evaluate(forceUserGesture ? QString::null : d->m_url.url(), 0, script, n);
   d->m_runningScripts--;
 
-  if (!d->m_runningScripts && d->m_doc && !d->m_doc->parsing() && d->m_submitForm)
+  if (!d->m_runningScripts)
       submitFormAgain();
 
   DocumentImpl::updateDocumentsRendering();
@@ -466,7 +449,6 @@ void Frame::clear(bool clearWindowProperties)
   d->m_mousePressNode = 0;
 
   if (d->m_doc) {
-    disconnect(d->m_doc.get(), SIGNAL(finishedParsing()), this, SLOT(slotFinishedParsing()));
     d->m_doc->cancelParsing();
     d->m_doc->detach();
   }
@@ -483,8 +465,6 @@ void Frame::clear(bool clearWindowProperties)
   d->m_doc = 0;
   d->m_decoder = 0;
 
-  for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
-      disconnectChild(child);
   d->m_plugins.clear();
 
   d->m_scheduledRedirection = noRedirectionScheduled;
@@ -519,15 +499,11 @@ DocumentImpl *Frame::document() const
 void Frame::setDocument(DocumentImpl* newDoc)
 {
     if (d) {
-        if (d->m_doc) {
-            disconnect(d->m_doc.get(), SIGNAL(finishedParsing()), this, SLOT(slotFinishedParsing()));
+        if (d->m_doc)
             d->m_doc->detach();
-        }
         d->m_doc = newDoc;
-        if (newDoc) {
+        if (newDoc)
             newDoc->attach();
-            connect(newDoc, SIGNAL(finishedParsing()), this, SLOT(slotFinishedParsing()));
-        }
     }
 }
 
@@ -603,7 +579,7 @@ void Frame::slotFinished( KIO::Job * job )
   d->m_job = 0L;
 
   if (d->m_doc->parsing())
-      end(); //will emit completed()
+      end(); // will call completed()
 }
 
 void Frame::childBegin()
@@ -673,7 +649,6 @@ void Frame::begin( const KURL &url, int xOffset, int yOffset )
   // clear widget
   if (d->m_view)
     d->m_view->resizeContents( 0, 0 );
-  connect(d->m_doc.get(),SIGNAL(finishedParsing()),this,SLOT(slotFinishedParsing()));
 }
 
 void Frame::write( const char *str, int len )
@@