Rubber stamped by Maciej (kinda).
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 15:10:21 +0000 (15:10 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 15:10:21 +0000 (15:10 +0000)
        - did the next pass of renaming (used do-webcore-rename script)
          this takes care of most of the remaining KWQ names (almost all)

        * WebCore+SVG/DOMList.h:
        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bindings/js/kjs_dom.cpp:
        * bindings/js/kjs_window.cpp:
        * bindings/objc/DOMHTML.mm:
        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        * bridge/mac/WebCoreFrameBridge.mm:
        * bridge/mac/WebCoreSettings.h:
        * bridge/mac/WebCoreSettings.mm:
        * bridge/win/FrameWin.cpp:
        * css/CSSPrimitiveValue.cpp:
        * css/CSSValueKeywords.in:
        * css/MediaQueryEvaluator.cpp:
        * css/cssparser.cpp:
        * css/cssstyleselector.cpp:
        * css/cssstyleselector.h:
        * dom/CharacterData.cpp:
        * dom/CharacterData.h:
        * dom/Document.cpp:
        * dom/Element.cpp:
        * dom/Element.h:
        * dom/EventTargetNode.cpp:
        * dom/EventTargetNode.h:
        * dom/Node.cpp:
        * dom/Node.h:
        * dom/Position.cpp:
        * dom/ProcessingInstruction.cpp:
        * dom/QualifiedName.cpp:
        * dom/QualifiedName.h:
        * dom/XMLTokenizer.cpp: Added.
        * dom/xml_tokenizer.cpp: Removed.
        * dom/xml_tokenizer.h: Removed.
        * editing/EditAction.h:
        * editing/HTMLInterchange.cpp:
        * editing/HTMLInterchange.h:
        * editing/Selection.h:
        * editing/SelectionController.h:
        * editing/TextAffinity.h:
        * editing/TextIterator.cpp:
        * editing/TextIterator.h:
        * editing/VisiblePosition.h:
        * editing/htmlediting.cpp:
        * editing/markup.cpp:
        * editing/markup.h:
        * editing/visible_units.cpp:
        * editing/visible_units.h:
        * html/HTMLDocument.cpp:
        * html/HTMLFontElement.cpp:
        * html/HTMLInputElement.cpp:
        * html/HTMLKeygenElement.cpp:
        * html/HTMLSelectElement.h:
        * html/HTMLTextAreaElement.cpp:
        * html/HTMLTextFieldInnerElement.cpp:
        * html/HTMLTokenizer.cpp:
        * html/HTMLTokenizer.h:
        * kcanvas/KCanvasContainer.cpp: Removed.
        * kcanvas/KCanvasContainer.h: Removed.
        * kcanvas/KCanvasCreator.cpp:
        * kcanvas/KCanvasFilters.cpp:
        * kcanvas/KCanvasFilters.h:
        * kcanvas/KCanvasMatrix.cpp:
        * kcanvas/KCanvasMatrix.h:
        * kcanvas/KCanvasPath.cpp:
        * kcanvas/KCanvasPath.h:
        * kcanvas/KCanvasResources.cpp:
        * kcanvas/KCanvasResources.h:
        * kcanvas/KCanvasTreeDebug.cpp:
        * kcanvas/KCanvasTreeDebug.h:
        * kcanvas/RenderForeignObject.cpp:
        * kcanvas/RenderForeignObject.h:
        * kcanvas/RenderPath.cpp:
        * kcanvas/RenderPath.h:
        * kcanvas/RenderSVGContainer.cpp: Added.
        * kcanvas/RenderSVGContainer.h: Added.
        * kcanvas/RenderSVGImage.cpp:
        * kcanvas/RenderSVGImage.h:
        * kcanvas/RenderSVGText.cpp:
        * kcanvas/RenderSVGText.h:
        * kcanvas/device/KRenderingPaintServer.h:
        * kcanvas/device/KRenderingPaintServerGradient.cpp:
        * kcanvas/device/KRenderingPaintServerGradient.h:
        * kcanvas/device/KRenderingPaintServerPattern.cpp:
        * kcanvas/device/KRenderingPaintServerPattern.h:
        * kcanvas/device/KRenderingPaintServerSolid.cpp:
        * kcanvas/device/KRenderingPaintServerSolid.h:
        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
        * kcanvas/device/quartz/KCanvasItemQuartz.h:
        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
        * ksvg2/css/CSSValueKeywords.in:
        * ksvg2/css/SVGRenderStyleDefs.cpp:
        * ksvg2/misc/KCanvasRenderingStyle.cpp:
        * ksvg2/misc/KSVGTimeScheduler.cpp:
        * ksvg2/svg/SVGAElement.cpp:
        * ksvg2/svg/SVGAnimateTransformElement.cpp:
        * ksvg2/svg/SVGAnimateTransformElement.h:
        * ksvg2/svg/SVGGElement.cpp:
        * ksvg2/svg/SVGHelper.cpp:
        * ksvg2/svg/SVGHelper.h:
        * ksvg2/svg/SVGImageElement.cpp:
        * ksvg2/svg/SVGLinearGradientElement.cpp:
        * ksvg2/svg/SVGMarkerElement.cpp:
        * ksvg2/svg/SVGMaskElement.cpp:
        * ksvg2/svg/SVGMatrix.cpp:
        * ksvg2/svg/SVGMatrix.h:
        * ksvg2/svg/SVGPatternElement.cpp:
        * ksvg2/svg/SVGRadialGradientElement.cpp:
        * ksvg2/svg/SVGSVGElement.cpp:
        * ksvg2/svg/SVGStyledElement.h:
        * ksvg2/svg/SVGStyledTransformableElement.cpp:
        * ksvg2/svg/SVGStyledTransformableElement.h:
        * ksvg2/svg/SVGSwitchElement.cpp:
        * ksvg2/svg/SVGTextElement.cpp:
        * ksvg2/svg/SVGTransformable.h:
        * ksvg2/svg/SVGUseElement.cpp:
        * kwq/AffineTransform.cpp: Added.
        * kwq/AffineTransform.h: Added.
        * kwq/DeprecatedCString.cpp: Added.
        * kwq/DeprecatedCString.h: Added.
        * kwq/DeprecatedPtrQueue.h: Added.
        * kwq/FileButton.h: Added.
        * kwq/FileButton.mm: Added.
        * kwq/FormDataMac.mm: Added.
        * kwq/KWQCString.cpp: Removed.
        * kwq/KWQCString.h: Removed.
        * kwq/KWQComboBox.h: Removed.
        * kwq/KWQComboBox.mm: Removed.
        * kwq/KWQEditCommand.h: Removed.
        * kwq/KWQEditCommand.mm: Removed.
        * kwq/KWQFileButton.h: Removed.
        * kwq/KWQFileButton.mm: Removed.
        * kwq/KWQFormData.h: Removed.
        * kwq/KWQFormData.mm: Removed.
        * kwq/KWQKHTMLSettings.h: Removed.
        * kwq/KWQKIOGlobal.h: Removed.
        * kwq/KWQKSSLKeyGen.h: Removed.
        * kwq/KWQKSSLKeyGen.mm: Removed.
        * kwq/KWQLineEdit.h: Removed.
        * kwq/KWQLineEdit.mm: Removed.
        * kwq/KWQListBox.h: Removed.
        * kwq/KWQListBox.mm: Removed.
        * kwq/KWQLoader.h: Removed.
        * kwq/KWQLoader.mm: Removed.
        * kwq/KWQPageState.h: Removed.
        * kwq/KWQPageState.mm: Removed.
        * kwq/KWQPtrQueue.h: Removed.
        * kwq/KWQResourceLoader.h: Removed.
        * kwq/KWQResourceLoader.mm: Removed.
        * kwq/KWQScrollBar.h: Removed.
        * kwq/KWQScrollBar.mm: Removed.
        * kwq/KWQSlider.h: Removed.
        * kwq/KWQSlider.mm: Removed.
        * kwq/KWQTextEdit.h: Removed.
        * kwq/KWQTextEdit.mm: Removed.
        * kwq/KWQTextStream.cpp: Removed.
        * kwq/KWQTextStream.h: Removed.
        * kwq/KWQWMatrix.cpp: Removed.
        * kwq/KWQWMatrix.h: Removed.
        * kwq/ListBox.h: Added.
        * kwq/ListBox.mm: Added.
        * kwq/LoaderFunctions.h: Added.
        * kwq/LoaderFunctions.mm: Added.
        * kwq/PopUpButton.h: Added.
        * kwq/PopUpButton.mm: Added.
        * kwq/SSLKeyGenerator.h: Added.
        * kwq/SSLKeyGenerator.mm: Added.
        * kwq/Settings.h: Added.
        * kwq/TextBox.h: Added.
        * kwq/TextBox.mm: Added.
        * kwq/TextField.h: Added.
        * kwq/TextField.mm: Added.
        * kwq/TextStream.cpp: Added.
        * kwq/TextStream.h: Added.
        * kwq/WebCoreEditCommand.h: Added.
        * kwq/WebCoreEditCommand.mm: Added.
        * kwq/WebCorePageState.h: Added.
        * kwq/WebCorePageState.mm: Added.
        * kwq/WebCoreResourceLoaderImp.h: Added.
        * kwq/WebCoreResourceLoaderImp.mm: Added.
        * kwq/WebCoreScrollBar.h: Added.
        * kwq/WebCoreScrollBar.mm: Added.
        * kwq/WebCoreSlider.h: Added.
        * kwq/WebCoreSlider.mm: Added.
        * loader/Cache.h:
        * loader/CachedCSSStyleSheet.cpp:
        * loader/CachedImage.cpp:
        * loader/CachedObject.h:
        * loader/CachedObjectClientWalker.h:
        * loader/CachedResource.h:
        * loader/CachedResourceClientWalker.h:
        * loader/CachedScript.h:
        * loader/CachedXBLDocument.h:
        * loader/Decoder.h:
        * loader/DocLoader.cpp:
        * loader/DocLoader.h:
        * loader/FormData.h:
        * loader/ImageDocument.cpp:
        * loader/PluginDocument.cpp:
        * loader/TextDocument.cpp:
        * loader/loader.cpp:
        * loader/loader.h:
        * page/Frame.cpp:
        * page/Frame.h:
        * page/FramePrivate.h:
        * page/Page.cpp:
        * page/Page.h:
        * platform/DeprecatedPtrList.h:
        * platform/DeprecatedPtrListImpl.cpp:
        * platform/DeprecatedPtrListImpl.h:
        * platform/DeprecatedString.cpp:
        * platform/DeprecatedString.h:
        * platform/DeprecatedStringList.cpp:
        * platform/DeprecatedStringList.h:
        * platform/DeprecatedValueList.h:
        * platform/DeprecatedValueListImpl.cpp:
        * platform/DeprecatedValueListImpl.h:
        * platform/FloatSize.h:
        * platform/Font.cpp:
        * platform/KURL.cpp:
        * platform/RegularExpression.cpp:
        * platform/RegularExpression.h:
        * platform/SegmentedString.h:
        * platform/StreamingTextDecoder.cpp:
        * platform/String.cpp:
        * platform/StringImpl.cpp:
        * platform/TextEncoding.cpp:
        * platform/TransferJob.cpp:
        * platform/TransferJob.h:
        * platform/TransferJobInternal.h:
        * platform/gdk/FrameGdk.cpp:
        * platform/gdk/TemporaryLinkStubs.cpp:
        * platform/mac/ClipboardMac.h:
        * platform/mac/ClipboardMac.mm:
        * platform/mac/CursorMac.mm:
        * platform/mac/DeprecatedStringMac.mm: Added.
        * platform/mac/FontCacheMac.mm:
        * platform/mac/FontMac.mm:
        * platform/mac/FoundationExtras.h:
        * platform/mac/ImageMac.mm:
        * platform/mac/KURLMac.mm:
        * platform/mac/MouseEventMac.mm: Removed.
        * platform/mac/QStringListMac.mm: Removed.
        * platform/mac/QStringMac.mm: Removed.
        * platform/mac/TransferJobMac.mm:
        * platform/mac/WebCoreTextArea.h:
        * platform/mac/WebCoreTextArea.mm:
        * platform/mac/WebCoreTextField.h:
        * platform/mac/WebCoreTextField.mm:
        * platform/mac/WidgetMac.mm:
        * platform/win/TemporaryLinkStubs.cpp:
        * rendering/DataRef.h:
        * rendering/DeprecatedRenderSelect.cpp:
        * rendering/DeprecatedRenderSelect.h:
        * rendering/DeprecatedSlider.cpp:
        * rendering/InlineFlowBox.cpp:
        * rendering/RenderApplet.cpp:
        * rendering/RenderBlock.cpp:
        * rendering/RenderBlock.h:
        * rendering/RenderContainer.cpp:
        * rendering/RenderFileButton.cpp:
        * rendering/RenderFlexibleBox.cpp:
        * rendering/RenderFlow.cpp:
        * rendering/RenderFormElement.cpp:
        * rendering/RenderFrameSet.cpp:
        * rendering/RenderFrameSet.h:
        * rendering/RenderImage.cpp:
        * rendering/RenderInline.cpp:
        * rendering/RenderLayer.cpp:
        * rendering/RenderLayer.h:
        * rendering/RenderLineEdit.cpp:
        * rendering/RenderListItem.cpp:
        * rendering/RenderListMarker.cpp:
        * rendering/RenderObject.cpp:
        * rendering/RenderObject.h:
        * rendering/RenderPartObject.cpp:
        * rendering/RenderReplaced.cpp:
        * rendering/RenderStyle.cpp: Added.
        * rendering/RenderStyle.h: Added.
        * rendering/RenderTable.cpp:
        * rendering/RenderTable.h:
        * rendering/RenderTableCell.cpp:
        * rendering/RenderTableCell.h:
        * rendering/RenderTableCol.cpp:
        * rendering/RenderTableCol.h:
        * rendering/RenderTableRow.cpp:
        * rendering/RenderTableSection.cpp:
        * rendering/RenderTableSection.h:
        * rendering/RenderText.cpp:
        * rendering/RenderText.h:
        * rendering/RenderTextArea.cpp:
        * rendering/RenderTextControl.cpp: Added.
        * rendering/RenderTextControl.h: Added.
        * rendering/RenderTextField.cpp: Removed.
        * rendering/RenderTextField.h: Removed.
        * rendering/RenderTheme.cpp:
        * rendering/RenderThemeMac.mm:
        * rendering/RenderTreeAsText.cpp:
        * rendering/RenderTreeAsText.h:
        * rendering/RenderView.cpp:
        * rendering/RenderWidget.cpp:
        * rendering/bidi.cpp:
        * rendering/render_style.cpp: Removed.
        * rendering/render_style.h: Removed.
        * xml/XSLStyleSheet.cpp:
        * xml/XSLTProcessor.cpp:
        * xml/xmlhttprequest.cpp:
        * xpath/impl/XPathParser.cpp:

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

272 files changed:
WebCore/ChangeLog
WebCore/WebCore+SVG/DOMList.h
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/bindings/js/kjs_dom.cpp
WebCore/bindings/js/kjs_window.cpp
WebCore/bindings/objc/DOMHTML.mm
WebCore/bridge/mac/FrameMac.h
WebCore/bridge/mac/FrameMac.mm
WebCore/bridge/mac/WebCoreFrameBridge.mm
WebCore/bridge/mac/WebCoreSettings.h
WebCore/bridge/mac/WebCoreSettings.mm
WebCore/bridge/win/FrameWin.cpp
WebCore/css/CSSPrimitiveValue.cpp
WebCore/css/CSSValueKeywords.in
WebCore/css/MediaQueryEvaluator.cpp
WebCore/css/cssparser.cpp
WebCore/css/cssstyleselector.cpp
WebCore/css/cssstyleselector.h
WebCore/dom/CharacterData.cpp
WebCore/dom/CharacterData.h
WebCore/dom/Document.cpp
WebCore/dom/Element.cpp
WebCore/dom/Element.h
WebCore/dom/EventTargetNode.cpp
WebCore/dom/EventTargetNode.h
WebCore/dom/Node.cpp
WebCore/dom/Node.h
WebCore/dom/Position.cpp
WebCore/dom/ProcessingInstruction.cpp
WebCore/dom/QualifiedName.cpp
WebCore/dom/QualifiedName.h
WebCore/dom/XMLTokenizer.cpp [moved from WebCore/dom/xml_tokenizer.cpp with 98% similarity]
WebCore/dom/XMLTokenizer.h [moved from WebCore/dom/xml_tokenizer.h with 100% similarity]
WebCore/editing/EditAction.h
WebCore/editing/HTMLInterchange.cpp
WebCore/editing/HTMLInterchange.h
WebCore/editing/Selection.h
WebCore/editing/SelectionController.h
WebCore/editing/TextAffinity.h
WebCore/editing/TextIterator.cpp
WebCore/editing/TextIterator.h
WebCore/editing/VisiblePosition.h
WebCore/editing/htmlediting.cpp
WebCore/editing/markup.cpp
WebCore/editing/markup.h
WebCore/editing/visible_units.cpp
WebCore/editing/visible_units.h
WebCore/html/HTMLDocument.cpp
WebCore/html/HTMLFontElement.cpp
WebCore/html/HTMLInputElement.cpp
WebCore/html/HTMLKeygenElement.cpp
WebCore/html/HTMLSelectElement.h
WebCore/html/HTMLTextAreaElement.cpp
WebCore/html/HTMLTextFieldInnerElement.cpp
WebCore/html/HTMLTokenizer.cpp
WebCore/html/HTMLTokenizer.h
WebCore/kcanvas/KCanvasCreator.cpp
WebCore/kcanvas/KCanvasFilters.cpp
WebCore/kcanvas/KCanvasFilters.h
WebCore/kcanvas/KCanvasMatrix.cpp
WebCore/kcanvas/KCanvasMatrix.h
WebCore/kcanvas/KCanvasPath.cpp
WebCore/kcanvas/KCanvasPath.h
WebCore/kcanvas/KCanvasResources.cpp
WebCore/kcanvas/KCanvasResources.h
WebCore/kcanvas/KCanvasTreeDebug.cpp
WebCore/kcanvas/KCanvasTreeDebug.h
WebCore/kcanvas/RenderForeignObject.cpp
WebCore/kcanvas/RenderForeignObject.h
WebCore/kcanvas/RenderPath.cpp
WebCore/kcanvas/RenderPath.h
WebCore/kcanvas/RenderSVGContainer.cpp [moved from WebCore/kcanvas/KCanvasContainer.cpp with 79% similarity]
WebCore/kcanvas/RenderSVGContainer.h [moved from WebCore/kcanvas/KCanvasContainer.h with 89% similarity]
WebCore/kcanvas/RenderSVGImage.cpp
WebCore/kcanvas/RenderSVGImage.h
WebCore/kcanvas/RenderSVGText.cpp
WebCore/kcanvas/RenderSVGText.h
WebCore/kcanvas/device/KRenderingPaintServer.h
WebCore/kcanvas/device/KRenderingPaintServerGradient.cpp
WebCore/kcanvas/device/KRenderingPaintServerGradient.h
WebCore/kcanvas/device/KRenderingPaintServerPattern.cpp
WebCore/kcanvas/device/KRenderingPaintServerPattern.h
WebCore/kcanvas/device/KRenderingPaintServerSolid.cpp
WebCore/kcanvas/device/KRenderingPaintServerSolid.h
WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
WebCore/kcanvas/device/quartz/KCanvasItemQuartz.h
WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h
WebCore/kcanvas/device/quartz/KRenderingDeviceQuartz.mm
WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm
WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm
WebCore/ksvg2/css/CSSValueKeywords.in
WebCore/ksvg2/css/SVGRenderStyleDefs.cpp
WebCore/ksvg2/misc/KCanvasRenderingStyle.cpp
WebCore/ksvg2/misc/KSVGTimeScheduler.cpp
WebCore/ksvg2/svg/SVGAElement.cpp
WebCore/ksvg2/svg/SVGAnimateTransformElement.cpp
WebCore/ksvg2/svg/SVGAnimateTransformElement.h
WebCore/ksvg2/svg/SVGGElement.cpp
WebCore/ksvg2/svg/SVGHelper.cpp
WebCore/ksvg2/svg/SVGHelper.h
WebCore/ksvg2/svg/SVGImageElement.cpp
WebCore/ksvg2/svg/SVGLinearGradientElement.cpp
WebCore/ksvg2/svg/SVGMarkerElement.cpp
WebCore/ksvg2/svg/SVGMaskElement.cpp
WebCore/ksvg2/svg/SVGMatrix.cpp
WebCore/ksvg2/svg/SVGMatrix.h
WebCore/ksvg2/svg/SVGPatternElement.cpp
WebCore/ksvg2/svg/SVGRadialGradientElement.cpp
WebCore/ksvg2/svg/SVGSVGElement.cpp
WebCore/ksvg2/svg/SVGStyledElement.h
WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp
WebCore/ksvg2/svg/SVGStyledTransformableElement.h
WebCore/ksvg2/svg/SVGSwitchElement.cpp
WebCore/ksvg2/svg/SVGTextElement.cpp
WebCore/ksvg2/svg/SVGTransformable.h
WebCore/ksvg2/svg/SVGUseElement.cpp
WebCore/kwq/AffineTransform.cpp [moved from WebCore/kwq/KWQWMatrix.cpp with 69% similarity]
WebCore/kwq/AffineTransform.h [moved from WebCore/kwq/KWQWMatrix.h with 73% similarity]
WebCore/kwq/CacheControl.h [moved from WebCore/kwq/KWQKIOGlobal.h with 100% similarity]
WebCore/kwq/DeprecatedCString.cpp [moved from WebCore/kwq/KWQCString.cpp with 99% similarity]
WebCore/kwq/DeprecatedCString.h [moved from WebCore/kwq/KWQCString.h with 98% similarity]
WebCore/kwq/DeprecatedPtrQueue.h [moved from WebCore/kwq/KWQPtrQueue.h with 95% similarity]
WebCore/kwq/FileButton.h [moved from WebCore/kwq/KWQFileButton.h with 94% similarity]
WebCore/kwq/FileButton.mm [moved from WebCore/kwq/KWQFileButton.mm with 93% similarity]
WebCore/kwq/FormDataMac.h [moved from WebCore/kwq/KWQFormData.h with 100% similarity]
WebCore/kwq/FormDataMac.mm [moved from WebCore/kwq/KWQFormData.mm with 98% similarity]
WebCore/kwq/ListBox.h [moved from WebCore/kwq/KWQListBox.h with 76% similarity]
WebCore/kwq/ListBox.mm [moved from WebCore/kwq/KWQListBox.mm with 86% similarity]
WebCore/kwq/LoaderFunctions.h [moved from WebCore/kwq/KWQLoader.h with 71% similarity]
WebCore/kwq/LoaderFunctions.mm [moved from WebCore/kwq/KWQLoader.mm with 89% similarity]
WebCore/kwq/PopUpButton.h [moved from WebCore/kwq/KWQComboBox.h with 80% similarity]
WebCore/kwq/PopUpButton.mm [moved from WebCore/kwq/KWQComboBox.mm with 80% similarity]
WebCore/kwq/SSLKeyGenerator.h [moved from WebCore/kwq/KWQKSSLKeyGen.h with 98% similarity]
WebCore/kwq/SSLKeyGenerator.mm [moved from WebCore/kwq/KWQKSSLKeyGen.mm with 90% similarity]
WebCore/kwq/Settings.h [moved from WebCore/kwq/KWQKHTMLSettings.h with 99% similarity]
WebCore/kwq/TextBox.h [moved from WebCore/kwq/KWQTextEdit.h with 94% similarity]
WebCore/kwq/TextBox.mm [moved from WebCore/kwq/KWQTextEdit.mm with 87% similarity]
WebCore/kwq/TextField.h [moved from WebCore/kwq/KWQLineEdit.h with 89% similarity]
WebCore/kwq/TextField.mm [moved from WebCore/kwq/KWQLineEdit.mm with 85% similarity]
WebCore/kwq/TextStream.cpp [moved from WebCore/kwq/KWQTextStream.cpp with 80% similarity]
WebCore/kwq/TextStream.h [moved from WebCore/kwq/KWQTextStream.h with 62% similarity]
WebCore/kwq/WebCoreEditCommand.h [moved from WebCore/kwq/KWQEditCommand.h with 92% similarity]
WebCore/kwq/WebCoreEditCommand.mm [moved from WebCore/kwq/KWQEditCommand.mm with 89% similarity]
WebCore/kwq/WebCorePageState.h [moved from WebCore/kwq/KWQPageState.h with 98% similarity]
WebCore/kwq/WebCorePageState.mm [moved from WebCore/kwq/KWQPageState.mm with 98% similarity]
WebCore/kwq/WebCoreResourceLoaderImp.h [moved from WebCore/kwq/KWQResourceLoader.h with 95% similarity]
WebCore/kwq/WebCoreResourceLoaderImp.mm [moved from WebCore/kwq/KWQResourceLoader.mm with 97% similarity]
WebCore/kwq/WebCoreScrollBar.h [moved from WebCore/kwq/KWQScrollBar.h with 82% similarity]
WebCore/kwq/WebCoreScrollBar.mm [moved from WebCore/kwq/KWQScrollBar.mm with 75% similarity]
WebCore/kwq/WebCoreSlider.h [moved from WebCore/kwq/KWQSlider.h with 94% similarity]
WebCore/kwq/WebCoreSlider.mm [moved from WebCore/kwq/KWQSlider.mm with 84% similarity]
WebCore/loader/Cache.h
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedImage.cpp
WebCore/loader/CachedObject.h
WebCore/loader/CachedObjectClientWalker.h
WebCore/loader/CachedResource.h
WebCore/loader/CachedResourceClientWalker.h
WebCore/loader/CachedScript.h
WebCore/loader/CachedXBLDocument.h
WebCore/loader/Decoder.h
WebCore/loader/DocLoader.cpp
WebCore/loader/DocLoader.h
WebCore/loader/FormData.h
WebCore/loader/ImageDocument.cpp
WebCore/loader/PluginDocument.cpp
WebCore/loader/TextDocument.cpp
WebCore/loader/loader.cpp
WebCore/loader/loader.h
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/page/Page.cpp
WebCore/page/Page.h
WebCore/platform/DeprecatedPtrList.h
WebCore/platform/DeprecatedPtrListImpl.cpp
WebCore/platform/DeprecatedPtrListImpl.h
WebCore/platform/DeprecatedString.cpp
WebCore/platform/DeprecatedString.h
WebCore/platform/DeprecatedStringList.cpp
WebCore/platform/DeprecatedStringList.h
WebCore/platform/DeprecatedValueList.h
WebCore/platform/DeprecatedValueListImpl.cpp
WebCore/platform/DeprecatedValueListImpl.h
WebCore/platform/FloatSize.h
WebCore/platform/Font.cpp
WebCore/platform/KURL.cpp
WebCore/platform/RegularExpression.cpp
WebCore/platform/RegularExpression.h
WebCore/platform/SegmentedString.h
WebCore/platform/StreamingTextDecoder.cpp
WebCore/platform/String.cpp
WebCore/platform/StringImpl.cpp
WebCore/platform/TextEncoding.cpp
WebCore/platform/TransferJob.cpp
WebCore/platform/TransferJob.h
WebCore/platform/TransferJobInternal.h
WebCore/platform/gdk/FrameGdk.cpp
WebCore/platform/gdk/TemporaryLinkStubs.cpp
WebCore/platform/mac/ClipboardMac.h
WebCore/platform/mac/ClipboardMac.mm
WebCore/platform/mac/CursorMac.mm
WebCore/platform/mac/DeprecatedStringListMac.mm [moved from WebCore/platform/mac/QStringListMac.mm with 100% similarity]
WebCore/platform/mac/DeprecatedStringMac.mm [moved from WebCore/platform/mac/QStringMac.mm with 97% similarity]
WebCore/platform/mac/FontCacheMac.mm
WebCore/platform/mac/FontMac.mm
WebCore/platform/mac/FoundationExtras.h
WebCore/platform/mac/ImageMac.mm
WebCore/platform/mac/KURLMac.mm
WebCore/platform/mac/PlatformMouseEventMac.mm [moved from WebCore/platform/mac/MouseEventMac.mm with 100% similarity]
WebCore/platform/mac/TransferJobMac.mm
WebCore/platform/mac/WebCoreTextArea.h
WebCore/platform/mac/WebCoreTextArea.mm
WebCore/platform/mac/WebCoreTextField.h
WebCore/platform/mac/WebCoreTextField.mm
WebCore/platform/mac/WidgetMac.mm
WebCore/platform/win/TemporaryLinkStubs.cpp
WebCore/rendering/DataRef.h
WebCore/rendering/DeprecatedRenderSelect.cpp
WebCore/rendering/DeprecatedRenderSelect.h
WebCore/rendering/DeprecatedSlider.cpp
WebCore/rendering/InlineFlowBox.cpp
WebCore/rendering/RenderApplet.cpp
WebCore/rendering/RenderBlock.cpp
WebCore/rendering/RenderBlock.h
WebCore/rendering/RenderContainer.cpp
WebCore/rendering/RenderFileButton.cpp
WebCore/rendering/RenderFlexibleBox.cpp
WebCore/rendering/RenderFlow.cpp
WebCore/rendering/RenderFormElement.cpp
WebCore/rendering/RenderFrameSet.cpp
WebCore/rendering/RenderFrameSet.h
WebCore/rendering/RenderImage.cpp
WebCore/rendering/RenderInline.cpp
WebCore/rendering/RenderLayer.cpp
WebCore/rendering/RenderLayer.h
WebCore/rendering/RenderLineEdit.cpp
WebCore/rendering/RenderListItem.cpp
WebCore/rendering/RenderListMarker.cpp
WebCore/rendering/RenderObject.cpp
WebCore/rendering/RenderObject.h
WebCore/rendering/RenderPartObject.cpp
WebCore/rendering/RenderReplaced.cpp
WebCore/rendering/RenderStyle.cpp [moved from WebCore/rendering/render_style.cpp with 99% similarity]
WebCore/rendering/RenderStyle.h [moved from WebCore/rendering/render_style.h with 99% similarity]
WebCore/rendering/RenderTable.cpp
WebCore/rendering/RenderTable.h
WebCore/rendering/RenderTableCell.cpp
WebCore/rendering/RenderTableCell.h
WebCore/rendering/RenderTableCol.cpp
WebCore/rendering/RenderTableCol.h
WebCore/rendering/RenderTableRow.cpp
WebCore/rendering/RenderTableSection.cpp
WebCore/rendering/RenderTableSection.h
WebCore/rendering/RenderText.cpp
WebCore/rendering/RenderText.h
WebCore/rendering/RenderTextArea.cpp
WebCore/rendering/RenderTextControl.cpp [moved from WebCore/rendering/RenderTextField.cpp with 92% similarity]
WebCore/rendering/RenderTextControl.h [moved from WebCore/rendering/RenderTextField.h with 94% similarity]
WebCore/rendering/RenderTheme.cpp
WebCore/rendering/RenderThemeMac.mm
WebCore/rendering/RenderTreeAsText.cpp
WebCore/rendering/RenderTreeAsText.h
WebCore/rendering/RenderView.cpp
WebCore/rendering/RenderWidget.cpp
WebCore/rendering/bidi.cpp
WebCore/xml/XSLStyleSheet.cpp
WebCore/xml/XSLTProcessor.cpp
WebCore/xml/xmlhttprequest.cpp
WebCore/xpath/impl/XPathParser.cpp

index 980b0489c7133f687b54e05f20193db8ad264e71..2898bb500b33b07c35521e6fc8d8e4a9e0c0aa97 100644 (file)
@@ -1,3 +1,323 @@
+2006-07-09  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Maciej (kinda).
+
+        - did the next pass of renaming (used do-webcore-rename script)
+          this takes care of most of the remaining KWQ names (almost all)
+
+        * WebCore+SVG/DOMList.h:
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/kjs_dom.cpp:
+        * bindings/js/kjs_window.cpp:
+        * bindings/objc/DOMHTML.mm:
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        * bridge/mac/WebCoreSettings.h:
+        * bridge/mac/WebCoreSettings.mm:
+        * bridge/win/FrameWin.cpp:
+        * css/CSSPrimitiveValue.cpp:
+        * css/CSSValueKeywords.in:
+        * css/MediaQueryEvaluator.cpp:
+        * css/cssparser.cpp:
+        * css/cssstyleselector.cpp:
+        * css/cssstyleselector.h:
+        * dom/CharacterData.cpp:
+        * dom/CharacterData.h:
+        * dom/Document.cpp:
+        * dom/Element.cpp:
+        * dom/Element.h:
+        * dom/EventTargetNode.cpp:
+        * dom/EventTargetNode.h:
+        * dom/Node.cpp:
+        * dom/Node.h:
+        * dom/Position.cpp:
+        * dom/ProcessingInstruction.cpp:
+        * dom/QualifiedName.cpp:
+        * dom/QualifiedName.h:
+        * dom/XMLTokenizer.cpp: Added.
+        * dom/xml_tokenizer.cpp: Removed.
+        * dom/xml_tokenizer.h: Removed.
+        * editing/EditAction.h:
+        * editing/HTMLInterchange.cpp:
+        * editing/HTMLInterchange.h:
+        * editing/Selection.h:
+        * editing/SelectionController.h:
+        * editing/TextAffinity.h:
+        * editing/TextIterator.cpp:
+        * editing/TextIterator.h:
+        * editing/VisiblePosition.h:
+        * editing/htmlediting.cpp:
+        * editing/markup.cpp:
+        * editing/markup.h:
+        * editing/visible_units.cpp:
+        * editing/visible_units.h:
+        * html/HTMLDocument.cpp:
+        * html/HTMLFontElement.cpp:
+        * html/HTMLInputElement.cpp:
+        * html/HTMLKeygenElement.cpp:
+        * html/HTMLSelectElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        * html/HTMLTextFieldInnerElement.cpp:
+        * html/HTMLTokenizer.cpp:
+        * html/HTMLTokenizer.h:
+        * kcanvas/KCanvasContainer.cpp: Removed.
+        * kcanvas/KCanvasContainer.h: Removed.
+        * kcanvas/KCanvasCreator.cpp:
+        * kcanvas/KCanvasFilters.cpp:
+        * kcanvas/KCanvasFilters.h:
+        * kcanvas/KCanvasMatrix.cpp:
+        * kcanvas/KCanvasMatrix.h:
+        * kcanvas/KCanvasPath.cpp:
+        * kcanvas/KCanvasPath.h:
+        * kcanvas/KCanvasResources.cpp:
+        * kcanvas/KCanvasResources.h:
+        * kcanvas/KCanvasTreeDebug.cpp:
+        * kcanvas/KCanvasTreeDebug.h:
+        * kcanvas/RenderForeignObject.cpp:
+        * kcanvas/RenderForeignObject.h:
+        * kcanvas/RenderPath.cpp:
+        * kcanvas/RenderPath.h:
+        * kcanvas/RenderSVGContainer.cpp: Added.
+        * kcanvas/RenderSVGContainer.h: Added.
+        * kcanvas/RenderSVGImage.cpp:
+        * kcanvas/RenderSVGImage.h:
+        * kcanvas/RenderSVGText.cpp:
+        * kcanvas/RenderSVGText.h:
+        * kcanvas/device/KRenderingPaintServer.h:
+        * kcanvas/device/KRenderingPaintServerGradient.cpp:
+        * kcanvas/device/KRenderingPaintServerGradient.h:
+        * kcanvas/device/KRenderingPaintServerPattern.cpp:
+        * kcanvas/device/KRenderingPaintServerPattern.h:
+        * kcanvas/device/KRenderingPaintServerSolid.cpp:
+        * kcanvas/device/KRenderingPaintServerSolid.h:
+        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+        * kcanvas/device/quartz/KCanvasItemQuartz.h:
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
+        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
+        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
+        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
+        * ksvg2/css/CSSValueKeywords.in:
+        * ksvg2/css/SVGRenderStyleDefs.cpp:
+        * ksvg2/misc/KCanvasRenderingStyle.cpp:
+        * ksvg2/misc/KSVGTimeScheduler.cpp:
+        * ksvg2/svg/SVGAElement.cpp:
+        * ksvg2/svg/SVGAnimateTransformElement.cpp:
+        * ksvg2/svg/SVGAnimateTransformElement.h:
+        * ksvg2/svg/SVGGElement.cpp:
+        * ksvg2/svg/SVGHelper.cpp:
+        * ksvg2/svg/SVGHelper.h:
+        * ksvg2/svg/SVGImageElement.cpp:
+        * ksvg2/svg/SVGLinearGradientElement.cpp:
+        * ksvg2/svg/SVGMarkerElement.cpp:
+        * ksvg2/svg/SVGMaskElement.cpp:
+        * ksvg2/svg/SVGMatrix.cpp:
+        * ksvg2/svg/SVGMatrix.h:
+        * ksvg2/svg/SVGPatternElement.cpp:
+        * ksvg2/svg/SVGRadialGradientElement.cpp:
+        * ksvg2/svg/SVGSVGElement.cpp:
+        * ksvg2/svg/SVGStyledElement.h:
+        * ksvg2/svg/SVGStyledTransformableElement.cpp:
+        * ksvg2/svg/SVGStyledTransformableElement.h:
+        * ksvg2/svg/SVGSwitchElement.cpp:
+        * ksvg2/svg/SVGTextElement.cpp:
+        * ksvg2/svg/SVGTransformable.h:
+        * ksvg2/svg/SVGUseElement.cpp:
+        * kwq/AffineTransform.cpp: Added.
+        * kwq/AffineTransform.h: Added.
+        * kwq/DeprecatedCString.cpp: Added.
+        * kwq/DeprecatedCString.h: Added.
+        * kwq/DeprecatedPtrQueue.h: Added.
+        * kwq/FileButton.h: Added.
+        * kwq/FileButton.mm: Added.
+        * kwq/FormDataMac.mm: Added.
+        * kwq/KWQCString.cpp: Removed.
+        * kwq/KWQCString.h: Removed.
+        * kwq/KWQComboBox.h: Removed.
+        * kwq/KWQComboBox.mm: Removed.
+        * kwq/KWQEditCommand.h: Removed.
+        * kwq/KWQEditCommand.mm: Removed.
+        * kwq/KWQFileButton.h: Removed.
+        * kwq/KWQFileButton.mm: Removed.
+        * kwq/KWQFormData.h: Removed.
+        * kwq/KWQFormData.mm: Removed.
+        * kwq/KWQKHTMLSettings.h: Removed.
+        * kwq/KWQKIOGlobal.h: Removed.
+        * kwq/KWQKSSLKeyGen.h: Removed.
+        * kwq/KWQKSSLKeyGen.mm: Removed.
+        * kwq/KWQLineEdit.h: Removed.
+        * kwq/KWQLineEdit.mm: Removed.
+        * kwq/KWQListBox.h: Removed.
+        * kwq/KWQListBox.mm: Removed.
+        * kwq/KWQLoader.h: Removed.
+        * kwq/KWQLoader.mm: Removed.
+        * kwq/KWQPageState.h: Removed.
+        * kwq/KWQPageState.mm: Removed.
+        * kwq/KWQPtrQueue.h: Removed.
+        * kwq/KWQResourceLoader.h: Removed.
+        * kwq/KWQResourceLoader.mm: Removed.
+        * kwq/KWQScrollBar.h: Removed.
+        * kwq/KWQScrollBar.mm: Removed.
+        * kwq/KWQSlider.h: Removed.
+        * kwq/KWQSlider.mm: Removed.
+        * kwq/KWQTextEdit.h: Removed.
+        * kwq/KWQTextEdit.mm: Removed.
+        * kwq/KWQTextStream.cpp: Removed.
+        * kwq/KWQTextStream.h: Removed.
+        * kwq/KWQWMatrix.cpp: Removed.
+        * kwq/KWQWMatrix.h: Removed.
+        * kwq/ListBox.h: Added.
+        * kwq/ListBox.mm: Added.
+        * kwq/LoaderFunctions.h: Added.
+        * kwq/LoaderFunctions.mm: Added.
+        * kwq/PopUpButton.h: Added.
+        * kwq/PopUpButton.mm: Added.
+        * kwq/SSLKeyGenerator.h: Added.
+        * kwq/SSLKeyGenerator.mm: Added.
+        * kwq/Settings.h: Added.
+        * kwq/TextBox.h: Added.
+        * kwq/TextBox.mm: Added.
+        * kwq/TextField.h: Added.
+        * kwq/TextField.mm: Added.
+        * kwq/TextStream.cpp: Added.
+        * kwq/TextStream.h: Added.
+        * kwq/WebCoreEditCommand.h: Added.
+        * kwq/WebCoreEditCommand.mm: Added.
+        * kwq/WebCorePageState.h: Added.
+        * kwq/WebCorePageState.mm: Added.
+        * kwq/WebCoreResourceLoaderImp.h: Added.
+        * kwq/WebCoreResourceLoaderImp.mm: Added.
+        * kwq/WebCoreScrollBar.h: Added.
+        * kwq/WebCoreScrollBar.mm: Added.
+        * kwq/WebCoreSlider.h: Added.
+        * kwq/WebCoreSlider.mm: Added.
+        * loader/Cache.h:
+        * loader/CachedCSSStyleSheet.cpp:
+        * loader/CachedImage.cpp:
+        * loader/CachedObject.h:
+        * loader/CachedObjectClientWalker.h:
+        * loader/CachedResource.h:
+        * loader/CachedResourceClientWalker.h:
+        * loader/CachedScript.h:
+        * loader/CachedXBLDocument.h:
+        * loader/Decoder.h:
+        * loader/DocLoader.cpp:
+        * loader/DocLoader.h:
+        * loader/FormData.h:
+        * loader/ImageDocument.cpp:
+        * loader/PluginDocument.cpp:
+        * loader/TextDocument.cpp:
+        * loader/loader.cpp:
+        * loader/loader.h:
+        * page/Frame.cpp:
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        * page/Page.cpp:
+        * page/Page.h:
+        * platform/DeprecatedPtrList.h:
+        * platform/DeprecatedPtrListImpl.cpp:
+        * platform/DeprecatedPtrListImpl.h:
+        * platform/DeprecatedString.cpp:
+        * platform/DeprecatedString.h:
+        * platform/DeprecatedStringList.cpp:
+        * platform/DeprecatedStringList.h:
+        * platform/DeprecatedValueList.h:
+        * platform/DeprecatedValueListImpl.cpp:
+        * platform/DeprecatedValueListImpl.h:
+        * platform/FloatSize.h:
+        * platform/Font.cpp:
+        * platform/KURL.cpp:
+        * platform/RegularExpression.cpp:
+        * platform/RegularExpression.h:
+        * platform/SegmentedString.h:
+        * platform/StreamingTextDecoder.cpp:
+        * platform/String.cpp:
+        * platform/StringImpl.cpp:
+        * platform/TextEncoding.cpp:
+        * platform/TransferJob.cpp:
+        * platform/TransferJob.h:
+        * platform/TransferJobInternal.h:
+        * platform/gdk/FrameGdk.cpp:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        * platform/mac/ClipboardMac.h:
+        * platform/mac/ClipboardMac.mm:
+        * platform/mac/CursorMac.mm:
+        * platform/mac/DeprecatedStringMac.mm: Added.
+        * platform/mac/FontCacheMac.mm:
+        * platform/mac/FontMac.mm:
+        * platform/mac/FoundationExtras.h:
+        * platform/mac/ImageMac.mm:
+        * platform/mac/KURLMac.mm:
+        * platform/mac/MouseEventMac.mm: Removed.
+        * platform/mac/QStringListMac.mm: Removed.
+        * platform/mac/QStringMac.mm: Removed.
+        * platform/mac/TransferJobMac.mm:
+        * platform/mac/WebCoreTextArea.h:
+        * platform/mac/WebCoreTextArea.mm:
+        * platform/mac/WebCoreTextField.h:
+        * platform/mac/WebCoreTextField.mm:
+        * platform/mac/WidgetMac.mm:
+        * platform/win/TemporaryLinkStubs.cpp:
+        * rendering/DataRef.h:
+        * rendering/DeprecatedRenderSelect.cpp:
+        * rendering/DeprecatedRenderSelect.h:
+        * rendering/DeprecatedSlider.cpp:
+        * rendering/InlineFlowBox.cpp:
+        * rendering/RenderApplet.cpp:
+        * rendering/RenderBlock.cpp:
+        * rendering/RenderBlock.h:
+        * rendering/RenderContainer.cpp:
+        * rendering/RenderFileButton.cpp:
+        * rendering/RenderFlexibleBox.cpp:
+        * rendering/RenderFlow.cpp:
+        * rendering/RenderFormElement.cpp:
+        * rendering/RenderFrameSet.cpp:
+        * rendering/RenderFrameSet.h:
+        * rendering/RenderImage.cpp:
+        * rendering/RenderInline.cpp:
+        * rendering/RenderLayer.cpp:
+        * rendering/RenderLayer.h:
+        * rendering/RenderLineEdit.cpp:
+        * rendering/RenderListItem.cpp:
+        * rendering/RenderListMarker.cpp:
+        * rendering/RenderObject.cpp:
+        * rendering/RenderObject.h:
+        * rendering/RenderPartObject.cpp:
+        * rendering/RenderReplaced.cpp:
+        * rendering/RenderStyle.cpp: Added.
+        * rendering/RenderStyle.h: Added.
+        * rendering/RenderTable.cpp:
+        * rendering/RenderTable.h:
+        * rendering/RenderTableCell.cpp:
+        * rendering/RenderTableCell.h:
+        * rendering/RenderTableCol.cpp:
+        * rendering/RenderTableCol.h:
+        * rendering/RenderTableRow.cpp:
+        * rendering/RenderTableSection.cpp:
+        * rendering/RenderTableSection.h:
+        * rendering/RenderText.cpp:
+        * rendering/RenderText.h:
+        * rendering/RenderTextArea.cpp:
+        * rendering/RenderTextControl.cpp: Added.
+        * rendering/RenderTextControl.h: Added.
+        * rendering/RenderTextField.cpp: Removed.
+        * rendering/RenderTextField.h: Removed.
+        * rendering/RenderTheme.cpp:
+        * rendering/RenderThemeMac.mm:
+        * rendering/RenderTreeAsText.cpp:
+        * rendering/RenderTreeAsText.h:
+        * rendering/RenderView.cpp:
+        * rendering/RenderWidget.cpp:
+        * rendering/bidi.cpp:
+        * rendering/render_style.cpp: Removed.
+        * rendering/render_style.h: Removed.
+        * xml/XSLStyleSheet.cpp:
+        * xml/XSLTProcessor.cpp:
+        * xml/xmlhttprequest.cpp:
+        * xpath/impl/XPathParser.cpp:
+
 2006-07-09  Rob Buis  <buis@kde.org>
 
         Reviewed by Darin.
index 5a7d90198126cffbc138116610d84da7aede1ca8..996f6487ee1493a77743dba2c88aca939ffdf10f 100644 (file)
@@ -117,7 +117,7 @@ namespace WebCore
         }
 
     private:
-        Q3PtrList<T> m_impl;
+        DeprecatedPtrList<T> m_impl;
     };
 };
 
index 3dea03c1fe32ddcb7580942638c069f953b405f8..76bda34f54ac37f109f470b56e52f4fa86f48b6b 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQComboBox.h"\r
+                               RelativePath="..\..\kwq\PopUpButton.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQCString.cpp"\r
+                               RelativePath="..\..\kwq\DeprecatedCString.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQCString.h"\r
+                               RelativePath="..\..\kwq\DeprecatedCString.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQEditCommand.h"\r
+                               RelativePath="..\..\kwq\WebCoreEditCommand.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQFileButton.h"\r
+                               RelativePath="..\..\kwq\FileButton.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQFormData.h"\r
+                               RelativePath="..\..\kwq\FormDataMac.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQKHTMLSettings.h"\r
+                               RelativePath="..\..\kwq\Settings.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQKSSLKeyGen.h"\r
+                               RelativePath="..\..\kwq\SSLKeyGenerator.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQLineEdit.h"\r
+                               RelativePath="..\..\kwq\TextField.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQListBox.h"\r
+                               RelativePath="..\..\kwq\ListBox.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQLoader.h"\r
+                               RelativePath="..\..\kwq\LoaderFunctions.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQPageState.h"\r
+                               RelativePath="..\..\kwq\WebCorePageState.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQPtrQueue.h"\r
+                               RelativePath="..\..\kwq\DeprecatedPtrQueue.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQResourceLoader.h"\r
+                               RelativePath="..\..\kwq\WebCoreResourceLoaderImp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQScrollBar.h"\r
+                               RelativePath="..\..\kwq\WebCoreScrollBar.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQSlider.h"\r
+                               RelativePath="..\..\kwq\WebCoreSlider.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQTextEdit.h"\r
+                               RelativePath="..\..\kwq\TextBox.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQTextStream.cpp"\r
+                               RelativePath="..\..\kwq\TextStream.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQTextStream.h"\r
+                               RelativePath="..\..\kwq\TextStream.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\KWQWMatrix.h"\r
+                               RelativePath="..\..\kwq\AffineTransform.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\rendering\render_style.cpp"\r
+                               RelativePath="..\..\rendering\RenderStyle.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\rendering\render_style.h"\r
+                               RelativePath="..\..\rendering\RenderStyle.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\rendering\RenderTextField.cpp"\r
+                               RelativePath="..\..\rendering\RenderTextControl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\rendering\RenderTextField.h"\r
+                               RelativePath="..\..\rendering\RenderTextControl.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\dom\xml_tokenizer.cpp"\r
+                               RelativePath="..\..\dom\XMLTokenizer.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\dom\xml_tokenizer.h"\r
+                               RelativePath="..\..\dom\XMLTokenizer.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index a8951afe403567c0f2292723ae9bd40a9093dcf0..f8ba8ba5272a62d6bc4d87f93097a31d0f68b854 100644 (file)
                650F53DD09D15DDF00C9B0C8 /* CSSGrammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6565814409D13043000E61D7 /* CSSGrammar.cpp */; };
                651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */; };
                651B4D8609AC83370029F1EF /* DeprecatedStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 651B4D8409AC83370029F1EF /* DeprecatedStringList.h */; };
-               651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */; };
+               651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */; };
                6522BCDF09C9DAA800C9BA7A /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */; };
                6545F67009B82FED0013006F /* TransferJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6545F66C09B82FED0013006F /* TransferJob.cpp */; };
                6545F67109B82FED0013006F /* TransferJob.h in Headers */ = {isa = PBXBuildFile; fileRef = 6545F66D09B82FED0013006F /* TransferJob.h */; };
                6582A16109999D6D00BEEB6D /* PDFDocumentImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */; };
                6582A16209999D6D00BEEB6D /* ScreenMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15409999D6D00BEEB6D /* ScreenMac.mm */; };
                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */; };
-               6582A17809999EA000BEEB6D /* QStringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A17709999EA000BEEB6D /* QStringMac.mm */; };
+               6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */; };
                65901A4409FC6039005BD752 /* WebCoreStringTruncator.h in Headers */ = {isa = PBXBuildFile; fileRef = 65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65901A4509FC6039005BD752 /* WebCoreStringTruncator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */; };
                6593923709AE4346002C531F /* KURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6593923509AE4346002C531F /* KURL.cpp */; };
                935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */; };
                935C476D09AC4D6300A6AAB4 /* FoundationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */; };
                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */; };
-               935C477109AC4D7300A6AAB4 /* MouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */; };
+               935C477109AC4D7300A6AAB4 /* PlatformMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */; };
                935C477309AC4D7700A6AAB4 /* WheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */; };
                935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C477409AC4D8D00A6AAB4 /* GapRects.h */; };
                935FBC4509BA00B900E230B1 /* EventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 935FBC4409BA00B900E230B1 /* EventListener.h */; };
                93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25302DE4396018635CA /* HTMLTokenizer.h */; };
                93F198F608245E59001E9ABC /* Decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* Decoder.h */; };
                93F1991808245E59001E9ABC /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30402DE4476018635CA /* Range.h */; };
-               93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* xml_tokenizer.h */; };
-               93F1992908245E59001E9ABC /* KWQCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* KWQCString.h */; };
-               93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* KWQComboBox.h */; };
+               93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* XMLTokenizer.h */; };
+               93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* DeprecatedCString.h */; };
+               93F1992E08245E59001E9ABC /* PopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* PopUpButton.h */; };
                93F1992F08245E59001E9ABC /* Cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868402DE3B8601EA4122 /* Cursor.h */; };
-               93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* KWQFileButton.h */; };
-               93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
-               93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */; };
+               93F1993908245E59001E9ABC /* FileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* FileButton.h */; };
+               93F1994F08245E59001E9ABC /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* Settings.h */; };
+               93F1995008245E59001E9ABC /* CacheControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* CacheControl.h */; };
                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864502DE3A7701EA4122 /* JavaAppletWidget.h */; };
-               93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
-               93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* KWQLineEdit.h */; };
-               93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* KWQListBox.h */; };
+               93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
+               93F1996B08245E59001E9ABC /* TextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* TextField.h */; };
+               93F1996C08245E59001E9ABC /* ListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* ListBox.h */; };
                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */; };
-               93F1996E08245E59001E9ABC /* KWQLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851702DE375901EA4122 /* KWQLoader.h */; };
-               93F1997708245E59001E9ABC /* KWQPageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* KWQPageState.h */; };
+               93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851702DE375901EA4122 /* LoaderFunctions.h */; };
+               93F1997708245E59001E9ABC /* WebCorePageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* WebCorePageState.h */; };
                93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */; };
-               93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */; };
+               93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */; };
                93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786B302DE3B8601EA4122 /* RegularExpression.h */; };
                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */ = {isa = PBXBuildFile; fileRef = 93955A4103D72932008635CE /* RenderTreeAsText.h */; };
-               93F1998D08245E59001E9ABC /* KWQResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 93386B90037045B3008635CE /* KWQResourceLoader.h */; };
+               93F1998D08245E59001E9ABC /* WebCoreResourceLoaderImp.h in Headers */ = {isa = PBXBuildFile; fileRef = 93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */; };
                93F1999708245E59001E9ABC /* WebCoreTextArea.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853502DE375901EA4122 /* WebCoreTextArea.h */; };
-               93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */; };
+               93F1999908245E59001E9ABC /* TextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BE02DE3B8601EA4122 /* TextBox.h */; };
                93F1999A08245E59001E9ABC /* WebCoreTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851B02DE375901EA4122 /* WebCoreTextField.h */; };
-               93F1999B08245E59001E9ABC /* KWQTextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BF02DE3B8601EA4122 /* KWQTextStream.h */; };
+               93F1999B08245E59001E9ABC /* TextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BF02DE3B8601EA4122 /* TextStream.h */; };
                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */; };
                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */; };
                93F199A508245E59001E9ABC /* WebCoreCache.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B2A4FC02E2220F018635CB /* WebCoreCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855002DE375901EA4122 /* WebCoreResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F565AE8502ECA583018635CA /* WebCoreSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93F199B808245E59001E9ABC /* KWQScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* KWQScrollBar.h */; };
+               93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */; };
                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */; };
                93F199BD08245E59001E9ABC /* AccessibilityObjectCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */; };
                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A640F00533BB1F0085E777 /* BlockExceptions.h */; settings = {ATTRIBUTES = (); }; };
                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3B364705C9D5E200E42902 /* AtomicStringList.h */; };
-               93F199D508245E59001E9ABC /* KWQEditCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */; };
+               93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */; };
                93F199DE08245E59001E9ABC /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = BE91FC8B06133666005E3790 /* Position.h */; };
-               93F199E008245E59001E9ABC /* KWQSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* KWQSlider.h */; };
+               93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */; };
                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */; };
                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D90660B0665D937006B6F1A /* ClipboardMac.h */; };
                93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24A06D18A7E004A6FA3 /* XSLStyleSheet.h */; };
                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */; };
                93F199EE08245E59001E9ABC /* FormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 93ABCE5E06E1A42E0085925B /* FormData.h */; };
-               93F199EF08245E59001E9ABC /* KWQFormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B641F206E28C5C0055F610 /* KWQFormData.h */; };
+               93F199EF08245E59001E9ABC /* FormDataMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B641F206E28C5C0055F610 /* FormDataMac.h */; };
                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = BE855F7F0701E83500239769 /* WebCoreView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 5150C2A10702629000AF642C /* WebDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199FE08245E59001E9ABC /* linkCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5A1B04902DE8ABA018635CA /* linkCursor.tiff */; };
                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 */; };
-               93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* KWQComboBox.mm */; };
-               93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* KWQCString.cpp */; };
+               93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* PopUpButton.mm */; };
+               93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* DeprecatedCString.cpp */; };
                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */; };
-               93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* KWQLoader.mm */; };
-               93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* KWQLineEdit.mm */; };
-               93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
+               93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* LoaderFunctions.mm */; };
+               93F19A3A08245E59001E9ABC /* TextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* TextField.mm */; };
+               93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* ListBox.mm */; };
                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* WebCoreTextField.mm */; };
                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* RegularExpression.cpp */; };
                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* WebCoreTextArea.mm */; };
-               93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* KWQTextEdit.mm */; };
-               93F19A5408245E59001E9ABC /* KWQTextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* KWQTextStream.cpp */; };
+               93F19A5308245E59001E9ABC /* TextBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* TextBox.mm */; };
+               93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* TextStream.cpp */; };
                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */; };
                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23B02DE4396018635CA /* HTMLDocument.cpp */; };
                93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25202DE4396018635CA /* HTMLTokenizer.cpp */; };
                93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* Decoder.cpp */; };
                93F19AB908245E59001E9ABC /* Range.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30302DE4476018635CA /* Range.cpp */; };
-               93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* xml_tokenizer.cpp */; };
+               93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* XMLTokenizer.cpp */; };
                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */; };
                93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A52C02E22573018635CB /* WebCoreJavaScript.mm */; };
                93F19AC208245E59001E9ABC /* WebCoreSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F565AE8602ECA583018635CA /* WebCoreSettings.mm */; };
                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56234E003026D7301629B47 /* WebCoreEncodings.mm */; };
                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5517DC3031AB56301A80180 /* WebCoreHistory.m */; };
-               93F19ACC08245E59001E9ABC /* KWQFileButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* KWQFileButton.mm */; };
-               93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* KWQResourceLoader.mm */; };
-               93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* KWQPageState.mm */; };
+               93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* FileButton.mm */; };
+               93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */; };
+               93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* WebCorePageState.mm */; };
                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93955A4203D72932008635CE /* RenderTreeAsText.cpp */; };
-               93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* KWQScrollBar.mm */; };
+               93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */; };
                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */; };
                93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */; };
                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65F80697054D9F86008BF776 /* BlockExceptions.mm */; };
                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */; };
-               93F19AE608245E59001E9ABC /* KWQKSSLKeyGen.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */; };
-               93F19AF708245E59001E9ABC /* KWQEditCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */; };
+               93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */; };
+               93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */; };
                93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; };
-               93F19AFA08245E59001E9ABC /* KWQSlider.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* KWQSlider.mm */; };
+               93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */; };
                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; };
                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };
                93F19B0308245E59001E9ABC /* XSLStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24906D18A7E004A6FA3 /* XSLStyleSheet.cpp */; };
                93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; };
                93F19B0508245E59001E9ABC /* FormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93ABCE5D06E1A42E0085925B /* FormData.cpp */; };
-               93F19B0608245E59001E9ABC /* KWQFormData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B641F106E28C5C0055F610 /* KWQFormData.mm */; };
+               93F19B0608245E59001E9ABC /* FormDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B641F106E28C5C0055F610 /* FormDataMac.mm */; };
                93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8560510701F91100239769 /* WebCoreView.m */; };
                93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */ = {isa = PBXBuildFile; fileRef = 5150C2A50702629800AF642C /* WebDashboardRegion.m */; };
                93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869302846DCD018635CA /* ApplicationServices.framework */; };
                A88AD3B60952486E001DD196 /* QuartzSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB77089701F800BA5114 /* QuartzSupport.mm */; };
                A88AD3B70952486E001DD196 /* KCanvasPathQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8ABC99909445EC00013945F /* KCanvasPathQuartz.h */; };
                A88AD3B80952486E001DD196 /* KCanvasPathQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8ABC99A09445EC00013945F /* KCanvasPathQuartz.mm */; };
-               A88AD3B90952486E001DD196 /* KCanvasContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */; };
-               A88AD3BA0952486E001DD196 /* KCanvasContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */; };
+               A88AD3B90952486E001DD196 /* RenderSVGContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */; };
+               A88AD3BA0952486E001DD196 /* RenderSVGContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */; };
                A88AD3BB0952486E001DD196 /* KCanvasCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */; };
                A88AD3BC0952486E001DD196 /* KCanvasCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */; };
                A88AD3BD0952486E001DD196 /* KCanvasFilters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB7E089701F800BA5114 /* KCanvasFilters.cpp */; };
                A8EA800C0A19516E00A8EF5F /* StyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA80040A19516E00A8EF5F /* StyleSheet.h */; };
                A8EA800D0A19516E00A8EF5F /* StyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA80050A19516E00A8EF5F /* StyleSheet.cpp */; };
                A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA80060A19516E00A8EF5F /* MediaList.h */; };
-               A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */; };
-               A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */; };
+               A8FD8B86087CB44C00DC3707 /* AffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */; };
+               A8FD8B87087CB45700DC3707 /* AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = A85D7A8D0879EC64006A9172 /* AffineTransform.h */; };
                A8FEFB0A0979F472005839FD /* RenderForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = A8FEFB080979F472005839FD /* RenderForeignObject.h */; };
                A8FEFB0B0979F472005839FD /* RenderForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8FEFB090979F472005839FD /* RenderForeignObject.cpp */; };
                A8FEFB310979F4F6005839FD /* SVGForeignObjectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8FEFB2F0979F4F6005839FD /* SVGForeignObjectElement.cpp */; };
                AB23A32709BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23A32509BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp */; };
                AB23A32809BBA7D00067CC53 /* BeforeTextInsertedEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = AB23A32609BBA7D00067CC53 /* BeforeTextInsertedEvent.h */; };
                AB4261D80A2F6C9700BDD17D /* missingImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AB4261D70A2F6C9700BDD17D /* missingImage.tiff */; };
-               AB67D1A8097F3AE300F9392E /* RenderTextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */; };
-               AB67D1A9097F3AE300F9392E /* RenderTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextField.h */; };
+               AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
+               AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; };
                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; };
                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
                ABDDFE7B0A5C6E7000A3E11D /* RenderPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE750A5C6E7000A3E11D /* RenderPopupMenu.cpp */; };
                BCEA487A097D93020094C9E4 /* RenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA483B097D93020094C9E4 /* RenderLayer.h */; };
                BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4840097D93020094C9E4 /* RenderObject.cpp */; };
                BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4841097D93020094C9E4 /* RenderObject.h */; };
-               BCEA4883097D93020094C9E4 /* render_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4844097D93020094C9E4 /* render_style.cpp */; };
-               BCEA4884097D93020094C9E4 /* render_style.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4845097D93020094C9E4 /* render_style.h */; };
+               BCEA4883097D93020094C9E4 /* RenderStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4844097D93020094C9E4 /* RenderStyle.cpp */; };
+               BCEA4884097D93020094C9E4 /* RenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4845097D93020094C9E4 /* RenderStyle.h */; };
                BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4848097D93020094C9E4 /* RenderThemeMac.h */; };
                BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */; };
                BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA484A097D93020094C9E4 /* RenderTheme.cpp */; };
                650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
                651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedStringList.cpp; sourceTree = "<group>"; };
                651B4D8409AC83370029F1EF /* DeprecatedStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedStringList.h; sourceTree = "<group>"; };
-               651B4D8E09AC859F0029F1EF /* QStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QStringListMac.mm; sourceTree = "<group>"; };
+               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DeprecatedStringListMac.mm; sourceTree = "<group>"; };
                6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
                6545F66C09B82FED0013006F /* TransferJob.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TransferJob.cpp; sourceTree = "<group>"; };
                6545F66D09B82FED0013006F /* TransferJob.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TransferJob.h; sourceTree = "<group>"; };
                6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFDocumentImage.mm; sourceTree = "<group>"; };
                6582A15409999D6D00BEEB6D /* ScreenMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScreenMac.mm; sourceTree = "<group>"; };
                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SystemTimeMac.cpp; sourceTree = "<group>"; };
-               6582A17709999EA000BEEB6D /* QStringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QStringMac.mm; sourceTree = "<group>"; };
+               6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DeprecatedStringMac.mm; sourceTree = "<group>"; };
                65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreStringTruncator.h; sourceTree = "<group>"; };
                65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreStringTruncator.mm; sourceTree = "<group>"; };
                6593923509AE4346002C531F /* KURL.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = KURL.cpp; sourceTree = "<group>"; };
                840633070731A77200DB1FD1 /* libxslt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxslt.dylib; path = /usr/lib/libxslt.dylib; sourceTree = "<absolute>"; };
                84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreKeyGenerator.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKSSLKeyGen.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SSLKeyGenerator.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84C0FA24052B966D000440A1 /* eastResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = eastResizeCursor.tiff; sourceTree = "<group>"; };
                84C0FA25052B966D000440A1 /* helpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = helpCursor.tiff; sourceTree = "<group>"; };
                84C0FA26052B966D000440A1 /* moveCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = moveCursor.tiff; sourceTree = "<group>"; };
                93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedTimerMac.cpp; sourceTree = "<group>"; };
                93309EA0099EB78C0056E581 /* SharedTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedTimer.h; sourceTree = "<group>"; };
                93309EA1099EB78C0056E581 /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timer.cpp; sourceTree = "<group>"; };
-               93386B90037045B3008635CE /* KWQResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQResourceLoader.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               93386B91037045B3008635CE /* KWQResourceLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQResourceLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreResourceLoaderImp.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreResourceLoaderImp.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9352071709BD3BA500F2038D /* StaticConstructors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticConstructors.h; sourceTree = "<group>"; };
                9352071809BD3BA500F2038D /* TextBoundaries.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBoundaries.h; sourceTree = "<group>"; };
                9352071B09BD3BBB00F2038D /* TextBoundaries.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBoundaries.mm; sourceTree = "<group>"; };
                935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWheelEvent.h; sourceTree = "<group>"; };
                935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoundationExtras.h; sourceTree = "<group>"; };
                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyEventMac.mm; sourceTree = "<group>"; };
-               935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MouseEventMac.mm; sourceTree = "<group>"; };
+               935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformMouseEventMac.mm; sourceTree = "<group>"; };
                935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WheelEventMac.mm; sourceTree = "<group>"; };
                935C477409AC4D8D00A6AAB4 /* GapRects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapRects.h; sourceTree = "<group>"; };
                935FBC4409BA00B900E230B1 /* EventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventListener.h; sourceTree = "<group>"; };
                938E666109F09B87008A48EC /* JSHTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLCanvasElement.h; sourceTree = "<group>"; };
                938E683B09F0BD7A008A48EC /* GraphicsTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsTypes.h; sourceTree = "<group>"; };
                938E685309F0BE04008A48EC /* GraphicsTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsTypes.cpp; sourceTree = "<group>"; };
-               9394E0A403AA5BBE008635CE /* KWQPageState.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPageState.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               9394E0A503AA5BBE008635CE /* KWQPageState.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQPageState.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               9394E0A403AA5BBE008635CE /* WebCorePageState.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCorePageState.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               9394E0A503AA5BBE008635CE /* WebCorePageState.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCorePageState.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93955A4103D72932008635CE /* RenderTreeAsText.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeAsText.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93955A4203D72932008635CE /* RenderTreeAsText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeAsText.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                939885C108B7E3D100E707C4 /* EventNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventNames.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93A1EAA70A563508006960A0 /* ImageDocumentMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDocumentMac.h; sourceTree = "<group>"; };
                93ABCE5D06E1A42E0085925B /* FormData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormData.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93ABCE5E06E1A42E0085925B /* FormData.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FormData.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               93B641F106E28C5C0055F610 /* KWQFormData.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQFormData.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               93B641F206E28C5C0055F610 /* KWQFormData.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFormData.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93B641F106E28C5C0055F610 /* FormDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FormDataMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93B641F206E28C5C0055F610 /* FormDataMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FormDataMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93B70D3F09EB0C7C009D8468 /* JSDOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMParser.cpp; sourceTree = "<group>"; };
                93B70D4009EB0C7C009D8468 /* JSDOMParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMParser.h; sourceTree = "<group>"; };
                93B70D4109EB0C7C009D8468 /* JSXMLHttpRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequest.cpp; sourceTree = "<group>"; };
                93CA4C9F09DF93FA00DF8677 /* quirks.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = quirks.css; sourceTree = "<group>"; };
                93CA4CA209DF93FA00DF8677 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
                93CA4CA309DF93FA00DF8677 /* tokenizer.flex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tokenizer.flex; sourceTree = "<group>"; };
-               93CCF7D4033BD43C008635CE /* KWQFileButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQFileButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               93CCF7D5033BD43C008635CE /* KWQFileButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQFileButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93CCF7D4033BD43C008635CE /* FileButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FileButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93CCF7D5033BD43C008635CE /* FileButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; };
                93CD4FD80995F9EA007ECC97 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; };
                93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringImpl.h; sourceTree = "<group>"; };
                A833C9A90A2CF68700D57664 /* SVGZoomAndPan.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SVGZoomAndPan.idl; path = svg/SVGZoomAndPan.idl; sourceTree = "<group>"; };
                A833C9AA0A2CF68700D57664 /* SVGZoomEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SVGZoomEvent.idl; path = svg/SVGZoomEvent.idl; sourceTree = "<group>"; };
                A85D7A2F0879EBA9006A9172 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
-               A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQWMatrix.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQWMatrix.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransform.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               A85D7A8D0879EC64006A9172 /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AffineTransform.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A86629C909DA2B47009633A5 /* JSUIEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSUIEvent.h; sourceTree = "<group>"; };
                A86629CA09DA2B47009633A5 /* JSUIEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSUIEvent.cpp; sourceTree = "<group>"; };
                A86629CB09DA2B47009633A5 /* JSMouseEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMouseEvent.h; sourceTree = "<group>"; };
                A8C0FB75089701F800BA5114 /* KRenderingPaintServerQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KRenderingPaintServerQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB76089701F800BA5114 /* QuartzSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QuartzSupport.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB77089701F800BA5114 /* QuartzSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuartzSupport.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasContainer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGContainer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGContainer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasCreator.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasCreator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB7E089701F800BA5114 /* KCanvasFilters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasFilters.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                AB23A32509BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BeforeTextInsertedEvent.cpp; sourceTree = "<group>"; };
                AB23A32609BBA7D00067CC53 /* BeforeTextInsertedEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BeforeTextInsertedEvent.h; sourceTree = "<group>"; };
                AB4261D70A2F6C9700BDD17D /* missingImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = missingImage.tiff; sourceTree = "<group>"; };
-               AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextField.cpp; sourceTree = "<group>"; };
-               AB67D1A7097F3AE300F9392E /* RenderTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextField.h; sourceTree = "<group>"; };
+               AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControl.cpp; sourceTree = "<group>"; };
+               AB67D1A7097F3AE300F9392E /* RenderTextControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextControl.h; sourceTree = "<group>"; };
                ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMenuList.cpp; sourceTree = "<group>"; };
                ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; };
                ABDDFE750A5C6E7000A3E11D /* RenderPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderPopupMenu.cpp; sourceTree = "<group>"; };
                BC73E3180978AFFB00EDFF8A /* IntPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IntPoint.h; sourceTree = "<group>"; };
                BC73E3900978CED700EDFF8A /* FloatPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPoint.cpp; sourceTree = "<group>"; };
                BC73E3910978CED700EDFF8A /* FloatPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatPoint.h; sourceTree = "<group>"; };
-               BC7B2AF80450824100A8000F /* KWQScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC7B2AF90450824100A8000F /* KWQScrollBar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQScrollBar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC86FB8D061F5C23006BB822 /* KWQSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQSlider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC86FB8E061F5C23006BB822 /* KWQSlider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQSlider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreScrollBar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSlider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSlider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BC92F1DB0A40AEA300AC0746 /* DeprecatedSlider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedSlider.cpp; sourceTree = "<group>"; };
                BC92F1DC0A40AEA300AC0746 /* DeprecatedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedSlider.h; sourceTree = "<group>"; };
                BC9C328A09933A6D001D6924 /* ImageAnimationObserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageAnimationObserver.h; sourceTree = "<group>"; };
                BCEA483B097D93020094C9E4 /* RenderLayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderLayer.h; sourceTree = "<group>"; };
                BCEA4840097D93020094C9E4 /* RenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObject.cpp; sourceTree = "<group>"; };
                BCEA4841097D93020094C9E4 /* RenderObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderObject.h; sourceTree = "<group>"; };
-               BCEA4844097D93020094C9E4 /* render_style.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = render_style.cpp; sourceTree = "<group>"; };
-               BCEA4845097D93020094C9E4 /* render_style.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = render_style.h; sourceTree = "<group>"; };
+               BCEA4844097D93020094C9E4 /* RenderStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderStyle.cpp; sourceTree = "<group>"; };
+               BCEA4845097D93020094C9E4 /* RenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderStyle.h; sourceTree = "<group>"; };
                BCEA4848097D93020094C9E4 /* RenderThemeMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderThemeMac.h; sourceTree = "<group>"; };
                BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderThemeMac.mm; sourceTree = "<group>"; };
                BCEA484A097D93020094C9E4 /* RenderTheme.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTheme.cpp; sourceTree = "<group>"; };
                BE91FC8B06133666005E3790 /* Position.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Position.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BE91FC8C06133666005E3790 /* Position.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Position.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyboardAccess.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQEditCommand.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQEditCommand.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreEditCommand.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreEditCommand.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifySelectionListLevel.h; sourceTree = "<group>"; };
                C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifySelectionListLevel.cpp; sourceTree = "<group>"; };
                D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FormatBlockCommand.cpp; sourceTree = "<group>"; };
                F523D27902DE43D7018635CA /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30302DE4476018635CA /* Range.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Range.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D30902DE4476018635CA /* xml_tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_tokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D30A02DE4476018635CA /* xml_tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = xml_tokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D30902DE4476018635CA /* XMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D30A02DE4476018635CA /* XMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = XMLTokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5517DC2031AB56301A80180 /* WebCoreHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreHistory.h; sourceTree = "<group>"; };
                F5517DC3031AB56301A80180 /* WebCoreHistory.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebCoreHistory.m; sourceTree = "<group>"; };
                F56234DF03026D7301629B47 /* WebCoreEncodings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreEncodings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                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; };
-               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; };
+               F58784D202DE375901EA4122 /* PopUpButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopUpButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58784D502DE375901EA4122 /* DeprecatedCString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCString.cpp; 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; };
                F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JavaAppletWidget.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587850302DE375901EA4122 /* KWQLoader.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851202DE375901EA4122 /* KWQLineEdit.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQLineEdit.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851302DE375901EA4122 /* KWQListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851402DE375901EA4122 /* KWQListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587850302DE375901EA4122 /* LoaderFunctions.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoaderFunctions.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851202DE375901EA4122 /* TextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851302DE375901EA4122 /* ListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851402DE375901EA4122 /* ListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851702DE375901EA4122 /* KWQLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQLoader.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851702DE375901EA4122 /* LoaderFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = LoaderFunctions.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851B02DE375901EA4122 /* WebCoreTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTextField.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851C02DE375901EA4122 /* WebCoreTextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreTextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587852B02DE375901EA4122 /* RegularExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegularExpression.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853502DE375901EA4122 /* WebCoreTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853602DE375901EA4122 /* WebCoreTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587853802DE375901EA4122 /* KWQTextEdit.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextEdit.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587853902DE375901EA4122 /* KWQTextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQTextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587853802DE375901EA4122 /* TextBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587853902DE375901EA4122 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedValueListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587854C02DE375901EA4122 /* WebCoreFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855002DE375901EA4122 /* WebCoreResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreResourceLoader.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855402DE375901EA4122 /* WebCoreViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; 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; };
+               F587863A02DE3A1401EA4122 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864502DE3A7701EA4122 /* JavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JavaAppletWidget.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; };
-               F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKSSLKeyGen.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; };
+               F587864902DE3A9A01EA4122 /* CacheControl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CacheControl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587868202DE3B8601EA4122 /* PopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = PopUpButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587868302DE3B8601EA4122 /* DeprecatedCString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCString.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Cursor.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; };
+               F587869802DE3B8601EA4122 /* TextField.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextField.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58786B302DE3B8601EA4122 /* RegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegularExpression.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextEdit.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58786BF02DE3B8601EA4122 /* KWQTextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58786BE02DE3B8601EA4122 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58786BF02DE3B8601EA4122 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58EF58E02DFDFB7018635CA /* WebCore.exp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.exports; path = WebCore.exp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F5A1B04902DE8ABA018635CA /* linkCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = linkCursor.tiff; sourceTree = "<group>"; };
                                9352084409BD43B900F2038D /* Language.mm */,
                                935207BF09BD412000F2038D /* LocalizedStringsMac.mm */,
                                65F5382409B2B57500F3DC4A /* mac-encodings.txt */,
-                               935C476F09AC4D7300A6AAB4 /* MouseEventMac.mm */,
+                               935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */,
                                6582A15209999D6D00BEEB6D /* PDFDocumentImage.h */,
                                6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */,
                                A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */,
-                               651B4D8E09AC859F0029F1EF /* QStringListMac.mm */,
-                               6582A17709999EA000BEEB6D /* QStringMac.mm */,
+                               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */,
+                               6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */,
                                6582A15409999D6D00BEEB6D /* ScreenMac.mm */,
                                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
                                93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
                        isa = PBXGroup;
                        children = (
                                A8C0FB53089701F700BA5114 /* device */,
-                               A8C0FB7A089701F800BA5114 /* KCanvasContainer.cpp */,
-                               A8C0FB7B089701F800BA5114 /* KCanvasContainer.h */,
+                               A8C0FB7A089701F800BA5114 /* RenderSVGContainer.cpp */,
+                               A8C0FB7B089701F800BA5114 /* RenderSVGContainer.h */,
                                A8C0FB7C089701F800BA5114 /* KCanvasCreator.cpp */,
                                A8C0FB7D089701F800BA5114 /* KCanvasCreator.h */,
                                A8C0FB7E089701F800BA5114 /* KCanvasFilters.cpp */,
                F523D15002DE4271018635CA /* other */ = {
                        isa = PBXGroup;
                        children = (
-                               BEF7EEA005FF8F0D009717EE /* KWQEditCommand.h */,
-                               BEF7EEA105FF8F0D009717EE /* KWQEditCommand.mm */,
-                               93CCF7D4033BD43C008635CE /* KWQFileButton.h */,
-                               93CCF7D5033BD43C008635CE /* KWQFileButton.mm */,
-                               93B641F206E28C5C0055F610 /* KWQFormData.h */,
-                               93B641F106E28C5C0055F610 /* KWQFormData.mm */,
-                               F587851702DE375901EA4122 /* KWQLoader.h */,
-                               F587850302DE375901EA4122 /* KWQLoader.mm */,
-                               9394E0A403AA5BBE008635CE /* KWQPageState.h */,
-                               9394E0A503AA5BBE008635CE /* KWQPageState.mm */,
-                               93386B90037045B3008635CE /* KWQResourceLoader.h */,
-                               93386B91037045B3008635CE /* KWQResourceLoader.mm */,
-                               BC7B2AF80450824100A8000F /* KWQScrollBar.h */,
-                               BC7B2AF90450824100A8000F /* KWQScrollBar.mm */,
+                               BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
+                               BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */,
+                               93CCF7D4033BD43C008635CE /* FileButton.h */,
+                               93CCF7D5033BD43C008635CE /* FileButton.mm */,
+                               93B641F206E28C5C0055F610 /* FormDataMac.h */,
+                               93B641F106E28C5C0055F610 /* FormDataMac.mm */,
+                               F587851702DE375901EA4122 /* LoaderFunctions.h */,
+                               F587850302DE375901EA4122 /* LoaderFunctions.mm */,
+                               9394E0A403AA5BBE008635CE /* WebCorePageState.h */,
+                               9394E0A503AA5BBE008635CE /* WebCorePageState.mm */,
+                               93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */,
+                               93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */,
+                               BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */,
+                               BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */,
                        );
                        name = other;
                        sourceTree = "<group>";
                                935C476009AC4CD100A6AAB4 /* Length.h */,
                                A8EA7A4D0A191A5200A8EF5F /* ListMarkerBox.cpp */,
                                A8EA7A490A191A5200A8EF5F /* ListMarkerBox.h */,
-                               BCEA4844097D93020094C9E4 /* render_style.cpp */,
-                               BCEA4845097D93020094C9E4 /* render_style.h */,
+                               BCEA4844097D93020094C9E4 /* RenderStyle.cpp */,
+                               BCEA4845097D93020094C9E4 /* RenderStyle.h */,
                                BCEA481C097D93020094C9E4 /* RenderApplet.cpp */,
                                BCEA481D097D93020094C9E4 /* RenderApplet.h */,
                                BCEA481E097D93020094C9E4 /* RenderArena.cpp */,
                                BCEA484D097D93020094C9E4 /* RenderText.h */,
                                A8EA73B40A1900E300A8EF5F /* RenderTextArea.cpp */,
                                A8EA73BA0A1900E300A8EF5F /* RenderTextArea.h */,
-                               AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */,
-                               AB67D1A7097F3AE300F9392E /* RenderTextField.h */,
+                               AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */,
+                               AB67D1A7097F3AE300F9392E /* RenderTextControl.h */,
                                BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */,
                                BCEA484F097D93020094C9E4 /* RenderTextFragment.h */,
                                BCEA484A097D93020094C9E4 /* RenderTheme.cpp */,
                                85031B3A0A44EFC700F992E0 /* WheelEvent.cpp */,
                                85031B3B0A44EFC700F992E0 /* WheelEvent.h */,
                                93EEC1F709C2877700C515D1 /* WheelEvent.idl */,
-                               F523D30902DE4476018635CA /* xml_tokenizer.cpp */,
-                               F523D30A02DE4476018635CA /* xml_tokenizer.h */,
+                               F523D30902DE4476018635CA /* XMLTokenizer.cpp */,
+                               F523D30A02DE4476018635CA /* XMLTokenizer.h */,
                        );
                        path = dom;
                        sourceTree = "<group>";
                F587864302DE3A1601EA4122 /* khtml */ = {
                        isa = PBXGroup;
                        children = (
-                               F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */,
+                               F587863A02DE3A1401EA4122 /* Settings.h */,
                        );
                        name = khtml;
                        sourceTree = "<group>";
                F587865F02DE3A9C01EA4122 /* kio */ = {
                        isa = PBXGroup;
                        children = (
-                               F587864902DE3A9A01EA4122 /* KWQKIOGlobal.h */,
-                               F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */,
-                               84B2B24F056BF15F00D2B771 /* KWQKSSLKeyGen.mm */,
+                               F587864902DE3A9A01EA4122 /* CacheControl.h */,
+                               F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
+                               84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */,
                        );
                        name = kio;
                        sourceTree = "<group>";
                F587871802DE3B8801EA4122 /* qt */ = {
                        isa = PBXGroup;
                        children = (
-                               F587868202DE3B8601EA4122 /* KWQComboBox.h */,
-                               F58784D202DE375901EA4122 /* KWQComboBox.mm */,
-                               F58784D502DE375901EA4122 /* KWQCString.cpp */,
-                               F587868302DE3B8601EA4122 /* KWQCString.h */,
-                               F587869802DE3B8601EA4122 /* KWQLineEdit.h */,
-                               F587851202DE375901EA4122 /* KWQLineEdit.mm */,
-                               F587851302DE375901EA4122 /* KWQListBox.h */,
-                               F587851402DE375901EA4122 /* KWQListBox.mm */,
-                               F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */,
-                               BC86FB8D061F5C23006BB822 /* KWQSlider.h */,
-                               BC86FB8E061F5C23006BB822 /* KWQSlider.mm */,
-                               F58786BE02DE3B8601EA4122 /* KWQTextEdit.h */,
-                               F587853802DE375901EA4122 /* KWQTextEdit.mm */,
-                               F587853902DE375901EA4122 /* KWQTextStream.cpp */,
-                               F58786BF02DE3B8601EA4122 /* KWQTextStream.h */,
-                               A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */,
-                               A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */,
+                               F587868202DE3B8601EA4122 /* PopUpButton.h */,
+                               F58784D202DE375901EA4122 /* PopUpButton.mm */,
+                               F58784D502DE375901EA4122 /* DeprecatedCString.cpp */,
+                               F587868302DE3B8601EA4122 /* DeprecatedCString.h */,
+                               F587869802DE3B8601EA4122 /* TextField.h */,
+                               F587851202DE375901EA4122 /* TextField.mm */,
+                               F587851302DE375901EA4122 /* ListBox.h */,
+                               F587851402DE375901EA4122 /* ListBox.mm */,
+                               F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */,
+                               BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */,
+                               BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */,
+                               F58786BE02DE3B8601EA4122 /* TextBox.h */,
+                               F587853802DE375901EA4122 /* TextBox.mm */,
+                               F587853902DE375901EA4122 /* TextStream.cpp */,
+                               F58786BF02DE3B8601EA4122 /* TextStream.h */,
+                               A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */,
+                               A85D7A8D0879EC64006A9172 /* AffineTransform.h */,
                        );
                        name = qt;
                        sourceTree = "<group>";
                                93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */,
                                93F198F608245E59001E9ABC /* Decoder.h in Headers */,
                                93F1991808245E59001E9ABC /* Range.h in Headers */,
-                               93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */,
-                               93F1992908245E59001E9ABC /* KWQCString.h in Headers */,
-                               93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */,
+                               93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */,
+                               93F1992908245E59001E9ABC /* DeprecatedCString.h in Headers */,
+                               93F1992E08245E59001E9ABC /* PopUpButton.h in Headers */,
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
-                               93F1993908245E59001E9ABC /* KWQFileButton.h in Headers */,
-                               93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */,
-                               93F1995008245E59001E9ABC /* KWQKIOGlobal.h in Headers */,
+                               93F1993908245E59001E9ABC /* FileButton.h in Headers */,
+                               93F1994F08245E59001E9ABC /* Settings.h in Headers */,
+                               93F1995008245E59001E9ABC /* CacheControl.h in Headers */,
                                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */,
-                               93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */,
-                               93F1996B08245E59001E9ABC /* KWQLineEdit.h in Headers */,
-                               93F1996C08245E59001E9ABC /* KWQListBox.h in Headers */,
+                               93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
+                               93F1996B08245E59001E9ABC /* TextField.h in Headers */,
+                               93F1996C08245E59001E9ABC /* ListBox.h in Headers */,
                                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */,
-                               93F1996E08245E59001E9ABC /* KWQLoader.h in Headers */,
-                               93F1997708245E59001E9ABC /* KWQPageState.h in Headers */,
+                               93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */,
+                               93F1997708245E59001E9ABC /* WebCorePageState.h in Headers */,
                                93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */,
-                               93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */,
+                               93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */,
                                93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */,
                                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */,
-                               93F1998D08245E59001E9ABC /* KWQResourceLoader.h in Headers */,
+                               93F1998D08245E59001E9ABC /* WebCoreResourceLoaderImp.h in Headers */,
                                93F1999708245E59001E9ABC /* WebCoreTextArea.h in Headers */,
-                               93F1999908245E59001E9ABC /* KWQTextEdit.h in Headers */,
+                               93F1999908245E59001E9ABC /* TextBox.h in Headers */,
                                93F1999A08245E59001E9ABC /* WebCoreTextField.h in Headers */,
-                               93F1999B08245E59001E9ABC /* KWQTextStream.h in Headers */,
+                               93F1999B08245E59001E9ABC /* TextStream.h in Headers */,
                                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */,
                                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */,
                                93F199A508245E59001E9ABC /* WebCoreCache.h in Headers */,
                                93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */,
                                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */,
                                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */,
-                               93F199B808245E59001E9ABC /* KWQScrollBar.h in Headers */,
+                               93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */,
                                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */,
                                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */,
                                93F199BD08245E59001E9ABC /* AccessibilityObjectCache.h in Headers */,
                                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */,
                                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */,
                                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */,
-                               93F199D508245E59001E9ABC /* KWQEditCommand.h in Headers */,
+                               93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */,
                                93F199DE08245E59001E9ABC /* Position.h in Headers */,
-                               93F199E008245E59001E9ABC /* KWQSlider.h in Headers */,
+                               93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */,
                                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */,
                                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
                                93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */,
                                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
                                93F199EE08245E59001E9ABC /* FormData.h in Headers */,
-                               93F199EF08245E59001E9ABC /* KWQFormData.h in Headers */,
+                               93F199EF08245E59001E9ABC /* FormDataMac.h in Headers */,
                                93F199F008245E59001E9ABC /* WebCoreView.h in Headers */,
                                93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */,
                                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
                                BCEF3435087B563E00BBF833 /* HTMLElementFactory.h in Headers */,
-                               A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */,
+                               A8FD8B87087CB45700DC3707 /* AffineTransform.h in Headers */,
                                7E6FEED80898582300C44C3F /* WebCoreScriptDebugger.h in Headers */,
                                939885C408B7E3D100E707C4 /* EventNames.h in Headers */,
                                65C97AF308EA908800ACD273 /* config.h in Headers */,
                                A88AD3B30952486E001DD196 /* KRenderingPaintServerQuartz.h in Headers */,
                                A88AD3B50952486E001DD196 /* QuartzSupport.h in Headers */,
                                A88AD3B70952486E001DD196 /* KCanvasPathQuartz.h in Headers */,
-                               A88AD3BA0952486E001DD196 /* KCanvasContainer.h in Headers */,
+                               A88AD3BA0952486E001DD196 /* RenderSVGContainer.h in Headers */,
                                A88AD3BC0952486E001DD196 /* KCanvasCreator.h in Headers */,
                                A88AD3BE0952486E001DD196 /* KCanvasFilters.h in Headers */,
                                A88AD3C00952486E001DD196 /* KCanvasImage.h in Headers */,
                                BCEA4878097D93020094C9E4 /* RenderInline.h in Headers */,
                                BCEA487A097D93020094C9E4 /* RenderLayer.h in Headers */,
                                BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */,
-                               BCEA4884097D93020094C9E4 /* render_style.h in Headers */,
+                               BCEA4884097D93020094C9E4 /* RenderStyle.h in Headers */,
                                BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */,
                                BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */,
                                BCEA488C097D93020094C9E4 /* RenderText.h in Headers */,
                                BCEA488E097D93020094C9E4 /* RenderTextFragment.h in Headers */,
                                BCEA4944097F0F5C0094C9E4 /* BrowserExtension.h in Headers */,
                                BCEA4947097F0F770094C9E4 /* BrowserExtensionMac.h in Headers */,
-                               AB67D1A9097F3AE300F9392E /* RenderTextField.h in Headers */,
+                               AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */,
                                A8DF3FCE097FA0FC0052981B /* HTMLFormCollection.h in Headers */,
                                A8DF3FD0097FA0FC0052981B /* HTMLCollection.h in Headers */,
                                A8DF3FD2097FA0FC0052981B /* HTMLBaseFontElement.h in Headers */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               93F19A1708245E59001E9ABC /* KWQComboBox.mm in Sources */,
-                               93F19A1808245E59001E9ABC /* KWQCString.cpp in Sources */,
+                               93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */,
+                               93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */,
                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
                                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */,
-                               93F19A3108245E59001E9ABC /* KWQLoader.mm in Sources */,
-                               93F19A3A08245E59001E9ABC /* KWQLineEdit.mm in Sources */,
-                               93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */,
+                               93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */,
+                               93F19A3A08245E59001E9ABC /* TextField.mm in Sources */,
+                               93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */,
                                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
                                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */,
                                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */,
                                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */,
-                               93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */,
-                               93F19A5408245E59001E9ABC /* KWQTextStream.cpp in Sources */,
+                               93F19A5308245E59001E9ABC /* TextBox.mm in Sources */,
+                               93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */,
                                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */,
                                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */,
                                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */,
                                93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */,
                                93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */,
                                93F19AB908245E59001E9ABC /* Range.cpp in Sources */,
-                               93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */,
+                               93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */,
                                93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */,
                                93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */,
                                93F19AC208245E59001E9ABC /* WebCoreSettings.mm in Sources */,
                                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */,
                                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */,
-                               93F19ACC08245E59001E9ABC /* KWQFileButton.mm in Sources */,
-                               93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */,
-                               93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */,
+                               93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */,
+                               93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */,
+                               93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */,
                                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
-                               93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */,
+                               93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */,
                                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */,
                                93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */,
                                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
                                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */,
-                               93F19AE608245E59001E9ABC /* KWQKSSLKeyGen.mm in Sources */,
-                               93F19AF708245E59001E9ABC /* KWQEditCommand.mm in Sources */,
+                               93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */,
+                               93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */,
                                93F19AF808245E59001E9ABC /* Position.cpp in Sources */,
-                               93F19AFA08245E59001E9ABC /* KWQSlider.mm in Sources */,
+                               93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */,
                                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */,
                                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
                                93F19B0308245E59001E9ABC /* XSLStyleSheet.cpp in Sources */,
                                93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */,
                                93F19B0508245E59001E9ABC /* FormData.cpp in Sources */,
-                               93F19B0608245E59001E9ABC /* KWQFormData.mm in Sources */,
+                               93F19B0608245E59001E9ABC /* FormDataMac.mm in Sources */,
                                93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
                                93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */,
                                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */,
                                BCEF3434087B563E00BBF833 /* HTMLElementFactory.cpp in Sources */,
-                               A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */,
+                               A8FD8B86087CB44C00DC3707 /* AffineTransform.cpp in Sources */,
                                7E6FEED90898582300C44C3F /* WebCoreScriptDebugger.mm in Sources */,
                                939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */,
                                E1EE773808F1086C00166870 /* WebCoreTextDecoder.mm in Sources */,
                                A88AD3B40952486E001DD196 /* KRenderingPaintServerQuartz.mm in Sources */,
                                A88AD3B60952486E001DD196 /* QuartzSupport.mm in Sources */,
                                A88AD3B80952486E001DD196 /* KCanvasPathQuartz.mm in Sources */,
-                               A88AD3B90952486E001DD196 /* KCanvasContainer.cpp in Sources */,
+                               A88AD3B90952486E001DD196 /* RenderSVGContainer.cpp in Sources */,
                                A88AD3BB0952486E001DD196 /* KCanvasCreator.cpp in Sources */,
                                A88AD3BD0952486E001DD196 /* KCanvasFilters.cpp in Sources */,
                                A88AD3C10952486E001DD196 /* RenderPath.cpp in Sources */,
                                BCEA4877097D93020094C9E4 /* RenderInline.cpp in Sources */,
                                BCEA4879097D93020094C9E4 /* RenderLayer.cpp in Sources */,
                                BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */,
-                               BCEA4883097D93020094C9E4 /* render_style.cpp in Sources */,
+                               BCEA4883097D93020094C9E4 /* RenderStyle.cpp in Sources */,
                                BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */,
                                BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */,
                                BCEA488B097D93020094C9E4 /* RenderText.cpp in Sources */,
                                BCEA488D097D93020094C9E4 /* RenderTextFragment.cpp in Sources */,
                                65FEA86909833ADE00BED4AB /* Page.cpp in Sources */,
                                BCEA4948097F0F770094C9E4 /* BrowserExtensionMac.mm in Sources */,
-                               AB67D1A8097F3AE300F9392E /* RenderTextField.cpp in Sources */,
+                               AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */,
                                A8DF3FCF097FA0FC0052981B /* HTMLFormCollection.cpp in Sources */,
                                A8DF3FD1097FA0FC0052981B /* HTMLCollection.cpp in Sources */,
                                A8DF3FD3097FA0FC0052981B /* HTMLBaseFontElement.cpp in Sources */,
                                6582A16109999D6D00BEEB6D /* PDFDocumentImage.mm in Sources */,
                                6582A16209999D6D00BEEB6D /* ScreenMac.mm in Sources */,
                                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */,
-                               6582A17809999EA000BEEB6D /* QStringMac.mm in Sources */,
+                               6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */,
                                A7638A8C09958EA50007E14F /* WKDisplacementMapFilter.m in Sources */,
                                A7638A980995965D0007E14F /* SVGFEDisplacementMapElement.cpp in Sources */,
                                93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */,
                                BCC47E2609A3D6F100ADB771 /* FontFamily.cpp in Sources */,
                                935C475F09AC4CAE00A6AAB4 /* HistoryMac.mm in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
-                               935C477109AC4D7300A6AAB4 /* MouseEventMac.mm in Sources */,
+                               935C477109AC4D7300A6AAB4 /* PlatformMouseEventMac.mm in Sources */,
                                935C477309AC4D7700A6AAB4 /* WheelEventMac.mm in Sources */,
                                651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */,
-                               651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */,
+                               651B4D8F09AC859F0029F1EF /* DeprecatedStringListMac.mm in Sources */,
                                93032CC809AEC34300F82A18 /* PathCG.cpp in Sources */,
                                6593923709AE4346002C531F /* KURL.cpp in Sources */,
                                6593923A09AE435C002C531F /* KURLMac.mm in Sources */,
index 65eaf8ea14fde2270d9fd0dc3c92e839a82023e2..b776bae5331dba7ac60ef941a7c8ad75caa803d6 100644 (file)
@@ -2,8 +2,8 @@
 <makefile>
        <set append="1" var="WEBCORE_SOURCES_KWQ">
                
-               kwq/KWQCString.cpp
-               kwq/KWQTextStream.cpp
+               kwq/DeprecatedCString.cpp
+               kwq/TextStream.cpp
        </set>
        <set append="1" var="WEBCORE_SOURCES_DERIVEDSOURCES">
                
                rendering/InlineFlowBox.cpp
                rendering/InlineTextBox.cpp
                rendering/ListMarkerBox.cpp
-               rendering/render_style.cpp
+               rendering/RenderStyle.cpp
                rendering/RenderApplet.cpp
                rendering/RenderArena.cpp
                rendering/RenderBlock.cpp
                rendering/RenderTableSection.cpp
                rendering/RenderText.cpp
                rendering/RenderTextArea.cpp
-               rendering/RenderTextField.cpp
+               rendering/RenderTextControl.cpp
                rendering/RenderTextFragment.cpp
                rendering/RenderTheme.cpp
                
                dom/TreeWalker.cpp
                dom/UIEvent.cpp
                dom/WheelEvent.cpp
-               dom/xml_tokenizer.cpp
+               dom/XMLTokenizer.cpp
 
        </set>
 
index 89f7141cd2af7291b7ec923e222fa0abb912b200..c333b66f580ff0ba3c8822304829f95cc6e80dba 100644 (file)
@@ -51,7 +51,7 @@
 #include "JSProcessingInstruction.h"
 #include "JSRange.h"
 #include "JSText.h"
-#include "KWQKHTMLSettings.h"
+#include "Settings.h"
 #include "NamedNodeMap.h"
 #include "Notation.h"
 #include "ProcessingInstruction.h"
index 51b9a0bb5354ef4346d780cb104adea4882d400a..6484e48a055304baaeba7c60cbcb3f11778e8875 100644 (file)
@@ -43,7 +43,7 @@
 #include "JSRange.h"
 #include "JSXMLHttpRequest.h"
 #include "JSXMLSerializer.h"
-#include "KWQKHTMLSettings.h"
+#include "Settings.h"
 #include "Logging.h"
 #include "Page.h"
 #include "PlugInInfoStore.h"
index 46b6fe760a56d68a295642497e44fea0f7084da0..84e6d49bb4ffffe8dedaa49bfc87a891aedc2e36 100644 (file)
@@ -85,7 +85,7 @@
 #import "HTMLUListElement.h"
 #import "NameNodeList.h"
 #import "markup.h"
-#import "RenderTextField.h"
+#import "RenderTextControl.h"
 #import "FrameView.h"
 
 using namespace WebCore;
index a3766eac94b701cf606a6e93115c20677d4e7853..f8ccb03206ebf39f9cd62c5150b74c7af8baa615 100644 (file)
@@ -52,7 +52,7 @@ namespace KJS {
 @class DOMElement;
 typedef DOMElement ObjCDOMElement;
 
-@class KWQPageState;
+@class WebCorePageState;
 @class NSArray;
 @class NSAttributedString;
 @class NSColor;
@@ -73,7 +73,7 @@ typedef DOMElement ObjCDOMElement;
 // Avoid clashes with KJS::DOMElement in KHTML code.
 class ObjCDOMElement;
 
-class KWQPageState;
+class WebCorePageState;
 class NSArray;
 class NSAttributedString;
 class NSColor;
@@ -104,9 +104,9 @@ class VisiblePosition;
 
 struct DashboardRegionValue;
 
-enum KWQSelectionDirection {
-    KWQSelectingNext,
-    KWQSelectingPrevious
+enum SelectionDirection {
+    SelectingNext,
+    SelectingPrevious
 };
 
 class FrameMac : public Frame
@@ -145,16 +145,16 @@ public:
     virtual void focusWindow();
     virtual void unfocusWindow();
     
-    void openURLFromPageCache(KWQPageState*);
+    void openURLFromPageCache(WebCorePageState*);
 
     virtual void saveDocumentState();
     virtual void restoreDocumentState();
     
     virtual void addMessageToConsole(const String& message,  unsigned int lineNumber, const String& sourceID);
     
-    NSView* nextKeyView(Node* startingPoint, KWQSelectionDirection);
-    NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, KWQSelectionDirection);
-    static NSView* nextKeyViewForWidget(Widget* startingPoint, KWQSelectionDirection);
+    NSView* nextKeyView(Node* startingPoint, SelectionDirection);
+    NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, SelectionDirection);
+    static NSView* nextKeyViewForWidget(Widget* startingPoint, SelectionDirection);
     static bool currentEventIsKeyboardOptionTab();
     static bool handleKeyboardOptionTabInView(NSView* view);
     
@@ -299,7 +299,7 @@ public:
     NSMutableDictionary* dashboardRegionsDictionary();
     void dashboardRegionsChanged();
     
-    virtual bool isCharacterSmartReplaceExempt(const QChar &, bool);
+    virtual bool isCharacterSmartReplaceExempt(const DeprecatedChar &, bool);
     
     virtual bool mouseDownMayStartSelect() const { return _mouseDownMayStartSelect; }
     
@@ -326,7 +326,7 @@ private:
     
     NSView* mouseDownViewIfStillGood();
 
-    NSView* nextKeyViewInFrame(Node* startingPoint, KWQSelectionDirection);
+    NSView* nextKeyViewInFrame(Node* startingPoint, SelectionDirection);
     static NSView* documentViewForNode(Node*);
     
     bool dispatchCPPEvent(const AtomicString &eventType, ClipboardMac::AccessPolicy policy);
index 253398c24d76fe7714f102ff1e74ed7d77b43a69..0dc585d8bf4a768028589f54d26189c7bc745002 100644 (file)
@@ -49,9 +49,9 @@
 #import "HTMLGenericFormElement.h"
 #import "HTMLNames.h"
 #import "HTMLTableCellElement.h"
-#import "KWQEditCommand.h"
-#import "KWQFormData.h"
-#import "KWQPageState.h"
+#import "WebCoreEditCommand.h"
+#import "FormDataMac.h"
+#import "WebCorePageState.h"
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
 #import "PlatformKeyboardEvent.h"
@@ -76,7 +76,7 @@
 #import <JavaScriptCore/WebScriptObjectPrivate.h>
 #import <JavaScriptCore/npruntime_impl.h>
 
-#undef _KWQ_TIMING
+#undef _webcore_TIMING
 
 @interface NSObject (WebPlugIn)
 - (id)objectForWebScript;
@@ -170,7 +170,7 @@ FrameMac::~FrameMac()
     clearRecordedFormValues();    
     
     [_bridge clearFrame];
-    KWQRelease(_bridge);
+    HardRelease(_bridge);
     _bridge = nil;
 }
 
@@ -579,7 +579,7 @@ void FrameMac::setView(FrameView *view)
     // Delete old PlugIn data structures
     cleanupPluginRootObjects();
     _bindingRoot = 0;
-    KWQRelease(_windowScriptObject);
+    HardRelease(_windowScriptObject);
     _windowScriptObject = 0;
 
     if (_windowScriptNPObject) {
@@ -722,7 +722,7 @@ String FrameMac::advanceToNextMisspelling(bool startBeforeSelection)
         if (!it.atEnd()) {      // we may be starting at the end of the doc, and already by atEnd
             const UChar* chars = it.characters();
             int len = it.length();
-            if (len > 1 || !QChar(chars[0]).isSpace()) {
+            if (len > 1 || !DeprecatedChar(chars[0]).isSpace()) {
                 NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(chars) length:len freeWhenDone:NO];
                 NSRange misspelling = [checker checkSpellingOfString:chunk startingAt:0 language:nil wrap:NO inSpellDocumentWithTag:[_bridge spellCheckerDocumentTag] wordCount:NULL];
                 [chunk release];
@@ -769,13 +769,13 @@ bool FrameMac::wheelEvent(NSEvent *event)
 
     if (v) {
         NSEvent *oldCurrentEvent = _currentEvent;
-        _currentEvent = KWQRetain(event);
+        _currentEvent = HardRetain(event);
 
         PlatformWheelEvent qEvent(event);
         v->handleWheelEvent(qEvent);
 
         ASSERT(_currentEvent == event);
-        KWQRelease(event);
+        HardRelease(event);
         _currentEvent = oldCurrentEvent;
 
         if (qEvent.isAccepted())
@@ -785,21 +785,21 @@ bool FrameMac::wheelEvent(NSEvent *event)
     // FIXME: The scrolling done here should be done in the default handlers
     // of the elements rather than here in the part.
 
-    KWQScrollDirection direction;
+    ScrollDirection direction;
     float multiplier;
     float deltaX = [event deltaX];
     float deltaY = [event deltaY];
     if (deltaX < 0) {
-        direction = KWQScrollRight;
+        direction = ScrollRight;
         multiplier = -deltaX;
     } else if (deltaX > 0) {
-        direction = KWQScrollLeft;
+        direction = ScrollLeft;
         multiplier = deltaX;
     } else if (deltaY < 0) {
-        direction = KWQScrollDown;
+        direction = ScrollDown;
         multiplier = -deltaY;
     }  else if (deltaY > 0) {
-        direction = KWQScrollUp;
+        direction = ScrollUp;
         multiplier = deltaY;
     } else
         return false;
@@ -820,7 +820,7 @@ bool FrameMac::wheelEvent(NSEvent *event)
     if (!r)
         return false;
     
-    return r->scroll(direction, KWQScrollWheel, multiplier);
+    return r->scroll(direction, ScrollByWheel, multiplier);
 }
 
 void FrameMac::startRedirectionTimer()
@@ -871,14 +871,14 @@ String FrameMac::mimeTypeForFileName(const String& fileName) const
     return String();
 }
 
-NSView* FrameMac::nextKeyViewInFrame(Node* node, KWQSelectionDirection direction)
+NSView* FrameMac::nextKeyViewInFrame(Node* node, SelectionDirection direction)
 {
     Document* doc = document();
     if (!doc)
         return nil;
     
     for (;;) {
-        node = direction == KWQSelectingNext
+        node = direction == SelectingNext
             ? doc->nextFocusNode(node) : doc->previousFocusNode(node);
         if (!node)
             return nil;
@@ -902,7 +902,7 @@ NSView* FrameMac::nextKeyViewInFrame(Node* node, KWQSelectionDirection direction
     }
 }
 
-NSView *FrameMac::nextKeyViewInFrameHierarchy(Node *node, KWQSelectionDirection direction)
+NSView *FrameMac::nextKeyViewInFrameHierarchy(Node *node, SelectionDirection direction)
 {
     NSView *next = nextKeyViewInFrame(node, direction);
     if (!next)
@@ -917,7 +917,7 @@ NSView *FrameMac::nextKeyViewInFrameHierarchy(Node *node, KWQSelectionDirection
     return next;
 }
 
-NSView *FrameMac::nextKeyView(Node *node, KWQSelectionDirection direction)
+NSView *FrameMac::nextKeyView(Node *node, SelectionDirection direction)
 {
     NSView * next;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -928,7 +928,7 @@ NSView *FrameMac::nextKeyView(Node *node, KWQSelectionDirection direction)
 
     // Look at views from the top level part up, looking for a next key view that we can use.
 
-    next = direction == KWQSelectingNext
+    next = direction == SelectingNext
         ? [_bridge nextKeyViewOutsideWebFrameViews]
         : [_bridge previousKeyViewOutsideWebFrameViews];
 
@@ -941,7 +941,7 @@ NSView *FrameMac::nextKeyView(Node *node, KWQSelectionDirection direction)
     return nextKeyViewInFrameHierarchy(0, direction);
 }
 
-NSView *FrameMac::nextKeyViewForWidget(Widget *startingWidget, KWQSelectionDirection direction)
+NSView *FrameMac::nextKeyViewForWidget(Widget *startingWidget, SelectionDirection direction)
 {
     // Use the event filter object to figure out which RenderWidget owns this Widget and get to the DOM.
     // Then get the next key view in the order determined by the DOM.
@@ -1069,7 +1069,7 @@ WebScriptObject *FrameMac::windowScriptObject()
     if (!_windowScriptObject) {
         KJS::JSLock lock;
         KJS::JSObject *win = KJS::Window::retrieveWindow(this);
-        _windowScriptObject = KWQRetainNSRelease([[WebScriptObject alloc] _initWithJSObject:win originExecutionContext:bindingRootObject() executionContext:bindingRootObject()]);
+        _windowScriptObject = HardRetainWithNSRelease([[WebScriptObject alloc] _initWithJSObject:win originExecutionContext:bindingRootObject() executionContext:bindingRootObject()]);
     }
 
     return _windowScriptObject;
@@ -1100,10 +1100,10 @@ void FrameMac::partClearedInBegin()
         [_bridge windowObjectCleared];
 }
 
-void FrameMac::openURLFromPageCache(KWQPageState *state)
+void FrameMac::openURLFromPageCache(WebCorePageState *state)
 {
-    // It's safe to assume none of the KWQPageState methods will raise
-    // exceptions, since KWQPageState is implemented by WebCore and
+    // It's safe to assume none of the WebCorePageState methods will raise
+    // exceptions, since WebCorePageState is implemented by WebCore and
     // does not throw
 
     Document *doc = [state document];
@@ -1349,7 +1349,7 @@ bool FrameMac::keyEvent(NSEvent *event)
     }
 
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
 
     PlatformKeyboardEvent qEvent(event);
     result = !EventTargetNodeCast(node)->dispatchKeyEvent(qEvent);
@@ -1365,7 +1365,7 @@ bool FrameMac::keyEvent(NSEvent *event)
     }
 
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
 
     return result;
@@ -1952,7 +1952,7 @@ void FrameMac::mouseDown(NSEvent *event)
     _dragSrc = 0;
     
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
     m_mouseDown = PlatformMouseEvent(event);
     NSPoint loc = [event locationInWindow];
     m_mouseDownPos = d->m_view->viewportToContents(IntPoint(loc));
@@ -1964,7 +1964,7 @@ void FrameMac::mouseDown(NSEvent *event)
     v->handleMousePressEvent(event);
     
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -1980,12 +1980,12 @@ void FrameMac::mouseDragged(NSEvent *event)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
 
     v->handleMouseMoveEvent(event);
     
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -2000,7 +2000,7 @@ void FrameMac::mouseUp(NSEvent *event)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
 
     // Our behavior here is a little different that Qt. Qt always sends
     // a mouse release event, even for a double click. To correct problems
@@ -2016,7 +2016,7 @@ void FrameMac::mouseUp(NSEvent *event)
         v->handleMouseReleaseEvent(event);
     
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
     
     _mouseDownView = nil;
@@ -2096,12 +2096,12 @@ void FrameMac::mouseMoved(NSEvent *event)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
     
     v->handleMouseMoveEvent(event);
     
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -2132,7 +2132,7 @@ bool FrameMac::sendContextMenuEvent(NSEvent *event)
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     NSEvent *oldCurrentEvent = _currentEvent;
-    _currentEvent = KWQRetain(event);
+    _currentEvent = HardRetain(event);
     
     PlatformMouseEvent mouseEvent(event);
 
@@ -2148,7 +2148,7 @@ bool FrameMac::sendContextMenuEvent(NSEvent *event)
     }
 
     ASSERT(_currentEvent == event);
-    KWQRelease(event);
+    HardRelease(event);
     _currentEvent = oldCurrentEvent;
 
     return swallowEvent;
@@ -2387,13 +2387,13 @@ NSAttributedString *FrameMac::attributedString(Node *_start, int startOffset, No
                         maxMarkerWidth = MAX([font pointSize], maxMarkerWidth);
                         switch(style->listStyleType()) {
                             case DISC:
-                                listText += ((QChar)BULLET_CHAR);
+                                listText += ((DeprecatedChar)BULLET_CHAR);
                                 break;
                             case CIRCLE:
-                                listText += ((QChar)CIRCLE_CHAR);
+                                listText += ((DeprecatedChar)CIRCLE_CHAR);
                                 break;
                             case SQUARE:
-                                listText += ((QChar)SQUARE_CHAR);
+                                listText += ((DeprecatedChar)SQUARE_CHAR);
                                 break;
                             case LNONE:
                                 break;
@@ -2853,8 +2853,8 @@ void FrameMac::setBridge(WebCoreFrameBridge *bridge)
     if (_bridge == bridge)
         return;
 
-    KWQRetain(bridge);
-    KWQRelease(_bridge);
+    HardRetain(bridge);
+    HardRelease(_bridge);
     _bridge = bridge;
 }
 
@@ -2978,7 +2978,7 @@ void FrameMac::cleanupPluginRootObjects()
 void FrameMac::registerCommandForUndoOrRedo(const EditCommandPtr &cmd, bool isRedo)
 {
     ASSERT(cmd.get());
-    KWQEditCommand *kwq = [KWQEditCommand commandWithEditCommand:cmd.get()];
+    WebCoreEditCommand *kwq = [WebCoreEditCommand commandWithEditCommand:cmd.get()];
     NSUndoManager *undoManager = [_bridge undoManager];
     [undoManager registerUndoWithTarget:_bridge selector:(isRedo ? @selector(redoEditing:) : @selector(undoEditing:)) object:kwq];
     NSString *actionName = [_bridge nameForUndoAction:static_cast<WebUndoAction>(cmd.editingAction())];
@@ -3092,7 +3092,7 @@ void FrameMac::markMisspellings(const SelectionController &selection)
     while (!it.atEnd()) {      // we may be starting at the end of the doc, and already by atEnd
         const UChar* chars = it.characters();
         int len = it.length();
-        if (len > 1 || !QChar(chars[0]).isSpace()) {
+        if (len > 1 || !DeprecatedChar(chars[0]).isSpace()) {
             NSString *chunk = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(chars) length:len freeWhenDone:NO];
             int startIndex = 0;
             // Loop over the chunk to find each misspelling in it.
@@ -3365,7 +3365,7 @@ void FrameMac::dashboardRegionsChanged()
     [_bridge dashboardRegionsChanged:webRegions];
 }
 
-bool FrameMac::isCharacterSmartReplaceExempt(const QChar &c, bool isPreviousChar)
+bool FrameMac::isCharacterSmartReplaceExempt(const DeprecatedChar &c, bool isPreviousChar)
 {
     return [_bridge isCharacterSmartReplaceExempt:c.unicode() isPreviousCharacter:isPreviousChar];
 }
index be35215c8d228a8be724f9b295068320bd0bddbd..8a28eb5523b5b6917163d146a5b32e512c19d481 100644 (file)
@@ -46,9 +46,9 @@
 #import "HTMLInputElement.h"
 #import "HTMLNames.h"
 #import "Image.h"
-#import "KWQEditCommand.h"
-#import "KWQLoader.h"
-#import "KWQPageState.h"
+#import "WebCoreEditCommand.h"
+#import "LoaderFunctions.h"
+#import "WebCorePageState.h"
 #import "ModifySelectionListLevel.h"
 #import "MoveSelectionCommand.h"
 #import "Page.h"
@@ -74,7 +74,7 @@
 #import "kjs_window.h"
 #import "markup.h"
 #import "visible_units.h"
-#import "xml_tokenizer.h"
+#import "XMLTokenizer.h"
 #import <JavaScriptCore/date_object.h>
 #import <JavaScriptCore/runtime_root.h>
 #import <kjs/SavedBuiltins.h>
@@ -517,7 +517,7 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
 - (void)openURL:(NSURL *)URL reload:(BOOL)reload contentType:(NSString *)contentType refresh:(NSString *)refresh lastModified:(NSDate *)lastModified pageCache:(NSDictionary *)pageCache
 {
     if (pageCache) {
-        KWQPageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
+        WebCorePageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
         m_frame->openURLFromPageCache(state);
         [state invalidate];
         return;
@@ -583,10 +583,10 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
     if (doc)
         doc->setInPageCache(NO);
 
-    KWQPageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
+    WebCorePageState *state = [pageCache objectForKey:WebCorePageCacheStateKey];
 
     // FIXME: This is a grotesque hack to fix <rdar://problem/4059059> Crash in RenderFlow::detach
-    // Somehow the KWQPageState object is not properly updated, and is holding onto a stale document
+    // Somehow the WebCorePageState object is not properly updated, and is holding onto a stale document
     // both Xcode and FileMaker see this crash, Safari does not.
     // This if check MUST be removed as part of re-writing the loader down in WebCore
     ASSERT(!state || ([state document] == doc));
@@ -649,7 +649,7 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
 {
     if (!m_frame)
         return NO;
-    return m_frame->scrollOverflow((KWQScrollDirection)direction, (KWQScrollGranularity)granularity);
+    return m_frame->scrollOverflow((ScrollDirection)direction, (ScrollGranularity)granularity);
 }
 
 - (BOOL)sendScrollWheelEvent:(NSEvent *)event
@@ -678,7 +678,7 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
     SavedBuiltins *interpreterBuiltins = new SavedBuiltins;
     m_frame->saveInterpreterBuiltins(*interpreterBuiltins);
 
-    KWQPageState *pageState = [[KWQPageState alloc] initWithDocument:doc
+    WebCorePageState *pageState = [[WebCorePageState alloc] initWithDocument:doc
                                                                  URL:m_frame->url()
                                                     windowProperties:windowProperties
                                                   locationProperties:locationProperties
@@ -1272,7 +1272,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document *doc = m_frame->document();
     if (!doc)
         return nil;
-    return m_frame->nextKeyView(doc->focusNode(), KWQSelectingNext);
+    return m_frame->nextKeyView(doc->focusNode(), SelectingNext);
 }
 
 - (NSView *)previousKeyView
@@ -1280,7 +1280,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document *doc = m_frame->document();
     if (!doc)
         return nil;
-    return m_frame->nextKeyView(doc->focusNode(), KWQSelectingPrevious);
+    return m_frame->nextKeyView(doc->focusNode(), SelectingPrevious);
 }
 
 - (NSView *)nextKeyViewInsideWebFrameViews
@@ -1288,7 +1288,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document *doc = m_frame->document();
     if (!doc)
         return nil;
-    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), KWQSelectingNext);
+    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), SelectingNext);
 }
 
 - (NSView *)previousKeyViewInsideWebFrameViews
@@ -1296,7 +1296,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document *doc = m_frame->document();
     if (!doc)
         return nil;
-    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), KWQSelectingPrevious);
+    return m_frame->nextKeyViewInFrameHierarchy(doc->focusNode(), SelectingPrevious);
 }
 
 - (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string
@@ -1515,7 +1515,7 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
     Document *doc = m_frame->document();
     
     if (doc)
-        return KWQNumberOfPendingOrLoadingRequests (doc->docLoader());
+        return NumberOfPendingOrLoadingRequests (doc->docLoader());
     return 0;
 }
 
@@ -1572,13 +1572,13 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
 
 - (void)undoEditing:(id)arg
 {
-    ASSERT([arg isKindOfClass:[KWQEditCommand class]]);
+    ASSERT([arg isKindOfClass:[WebCoreEditCommand class]]);
     [arg command]->unapply();
 }
 
 - (void)redoEditing:(id)arg
 {
-    ASSERT([arg isKindOfClass:[KWQEditCommand class]]);
+    ASSERT([arg isKindOfClass:[WebCoreEditCommand class]]);
     [arg command]->reapply();
 }
 
@@ -1896,14 +1896,14 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
 
     bool addLeadingSpace = startPos.leadingWhitespacePosition(VP_DEFAULT_AFFINITY, true).isNull() && !isStartOfParagraph(startVisiblePos);
     if (addLeadingSpace) {
-        QChar previousChar = startVisiblePos.previous().characterAfter();
+        DeprecatedChar previousChar = startVisiblePos.previous().characterAfter();
         if (previousChar.unicode())
             addLeadingSpace = !m_frame->isCharacterSmartReplaceExempt(previousChar, true);
     }
     
     bool addTrailingSpace = endPos.trailingWhitespacePosition(VP_DEFAULT_AFFINITY, true).isNull() && !isEndOfParagraph(endVisiblePos);
     if (addTrailingSpace) {
-        QChar thisChar = endVisiblePos.characterAfter();
+        DeprecatedChar thisChar = endVisiblePos.characterAfter();
         if (thisChar.unicode())
             addTrailingSpace = !m_frame->isCharacterSmartReplaceExempt(thisChar, false);
     }
index 59e811637dd8d3e8454a91af5e11a6cb9683d7df..3ba764a1a13c87384cd2a4662c2cc661717dcdae 100644 (file)
@@ -26,9 +26,9 @@
 #import <Foundation/Foundation.h>
 
 #ifdef __cplusplus
-class KHTMLSettings;
+class Settings;
 #else
-@class KHTMLSettings;
+@class Settings;
 #endif
 
 @interface WebCoreSettings : NSObject
@@ -54,7 +54,7 @@ class KHTMLSettings;
     NSString *userStyleSheetLocation;
     NSString *defaultTextEncoding;
     
-    KHTMLSettings *settings;
+    Settings *settings;
 }
 
 - (void)setStandardFontFamily:(NSString *)family;
@@ -117,6 +117,6 @@ class KHTMLSettings;
 - (void)setDefaultTextEncoding:(NSString *)encoding;
 - (NSString *)defaultTextEncoding;
 
-- (KHTMLSettings *)settings;
+- (Settings *)settings;
 
 @end
index 9d1c1f6cb0cd5a7e42f4b03814e4d9232201f46e..4aa67c11bfe3e42b84ccbc9cfaed5f6535ab36bc 100644 (file)
@@ -27,7 +27,7 @@
 #import "WebCoreSettings.h"
 
 #import "FoundationExtras.h"
-#import "KWQKHTMLSettings.h"
+#import "Settings.h"
 #import "Page.h"
 #import "WebCoreFrameBridge.h"
 
@@ -59,9 +59,9 @@ using namespace WebCore;
 
 - (id)init
 {
-    // A Frame may not have been created yet, so we initialize the AtomicString hash before we try and use it in KHTMLSettings.
+    // A Frame may not have been created yet, so we initialize the AtomicString hash before we try and use it in Settings.
     AtomicString::init();
-    settings = new KHTMLSettings;
+    settings = new Settings;
     return [super init];
 }
 
@@ -333,7 +333,7 @@ using namespace WebCore;
     return defaultTextEncoding;
 }
 
-- (KHTMLSettings *)settings
+- (Settings *)settings
 {
     return settings;
 }
index 9a726d22bb9b09c7fa6f3ea7ed2bfde14e394955..cebd2029f0314d28c88e9699aba740300791d509 100644 (file)
@@ -30,7 +30,7 @@
 #include "Decoder.h"
 #include "Document.h"
 #include "FramePrivate.h"
-#include "KWQKHTMLSettings.h"
+#include "Settings.h"
 #include "PlatformKeyboardEvent.h"
 #include "Plugin.h"
 #include "RenderFrame.h"
@@ -43,7 +43,7 @@ FrameWin::FrameWin(Page* page, Element* ownerElement, FrameWinClient* client)
     : Frame(page, ownerElement)
 {
     d->m_extension = new BrowserExtensionWin(this);
-    KHTMLSettings* settings = new KHTMLSettings();
+    Settings* settings = new Settings();
     settings->setAutoLoadImages(true);
     settings->setMediumFixedFontSize(13);
     settings->setMediumFontSize(16);
index 4fa126507c45002d2e50e35df743b65c39be2ae8..64b621ff7ae527fad5b8db10a452ce6a5e5ce7b1 100644 (file)
@@ -28,7 +28,7 @@
 #include "DashboardRegion.h"
 #include "ExceptionCode.h"
 #include "Pair.h"
-#include "render_style.h"
+#include "RenderStyle.h"
 
 namespace WebCore {
 
index 5e5a34c7a5a1280f020cc022f93c0167e020b290..4f4c8c38d272ed2300035ab37c8e7e092ca0e1c6 100644 (file)
@@ -4,7 +4,7 @@
 # --------
 #
 # The Values are sorted according to the properties they belong to,
-# and have to be in the same order as the enums in render_style.h.
+# and have to be in the same order as the enums in RenderStyle.h.
 #
 # If not, the optimizations in the cssparser and style selector will fail,
 # and produce incorrect results.
index aa2ff86bd3dddd87a2fc7ac7ea26dd42c171a9ad..f9642adf3f8884660009963a9bc2fe84b94e0599 100644 (file)
@@ -37,7 +37,7 @@
 #include "MediaList.h"
 #include "MediaQuery.h"
 #include "MediaQueryExp.h"
-#include "rendering/render_style.h"
+#include "rendering/RenderStyle.h"
 #include "page/FrameView.h"
 #include "Screen.h"
 #include <wtf/HashMap.h>
@@ -148,7 +148,7 @@ static bool parseAspectRatio(CSSValue* value, int& a, int& b)
                 && i1->isPrimitiveValue() && static_cast<CSSPrimitiveValue*>(i1)->primitiveType() == CSSPrimitiveValue::CSS_STRING
                 && i2->isPrimitiveValue() && static_cast<CSSPrimitiveValue*>(i2)->primitiveType() == CSSPrimitiveValue::CSS_NUMBER) {
                 String str = static_cast<CSSPrimitiveValue*>(i1)->getStringValue();
-                if (!str.isNull() && str.length() == 1 && str[0] == QChar('/')) {
+                if (!str.isNull() && str.length() == 1 && str[0] == DeprecatedChar('/')) {
                     a = (int) static_cast<CSSPrimitiveValue*>(i0)->getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
                     b = (int) static_cast<CSSPrimitiveValue*>(i2)->getFloatValue(CSSPrimitiveValue::CSS_NUMBER);
                     return true;
index 0de30d411491d0d604b7157c757942bb40d1a43a..845ab45a8ea1579a69baa11c9489199b5f197248 100644 (file)
@@ -2702,7 +2702,7 @@ int CSSParser::lex(void* yylvalWithoutType)
     UChar* t = text(&length);
 
 #ifdef TOKEN_DEBUG
-    qDebug("CSSTokenizer: got token %d: '%s'", token, token == END_TOKEN ? "" : DeprecatedString((QChar *)t, length).latin1());
+    qDebug("CSSTokenizer: got token %d: '%s'", token, token == END_TOKEN ? "" : DeprecatedString((DeprecatedChar *)t, length).latin1());
 #endif
     switch(token) {
     case WHITESPACE:
@@ -2757,7 +2757,7 @@ int CSSParser::lex(void* yylvalWithoutType)
         length--;
     case FLOAT:
     case INTEGER:
-        yylval->val = DeprecatedString((QChar *)t, length).toDouble();
+        yylval->val = DeprecatedString((DeprecatedChar *)t, length).toDouble();
         break;
 
     default:
@@ -3057,7 +3057,7 @@ CSSRule* CSSParser::createStyleRule(CSSSelector* selector)
 
 DeprecatedString deprecatedString(const ParseString& ps)
 {
-    return DeprecatedString(reinterpret_cast<const QChar*>(ps.characters), ps.length);
+    return DeprecatedString(reinterpret_cast<const DeprecatedChar*>(ps.characters), ps.length);
 }
 
 #define YY_DECL int CSSParser::lex()
index 0df1a6719bf662f743ee9f90b9310be9797f70cf..734f1965bfd7625b72aa512de222d83519ee3931 100644 (file)
@@ -47,7 +47,7 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "History.h"
-#include "KWQKHTMLSettings.h"
+#include "Settings.h"
 #include "MediaList.h"
 #include "MediaQueryEvaluator.h"
 #include "Pair.h"
@@ -616,7 +616,7 @@ static void checkPseudoState(Element *e, bool checkVisited = true)
         return;
     }
     
-    QConstString cu(reinterpret_cast<const QChar*>(attr.characters()), attr.length());
+    DeprecatedConstString cu(reinterpret_cast<const DeprecatedChar*>(attr.characters()), attr.length());
     DeprecatedString u = cu.string();
     if (!u.contains("://")) {
         if (u[0] == '/')
index 8a525703ec1177bc99ffdbf715d63bb3ce786e32..b5389ffb07ae193f30e8de215dd0315a2f73719c 100644 (file)
 #define CSS_cssstyleselector_h_
 
 #include "DeprecatedString.h"
-#include "render_style.h"
+#include "RenderStyle.h"
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 
-class KHTMLSettings;
+class Settings;
 class KURL;
 
 namespace WebCore {
@@ -225,7 +225,7 @@ class StyledElement;
         RenderStyle::PseudoId pseudoStyle;
         FrameView *view;
         Frame *frame;
-        const KHTMLSettings *settings;
+        const Settings *settings;
         bool fontDirty;
         bool isXMLDoc;
 
index d49b3e014525021dd83f3cae13e0097fdce35720..edaa3811063f82e407f01ca672d8726ee7fa0b7a 100644 (file)
@@ -27,7 +27,7 @@
 #include "Document.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
-#include "KWQTextStream.h"
+#include "TextStream.h"
 #include "MutationEvent.h"
 #include "RenderText.h"
 
@@ -309,7 +309,7 @@ bool CharacterData::offsetInCharacters() const
 }
 
 #ifndef NDEBUG
-void CharacterData::dump(QTextStream *stream, DeprecatedString ind) const
+void CharacterData::dump(TextStream *stream, DeprecatedString ind) const
 {
     *stream << " str=\"" << String(str).deprecatedString().ascii() << "\"";
 
index 5c6a911e00358c145b36c9b90287f14bcdd3f058..3cf00d6d48e6442d1747c98ef93964e36ff01876 100644 (file)
@@ -67,7 +67,7 @@ public:
     virtual bool rendererIsNeeded(RenderStyle*);
     
 #ifndef NDEBUG
-    virtual void dump(QTextStream*, DeprecatedString ind = "") const;
+    virtual void dump(TextStream*, DeprecatedString ind = "") const;
 #endif
 
 protected:
index dbd27c6868d2215716b666d470e446db98475ebf..f8ee26cfa6a259963e3684d27d5443d5e33bae31 100644 (file)
@@ -81,7 +81,7 @@
 #include "cssstyleselector.h"
 #include "kjs_binding.h"
 #include "kjs_proxy.h"
-#include "xml_tokenizer.h"
+#include "XMLTokenizer.h"
 #include "xmlhttprequest.h"
 
 #if XPATH_SUPPORT
@@ -843,7 +843,7 @@ void Document::recalcStyle(StyleChange change)
         FontDescription fontDescription;
         fontDescription.setUsePrinterFont(printing());
         if (m_view) {
-            const KHTMLSettings *settings = m_view->frame()->settings();
+            const Settings *settings = m_view->frame()->settings();
             if (printing() && !settings->shouldPrintBackgrounds())
                 _style->setForceBackgroundsToWhite(true);
             const AtomicString& stdfont = settings->stdFontName();
index 2c0faa8c15cb31a23a8ba9209c24b570c7d1f0da..4187661d810ab4f50c9cbe5c7c5b225c7c7e92aa 100644 (file)
@@ -33,7 +33,7 @@
 #include "NamedAttrMap.h"
 #include "RenderBlock.h"
 #include "SelectionController.h"
-#include "KWQTextStream.h"
+#include "TextStream.h"
 
 namespace WebCore {
 
@@ -154,14 +154,14 @@ void Element::scrollIntoViewIfNeeded(bool centerIfNeeded)
     }
 }
 
-void Element::scrollByUnits(int units, KWQScrollGranularity granularity)
+void Element::scrollByUnits(int units, ScrollGranularity granularity)
 {
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderObject *rend = renderer()) {
         if (rend->hasOverflowClip()) {
-            KWQScrollDirection direction = KWQScrollDown;
+            ScrollDirection direction = ScrollDown;
             if (units < 0) {
-                direction = KWQScrollUp;
+                direction = ScrollUp;
                 units = -units;
             }
             rend->layer()->scroll(direction, granularity, units);
@@ -171,12 +171,12 @@ void Element::scrollByUnits(int units, KWQScrollGranularity granularity)
 
 void Element::scrollByLines(int lines)
 {
-    scrollByUnits(lines, KWQScrollLine);
+    scrollByUnits(lines, ScrollByLine);
 }
 
 void Element::scrollByPages(int pages)
 {
-    scrollByUnits(pages, KWQScrollPage);
+    scrollByUnits(pages, ScrollByPage);
 }
 
 int Element::offsetLeft()
@@ -699,7 +699,7 @@ void Element::updateId(const AtomicString& oldId, const AtomicString& newId)
 }
 
 #ifndef NDEBUG
-void Element::dump(QTextStream *stream, DeprecatedString ind) const
+void Element::dump(TextStream *stream, DeprecatedString ind) const
 {
     updateStyleAttributeIfNeeded();
     if (namedAttrMap) {
index 070d335ae3b36065505dfb3925320864640da60c..381e042c74e4e8274c3f2527ff39e539cb6c77d9 100644 (file)
@@ -28,7 +28,7 @@
 #define Element_h
 
 #include "Attr.h"
-#include "KWQScrollBar.h"
+#include "WebCoreScrollBar.h"
 
 namespace WebCore {
 
@@ -67,7 +67,7 @@ public:
     void scrollIntoView (bool alignToTop);
     void scrollIntoViewIfNeeded(bool centerIfNeeded);
 
-    void scrollByUnits(int units, KWQScrollGranularity granularity);
+    void scrollByUnits(int units, ScrollGranularity granularity);
     void scrollByLines(int lines);
     void scrollByPages(int pages);
 
@@ -155,7 +155,7 @@ public:
     void blur();
     
 #if !NDEBUG
-    virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
+    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;
     virtual void formatForDebugger(char *buffer, unsigned length) const;
 #endif
 
index f152058b0bbae834d00bf2e8fbd311ac24861114..a2af079b5264b94d3b71df008d80d4c5783603e8 100644 (file)
@@ -33,7 +33,7 @@
 #include "EventNames.h"
 #include "Frame.h"
 #include "HTMLNames.h"
-#include "KWQTextStream.h"
+#include "TextStream.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "MutationEvent.h"
@@ -419,7 +419,7 @@ bool EventTargetNode::dispatchMouseEvent(const AtomicString& eventType, int butt
     if (defaultHandled || defaultPrevented)
         swallowEvent = true;
     
-    // Special case: If it's a double click event, we also send the KHTML_DBLCLICK event. This is not part
+    // Special case: If it's a double click event, we also send the dblclick event. This is not part
     // of the DOM specs, but is used for compatibility with the ondblclick="" attribute.  This is treated
     // as a separate event in other DOM-compliant browsers like Firefox, and so we do the same.
     if (eventType == clickEvent && detail == 2) {
@@ -526,7 +526,7 @@ void EventTargetNode::defaultEventHandler(Event *evt)
 
 #ifndef NDEBUG
 
-void EventTargetNode::dump(QTextStream* stream, DeprecatedString ind) const
+void EventTargetNode::dump(TextStream* stream, DeprecatedString ind) const
 {
     if (m_regdListeners)
         *stream << " #regdListeners=" << m_regdListeners->count(); // ### more detail
index a3517e033355e77a8bbab7707bb3fce50387aacd..2d587e34fe91382d6ff0e89bbdd171d243597687 100644 (file)
@@ -88,7 +88,7 @@ public:
     virtual bool disabled() const;
     
 #ifndef NDEBUG
-    virtual void dump(QTextStream*, DeprecatedString indent = "") const;
+    virtual void dump(TextStream*, DeprecatedString indent = "") const;
 #endif
 
 protected:
index b6cb4d58e48493c27a9890585abdc7c2a8ef66f2..3952a32ce8b7a00cd8d393daab86010fdd7a93df 100644 (file)
@@ -36,7 +36,7 @@
 #include "HTMLNames.h"
 #include "kjs_binding.h"
 #include "RenderObject.h"
-#include "KWQTextStream.h"
+#include "TextStream.h"
 
 namespace WebCore {
 
@@ -675,7 +675,7 @@ Node::StyleChange Node::diff( WebCore::RenderStyle *s1, WebCore::RenderStyle *s2
 }
 
 #ifndef NDEBUG
-void Node::dump(QTextStream *stream, DeprecatedString ind) const
+void Node::dump(TextStream *stream, DeprecatedString ind) const
 {
     // ### implement dump() for all appropriate subclasses
 
index a17c9a94c89fcc196071dac558458912ac0d3892..7a51a52d849f435bc619bfacc12a20c15543d194 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/PassRefPtr.h>
 
 class DeprecatedStringList;
-class QTextStream;
+class TextStream;
 class RenderArena;
 
 namespace WebCore {
@@ -338,7 +338,7 @@ public:
     virtual int nextOffset(int current) const;
     
 #ifndef NDEBUG
-    virtual void dump(QTextStream*, DeprecatedString indent = "") const;
+    virtual void dump(TextStream*, DeprecatedString indent = "") const;
 #endif
 
     // -----------------------------------------------------------------------------
index f604777e2134790194aa43d2b151c64dd582f74e..db83a9abb0d6ec2ac8d76c6a3cf8ed20114f2e5e 100644 (file)
@@ -609,7 +609,7 @@ Position Position::leadingWhitespacePosition(EAffinity affinity, bool considerNo
     if (prev != *this && prev.node()->inSameContainingBlockFlowElement(node()) && prev.node()->isTextNode()) {
         String string = static_cast<Text *>(prev.node())->data();
         UChar c = string[prev.offset()];
-        if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
+        if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
             return prev;
     }
 
@@ -626,7 +626,7 @@ Position Position::trailingWhitespacePosition(EAffinity affinity, bool considerN
         if (offset() < (int)textNode->length()) {
             String string = textNode->data();
             UChar c = string[offset()];
-            if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
+            if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
                 return *this;
             return Position();
         }
@@ -639,7 +639,7 @@ Position Position::trailingWhitespacePosition(EAffinity affinity, bool considerN
     if (next != *this && next.node()->inSameContainingBlockFlowElement(node()) && next.node()->isTextNode()) {
         String string = static_cast<Text*>(next.node())->data();
         UChar c = string[0];
-        if (considerNonCollapsibleWhitespace ? (QChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
+        if (considerNonCollapsibleWhitespace ? (DeprecatedChar(c).isSpace() || c == nonBreakingSpace) : isCollapsibleWhitespace(c))
             return next;
     }
 
index e51b6741a3fb3494d8530aadb12405458c27ebe6..5a7f5b08a2f14245725d28481dc7e8934b880c79 100644 (file)
@@ -29,7 +29,7 @@
 #include "DocLoader.h"
 #include "ExceptionCode.h"
 #include "XSLStyleSheet.h"
-#include "xml_tokenizer.h" // for parseAttributes()
+#include "XMLTokenizer.h" // for parseAttributes()
 
 namespace WebCore {
 
index 2a1f2bdfef3e2b872c5fb4fe8dc1675830fac5d1..e2c3500b7a0ad3b2f1b98ca9838f33ee79f671a3 100644 (file)
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #if AVOID_STATIC_CONSTRUCTORS
-#define KHTML_QNAME_HIDE_GLOBALS 1
+#define WEBCORE_QUALIFIEDNAME_HIDE_GLOBALS 1
 #else
 #define QNAME_DEFAULT_CONSTRUCTOR
 #endif
index 77eaea6408f84023a98a3cfdd242c9544a167ba3..1669486d0c5147f0c096dad5ebe51c10182fc562 100644 (file)
@@ -71,7 +71,7 @@ private:
     QualifiedNameImpl* m_impl;
 };
 
-#if !KHTML_QNAME_HIDE_GLOBALS
+#if !WEBCORE_QUALIFIEDNAME_HIDE_GLOBALS
 extern const QualifiedName anyName;
 inline const QualifiedName& anyQName() { return anyName; }
 #endif
similarity index 98%
rename from WebCore/dom/xml_tokenizer.cpp
rename to WebCore/dom/XMLTokenizer.cpp
index 3c7ee4ba4844d4b059f51693ead9f8bfad68e8dc..cc5ce2319c3cbffccbb886d17bc3d4f4f2b71f28 100644 (file)
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "xml_tokenizer.h"
+#include "XMLTokenizer.h"
 
 #include "CDATASection.h"
 #include "Cache.h"
@@ -38,7 +38,7 @@
 #include "HTMLScriptElement.h"
 #include "HTMLTableSectionElement.h"
 #include "HTMLTokenizer.h"
-#include "KWQLoader.h"
+#include "LoaderFunctions.h"
 #include "ProcessingInstruction.h"
 #include "TransferJob.h"
 #include <libxml/parser.h>
@@ -460,7 +460,7 @@ static void* openFunc(const char* uri)
     KURL finalURL;
     TransferJob* job = new TransferJob(0, "GET", uri);
     DeprecatedString headers;
-    Vector<char> data = KWQServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
+    Vector<char> data = ServeSynchronousRequest(Cache::loader(), globalDocLoader, job, finalURL, headers);
     
     return new OffsetBuffer(data);
 }
@@ -513,7 +513,7 @@ static xmlParserCtxtPtr createQStringParser(xmlSAXHandlerPtr handlers, void *use
     xmlParserCtxtPtr parser = xmlCreatePushParserCtxt(handlers, 0, 0, 0, 0);
     parser->_private = userData;
     parser->replaceEntities = true;
-    const QChar BOM(0xFEFF);
+    const DeprecatedChar BOM(0xFEFF);
     const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
     xmlSwitchEncoding(parser, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
     return parser;
@@ -634,11 +634,11 @@ bool XMLTokenizer::write(const SegmentedString &s, bool /*appendData*/ )
     // resetting the encoding to UTF-16 before every chunk.  Otherwise libxml
     // will detect <?xml version="1.0" encoding="<encoding name>"?> blocks 
     // and switch encodings, causing the parse to fail.
-    const QChar BOM(0xFEFF);
+    const DeprecatedChar BOM(0xFEFF);
     const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
     xmlSwitchEncoding(m_context, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
     
-    xmlParseChunk(m_context, reinterpret_cast<const char *>(parseString.unicode()), sizeof(QChar) * parseString.length(), 0);
+    xmlParseChunk(m_context, reinterpret_cast<const char *>(parseString.unicode()), sizeof(DeprecatedChar) * parseString.length(), 0);
     
     return false;
 }
@@ -1105,7 +1105,7 @@ static xmlEntityPtr getXHTMLEntity(const xmlChar* name)
     if (!c)
         return 0;
 
-    DeprecatedCString value = DeprecatedString(QChar(c)).utf8();
+    DeprecatedCString value = DeprecatedString(DeprecatedChar(c)).utf8();
     assert(value.length() < 5);
     sharedXHTMLEntity.length = value.length();
     sharedXHTMLEntity.name = name;
@@ -1333,7 +1333,7 @@ void *xmlDocPtrForString(DocLoader* docLoader, const DeprecatedString &source, c
     // Parse in a single chunk into an xmlDocPtr
     // FIXME: Hook up error handlers so that a failure to parse the main document results in
     // good error messages.
-    const QChar BOM(0xFEFF);
+    const DeprecatedChar BOM(0xFEFF);
     const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
 
     xmlGenericErrorFunc oldErrorFunc = xmlGenericError;
@@ -1343,7 +1343,7 @@ void *xmlDocPtrForString(DocLoader* docLoader, const DeprecatedString &source, c
     xmlSetGenericErrorFunc(0, errorFunc);
     
     xmlDocPtr sourceDoc = xmlReadMemory(reinterpret_cast<const char *>(source.unicode()),
-                                        source.length() * sizeof(QChar),
+                                        source.length() * sizeof(DeprecatedChar),
                                         url.ascii(),
                                         BOMHighByte == 0xFF ? "UTF-16LE" : "UTF-16BE", 
                                         XSLT_PARSE_OPTIONS);
@@ -1510,7 +1510,7 @@ HashMap<String, String> parseAttributes(const String& string, bool& attrsOK)
     sax.initialized = XML_SAX2_MAGIC;
     xmlParserCtxtPtr parser = createQStringParser(&sax, &state);
     DeprecatedString parseString = "<?xml version=\"1.0\"?><attrs " + string.deprecatedString() + " />";
-    xmlParseChunk(parser, reinterpret_cast<const char *>(parseString.unicode()), parseString.length() * sizeof(QChar), 1);
+    xmlParseChunk(parser, reinterpret_cast<const char *>(parseString.unicode()), parseString.length() * sizeof(DeprecatedChar), 1);
     if (parser->myDoc)
         xmlFreeDoc(parser->myDoc);
     xmlFreeParserCtxt(parser);
index 177bf7de3e68b69414e1e6ea2d714c081c10be0f..8046f3c8f7a14800e4691a79eb86d6a1322d1904 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_EDIT_ACTIONS_H
-#define KHTML_EDITING_EDIT_ACTIONS_H
+#ifndef EditAction_h
+#define EditAction_h
 
 namespace WebCore {
     typedef enum {
index 8a1237608bbfb17804af5343918e15c9fff3a580..043d8424523c94d27defeec829ef8d0ba235957f 100644 (file)
@@ -40,7 +40,7 @@ DeprecatedString convertedSpaceString()
         convertedSpaceString = "<span class=\"";
         convertedSpaceString += AppleConvertedSpace;
         convertedSpaceString += "\">";
-        convertedSpaceString += QChar(0xa0);
+        convertedSpaceString += DeprecatedChar(0xa0);
         convertedSpaceString += "</span>";
     }
     return convertedSpaceString;
index ddddd976e079fb840efeb1ddc0f252c55c9a7652..8251162101b8aec1e0e27084e5cc8427e4621b2b 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_HTML_INTERCHANGE_H
-#define KHTML_EDITING_HTML_INTERCHANGE_H
+#ifndef HTMLInterchange_h
+#define HTMLInterchange_h
 
 class DeprecatedString;
 
index d7238ca7982819f316c9a613acec165eb0394139..ebd310b0acabb3a8313abc6da17d987be0622b0c 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_SELECTION_H
-#define KHTML_EDITING_SELECTION_H
+#ifndef Selection_h
+#define Selection_h
 
 #include "Position.h"
 #include "VisiblePosition.h"
@@ -121,4 +121,4 @@ void showTree(const WebCore::Selection&);
 void showTree(const WebCore::Selection*);
 #endif
 
-#endif // KHTML_EDITING_SELECTION_H
+#endif // Selection_h
index 3d30f32ae66688e50ba129c13a5ccf34edd2d2a8..924f62dcbf409697082f2e64102a1ceab5b12916 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_SELECTIONCONTROLLER_H
-#define KHTML_EDITING_SELECTIONCONTROLLER_H
+#ifndef SelectionController_h
+#define SelectionController_h
 
 #include "IntRect.h"
 #include "Selection.h"
@@ -201,4 +201,4 @@ void showTree(const WebCore::SelectionController&);
 void showTree(const WebCore::SelectionController*);
 #endif
 
-#endif // KHTML_EDITING_SELECTIONCONTROLLER_H
+#endif // SelectionController_h
index 24a8e90d9b234c2913a764e20d94c15ddb9bba60..25578bf2e8a190777d3cc4f5aec2aa58c5764e0d 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_TEXT_AFFINITY_H
-#define KHTML_EDITING_TEXT_AFFINITY_H
+#ifndef TextAffinity_h
+#define TextAffinity_h
 
 namespace WebCore {
 
index 676dca0915bc5e6eb4901afd8c23be443912917e..21181fc788b3497df2b4f141b73bf4cb5a0c55a7 100644 (file)
@@ -843,7 +843,7 @@ DeprecatedString CharacterIterator::string(int numChars)
     result.reserve(numChars);
     while (numChars > 0 && !atEnd()) {
         int runSize = min(numChars, length());
-        result.append(reinterpret_cast<const QChar*>(characters()), runSize);
+        result.append(reinterpret_cast<const DeprecatedChar*>(characters()), runSize);
         numChars -= runSize;
         advance(runSize);
     }
@@ -894,7 +894,7 @@ void WordAwareIterator::advance()
     
     while (1) {
         // If this chunk ends in whitespace we can just use it as our chunk.
-        if (QChar(m_textIterator.characters()[m_textIterator.length() - 1]).isSpace())
+        if (DeprecatedChar(m_textIterator.characters()[m_textIterator.length() - 1]).isSpace())
             return;
 
         // If this is the first chunk that failed, save it in previousText before look ahead
@@ -905,17 +905,17 @@ void WordAwareIterator::advance()
 
         // Look ahead to next chunk.  If it is whitespace or a break, we can use the previous stuff
         m_textIterator.advance();
-        if (m_textIterator.atEnd() || m_textIterator.length() == 0 || QChar(m_textIterator.characters()[0]).isSpace()) {
+        if (m_textIterator.atEnd() || m_textIterator.length() == 0 || DeprecatedChar(m_textIterator.characters()[0]).isSpace()) {
             m_didLookAhead = true;
             return;
         }
 
         if (m_buffer.isEmpty()) {
             // Start gobbling chunks until we get to a suitable stopping point
-            m_buffer.append(reinterpret_cast<const QChar*>(m_previousText), m_previousLength);
+            m_buffer.append(reinterpret_cast<const DeprecatedChar*>(m_previousText), m_previousLength);
             m_previousText = 0;
         }
-        m_buffer.append(reinterpret_cast<const QChar*>(m_textIterator.characters()), m_textIterator.length());
+        m_buffer.append(reinterpret_cast<const DeprecatedChar*>(m_textIterator.characters()), m_textIterator.length());
         int exception = 0;
         m_range->setEnd(m_textIterator.range()->endContainer(exception), m_textIterator.range()->endOffset(exception), exception);
     }
@@ -1096,7 +1096,7 @@ DeprecatedString plainText(const Range* r)
 {
     DeprecatedString result("");
     for (TextIterator it(r); !it.atEnd(); it.advance())
-        result.append(reinterpret_cast<const QChar*>(it.characters()), it.length());
+        result.append(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
     return result;
 }
 
index 0564605c03ef1d5bcedd34060a5fee2ff9bf492d..ab012560b1d046b53e90093fb06927cf715db65f 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_VISIBLE_TEXT_H
-#define KHTML_EDITING_VISIBLE_TEXT_H
+#ifndef TextIterator_h
+#define TextIterator_h
 
 #include "DeprecatedString.h"
 #include "InlineTextBox.h"
index ce0b75c5ef5e419bd986f1fe0c788bec5adde1ce..e1693f640409bf8ebe3e7566a9e4b4b66c8380dd 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_VISIBLE_POSITION_H
-#define KHTML_EDITING_VISIBLE_POSITION_H
+#ifndef VisiblePosition_h
+#define VisiblePosition_h
 
 #include "Position.h"
 
@@ -122,4 +122,4 @@ void showTree(const WebCore::VisiblePosition*);
 void showTree(const WebCore::VisiblePosition&);
 #endif
 
-#endif // KHTML_EDITING_VISIBLE_POSITION_H
+#endif // VisiblePosition_h
index 9d4daddf9eefd8b210feb97e82e617da16b5ad63..c6854280d6b7abd4abdafdf0768021100e5190cf 100644 (file)
@@ -380,7 +380,7 @@ bool isTableStructureNode(const Node *node)
 
 const String& nonBreakingSpaceString()
 {
-    static String nonBreakingSpaceString = DeprecatedString(QChar(NON_BREAKING_SPACE));
+    static String nonBreakingSpaceString = DeprecatedString(DeprecatedChar(NON_BREAKING_SPACE));
     return nonBreakingSpaceString;
 }
 
index fffa6e650e536f9cf2e735f6b143b2a6353b0f65..e87bced0480db03725ffff18cc033ac135d970f7 100644 (file)
@@ -154,7 +154,7 @@ static DeprecatedString startMarkup(const Node *node, const Range *range, EAnnot
         case Node::PROCESSING_INSTRUCTION_NODE:
             return static_cast<const ProcessingInstruction*>(node)->toString().deprecatedString();
         case Node::ELEMENT_NODE: {
-            DeprecatedString markup = QChar('<');
+            DeprecatedString markup = DeprecatedChar('<');
             const Element* el = static_cast<const Element*>(node);
             markup += el->nodeNamePreservingCase().deprecatedString();
             String additionalStyle;
index 11277aa25366af376013f8899013b9c0e2a93a52..17aca581d2f4c44156ddfc1d2130005b8b6be1b5 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_MARKUP_H
-#define KHTML_EDITING_MARKUP_H
+#ifndef markup_h
+#define markup_h
 
 #include "HTMLInterchange.h"
 #include <wtf/Forward.h>
@@ -52,4 +52,4 @@ namespace WebCore {
 
 }
 
-#endif // KHTML_EDITING_MARKUP_H
+#endif // markup_h
index 337e4555a53eeddb22ccf644fdedaff5b8afd914..8e9bb994765ccc6fc8a76f88c650bde62ad891bb 100644 (file)
@@ -72,7 +72,7 @@ static VisiblePosition previousBoundary(const VisiblePosition &c, unsigned (*sea
     unsigned next = 0;
     while (!it.atEnd() && it.length() > 0) {
         // iterate to get chunks until the searchFunction returns a non-zero value.
-        string.prepend(reinterpret_cast<const QChar*>(it.characters()), it.length());
+        string.prepend(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
         next = searchFunction(reinterpret_cast<const UChar*>(string.unicode()), string.length());
         if (next != 0)
             break;
@@ -88,7 +88,7 @@ static VisiblePosition previousBoundary(const VisiblePosition &c, unsigned (*sea
         // Make a check to see if the position should be before or after the replaced element
         // by performing an additional check with a modified string which uses an "X" 
         // character to stand in for the replaced element.
-        QChar chars[2];
+        DeprecatedChar chars[2];
         chars[0] = 'X';
         chars[1] = ' ';
         string.prepend(chars, 2);
@@ -143,7 +143,7 @@ static VisiblePosition nextBoundary(const VisiblePosition &c, unsigned (*searchF
     while (!it.atEnd() && it.length() > 0) {
         // Keep asking the iterator for chunks until the search function
         // returns an end value not equal to the length of the string passed to it.
-        string.append(reinterpret_cast<const QChar*>(it.characters()), it.length());
+        string.append(reinterpret_cast<const DeprecatedChar*>(it.characters()), it.length());
         next = searchFunction(reinterpret_cast<const UChar*>(string.unicode()), string.length());
         if (next != string.length())
             break;
@@ -160,7 +160,7 @@ static VisiblePosition nextBoundary(const VisiblePosition &c, unsigned (*searchF
         // Make a check to see if the position should be before or after the replaced element
         // by performing an additional check with a modified string which uses an "X" 
         // character to stand in for the replaced element.
-        QChar chars[2];
+        DeprecatedChar chars[2];
         chars[0] = ' ';
         chars[1] = 'X';
         string.append(chars, 2);
index 2509720064b5f939e80a223003c9e9068b882e6a..2fd24d5acffdf59a0fdb8aa3728fca05ba3e1fa7 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_VISIBLE_UNITS_H
-#define KHTML_EDITING_VISIBLE_UNITS_H
+#ifndef visible_units_h
+#define visible_units_h
 
 #include "TextAffinity.h"
 
@@ -87,4 +87,4 @@ bool isEndOfEditableContent(const VisiblePosition &);
 
 } // namespace WebCore
 
-#endif // KHTML_EDITING_VISIBLE_POSITION_H
+#endif // VisiblePosition_h
index 2140d35554e666a4437842638af985808304fa1b..0f50ef58af97aabce121d3b4c89e9a2b9199e6c0 100644 (file)
@@ -205,7 +205,7 @@ const int PARSEMODE_HAVE_INTERNAL       =       (1<<3);
 static int parseDocTypePart(const DeprecatedString& buffer, int index)
 {
     while (true) {
-        QChar ch = buffer[index];
+        DeprecatedChar ch = buffer[index];
         if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')
             ++index;
         else if (ch == '-') {
@@ -247,7 +247,7 @@ static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
     do {
         index = buffer.find('<', index);
         if (index == -1) break;
-        QChar nextChar = buffer[index+1];
+        DeprecatedChar nextChar = buffer[index+1];
         if (nextChar == '!') {
             if (containsString("doctype", buffer, index+2)) {
                 haveDocType = true;
@@ -280,7 +280,7 @@ static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
         // We've read <!DOCTYPE HTML PUBLIC (not case sensitive).
         // Now we find the beginning and end of the public identifers
         // and system identifiers (assuming they're even present).
-        QChar theChar = buffer[index];
+        DeprecatedChar theChar = buffer[index];
         if (theChar != '\"' && theChar != '\'')
             return false;
         
@@ -291,7 +291,7 @@ static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
         if (publicIDEnd == -1)
             return false;
         index = parseDocTypePart(buffer, publicIDEnd+1);
-        QChar next = buffer[index];
+        DeprecatedChar next = buffer[index];
         if (next == '>') {
             // Public identifier present, but no system identifier.
             // Do nothing.  Note that this is the most common
@@ -322,7 +322,7 @@ static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
             // Doctype has a system ID but no public ID
             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
             index = parseDocTypePart(buffer, index+6);
-            QChar next = buffer[index];
+            DeprecatedChar next = buffer[index];
             if (next != '\"' && next != '\'')
                 return false;
             int systemIDStart = index+1;
@@ -333,7 +333,7 @@ static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
             index = parseDocTypePart(buffer, systemIDEnd+1);
         }
 
-        QChar nextChar = buffer[index];
+        DeprecatedChar nextChar = buffer[index];
         if (nextChar == '[')
             *resultFlags |= PARSEMODE_HAVE_INTERNAL;
         else if (nextChar != '>')
index cfb20c89f39da766b2161f1535c2957ab193fb46..39996f1a170fef5a0434ed931bb5684321f232b6 100644 (file)
@@ -49,7 +49,7 @@ static bool parseFontSizeNumber(const String& s, int& size)
     unsigned pos = 0;
     
     // Skip leading spaces.
-    while (QChar(s[pos]).isSpace())
+    while (DeprecatedChar(s[pos]).isSpace())
         ++pos;
     
     // Skip a plus or minus.
index 7b5b3007aee3605895a0b2bd7b7408b0071f8ac2..c40c695b3b9174bfb5ff36caeab2eadd148df0c3 100644 (file)
@@ -46,7 +46,7 @@
 #include "RenderImageButton.h"
 #include "RenderLineEdit.h"
 #include "RenderText.h"
-#include "RenderTextField.h"
+#include "RenderTextControl.h"
 #include "RenderTheme.h"
 #include "SelectionController.h"
 #include <unicode/ubrk.h>
@@ -462,7 +462,7 @@ int HTMLInputElement::selectionStart() const
         case TEXT:
             if (document()->focusNode() != this && cachedSelStart >= 0)
                 return cachedSelStart;
-            return static_cast<RenderTextField*>(renderer())->selectionStart();
+            return static_cast<RenderTextControl*>(renderer())->selectionStart();
     }
     return 0;
 }
@@ -490,7 +490,7 @@ int HTMLInputElement::selectionEnd() const
         case TEXT:
             if (document()->focusNode() != this && cachedSelEnd >= 0)
                 return cachedSelEnd;
-            return static_cast<RenderTextField*>(renderer())->selectionEnd();
+            return static_cast<RenderTextControl*>(renderer())->selectionEnd();
     }
     return 0;
 }
@@ -517,7 +517,7 @@ void HTMLInputElement::setSelectionStart(int start)
             static_cast<RenderLineEdit*>(renderer())->setSelectionStart(start);
             break;
         case TEXT:
-            static_cast<RenderTextField*>(renderer())->setSelectionStart(start);
+            static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
             break;
     }
 }
@@ -544,7 +544,7 @@ void HTMLInputElement::setSelectionEnd(int end)
             static_cast<RenderLineEdit*>(renderer())->setSelectionEnd(end);
             break;
         case TEXT:
-            static_cast<RenderTextField*>(renderer())->setSelectionEnd(end);
+            static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
             break;
     }
 }
@@ -573,7 +573,7 @@ void HTMLInputElement::select()
             static_cast<RenderLineEdit*>(renderer())->select();
             break;
         case TEXT:
-            static_cast<RenderTextField*>(renderer())->select();
+            static_cast<RenderTextControl*>(renderer())->select();
             break;
     }
 }
@@ -600,7 +600,7 @@ void HTMLInputElement::setSelectionRange(int start, int end)
             static_cast<RenderLineEdit*>(renderer())->setSelectionRange(start, end);
             break;
         case TEXT:
-            static_cast<RenderTextField*>(renderer())->setSelectionRange(start, end);
+            static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
             break;
     }
 }
@@ -824,7 +824,7 @@ RenderObject *HTMLInputElement::createRenderer(RenderArena *arena, RenderStyle *
         case RANGE:
             return new (arena) DeprecatedSlider(this);
         case TEXT:
-            return new (arena) RenderTextField(this, false);
+            return new (arena) RenderTextControl(this, false);
     }
     assert(false);
     return 0;
@@ -1360,7 +1360,7 @@ void HTMLInputElement::defaultEventHandler(Event *evt)
     }
     
     if (isNonWidgetTextField() && (evt->isMouseEvent() || evt->isDragEvent() || evt->isWheelEvent() || evt->type() == blurEvent) && renderer())
-        static_cast<RenderTextField*>(renderer())->forwardEvent(evt);
+        static_cast<RenderTextControl*>(renderer())->forwardEvent(evt);
     
     HTMLGenericFormElement::defaultEventHandler(evt);
 }
index 74b0d33470f1e2e96578666a26700c6f278462a3..c369a47ed19afa044aee4112e8cbb4f90974a914 100644 (file)
@@ -32,7 +32,7 @@
 #include "HTMLNames.h"
 #include "HTMLOptionElement.h"
 #include "KURL.h"
-#include "KWQKSSLKeyGen.h"
+#include "SSLKeyGenerator.h"
 #include "Text.h"
 
 using namespace WebCore;
@@ -44,7 +44,7 @@ using namespace HTMLNames;
 HTMLKeygenElement::HTMLKeygenElement(Document* doc, HTMLFormElement* f)
     : HTMLSelectElement(keygenTag, doc, f)
 {
-    DeprecatedStringList keys = KSSLKeyGen::supportedKeySizes();
+    DeprecatedStringList keys = SSLKeyGenerator::supportedKeySizes();
     for (DeprecatedStringList::Iterator i = keys.begin(); i != keys.end(); ++i) {
         HTMLOptionElement* o = new HTMLOptionElement(doc, form());
         addChild(o);
@@ -74,7 +74,7 @@ bool HTMLKeygenElement::appendFormData(FormDataList& encoded_values, bool)
     // Only RSA is supported at this time.
     if (!m_keyType.isNull() && !equalIgnoringCase(m_keyType, "rsa"))
         return false;
-    DeprecatedString value = KSSLKeyGen::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.deprecatedString(), document()->baseURL());
+    DeprecatedString value = SSLKeyGenerator::signedPublicKeyAndChallengeString(selectedIndex(), m_challenge.deprecatedString(), document()->baseURL());
     if (value.isNull())
         return false;
     encoded_values.appendData(name(), value.utf8());
index d71a15dc6cd95d8acd94d60059230dddceaf481a..94bc09e142e29b50c0043e5e040e1f5cd8551e05 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "HTMLGenericFormElement.h"
 #include "HTMLCollection.h"
-#include "render_style.h"
+#include "RenderStyle.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 1566c3f3d224b228cbb65ba59ad793a6690c58c1..5a4c49428335c9ea088e6ad22c5778aa1031e2ef 100644 (file)
@@ -34,9 +34,9 @@
 #include "Frame.h"
 #include "HTMLNames.h"
 #include "RenderTextArea.h"
-#include "RenderTextField.h"
+#include "RenderTextControl.h"
 #include "Text.h"
-#include "render_style.h"
+#include "RenderStyle.h"
 
 namespace WebCore {
 
@@ -81,7 +81,7 @@ int HTMLTextAreaElement::selectionStart()
     if (renderer()) {
         if (document()->focusNode() != this && cachedSelStart >= 0)
             return cachedSelStart;
-        return static_cast<RenderTextField *>(renderer())->selectionStart();
+        return static_cast<RenderTextControl *>(renderer())->selectionStart();
     }
     return 0;
 }
@@ -91,7 +91,7 @@ int HTMLTextAreaElement::selectionEnd()
     if (renderer()) {
         if (document()->focusNode() != this && cachedSelEnd >= 0)
             return cachedSelEnd;
-        return static_cast<RenderTextField *>(renderer())->selectionEnd();
+        return static_cast<RenderTextControl *>(renderer())->selectionEnd();
     }
     return 0;
 }
@@ -99,25 +99,25 @@ int HTMLTextAreaElement::selectionEnd()
 void HTMLTextAreaElement::setSelectionStart(int start)
 {
     if (renderer())
-        static_cast<RenderTextField*>(renderer())->setSelectionStart(start);
+        static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
 }
 
 void HTMLTextAreaElement::setSelectionEnd(int end)
 {
     if (renderer())
-        static_cast<RenderTextField*>(renderer())->setSelectionEnd(end);
+        static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
 }
 
 void HTMLTextAreaElement::select()
 {
     if (renderer())
-        static_cast<RenderTextField *>(renderer())->select();
+        static_cast<RenderTextControl *>(renderer())->select();
 }
 
 void HTMLTextAreaElement::setSelectionRange(int start, int end)
 {
     if (renderer())
-        static_cast<RenderTextField*>(renderer())->setSelectionRange(start, end);
+        static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
 }
 
 void HTMLTextAreaElement::childrenChanged()
@@ -164,7 +164,7 @@ void HTMLTextAreaElement::parseMappedAttribute(MappedAttribute *attr)
 
 RenderObject* HTMLTextAreaElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
-    return new (arena) RenderTextField(this, true);
+    return new (arena) RenderTextControl(this, true);
 }
 
 bool HTMLTextAreaElement::appendFormData(FormDataList& encoding, bool)
@@ -173,7 +173,7 @@ bool HTMLTextAreaElement::appendFormData(FormDataList& encoding, bool)
         return false;
         
     bool hardWrap = renderer() && wrap() == ta_Physical;
-    String v = hardWrap ? static_cast<RenderTextField*>(renderer())->textWithHardLineBreaks() : value();
+    String v = hardWrap ? static_cast<RenderTextControl*>(renderer())->textWithHardLineBreaks() : value();
     encoding.appendData(name(), v);
     return true;
 }
@@ -210,7 +210,7 @@ void HTMLTextAreaElement::focus()
             ASSERT(cachedSelEnd == -1);
             // If this is the first focus, set a caret at the end of the text.  
             // This matches other browsers' behavior.
-            int max = static_cast<RenderTextField*>(renderer())->text().length();
+            int max = static_cast<RenderTextControl*>(renderer())->text().length();
             setSelectionRange(max, max);
         } else
             // Restore the cached selection.  This matches other browsers' behavior.
@@ -226,7 +226,7 @@ void HTMLTextAreaElement::focus()
 void HTMLTextAreaElement::defaultEventHandler(Event *evt)
 {
     if (renderer() && (evt->isMouseEvent() || evt->isDragEvent() || evt->isWheelEvent() || evt->type() == blurEvent))
-        static_cast<RenderTextField*>(renderer())->forwardEvent(evt);
+        static_cast<RenderTextControl*>(renderer())->forwardEvent(evt);
 
     HTMLGenericFormElement::defaultEventHandler(evt);
 }
@@ -240,7 +240,7 @@ void HTMLTextAreaElement::updateValue() const
 {
     if (!valueMatchesRenderer()) {
         ASSERT(renderer());
-        m_value = static_cast<RenderTextField*>(renderer())->text();
+        m_value = static_cast<RenderTextControl*>(renderer())->text();
         setValueMatchesRenderer();
     }
 }
index c76aaa4c875b1a2e2b9093eff17f3f56dcb52376..b9a4fc1002e1aeba5d8fc5c7d658ddeb3f81bae6 100644 (file)
@@ -30,7 +30,7 @@
 #include "EventNames.h"
 #include "HTMLInputElement.h"
 #include "HTMLTextAreaElement.h"
-#include "RenderTextField.h"
+#include "RenderTextControl.h"
 
 namespace WebCore {
 
@@ -53,7 +53,7 @@ void HTMLTextFieldInnerElement::defaultEventHandler(Event* evt)
             else
                 static_cast<HTMLTextAreaElement*>(shadowParentNode())->defaultEventHandler(evt);
         if (evt->type() == khtmlEditableContentChangedEvent)
-            static_cast<RenderTextField*>(shadowParentNode()->renderer())->subtreeHasChanged();
+            static_cast<RenderTextControl*>(shadowParentNode()->renderer())->subtreeHasChanged();
     }
     HTMLDivElement::defaultEventHandler(evt);
 }
index 58bb0a6458019f61b0c1501a6133297a3e495b82..33b931c1602d8197ff5e143dd47f4127b856f916 100644 (file)
@@ -388,7 +388,7 @@ HTMLTokenizer::State HTMLTokenizer::scriptHandler(State state)
     }
 
     state = processListing(SegmentedString(scriptCode, scriptCodeSize), state);
-    DeprecatedString exScript(reinterpret_cast<QChar*>(buffer), dest - buffer);
+    DeprecatedString exScript(reinterpret_cast<DeprecatedChar*>(buffer), dest - buffer);
     processToken();
     currToken.tagName = scriptTag.localName();
     currToken.beginTag = false;
@@ -1546,13 +1546,13 @@ void HTMLTokenizer::finish()
         int pos;
         DeprecatedString food;
         if (m_state.inScript() || m_state.inStyle())
-            food.setUnicode(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize);
+            food.setUnicode(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize);
         else if (m_state.inServer()) {
             food = "<";
-            food += DeprecatedString(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize);
+            food += DeprecatedString(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize);
         } else {
-            pos = QConstString(reinterpret_cast<QChar*>(scriptCode), scriptCodeSize).string().find('>');
-            food.setUnicode(reinterpret_cast<QChar*>(scriptCode) + pos + 1, scriptCodeSize - pos - 1); // deep copy
+            pos = DeprecatedConstString(reinterpret_cast<DeprecatedChar*>(scriptCode), scriptCodeSize).string().find('>');
+            food.setUnicode(reinterpret_cast<DeprecatedChar*>(scriptCode) + pos + 1, scriptCodeSize - pos - 1); // deep copy
         }
         fastFree(scriptCode);
         scriptCode = 0;
@@ -1577,7 +1577,7 @@ PassRefPtr<Node> HTMLTokenizer::processToken()
     if (dest > buffer) {
 #ifdef TOKEN_DEBUG
         if(currToken.tagName.length()) {
-            qDebug( "unexpected token: %s, str: *%s*", currToken.tagName.deprecatedString().latin1(),QConstString( buffer,dest-buffer ).deprecatedString().latin1() );
+            qDebug( "unexpected token: %s, str: *%s*", currToken.tagName.deprecatedString().latin1(),DeprecatedConstString( buffer,dest-buffer ).deprecatedString().latin1() );
             ASSERT(0);
         }
 
@@ -1598,7 +1598,7 @@ PassRefPtr<Node> HTMLTokenizer::processToken()
     DeprecatedString name = currToken.tagName.deprecatedString();
     DeprecatedString text;
     if(currToken.text)
-        text = QConstString(currToken.text->unicode(), currToken.text->length()).deprecatedString();
+        text = DeprecatedConstString(currToken.text->unicode(), currToken.text->length()).deprecatedString();
 
     kdDebug( 6036 ) << "Token --> " << name << endl;
     if (currToken.flat)
index 11f35c8d7d6713691b5414f1066d645112a79288..52ff09b25734c0987036b2f8e00abaf9f6937d5d 100644 (file)
 #ifndef HTMLTOKENIZER_H
 #define HTMLTOKENIZER_H
 
-#include "KWQPtrQueue.h"
+#include "DeprecatedPtrQueue.h"
 #include "NamedMappedAttrMap.h"
 #include "SegmentedString.h"
 #include "Timer.h"
-#include "xml_tokenizer.h"
+#include "XMLTokenizer.h"
 #include "CachedObjectClient.h"
 
 namespace WebCore {
index 17f4c59ff17b7f3fdd6730ce0550cdf401d1c4d0..4d8b37766d6fbc277e5bdfa5751276529ea215ac 100644 (file)
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "KRenderingDevice.h"
-#include "KCanvasContainer.h"
+#include "RenderSVGContainer.h"
 
 namespace WebCore {
 
index bcbd4043cd6be80b48e4524fd9bac0911884172d..f815ac6abbfef1f0912e4575d9cc6d36c22313f2 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "CachedImage.h"
 
-#include "KWQTextStream.h"
+#include "TextStream.h"
 #include "KCanvasTreeDebug.h"
 #include <wtf/Assertions.h>
 
@@ -66,7 +66,7 @@ FloatRect KCanvasFilter::filterBBoxForItemBBox(FloatRect itemBBox) const
     return filterBBox;
 }
 
-QTextStream &KCanvasFilter::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFilter::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=FILTER] "
         << " [bounding box=" << filterRect() << "]";
@@ -87,7 +87,7 @@ KCanvasFilter *getFilterById(Document *document, const AtomicString &id)
     return 0;
 }
 
-QTextStream &operator<<(QTextStream &ts, const KCanvasFilterEffect &e)
+TextStream &operator<<(TextStream &ts, const KCanvasFilterEffect &e)
 {
     return e.externalRepresentation(ts);
 }
@@ -121,13 +121,13 @@ void KCanvasFilterEffect::setResult(const DeprecatedString &result)
     m_result = result;
 }
 
-static QTextStream &operator<<(QTextStream &ts, const KCanvasPoint3F p)
+static TextStream &operator<<(TextStream &ts, const KCanvasPoint3F p)
 {
     ts << "x=" << p.x() << " y=" << p.y() << " z=" << p.z();
     return ts;  
 }
 
-QTextStream &KCanvasFilterEffect::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFilterEffect::externalRepresentation(TextStream &ts) const
 {
     if (!in().isEmpty())
         ts << "[in=\"" << in() << "\"]";
@@ -138,14 +138,14 @@ QTextStream &KCanvasFilterEffect::externalRepresentation(QTextStream &ts) const
     return ts;    
 }
 
-QTextStream &KCPointLightSource::externalRepresentation(QTextStream &ts) const
+TextStream &KCPointLightSource::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=POINT-LIGHT] ";
     ts << "[position=\"" << position() << "\"]";
     return ts;  
 }
 
-QTextStream &KCSpotLightSource::externalRepresentation(QTextStream &ts) const
+TextStream &KCSpotLightSource::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=SPOT-LIGHT] ";
     ts << "[position=\"" << position() << "\"]";
@@ -155,7 +155,7 @@ QTextStream &KCSpotLightSource::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-QTextStream &KCDistantLightSource::externalRepresentation(QTextStream &ts) const
+TextStream &KCDistantLightSource::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=DISTANT-LIGHT] ";
     ts << "[azimuth=\"" << azimuth() << "\"]";
@@ -163,7 +163,7 @@ QTextStream &KCDistantLightSource::externalRepresentation(QTextStream &ts) const
     return ts;  
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCBlendModeType t)
+static TextStream &operator<<(TextStream &ts, KCBlendModeType t)
 {
     switch (t) 
     {
@@ -181,7 +181,7 @@ static QTextStream &operator<<(QTextStream &ts, KCBlendModeType t)
     return ts;        
 }
 
-QTextStream &KCanvasFEBlend::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEBlend::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=BLEND] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -191,7 +191,7 @@ QTextStream &KCanvasFEBlend::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCColorMatrixType t)
+static TextStream &operator<<(TextStream &ts, KCColorMatrixType t)
 {
     switch (t) 
     {
@@ -207,7 +207,7 @@ static QTextStream &operator<<(QTextStream &ts, KCColorMatrixType t)
     return ts;        
 }
 
-QTextStream &KCanvasFEColorMatrix::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEColorMatrix::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=COLOR-MATRIX] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -216,7 +216,7 @@ QTextStream &KCanvasFEColorMatrix::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCComponentTransferType t)
+static TextStream &operator<<(TextStream &ts, KCComponentTransferType t)
 {
     switch (t) 
     {
@@ -234,7 +234,7 @@ static QTextStream &operator<<(QTextStream &ts, KCComponentTransferType t)
     return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, const KCComponentTransferFunction &func)
+static TextStream &operator<<(TextStream &ts, const KCComponentTransferFunction &func)
 {
     ts << "[type=" << func.type << "]"; 
     switch (func.type) {
@@ -265,7 +265,7 @@ static QTextStream &operator<<(QTextStream &ts, const KCComponentTransferFunctio
     return ts;        
 }
 
-QTextStream &KCanvasFEComponentTransfer::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEComponentTransfer::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=COMPONENT-TRANSFER] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -276,7 +276,7 @@ QTextStream &KCanvasFEComponentTransfer::externalRepresentation(QTextStream &ts)
     return ts;  
 }
 
-QTextStream &KCanvasFEComposite::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEComposite::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=COMPOSITE] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -286,7 +286,7 @@ QTextStream &KCanvasFEComposite::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCEdgeModeType t)
+static TextStream &operator<<(TextStream &ts, KCEdgeModeType t)
 {   
     switch (t) 
     {
@@ -300,7 +300,7 @@ static QTextStream &operator<<(QTextStream &ts, KCEdgeModeType t)
     return ts;
 }
 
-QTextStream &KCanvasFEConvolveMatrix::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEConvolveMatrix::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=CONVOLVE-MATRIX] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -331,7 +331,7 @@ void KCanvasFESpecularLighting::setLightSource(KCLightSource *lightSource)
     }
 }
 
-QTextStream &KCanvasFEDiffuseLighting::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEDiffuseLighting::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=DIFFUSE-LIGHTING] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -341,7 +341,7 @@ QTextStream &KCanvasFEDiffuseLighting::externalRepresentation(QTextStream &ts) c
    return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCChannelSelectorType t)
+static TextStream &operator<<(TextStream &ts, KCChannelSelectorType t)
 {
     switch (t)
     {
@@ -357,7 +357,7 @@ static QTextStream &operator<<(QTextStream &ts, KCChannelSelectorType t)
     return ts;
 }
 
-QTextStream &KCanvasFEDisplacementMap::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEDisplacementMap::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=DISPLACEMENT-MAP] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -369,7 +369,7 @@ QTextStream &KCanvasFEDisplacementMap::externalRepresentation(QTextStream &ts) c
    return ts;
 }
 
-QTextStream &KCanvasFEFlood::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEFlood::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=FLOOD] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -398,7 +398,7 @@ void KCanvasFEGaussianBlur::setStdDeviationY(float y)
     m_y = y;
 }
 
-QTextStream &KCanvasFEGaussianBlur::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEGaussianBlur::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=GAUSSIAN-BLUR] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -406,7 +406,7 @@ QTextStream &KCanvasFEGaussianBlur::externalRepresentation(QTextStream &ts) cons
     return ts;
 }
 
-QTextStream &KCanvasFEImage::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEImage::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=IMAGE] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -414,7 +414,7 @@ QTextStream &KCanvasFEImage::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-QTextStream &KCanvasFEMerge::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEMerge::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=MERGE] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -422,7 +422,7 @@ QTextStream &KCanvasFEMerge::externalRepresentation(QTextStream &ts) const
     return ts;
 }
 
-static QTextStream &operator<<(QTextStream &ts, KCMorphologyOperatorType t)
+static TextStream &operator<<(TextStream &ts, KCMorphologyOperatorType t)
 {
     switch (t)
     {
@@ -434,7 +434,7 @@ static QTextStream &operator<<(QTextStream &ts, KCMorphologyOperatorType t)
     return ts;
 }
 
-QTextStream &KCanvasFEMorphology::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEMorphology::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=MORPHOLOGY-OPERATOR] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -443,14 +443,14 @@ QTextStream &KCanvasFEMorphology::externalRepresentation(QTextStream &ts) const
    return ts;
 }
 
-QTextStream &KCanvasFEOffset::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFEOffset::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=OFFSET] "; KCanvasFilterEffect::externalRepresentation(ts)
         << " [dx=" << dx() << " dy=" << dy() << "]";    
    return ts;
 }
 
-QTextStream &KCanvasFESpecularLighting::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFESpecularLighting::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=SPECULAR-LIGHTING] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -462,14 +462,14 @@ QTextStream &KCanvasFESpecularLighting::externalRepresentation(QTextStream &ts)
 
 #if 0
 ///FIXME: KCanvasFETile doesn't have any properties
-QTextStream &KCanvasFETile::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFETile::externalRepresentation(TextStream &ts) const
 {
    KCanvasFilterEffect::externalRepresentation(ts);
    return ts;
 }
 #endif
 
-static QTextStream &operator<<(QTextStream &ts, KCTurbulanceType t)
+static TextStream &operator<<(TextStream &ts, KCTurbulanceType t)
 {
     switch (t)
     {
@@ -481,7 +481,7 @@ static QTextStream &operator<<(QTextStream &ts, KCTurbulanceType t)
     return ts;
 }
 
-QTextStream &KCanvasFETurbulence::externalRepresentation(QTextStream &ts) const
+TextStream &KCanvasFETurbulence::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=TURBULENCE] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
index ae23b3fd9a253b1a6eb67c93ac67fb136019222c..2c6d55b66a3b73e3f749d2a1a93470e55ed82cd6 100644 (file)
@@ -112,7 +112,7 @@ public:
     virtual void prepareFilter(const FloatRect &bbox) = 0;
     virtual void applyFilter(const FloatRect &bbox) = 0;
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 protected:
     FloatRect m_filterRect;
@@ -145,7 +145,7 @@ public:
     virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const = 0;
 #endif
 
-    virtual QTextStream &externalRepresentation(QTextStream &) const;
+    virtual TextStream &externalRepresentation(TextStream &) const;
 
 private:
     FloatRect m_subregion;
@@ -153,7 +153,7 @@ private:
     DeprecatedString m_result;
 };
 
-QTextStream &operator<<(QTextStream &, const KCanvasFilterEffect &);
+TextStream &operator<<(TextStream &, const KCanvasFilterEffect &);
 
 typedef enum {
     BM_NORMAL = 0,
@@ -172,7 +172,7 @@ public:
     KCBlendModeType blendMode() const { return m_mode; }
     void setBlendMode(KCBlendModeType mode) { m_mode = mode; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     KCBlendModeType m_mode;
@@ -195,7 +195,7 @@ public:
     DeprecatedValueList<float> values() const { return m_values; }
     void setValues(const DeprecatedValueList<float> &values) { m_values = values; };
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     KCColorMatrixType m_type;
@@ -237,7 +237,7 @@ public:
     KCComponentTransferFunction alphaFunction() const { return m_alphaFunc; }
     void setAlphaFunction(const KCComponentTransferFunction& func) { m_alphaFunc = func; }
 
-    QTextStream& externalRepresentation(QTextStream&) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     KCComponentTransferFunction m_redFunc;
@@ -273,7 +273,7 @@ public:
     float k4() const { return m_k4; }
     void setK4(float k4) { m_k4 = k4; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     DeprecatedString m_in2;
@@ -319,7 +319,7 @@ public:
     bool preserveAlpha() const { return m_preserveAlpha; }
     void setPreserveAlpha(bool preserveAlpha) { m_preserveAlpha = preserveAlpha; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     FloatSize m_kernelSize;
@@ -348,7 +348,7 @@ public:
     
     KCLightType type() const { return m_type; }
     
-    virtual QTextStream &externalRepresentation(QTextStream &) const = 0;
+    virtual TextStream &externalRepresentation(TextStream &) const = 0;
     
 private:
     KCLightType m_type;
@@ -363,7 +363,7 @@ public:
     float azimuth() const{ return m_azimuth; }
     float elevation() const{ return m_elevation; }
     
-    virtual QTextStream &externalRepresentation(QTextStream &) const;
+    virtual TextStream &externalRepresentation(TextStream &) const;
     
 private:
     float m_azimuth;
@@ -377,7 +377,7 @@ public:
     
     const KCanvasPoint3F& position() const { return m_position; }
     
-    virtual QTextStream &externalRepresentation(QTextStream &) const;
+    virtual TextStream &externalRepresentation(TextStream &) const;
 
 private:
     KCanvasPoint3F m_position;
@@ -395,7 +395,7 @@ public:
     float specularExponent() const { return m_specularExponent; }
     float limitingConeAngle() const { return m_limitingConeAngle; }
     
-    virtual QTextStream &externalRepresentation(QTextStream &) const;
+    virtual TextStream &externalRepresentation(TextStream &) const;
 private:
     KCanvasPoint3F m_position;
     KCanvasPoint3F m_direction;
@@ -427,7 +427,7 @@ public:
     const KCLightSource *lightSource() const { return m_lightSource; }
     void setLightSource(KCLightSource *lightSource);
     
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     Color m_lightingColor;
@@ -462,7 +462,7 @@ public:
     float scale() const { return m_scale; }
     void setScale(float scale) { m_scale = scale; }
     
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     DeprecatedString m_in2;
@@ -480,7 +480,7 @@ public:
     float floodOpacity() const { return m_floodOpacity; }
     void setFloodOpacity(float floodOpacity) { m_floodOpacity = floodOpacity; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     Color m_floodColor;
@@ -496,7 +496,7 @@ public:
     float stdDeviationY() const;
     void setStdDeviationY(float y);
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
 
 private:
     float m_x;
@@ -514,7 +514,7 @@ public:
     CachedImage* cachedImage() const { return m_cachedImage; }
     void setCachedImage(CachedImage* image);
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     CachedImage* m_cachedImage;
@@ -526,7 +526,7 @@ public:
     DeprecatedStringList mergeInputs() const { return m_mergeInputs; }
     void setMergeInputs(const DeprecatedStringList &mergeInputs) { m_mergeInputs = mergeInputs; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     DeprecatedStringList m_mergeInputs;
@@ -549,7 +549,7 @@ public:
     float radiusY() const { return m_radiusY; }
     void setRadiusY(float radiusY) { m_radiusY = radiusY; }
     
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     KCMorphologyOperatorType m_operator;
@@ -566,7 +566,7 @@ public:
     float dy() const { return m_dy; }
     void setDy(float dy) { m_dy = dy; }
     
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     float m_dx;
@@ -600,7 +600,7 @@ public:
     const KCLightSource *lightSource() const { return m_lightSource; }
     void setLightSource(KCLightSource *lightSource);
     
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     Color m_lightingColor;
@@ -640,7 +640,7 @@ public:
     bool stitchTiles() const { return m_stitchTiles; }
     void setStitchTiles(bool stitch) { m_stitchTiles = stitch; }
 
-    QTextStream &externalRepresentation(QTextStream &) const;
+    TextStream &externalRepresentation(TextStream &) const;
     
 private:
     float m_baseFrequencyX;
index dd45305b4629dbf8a9d47376a8aa7532107fd374..a6efbec77232321c4d18140fcd637ee254ed7ec4 100644 (file)
@@ -25,7 +25,7 @@
 #include "KCanvasMatrix.h"
 
 #include "KCanvasPath.h"
-#include "KWQWMatrix.h"
+#include "AffineTransform.h"
 #include <math.h>
 
 namespace WebCore {
@@ -38,10 +38,10 @@ KCanvasMatrix::KCanvasMatrix()
     m_mode = OPS_PREMUL;
 }
 
-KCanvasMatrix::KCanvasMatrix(const QMatrix &qmatrix)
+KCanvasMatrix::KCanvasMatrix(const AffineTransform &matrix)
 {
     m_mode = OPS_PREMUL;
-    (*this) = qmatrix;
+    (*this) = matrix;
 }
 
 KCanvasMatrix::KCanvasMatrix(const KCanvasMatrix &matrix)
@@ -60,7 +60,7 @@ KCanvasMatrix::~KCanvasMatrix()
 {
 }
 
-KCanvasMatrix &KCanvasMatrix::operator=(const QMatrix &other)
+KCanvasMatrix &KCanvasMatrix::operator=(const AffineTransform &other)
 {
     m_matrix = other;
     return *this;
@@ -72,12 +72,12 @@ KCanvasMatrix &KCanvasMatrix::operator=(const KCanvasMatrix &other)
     return *this;
 }
 
-bool KCanvasMatrix::operator==(const QMatrix &other) const
+bool KCanvasMatrix::operator==(const AffineTransform &other) const
 {
     return (m_matrix == other);
 }
 
-bool KCanvasMatrix::operator!=(const QMatrix &other) const
+bool KCanvasMatrix::operator!=(const AffineTransform &other) const
 {
     return !operator==(other);
 }
@@ -163,7 +163,7 @@ KCanvasMatrix &KCanvasMatrix::translate(double x, double y)
         m_matrix.translate(x, y);
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.translate(x, y);
         m_matrix *= temp;
     }
@@ -173,7 +173,7 @@ KCanvasMatrix &KCanvasMatrix::translate(double x, double y)
 
 KCanvasMatrix &KCanvasMatrix::multiply(const KCanvasMatrix &other)
 {
-    QMatrix temp(other.a(), other.b(), other.c(), other.d(), other.e(), other.f());
+    AffineTransform temp(other.a(), other.b(), other.c(), other.d(), other.e(), other.f());
 
     if(m_mode == OPS_PREMUL)
     {
@@ -192,7 +192,7 @@ KCanvasMatrix &KCanvasMatrix::scale(double scaleFactorX, double scaleFactorY)
         m_matrix.scale(scaleFactorX, scaleFactorY);
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.scale(scaleFactorX, scaleFactorY);
         m_matrix *= temp;
     }
@@ -206,7 +206,7 @@ KCanvasMatrix &KCanvasMatrix::rotate(double angle)
         m_matrix.rotate(angle);
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.rotate(angle);
         m_matrix *= temp;
     }
@@ -220,7 +220,7 @@ KCanvasMatrix &KCanvasMatrix::rotateFromVector(double x, double y)
         m_matrix.rotate(atan2(y, x) / deg2rad);
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.rotate(atan2(y, x) / deg2rad);
         m_matrix *= temp;
     }
@@ -244,7 +244,7 @@ KCanvasMatrix &KCanvasMatrix::skewX(double angle)
         m_matrix.shear(tan(angle * deg2rad), 0.0f);
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.shear(tan(angle * deg2rad), 0.0f);
         m_matrix *= temp;
     }
@@ -258,7 +258,7 @@ KCanvasMatrix &KCanvasMatrix::skewY(double angle)
         m_matrix.shear(0.0f, tan(angle * deg2rad));
     else
     {
-        QMatrix temp;
+        AffineTransform temp;
         temp.shear(0.0f, tan(angle * deg2rad));
         m_matrix *= temp;
     }
@@ -283,7 +283,7 @@ void KCanvasMatrix::removeScale(double *xScale, double *yScale)
     *xScale = sx; *yScale = sy;
 }
 
-QMatrix KCanvasMatrix::qmatrix() const
+AffineTransform KCanvasMatrix::matrix() const
 {
     return m_matrix;
 }
index 915989f713de6c2e093cce5b38ce78dd051690e6..52096254621d14ac26ab933c7bee8f878d922643 100644 (file)
@@ -24,7 +24,7 @@
 #define KCanvasMatrix_H
 #if SVG_SUPPORT
 
-#include "KWQWMatrix.h"
+#include "AffineTransform.h"
 
 namespace WebCore {
 
@@ -38,17 +38,17 @@ class KCanvasMatrix
 {
 public:
     KCanvasMatrix();
-    KCanvasMatrix(const QMatrix &qmatrix);
+    KCanvasMatrix(const AffineTransform &matrix);
     KCanvasMatrix(const KCanvasMatrix &matrix);
     KCanvasMatrix(double a, double b, double c, double d, double e, double f);
     ~KCanvasMatrix();
 
     // Operators
-    KCanvasMatrix &operator=(const QMatrix &other);
+    KCanvasMatrix &operator=(const AffineTransform &other);
     KCanvasMatrix &operator=(const KCanvasMatrix &other);
 
-    bool operator==(const QMatrix &other) const;
-    bool operator!=(const QMatrix &other) const;
+    bool operator==(const AffineTransform &other) const;
+    bool operator!=(const AffineTransform &other) const;
 
     bool operator==(const KCanvasMatrix &other) const;
     bool operator!=(const KCanvasMatrix &other) const;
@@ -94,10 +94,10 @@ public:
     // After this operation, the matrix has x and y scale of one ('1').
     void removeScale(double *xScale, double *yScale);
 
-    QMatrix qmatrix() const;
+    AffineTransform matrix() const;
 
 private:
-    QMatrix m_matrix;
+    AffineTransform m_matrix;
     KCMatrixOperationMode m_mode;
 };
 
index 36b116083b4a73d85b21ec8157bded9b14835006..9a930dd9a6ea54bf87d2851a14a86d0fdf54618c 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #if SVG_SUPPORT
 
-#include "KWQTextStream.h"
+#include "TextStream.h"
 
 #include "KCanvasPath.h"
 #include "KCanvasTreeDebug.h"
@@ -35,7 +35,7 @@
 namespace WebCore {
 
 //KCWindRule
-QTextStream &operator<<(QTextStream &ts, KCWindRule rule)
+TextStream &operator<<(TextStream &ts, KCWindRule rule)
 {
     switch (rule) 
     {
@@ -48,7 +48,7 @@ QTextStream &operator<<(QTextStream &ts, KCWindRule rule)
 }
 
 //KCClipData
-QTextStream &operator<<(QTextStream &ts, const KCClipData &d)
+TextStream &operator<<(TextStream &ts, const KCClipData &d)
 {
     ts << "[winding=" << d.windRule() << "]";
     if (d.bboxUnits)
index 336f54f85e173c4b5d65f14c8ac93ef0f35ec152..f9417139b6afc2fbe1ad22e4eb3145a7e421d2b2 100644 (file)
@@ -30,7 +30,7 @@
 #include "Shared.h"
 #include "FloatRect.h"
 
-class QTextStream;
+class TextStream;
 
 namespace WebCore {
 
@@ -94,8 +94,8 @@ public:
     }
 };
 
-QTextStream &operator<<(QTextStream &ts, KCWindRule rule);
-QTextStream &operator<<(QTextStream &ts, const KCClipData &d);
+TextStream &operator<<(TextStream &ts, KCWindRule rule);
+TextStream &operator<<(TextStream &ts, const KCClipData &d);
 
 }
 
index 1f3f2540bcffd793ef9002d91b08ba8209115ef0..b310cb5234da6a42eae6211b16601cba5bbd37cf 100644 (file)
 #include "Document.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"
-#include "KCanvasContainer.h"
+#include "RenderSVGContainer.h"
 #include "KCanvasImage.h"
 #include "KCanvasMatrix.h"
 #include "KCanvasTreeDebug.h"
 #include "KRenderingDevice.h"
 #include "RenderPath.h"
 #include "SVGStyledElement.h"
-#include "KWQTextStream.h"
+#include "TextStream.h"
 
 namespace WebCore {
 
-QTextStream &operator<<(QTextStream &ts, const WebCore::KCanvasResource &r) 
+TextStream &operator<<(TextStream &ts, const WebCore::KCanvasResource &r) 
 { 
     return r.externalRepresentation(ts); 
 }
@@ -84,7 +84,7 @@ void KCanvasResource::setIdInRegistry(const DeprecatedString& newId)
     registryId = newId;
 } 
 
-QTextStream& KCanvasResource::externalRepresentation(QTextStream &ts) const
+TextStream& KCanvasResource::externalRepresentation(TextStream &ts) const
 {
     return ts;
 }
@@ -113,7 +113,7 @@ KCClipDataList KCanvasClipper::clipData() const
     return m_clipData;
 }
 
-QTextStream& KCanvasClipper::externalRepresentation(QTextStream &ts) const
+TextStream& KCanvasClipper::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=CLIPPER]";
     ts << " [clip data=" << clipData() << "]";
@@ -138,7 +138,7 @@ void KCanvasMasker::setMask(KCanvasImage *mask)
     }
 }
 
-QTextStream& KCanvasMasker::externalRepresentation(QTextStream &ts) const
+TextStream& KCanvasMasker::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=MASKER]";
     return ts;
@@ -240,14 +240,14 @@ void KCanvasMarker::draw(GraphicsContext* context, const FloatRect& rect, double
         // FIXME: PaintInfo should be passed into this method instead.
         // FIXME: bounding box fractions lost
         RenderObject::PaintInfo info(context, enclosingIntRect(rect), PaintPhaseForeground, 0, 0);
-        m_marker->setLocalTransform(rotation.multiply(translation).qmatrix());
-        static_cast<KCanvasContainer *>(m_marker)->setDrawsContents(true);
+        m_marker->setLocalTransform(rotation.multiply(translation).matrix());
+        static_cast<RenderSVGContainer *>(m_marker)->setDrawsContents(true);
         m_marker->paint(info, 0, 0);
-        static_cast<KCanvasContainer *>(m_marker)->setDrawsContents(false);
+        static_cast<RenderSVGContainer *>(m_marker)->setDrawsContents(false);
     }
 }
 
-QTextStream& KCanvasMarker::externalRepresentation(QTextStream &ts) const
+TextStream& KCanvasMarker::externalRepresentation(TextStream &ts) const
 {
     ts << "[type=MARKER]"
        << " [angle=";
index ec5049874c49d4adfc37fbb46578748a6af748c0..efd4e45b4185641b6942cc0761d6e42988c43e70 100644 (file)
@@ -28,7 +28,7 @@
 #include <kcanvas/KCanvasPath.h>
 #include <kcanvas/KCanvasResourceListener.h>
 
-class QTextStream;
+class TextStream;
 
 namespace WebCore {
 
@@ -66,7 +66,7 @@ public: